X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsDeployment.java;h=1d1734d36645664b0bc5adca04183674614daed0;hb=255654a72d48b875d71cea637532784953d80499;hp=7a180cfc5287adf5612ea3deaaf9d65162d8a112;hpb=277bb126a4b8523b93c2cd9abd345833a8387eba;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 7a180cfc5..1d1734d36 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 @@ -14,18 +14,20 @@ import java.util.Set; import javax.jcr.Repository; import javax.jcr.Session; +import javax.security.auth.callback.CallbackHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.commons.cnd.CndImporter; import org.apache.jackrabbit.core.RepositoryContext; import org.argeo.cms.CmsException; -import org.argeo.jcr.ArgeoJcrConstants; 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.util.LangUtils; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; @@ -34,12 +36,16 @@ import org.osgi.framework.ServiceReference; import org.osgi.framework.wiring.BundleCapability; import org.osgi.framework.wiring.BundleWire; import org.osgi.framework.wiring.BundleWiring; +import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; +import org.osgi.service.cm.ManagedService; import org.osgi.service.http.HttpService; import org.osgi.service.useradmin.UserAdmin; import org.osgi.util.tracker.ServiceTracker; 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(); @@ -83,6 +89,15 @@ public class CmsDeployment implements NodeDeployment { ConfigurationAdmin configurationAdmin = bc.getService(reference); deployConfig = new DeployConfig(configurationAdmin, cleanState); httpExpected = deployConfig.getProps(KernelConstants.JETTY_FACTORY_PID, "default") != null; + try { + Configuration[] configs= configurationAdmin.listConfigurations("(service.factoryPid="+NodeConstants.NODE_REPOS_FACTORY_PID+")"); + for(Configuration config:configs){ + Object cn = config.getProperties().get(NodeConstants.CN); + log.debug("Standalone repo cn: "+cn); + } + } catch (Exception e) { + throw new CmsException("Cannot initialize config", e); + } return super.addingService(reference); } }.open(); @@ -128,13 +143,31 @@ public class CmsDeployment implements NodeDeployment { throw new CmsException("Deployment is already available"); } + // home prepareDataModel(KernelUtils.openAdminSession(deployedNodeRepository)); + } + + private void prepareHomeRepository(Repository deployedRepository) { Hashtable regProps = new Hashtable(); - regProps.put(NodeConstants.CN, ArgeoJcrConstants.ALIAS_HOME); - regProps.put(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS, ArgeoJcrConstants.ALIAS_HOME); - homeRepository = new HomeRepository(deployedNodeRepository); + regProps.put(NodeConstants.CN, NodeConstants.HOME); + regProps.put(LEGACY_JCR_REPOSITORY_ALIAS, NodeConstants.HOME); + homeRepository = new HomeRepository(deployedRepository); // register bc.registerService(Repository.class, homeRepository, regProps); + + new ServiceTracker(bc, CallbackHandler.class, null) { + + @Override + public CallbackHandler addingService(ServiceReference reference) { + NodeKeyRing nodeKeyring = new NodeKeyRing(homeRepository); + CallbackHandler callbackHandler = bc.getService(reference); + nodeKeyring.setDefaultCallbackHandler(callbackHandler); + bc.registerService(LangUtils.names(CryptoKeyring.class, ManagedService.class), nodeKeyring, + LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_KEYRING_PID)); + return callbackHandler; + } + + }.open(); } /** Session is logged out. */ @@ -143,11 +176,8 @@ public class CmsDeployment implements NodeDeployment { Set processed = new HashSet(); bundles: for (Bundle bundle : bc.getBundles()) { BundleWiring wiring = bundle.adapt(BundleWiring.class); - if (wiring == null) { - if (log.isTraceEnabled()) - log.error("No wiring for " + bundle.getSymbolicName()); + if (wiring == null) continue bundles; - } processWiring(adminSession, wiring, processed); } } finally { @@ -170,13 +200,13 @@ public class CmsDeployment implements NodeDeployment { private void registerCnd(Session adminSession, BundleCapability capability, Set processed) { Map attrs = capability.getAttributes(); - String name = attrs.get(DataModelNamespace.CAPABILITY_NAME_ATTRIBUTE).toString(); + String name = (String) attrs.get(DataModelNamespace.CAPABILITY_NAME_ATTRIBUTE); if (processed.contains(name)) { if (log.isTraceEnabled()) log.trace("Data model " + name + " has already been processed"); return; } - String path = attrs.get(DataModelNamespace.CAPABILITY_CND_ATTRIBUTE).toString(); + String path = (String) attrs.get(DataModelNamespace.CAPABILITY_CND_ATTRIBUTE); URL url = capability.getRevision().getBundle().getResource(path); try (Reader reader = new InputStreamReader(url.openStream())) { CndImporter.registerNodeTypes(reader, adminSession, true); @@ -187,14 +217,31 @@ public class CmsDeployment implements NodeDeployment { throw new CmsException("Cannot import CND " + url, e); } - Hashtable properties = new Hashtable<>(); - properties.put(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS, name); - properties.put(NodeConstants.CN, name); - if (name.equals(ArgeoJcrConstants.ALIAS_NODE)) - properties.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE); - bc.registerService(Repository.class, adminSession.getRepository(), properties); - if (log.isDebugEnabled()) - log.debug("Published data model " + name); + if (!asBoolean((String) attrs.get(DataModelNamespace.CAPABILITY_ABSTRACT_ATTRIBUTE))) { + Hashtable properties = new Hashtable<>(); + properties.put(LEGACY_JCR_REPOSITORY_ALIAS, name); + properties.put(NodeConstants.CN, name); + if (name.equals(NodeConstants.NODE)) + properties.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE); + LocalRepository localRepository = new LocalRepository(adminSession.getRepository(), capability); + bc.registerService(Repository.class, localRepository, properties); + if (log.isDebugEnabled()) + log.debug("Published data model " + name); + } + } + + private boolean asBoolean(String value) { + if (value == null) + return false; + switch (value) { + case "true": + return true; + case "false": + return false; + default: + throw new CmsException("Unsupported value for attribute " + DataModelNamespace.CAPABILITY_ABSTRACT_ATTRIBUTE + + ": " + value); + } } @Override @@ -212,10 +259,15 @@ public class CmsDeployment implements NodeDeployment { public RepositoryContext addingService(ServiceReference reference) { RepositoryContext nodeRepo = bc.getService(reference); Object cn = reference.getProperty(NodeConstants.CN); - if (cn != null && cn.equals(ArgeoJcrConstants.ALIAS_NODE)) { - prepareNodeRepository(nodeRepo.getRepository()); - nodeAvailable = true; - checkReadiness(); + if (cn != null) { + if (cn.equals(NodeConstants.NODE)) { + prepareNodeRepository(nodeRepo.getRepository()); + prepareHomeRepository(nodeRepo.getRepository()); + nodeAvailable = true; + checkReadiness(); + }else{ + // TODO standalone + } } return nodeRepo; }