X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fruntime%2FStaticCms.java;fp=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fruntime%2FStaticCms.java;h=e473d27994ff8f4e467461166b3b6523c7043fb5;hb=f3ea14abccc33b1c3326417a87c91145be776c72;hp=d1a19bd63a1af6d395d53e6312b8048270b91361;hpb=2752f591462f846423020ef1c1989766b20cd554;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 d1a19bd63..e473d2799 100644 --- a/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java +++ b/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java @@ -31,7 +31,7 @@ import org.osgi.service.useradmin.UserAdmin; * deployment. Useful for testing or AOT compilation. */ public class StaticCms { - private static SimpleRegister register = new SimpleRegister(); + private SimpleRegister register = new SimpleRegister(); private CompletableFuture stopped = new CompletableFuture(); @@ -51,14 +51,6 @@ public class StaticCms { .addDependency(uuidFactoryC.getType(UuidFactory.class), cmsState::setUuidFactory, null) // .build(register); - // Deployment Configuration -// DeployConfig deployConfig = new DeployConfig(); -// Component deployConfigC = new Component.Builder<>(deployConfig) // -// .addType(DeployConfig.class) // -// .addActivation(deployConfig::start) // -// .addDeactivation(deployConfig::stop) // -// .build(register); - // Transaction manager SimpleTransactionManager transactionManager = new SimpleTransactionManager(); Component transactionManagerC = new Component.Builder<>(transactionManager) // @@ -75,10 +67,6 @@ public class StaticCms { .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 userDirectoryConfig : d.getUserDirectoryConfigs()) -// userAdmin.enableUserDirectory(userDirectoryConfig); -// }, null) // .build(register); // User manager