Fix static CMS initialisation.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / runtime / StaticCms.java

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 c88ebb8bdb95eb308e42aba6edbc56c7ef56e836..6744700d4cccc390d9c0a18a9e13a1d2500296b3 100644 (file)
--- 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;
@@ -62,16 +58,6 @@ public class StaticCms {
 //                             .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);
-
                // Transaction manager
                SimpleTransactionManager transactionManager = new SimpleTransactionManager();
                Component<SimpleTransactionManager> transactionManagerC = new Component.Builder<>(transactionManager) //
@@ -83,6 +69,9 @@ 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) -> {
@@ -99,6 +88,8 @@ public class StaticCms {
 //             }
                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) //