X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FActivator.java;h=f6a9b146968d8a7981a37d710fef07e02fc37804;hb=d66d81530f1da58e2e2c5d25e0a5dc30ad32b848;hp=e5930303a076ade9b77a4301ceccd0e8f8699b43;hpb=6decc943ce5bca1b57ef407b7e9c6bb6ad6f3c97;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
index e5930303a..f6a9b1469 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.security.AllPermission;
 import java.util.Dictionary;
 import java.util.List;
 import java.util.Locale;
@@ -14,7 +15,6 @@ import javax.security.auth.login.Configuration;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
-import org.argeo.node.ArgeoLogger;
 import org.argeo.node.NodeConstants;
 import org.argeo.node.NodeDeployment;
 import org.argeo.node.NodeInstance;
@@ -25,7 +25,13 @@ import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
+import org.osgi.service.condpermadmin.BundleLocationCondition;
+import org.osgi.service.condpermadmin.ConditionInfo;
+import org.osgi.service.condpermadmin.ConditionalPermissionAdmin;
+import org.osgi.service.condpermadmin.ConditionalPermissionInfo;
+import org.osgi.service.condpermadmin.ConditionalPermissionUpdate;
 import org.osgi.service.log.LogReaderService;
+import org.osgi.service.permissionadmin.PermissionInfo;
 import org.osgi.service.useradmin.UserAdmin;
 
 /**
@@ -42,7 +48,7 @@ public class Activator implements BundleActivator {
 	private LogReaderService logReaderService;
 	// private ConfigurationAdmin configurationAdmin;
 
-	private NodeLogger logger;
+	// private NodeLogger logger;
 	private CmsState nodeState;
 	private CmsDeployment nodeDeployment;
 	private CmsInstance nodeInstance;
@@ -69,15 +75,29 @@ public class Activator implements BundleActivator {
 		if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) {
 			String jaasConfig = KernelConstants.JAAS_CONFIG;
 			URL url = getClass().getClassLoader().getResource(jaasConfig);
-			System.setProperty(KernelConstants.JAAS_CONFIG_PROP, url.toExternalForm());
+			// System.setProperty(KernelConstants.JAAS_CONFIG_PROP,
+			// url.toExternalForm());
+			KernelUtils.setJaasConfiguration(url);
 		}
 		// explicitly load JAAS configuration
 		Configuration.getConfiguration();
+
+		ConditionalPermissionAdmin permissionAdmin = bc
+				.getService(bc.getServiceReference(ConditionalPermissionAdmin.class));
+		ConditionalPermissionUpdate update = permissionAdmin.newConditionalPermissionUpdate();
+		// Self
+		update.getConditionalPermissionInfos()
+				.add(permissionAdmin.newConditionalPermissionInfo(null,
+						new ConditionInfo[] {
+								new ConditionInfo(BundleLocationCondition.class.getName(), new String[] { "*" }) },
+						new PermissionInfo[] { new PermissionInfo(AllPermission.class.getName(), null, null) },
+						ConditionalPermissionInfo.ALLOW));
+
 	}
 
 	private void initArgeoLogger() {
-		logger = new NodeLogger(logReaderService);
-		bc.registerService(ArgeoLogger.class, logger, null);
+		// logger = new NodeLogger(logReaderService);
+		// bc.registerService(ArgeoLogger.class, logger, null);
 	}
 
 	private void initNode() throws IOException {