X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjcr%2Finternal%2Fosgi%2FCmsJcrActivator.java;h=7332fde293586d9ebe2074f459a1c1a481237736;hb=549ff25baf9371d910065303e22daf49321b517a;hp=1fb81b7170c53b145a34bfbc2282c9694fd8922b;hpb=1a0d5ca243bc86a5f54448186178e5fb04c623e9;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/osgi/CmsJcrActivator.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/osgi/CmsJcrActivator.java
index 1fb81b717..7332fde29 100644
--- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/osgi/CmsJcrActivator.java
+++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/osgi/CmsJcrActivator.java
@@ -1,42 +1,34 @@
 package org.argeo.cms.jcr.internal.osgi;
 
 import java.nio.file.spi.FileSystemProvider;
-import java.util.ArrayList;
 import java.util.Dictionary;
-import java.util.List;
 
 import javax.jcr.RepositoryFactory;
 
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsConstants;
 import org.argeo.cms.jcr.internal.CmsFsProvider;
-import org.argeo.cms.jcr.internal.StatisticsThread;
 import org.argeo.cms.jcr.internal.NodeRepositoryFactory;
 import org.argeo.cms.jcr.internal.RepositoryServiceFactory;
+import org.argeo.cms.jcr.internal.StatisticsThread;
 import org.argeo.util.LangUtils;
-import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
-import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.cm.ManagedServiceFactory;
 
 public class CmsJcrActivator implements BundleActivator {
 	private static BundleContext bundleContext;
-	static {
-		Bundle bundle = FrameworkUtil.getBundle(CmsJcrActivator.class);
-		if (bundle != null) {
-			bundleContext = bundle.getBundleContext();
-		}
-	}
 
 //	private List<Runnable> stopHooks = new ArrayList<>();
 	private StatisticsThread kernelThread;
 
 	private RepositoryServiceFactory repositoryServiceFactory;
-//	private JcrDeployment jcrDeployment;
+//	private CmsJcrDeployment jcrDeployment;
 
 	@Override
 	public void start(BundleContext context) throws Exception {
+		bundleContext = context;
+		
 		// kernel thread
 		kernelThread = new StatisticsThread("Kernel Thread");
 		kernelThread.setContextClassLoader(getClass().getClassLoader());
@@ -46,7 +38,7 @@ public class CmsJcrActivator implements BundleActivator {
 		repositoryServiceFactory = new RepositoryServiceFactory();
 //		stopHooks.add(() -> repositoryServiceFactory.shutdown());
 		registerService(ManagedServiceFactory.class, repositoryServiceFactory,
-				LangUtils.dict(Constants.SERVICE_PID, NodeConstants.NODE_REPOS_FACTORY_PID));
+				LangUtils.dict(Constants.SERVICE_PID, CmsConstants.NODE_REPOS_FACTORY_PID));
 
 		NodeRepositoryFactory repositoryFactory = new NodeRepositoryFactory();
 		registerService(RepositoryFactory.class, repositoryFactory, null);
@@ -64,9 +56,9 @@ public class CmsJcrActivator implements BundleActivator {
 //			log.debug("Installed FileSystemProvider " + fsp);
 //		}
 		registerService(FileSystemProvider.class, cmsFsProvider,
-				LangUtils.dict(Constants.SERVICE_PID, NodeConstants.NODE_FS_PROVIDER_PID));
+				LangUtils.dict(Constants.SERVICE_PID, CmsConstants.NODE_FS_PROVIDER_PID));
 
-//		jcrDeployment = new JcrDeployment();
+//		jcrDeployment = new CmsJcrDeployment();
 //		jcrDeployment.init();
 	}
 
@@ -81,6 +73,7 @@ public class CmsJcrActivator implements BundleActivator {
 		if (kernelThread != null)
 			kernelThread.destroyAndJoin();
 
+		bundleContext = null;
 	}
 
 	@Deprecated