X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fruntime%2FStaticCms.java;h=6744700d4cccc390d9c0a18a9e13a1d2500296b3;hb=333f1fbd809a57b74e9376d074825d14722d7f9d;hp=a1b8c54010b89828b9d72244a91dcdd96d39b6ad;hpb=4672ec9d1071dffc7c591f623898d32a31637d04;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 a1b8c5401..6744700d4 100644
--- a/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java
+++ b/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java
@@ -2,8 +2,6 @@ package org.argeo.cms.runtime;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Dictionary;
-import java.util.HashMap;
 import java.util.concurrent.CompletableFuture;
 
 import org.argeo.api.acr.ContentRepository;
@@ -15,13 +13,11 @@ import org.argeo.api.uuid.UuidFactory;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.acr.CmsUuidFactory;
 import org.argeo.cms.internal.auth.CmsUserManagerImpl;
-import org.argeo.cms.internal.osgi.DeployConfig;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
 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.useradmin.UserDirectory;
 import org.argeo.util.register.Component;
 import org.argeo.util.register.SimpleRegister;
 import org.argeo.util.transaction.SimpleTransactionManager;
@@ -55,22 +51,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);
-
-		// CMS Deployment
-		CmsDeploymentImpl cmsDeployment = new CmsDeploymentImpl();
-		Component<CmsDeploymentImpl> cmsDeploymentC = new Component.Builder<>(cmsDeployment) //
-				.addType(CmsDeployment.class) //
-				.addActivation(cmsDeployment::start) //
-				.addDeactivation(cmsDeployment::stop) //
-				.addDependency(cmsStateC.getType(CmsState.class), cmsDeployment::setCmsState, null) //
-				.addDependency(deployConfigC.getType(DeployConfig.class), cmsDeployment::setDeployConfig, null) //
-				.build(register);
+//		DeployConfig deployConfig = new DeployConfig();
+//		Component<DeployConfig> deployConfigC = new Component.Builder<>(deployConfig) //
+//				.addType(DeployConfig.class) //
+//				.addActivation(deployConfig::start) //
+//				.addDeactivation(deployConfig::stop) //
+//				.build(register);
 
 		// Transaction manager
 		SimpleTransactionManager transactionManager = new SimpleTransactionManager();
@@ -83,22 +69,27 @@ public class StaticCms {
 		CmsUserAdmin userAdmin = new CmsUserAdmin();
 		Component<CmsUserAdmin> userAdminC = new Component.Builder<>(userAdmin) //
 				.addType(UserAdmin.class) //
+				.addActivation(userAdmin::start) //
+				.addDeactivation(userAdmin::stop) //
+				.addDependency(cmsStateC.getType(CmsState.class), userAdmin::setCmsState, null) //
 				.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) //
+				.addActivation(userManager::start) //
+				.addDeactivation(userManager::stop) //
 				.addDependency(userAdminC.getType(UserAdmin.class), userManager::setUserAdmin, null) //
 				.addDependency(transactionManagerC.getType(WorkTransaction.class), userManager::setUserTransaction,
 						null) //
@@ -116,6 +107,16 @@ public class StaticCms {
 				.addDependency(userManagerC.getType(CmsUserManager.class), contentRepository::setUserManager, null) //
 				.build(register);
 
+		// CMS Deployment
+		CmsDeploymentImpl cmsDeployment = new CmsDeploymentImpl();
+		Component<CmsDeploymentImpl> cmsDeploymentC = new Component.Builder<>(cmsDeployment) //
+				.addType(CmsDeployment.class) //
+				.addActivation(cmsDeployment::start) //
+				.addDeactivation(cmsDeployment::stop) //
+				.addDependency(cmsStateC.getType(CmsState.class), cmsDeployment::setCmsState, null) //
+//				.addDependency(deployConfigC.getType(DeployConfig.class), cmsDeployment::setDeployConfig, null) //
+				.build(register);
+
 		// CMS Context
 		CmsContextImpl cmsContext = new CmsContextImpl();
 		Component<CmsContextImpl> cmsContextC = new Component.Builder<>(cmsContext) //
@@ -126,8 +127,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;