X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsDeployment.java;h=34b4dd927aaeeb4deb29128b74d6e06239b05139;hb=e7dc62c485696931a3e048d9102a7c86f9323b92;hp=f09a008072104b90050fb64feb221a16ba023766;hpb=9e5ea515aa9a855645c9d20c478c14770264a5cb;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java index f09a00807..34b4dd927 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java @@ -1,6 +1,6 @@ package org.argeo.cms.internal.kernel; -import static org.argeo.node.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE; +import static org.argeo.api.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE; import java.io.File; import java.io.InputStreamReader; @@ -26,15 +26,15 @@ import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.commons.cnd.CndImporter; import org.apache.jackrabbit.core.RepositoryContext; import org.apache.jackrabbit.core.RepositoryImpl; +import org.argeo.api.DataModelNamespace; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeDeployment; +import org.argeo.api.NodeState; +import org.argeo.api.security.CryptoKeyring; +import org.argeo.api.security.Keyring; import org.argeo.cms.ArgeoNames; import org.argeo.cms.CmsException; import org.argeo.jcr.JcrUtils; -import org.argeo.node.DataModelNamespace; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeDeployment; -import org.argeo.node.NodeState; -import org.argeo.node.security.CryptoKeyring; -import org.argeo.node.security.Keyring; import org.argeo.osgi.useradmin.UserAdminConf; import org.argeo.util.LangUtils; import org.eclipse.equinox.http.jetty.JettyConfigurator; @@ -42,6 +42,7 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.framework.FrameworkUtil; +import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; import org.osgi.framework.wiring.BundleCapability; import org.osgi.framework.wiring.BundleWire; @@ -54,16 +55,13 @@ import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.UserAdmin; import org.osgi.util.tracker.ServiceTracker; +/** Implementation of a CMS deployment. */ public class CmsDeployment implements NodeDeployment { - // private final static String LEGACY_JCR_REPOSITORY_ALIAS = - // "argeo.jcr.repository.alias"; - private final Log log = LogFactory.getLog(getClass()); private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext(); private DataModels dataModels; private DeployConfig deployConfig; - private HomeRepository homeRepository; private Long availableSince; @@ -199,6 +197,15 @@ public class CmsDeployment implements NodeDeployment { if (nodeHttp != null) nodeHttp.destroy(); + try { + for (ServiceReference sr : bc + .getServiceReferences(JackrabbitLocalRepository.class, null)) { + bc.getService(sr).destroy(); + } + } catch (InvalidSyntaxException e1) { + log.error("Cannot sclean repsoitories", e1); + } + try { JettyConfigurator.stopServer(KernelConstants.DEFAULT_JETTY_SERVER); } catch (Exception e) { @@ -260,7 +267,7 @@ public class CmsDeployment implements NodeDeployment { } // home - prepareDataModel(NodeConstants.NODE, deployedNodeRepository); + prepareDataModel(NodeConstants.NODE_REPOSITORY, deployedNodeRepository); } private void prepareHomeRepository(RepositoryImpl deployedRepository) { @@ -276,12 +283,12 @@ public class CmsDeployment implements NodeDeployment { JcrUtils.logoutQuietly(adminSession); } - Hashtable regProps = new Hashtable(); - regProps.put(NodeConstants.CN, NodeConstants.HOME); - // regProps.put(LEGACY_JCR_REPOSITORY_ALIAS, NodeConstants.HOME); - homeRepository = new HomeRepository(deployedRepository, false); - // register - bc.registerService(Repository.class, homeRepository, regProps); + // Publish home with the highest service ranking + Hashtable regProps = new Hashtable<>(); + regProps.put(NodeConstants.CN, NodeConstants.EGO_REPOSITORY); + regProps.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE); + Repository egoRepository = new EgoRepository(deployedRepository, false); + bc.registerService(Repository.class, egoRepository, regProps); // Keyring only if Argeo extensions are available if (argeoDataModelExtensionsAvailable) { @@ -289,7 +296,7 @@ public class CmsDeployment implements NodeDeployment { @Override public CallbackHandler addingService(ServiceReference reference) { - NodeKeyRing nodeKeyring = new NodeKeyRing(homeRepository); + NodeKeyRing nodeKeyring = new NodeKeyRing(egoRepository); CallbackHandler callbackHandler = bc.getService(reference); nodeKeyring.setDefaultCallbackHandler(callbackHandler); bc.registerService(LangUtils.names(Keyring.class, CryptoKeyring.class, ManagedService.class), @@ -310,7 +317,7 @@ public class CmsDeployment implements NodeDeployment { BundleWiring wiring = bundle.adapt(BundleWiring.class); if (wiring == null) continue bundles; - if (NodeConstants.NODE.equals(cn))// process all data models + if (NodeConstants.NODE_REPOSITORY.equals(cn))// process all data models processWiring(cn, adminSession, wiring, processed, false); else { List capabilities = wiring.getCapabilities(CMS_DATA_MODEL_NAMESPACE); @@ -388,7 +395,7 @@ public class CmsDeployment implements NodeDeployment { boolean publishLocalRepo; if (isStandalone && name.equals(cn))// includes the node itself publishLocalRepo = true; - else if (!isStandalone && cn.equals(NodeConstants.NODE)) + else if (!isStandalone && cn.equals(NodeConstants.NODE_REPOSITORY)) publishLocalRepo = true; else publishLocalRepo = false; @@ -398,16 +405,18 @@ public class CmsDeployment implements NodeDeployment { private void publishLocalRepo(String dataModelName, Repository repository) { Hashtable properties = new Hashtable<>(); - // properties.put(LEGACY_JCR_REPOSITORY_ALIAS, name); properties.put(NodeConstants.CN, dataModelName); - if (dataModelName.equals(NodeConstants.NODE)) - properties.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE); LocalRepository localRepository; - if (repository instanceof RepositoryImpl) + String[] classes; + if (repository instanceof RepositoryImpl) { localRepository = new JackrabbitLocalRepository((RepositoryImpl) repository, dataModelName); - else + classes = new String[] { Repository.class.getName(), LocalRepository.class.getName(), + JackrabbitLocalRepository.class.getName() }; + } else { localRepository = new LocalRepository(repository, dataModelName); - bc.registerService(Repository.class, localRepository, properties); + classes = new String[] { Repository.class.getName(), LocalRepository.class.getName() }; + } + bc.registerService(classes, localRepository, properties); if (log.isTraceEnabled()) log.trace("Published data model " + dataModelName); } @@ -432,7 +441,7 @@ public class CmsDeployment implements NodeDeployment { RepositoryContext repoContext = bc.getService(reference); String cn = (String) reference.getProperty(NodeConstants.CN); if (cn != null) { - if (cn.equals(NodeConstants.NODE)) { + if (cn.equals(NodeConstants.NODE_REPOSITORY)) { prepareNodeRepository(repoContext.getRepository()); // TODO separate home repository prepareHomeRepository(repoContext.getRepository());