From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 15 Apr 2017 12:42:49 +0000 (+0200)
Subject: Adapt Node runner
X-Git-Tag: argeo-commons-2.1.69~9
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=5f0980eb97f8517b283696ea3895bf3c0bff199f;p=lgpl%2Fargeo-commons.git

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 94fd1fd45..2bc4e5045 100644
--- 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
index 000000000..facb61327
--- /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
index facb61327..000000000
--- 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