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=76a7e65ffa515c0dbd7a5587b29ffc9bba449542;hp=19dc8d9b8b1e7281666a01dfc47c81b7148815b6;hpb=b7954524256d1ce161ffa468b9a3051db4164253;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 19dc8d9b8..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<String, String> regProps = new Hashtable<String, String>();
-		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<CallbackHandler, CallbackHandler>(bc, CallbackHandler.class, null) {
+
+			@Override
+			public CallbackHandler addingService(ServiceReference<CallbackHandler> 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. */
@@ -186,9 +219,9 @@ public class CmsDeployment implements NodeDeployment {
 
 		if (!asBoolean((String) attrs.get(DataModelNamespace.CAPABILITY_ABSTRACT_ATTRIBUTE))) {
 			Hashtable<String, Object> properties = new Hashtable<>();
-			properties.put(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS, name);
+			properties.put(LEGACY_JCR_REPOSITORY_ALIAS, name);
 			properties.put(NodeConstants.CN, name);
-			if (name.equals(ArgeoJcrConstants.ALIAS_NODE))
+			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);
@@ -226,10 +259,15 @@ public class CmsDeployment implements NodeDeployment {
 		public RepositoryContext addingService(ServiceReference<RepositoryContext> 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;
 		}