X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fruntime%2FStaticCms.java;h=c88ebb8bdb95eb308e42aba6edbc56c7ef56e836;hb=4e8d82137c2dce7145175eacbd225a52227b6f73;hp=a44c5d4fdade72c495ed52e430ae033716ffbf1c;hpb=4c7e1885b8bf3c93fa0919ace122e3f289a925ea;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java b/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java
index a44c5d4fd..c88ebb8bd 100644
--- a/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java
+++ b/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java
@@ -21,12 +21,12 @@ import org.argeo.cms.internal.runtime.CmsDeploymentImpl;
 import org.argeo.cms.internal.runtime.CmsStateImpl;
 import org.argeo.cms.internal.runtime.CmsUserAdmin;
 import org.argeo.cms.internal.runtime.DeployedContentRepository;
-import org.argeo.osgi.transaction.SimpleTransactionManager;
-import org.argeo.osgi.transaction.WorkControl;
-import org.argeo.osgi.transaction.WorkTransaction;
 import org.argeo.osgi.useradmin.UserDirectory;
 import org.argeo.util.register.Component;
 import org.argeo.util.register.SimpleRegister;
+import org.argeo.util.transaction.SimpleTransactionManager;
+import org.argeo.util.transaction.WorkControl;
+import org.argeo.util.transaction.WorkTransaction;
 import org.osgi.service.useradmin.UserAdmin;
 
 /**
@@ -55,12 +55,12 @@ public class StaticCms {
 				.build(register);
 
 		// Deployment Configuration
-		DeployConfig deployConfig = new DeployConfig();
-		Component<DeployConfig> deployConfigC = new Component.Builder<>(deployConfig) //
-				.addType(DeployConfig.class) //
-				.addActivation(deployConfig::start) //
-				.addDeactivation(deployConfig::stop) //
-				.build(register);
+//		DeployConfig deployConfig = new DeployConfig();
+//		Component<DeployConfig> deployConfigC = new Component.Builder<>(deployConfig) //
+//				.addType(DeployConfig.class) //
+//				.addActivation(deployConfig::start) //
+//				.addDeactivation(deployConfig::stop) //
+//				.build(register);
 
 		// CMS Deployment
 		CmsDeploymentImpl cmsDeployment = new CmsDeploymentImpl();
@@ -69,7 +69,7 @@ public class StaticCms {
 				.addActivation(cmsDeployment::start) //
 				.addDeactivation(cmsDeployment::stop) //
 				.addDependency(cmsStateC.getType(CmsState.class), cmsDeployment::setCmsState, null) //
-				.addDependency(deployConfigC.getType(DeployConfig.class), cmsDeployment::setDeployConfig, null) //
+//				.addDependency(deployConfigC.getType(DeployConfig.class), cmsDeployment::setDeployConfig, null) //
 				.build(register);
 
 		// Transaction manager
@@ -85,18 +85,18 @@ public class StaticCms {
 				.addType(UserAdmin.class) //
 				.addDependency(transactionManagerC.getType(WorkControl.class), userAdmin::setTransactionManager, null) //
 				.addDependency(transactionManagerC.getType(WorkTransaction.class), userAdmin::setUserTransaction, null) //
-				.addDependency(deployConfigC.getType(DeployConfig.class), (d) -> {
-					for (Dictionary<String, Object> userDirectoryConfig : d.getUserDirectoryConfigs())
-						userAdmin.enableUserDirectory(userDirectoryConfig);
-				}, null) //
+//				.addDependency(deployConfigC.getType(DeployConfig.class), (d) -> {
+//					for (Dictionary<String, Object> userDirectoryConfig : d.getUserDirectoryConfigs())
+//						userAdmin.enableUserDirectory(userDirectoryConfig);
+//				}, null) //
 				.build(register);
 
 		// User manager
 		CmsUserManagerImpl userManager = new CmsUserManagerImpl();
-		for (UserDirectory userDirectory : userAdmin.getUserDirectories()) {
-			// FIXME deal with properties
-			userManager.addUserDirectory(userDirectory, new HashMap<>());
-		}
+//		for (UserDirectory userDirectory : userAdmin.getUserDirectories()) {
+//			// FIXME deal with properties
+//			userManager.addUserDirectory(userDirectory, new HashMap<>());
+//		}
 		Component<CmsUserManagerImpl> userManagerC = new Component.Builder<>(userManager) //
 				.addType(CmsUserManager.class) //
 				.addDependency(userAdminC.getType(UserAdmin.class), userManager::setUserAdmin, null) //
@@ -126,8 +126,8 @@ public class StaticCms {
 				.addDependency(cmsDeploymentC.getType(CmsDeployment.class), cmsContext::setCmsDeployment, null) //
 				.addDependency(userAdminC.getType(UserAdmin.class), cmsContext::setUserAdmin, null) //
 				.addDependency(uuidFactoryC.getType(UuidFactory.class), cmsContext::setUuidFactory, null) //
-				.addDependency(contentRepositoryC.getType(ProvidedRepository.class), cmsContext::setContentRepository,
-						null) //
+//				.addDependency(contentRepositoryC.getType(ProvidedRepository.class), cmsContext::setContentRepository,
+//						null) //
 				.build(register);
 		assert cmsContextC.get() == cmsContext;