X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsState.java;h=b794d088e619392088fd179043aa1d3690030631;hb=6e6286a551d04ee0993dc7930bd9744f7c9df10e;hp=7ff650254b1149a45801e9623fed7e44c01645f6;hpb=a5041ede454d2cb851aa2908f75e25fce43e639a;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
index 7ff650254..b794d088e 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
@@ -17,18 +17,18 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.NodeConstants;
 import org.argeo.api.NodeState;
-import org.argeo.cms.CmsException;
 import org.argeo.cms.LocaleUtils;
 import org.argeo.transaction.simple.SimpleTransactionManager;
 import org.argeo.util.LangUtils;
-import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
-import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.cm.ManagedServiceFactory;
 
+/**
+ * Implementation of a {@link NodeState}, initialising the required services.
+ */
 public class CmsState implements NodeState {
 	private final static Log log = LogFactory.getLog(CmsState.class);
-	private final BundleContext bc = FrameworkUtil.getBundle(CmsState.class).getBundleContext();
+//	private final BundleContext bc = FrameworkUtil.getBundle(CmsState.class).getBundleContext();
 
 	// REFERENCES
 	private Long availableSince;
@@ -88,7 +88,7 @@ public class CmsState implements NodeState {
 			throw new UnsupportedOperationException(
 					"Bitronix is not supported anymore, but could be again if there is enough interest.");
 		} else {
-			throw new CmsException("Usupported transaction manager type " + tmType);
+			throw new IllegalArgumentException("Usupported transaction manager type " + tmType);
 		}
 
 		// POI
@@ -108,17 +108,17 @@ public class CmsState implements NodeState {
 		// JCR
 		RepositoryServiceFactory repositoryServiceFactory = new RepositoryServiceFactory();
 		stopHooks.add(() -> repositoryServiceFactory.shutdown());
-		bc.registerService(ManagedServiceFactory.class, repositoryServiceFactory,
-				LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_REPOS_FACTORY_PID));
+		Activator.registerService(ManagedServiceFactory.class, repositoryServiceFactory,
+				LangUtils.dict(Constants.SERVICE_PID, NodeConstants.NODE_REPOS_FACTORY_PID));
 
 		NodeRepositoryFactory repositoryFactory = new NodeRepositoryFactory();
-		bc.registerService(RepositoryFactory.class, repositoryFactory, null);
+		Activator.registerService(RepositoryFactory.class, repositoryFactory, null);
 
 		// Security
 		NodeUserAdmin userAdmin = new NodeUserAdmin(NodeConstants.ROLES_BASEDN, NodeConstants.TOKENS_BASEDN);
 		stopHooks.add(() -> userAdmin.destroy());
-		bc.registerService(ManagedServiceFactory.class, userAdmin,
-				LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_USER_ADMIN_PID));
+		Activator.registerService(ManagedServiceFactory.class, userAdmin,
+				LangUtils.dict(Constants.SERVICE_PID, NodeConstants.NODE_USER_ADMIN_PID));
 
 		// File System
 		CmsFsProvider cmsFsProvider = new CmsFsProvider();
@@ -132,14 +132,14 @@ public class CmsState implements NodeState {
 //		for (FileSystemProvider fsp : FileSystemProvider.installedProviders()) {
 //			log.debug("Installed FileSystemProvider " + fsp);
 //		}
-		bc.registerService(FileSystemProvider.class, cmsFsProvider,
-				LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_FS_PROVIDER_PID));
+		Activator.registerService(FileSystemProvider.class, cmsFsProvider,
+				LangUtils.dict(Constants.SERVICE_PID, NodeConstants.NODE_FS_PROVIDER_PID));
 	}
 
 	private void initSimpleTransactionManager() {
 		SimpleTransactionManager transactionManager = new SimpleTransactionManager();
-		bc.registerService(TransactionManager.class, transactionManager, null);
-		bc.registerService(UserTransaction.class, transactionManager, null);
+		Activator.registerService(TransactionManager.class, transactionManager, null);
+		Activator.registerService(UserTransaction.class, transactionManager, null);
 		// TODO TransactionSynchronizationRegistry
 	}