Skip to content

Commit

Permalink
Merge branch 'master' into help-command-improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Andy Berry committed Sep 28, 2015
2 parents f995a50 + 712766c commit abaf8ae
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Contributing to the BRJS codebase is really easy. We only have one hard rule: **
* Check for unnecessary whitespace with `git diff --check` before committing
* Run all the tests for the project before making the pull request

When you submit a pull request please submit into `develop` rather than `master` - the BRJS uses develop for day to day work, only merging to master for releases. If you have built from a feature branch and want to submit a pull request into that feature branch feel free to submit a PR to that branch instead.
Pull requests should be made against the `master` branch. If you have built from a feature branch and want to submit a pull request into that feature branch feel free to submit a PR to that branch instead.


The following information will also be of use:
Expand Down
10 changes: 9 additions & 1 deletion brjs-core/src/main/java/org/bladerunnerjs/model/IO.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package org.bladerunnerjs.model;

import java.io.File;
import java.io.FileFilter;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.Map;

import org.apache.commons.io.filefilter.DelegateFileFilter;
import org.apache.commons.io.filefilter.IOFileFilter;
import org.apache.commons.io.filefilter.OrFileFilter;
import org.apache.commons.io.filefilter.SuffixFileFilter;
Expand All @@ -12,9 +15,14 @@ public class IO {
private final Map<FileAccessLimitScope, File[]> activeScopes = new LinkedHashMap<>();
private final SecurityManager securityManager;
private final IOFileFilter classFileAndJarFileFilter = new SuffixFileFilter( new String[] { ".class", ".jar" } );
private final IOFileFilter jrePathFileFilter = new DelegateFileFilter(new FileFilter() {
public boolean accept(File pathname) {
return pathname.getAbsolutePath().replace("\\", "/").contains("jre/lib");
}
});;

public IO(IOFileFilter globalFileFilter) {
securityManager = new BRJSSecurityManager( new OrFileFilter(classFileAndJarFileFilter, globalFileFilter), activeScopes);
securityManager = new BRJSSecurityManager( new OrFileFilter(Arrays.asList(jrePathFileFilter, classFileAndJarFileFilter, globalFileFilter)), activeScopes);
}

public FileAccessLimitScope limitAccessToWithin(String scopeIdentifier, File[] watchItems) {
Expand Down
2 changes: 1 addition & 1 deletion releases/v1.1.0.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"milestone": "1.1.0",
"name": "BladeRunnerJS 1.1.0",
"prerelease": "false"
"prerelease": false
}

0 comments on commit abaf8ae

Please sign in to comment.