Adapt Node runner

diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/NodeRunner.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/NodeRunner.java
index 94fd1fd457fb8671644bc7f05fa14a24808ffe47..2bc4e504516032674ae90005cb268ddd99adf6d7 100644 (file)
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/NodeRunner.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/NodeRunner.java
@@ -43,8 +43,8 @@ public class NodeRunner {
                }
 
                this.baseDir = baseDir;
-               this.confDir = baseDir.resolve("state");
-               this.dataDir = baseDir.resolve("data");
+               this.confDir = this.baseDir.resolve("state");
+               this.dataDir = this.baseDir.resolve("data");
 
        }
 
@@ -121,9 +121,9 @@ public class NodeRunner {
 
        private void defaultConfiguration(Map<String, String> configuration) {
                // all permissions to OSGi security manager
-               Path policyFile = confDir.resolve("osgi.policy");
+               Path policyFile = confDir.resolve("node.policy");
                if (!Files.exists(policyFile))
-                       copyResource("/org/argeo/osgi/boot/osgi.policy", policyFile);
+                       copyResource("/org/argeo/osgi/boot/node.policy", policyFile);
                configuration.put("java.security.policy", "file://" + policyFile.toAbsolutePath());
 
                configuration.put("org.eclipse.rap.workbenchAutostart", "false");

diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/node.policy b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/node.policy
new file mode 100644 (file)
index 0000000..facb613
--- /dev/null
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/node.policy
@@ -0,0 +1,3 @@
+grant {
+  permission java.security.AllPermission;
+};
\ No newline at end of file

diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/osgi.policy b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/osgi.policy
deleted file mode 100644 (file)
index facb613..0000000
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/osgi.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-  permission java.security.AllPermission;
-};
\ No newline at end of file