X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fruntime%2FStaticCms.java;h=76775fed8060f912bed6a725df629113fc8f211e;hb=de8f04a41db19968896b15cd7f43c819a28e7158;hp=5ffff1d0e3a1757d2e6a36b5b28fe4aa8baedad4;hpb=b843d903237a2a4192c40d8c933e71137284050b;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 5ffff1d0e..76775fed8 100644 --- a/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java +++ b/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java @@ -1,31 +1,46 @@ package org.argeo.cms.runtime; -import java.util.Dictionary; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.concurrent.CompletableFuture; +import org.argeo.api.acr.ContentRepository; +import org.argeo.api.acr.spi.ProvidedRepository; import org.argeo.api.cms.CmsContext; import org.argeo.api.cms.CmsDeployment; import org.argeo.api.cms.CmsState; -import org.argeo.cms.internal.osgi.DeployConfig; +import org.argeo.api.cms.directory.CmsUserManager; +import org.argeo.api.cms.transaction.SimpleTransactionManager; +import org.argeo.api.cms.transaction.WorkControl; +import org.argeo.api.cms.transaction.WorkTransaction; +import org.argeo.api.register.Component; +import org.argeo.api.register.ComponentRegister; +import org.argeo.api.register.SimpleRegister; +import org.argeo.api.uuid.UuidFactory; +import org.argeo.cms.acr.CmsUuidFactory; 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.osgi.transaction.SimpleTransactionManager; -import org.argeo.osgi.transaction.WorkControl; -import org.argeo.osgi.transaction.WorkTransaction; -import org.argeo.util.register.Component; -import org.argeo.util.register.ComponentRegister; -import org.argeo.util.register.StaticRegister; +import org.argeo.cms.internal.runtime.CmsUserManagerImpl; +import org.argeo.cms.internal.runtime.DeployedContentRepository; import org.osgi.service.useradmin.UserAdmin; /** - * A CMS assembly which is programatically defined, as an alternative to OSGi + * A CMS assembly which is programmatically defined, as an alternative to OSGi * deployment. Useful for testing or AOT compilation. */ public class StaticCms { + private SimpleRegister register = new SimpleRegister(); + + private CompletableFuture stopped = new CompletableFuture(); public void start() { - ComponentRegister register = StaticRegister.getInstance(); + // UID factory + CmsUuidFactory uuidFactory = new CmsUuidFactory(); + Component uuidFactoryC = new Component.Builder<>(uuidFactory) // + .addType(UuidFactory.class) // + .build(register); // CMS State CmsStateImpl cmsState = new CmsStateImpl(); @@ -33,24 +48,7 @@ public class StaticCms { .addType(CmsState.class) // .addActivation(cmsState::start) // .addDeactivation(cmsState::stop) // - .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); - - // CMS Deployment - CmsDeploymentImpl cmsDeployment = new CmsDeploymentImpl(); - Component 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) // + .addDependency(uuidFactoryC.getType(UuidFactory.class), cmsState::setUuidFactory, null) // .build(register); // Transaction manager @@ -62,15 +60,50 @@ public class StaticCms { // User Admin CmsUserAdmin userAdmin = new CmsUserAdmin(); - Component 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 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<>()); +// } + Component 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) // + .build(register); + + // Content Repository + DeployedContentRepository contentRepository = new DeployedContentRepository(); + Component contentRepositoryC = new Component.Builder<>(contentRepository) // + .addType(ProvidedRepository.class) // + .addType(ContentRepository.class) // + .addActivation(contentRepository::start) // + .addDeactivation(contentRepository::stop) // + .addDependency(cmsStateC.getType(CmsState.class), contentRepository::setCmsState, null) // + .addDependency(uuidFactoryC.getType(UuidFactory.class), contentRepository::setUuidFactory, null) // + .addDependency(userManagerC.getType(CmsUserManager.class), contentRepository::setUserManager, null) // + .build(register); + + // CMS Deployment + CmsDeploymentImpl cmsDeployment = new CmsDeploymentImpl(); + Component 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 @@ -82,22 +115,55 @@ public class StaticCms { .addDependency(cmsStateC.getType(CmsState.class), cmsContext::setCmsState, null) // .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) // .build(register); - assert cmsContextC.getInstance() == cmsContext; + assert cmsContextC.get() == cmsContext; + + addComponents(register); register.activate(); + + postActivation(register); + } + + protected void addComponents(ComponentRegister register) { + + } + + protected void postActivation(ComponentRegister register) { + + } + + public ComponentRegister getComponentRegister() { + return register; } public void stop() { - if (StaticRegister.getInstance().isActive()) - StaticRegister.getInstance().deactivate(); + if (register.isActive()) { + register.deactivate(); + } + register.clear(); + stopped.complete(null); + } + + public void waitForStop() { + stopped.join(); } public static void main(String[] args) { + if (args.length == 0) { + System.err.println("Usage: "); + System.exit(1); + } + Path instancePath = Paths.get(args[0]); + System.setProperty("osgi.instance.area", instancePath.toUri().toString()); + StaticCms staticCms = new StaticCms(); Runtime.getRuntime().addShutdownHook(new Thread(() -> staticCms.stop(), "Static CMS Shutdown")); staticCms.start(); - + staticCms.waitForStop(); } }