X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FRepositoryServiceFactory.java;h=97a3e8d5ae12b8e353af65776c0604220c4ea743;hb=1b09095425a7c067c097eb91bed5b4a4a33f0dc8;hp=a4e3a9bb8db9982d443c0e632ab43cea29e34afd;hpb=b4c772a263e0f19f6c283dbbb87d04794072b284;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java
index a4e3a9bb8..97a3e8d5a 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java
@@ -1,16 +1,20 @@
 package org.argeo.cms.internal.kernel;
 
+import java.net.URI;
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.jcr.Repository;
+import javax.jcr.RepositoryFactory;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.jackrabbit.api.JackrabbitRepository;
 import org.apache.jackrabbit.core.RepositoryContext;
-import org.argeo.ArgeoException;
-import org.argeo.jcr.ArgeoJcrConstants;
-import org.argeo.node.RepoConf;
+import org.argeo.cms.CmsException;
+import org.argeo.cms.internal.jcr.RepoConf;
+import org.argeo.cms.internal.jcr.RepositoryBuilder;
+import org.argeo.node.NodeConstants;
 import org.argeo.util.LangUtils;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -23,6 +27,7 @@ class RepositoryServiceFactory implements ManagedServiceFactory {
 	private final BundleContext bc = FrameworkUtil.getBundle(RepositoryServiceFactory.class).getBundleContext();
 
 	private Map<String, RepositoryContext> repositories = new HashMap<String, RepositoryContext>();
+	private Map<String, Object> pidToCn = new HashMap<String, Object>();
 
 	@Override
 	public String getName() {
@@ -32,7 +37,7 @@ class RepositoryServiceFactory implements ManagedServiceFactory {
 	@Override
 	public void updated(String pid, Dictionary<String, ?> properties) throws ConfigurationException {
 		if (repositories.containsKey(pid))
-			throw new ArgeoException("Already a repository registered for " + pid);
+			throw new CmsException("Already a repository registered for " + pid);
 
 		if (properties == null)
 			return;
@@ -43,14 +48,61 @@ class RepositoryServiceFactory implements ManagedServiceFactory {
 		}
 
 		try {
-			RepositoryBuilder repositoryBuilder = new RepositoryBuilder();
-			RepositoryContext repositoryContext = repositoryBuilder.createRepositoryContext(properties);
-			repositories.put(pid, repositoryContext);
-			Dictionary<String, Object> props = LangUtils.init(Constants.SERVICE_PID, pid);
-			props.put(ArgeoJcrConstants.JCR_REPOSITORY_URI, properties.get(RepoConf.labeledUri.name()));
-			bc.registerService(JackrabbitRepository.class, repositoryContext.getRepository(), props);
+			Object labeledUri = properties.get(RepoConf.labeledUri.name());
+			if (labeledUri == null) {
+				RepositoryBuilder repositoryBuilder = new RepositoryBuilder();
+				RepositoryContext repositoryContext = repositoryBuilder.createRepositoryContext(properties);
+				repositories.put(pid, repositoryContext);
+				Dictionary<String, Object> props = LangUtils.dico(Constants.SERVICE_PID, pid);
+				// props.put(ArgeoJcrConstants.JCR_REPOSITORY_URI,
+				// properties.get(RepoConf.labeledUri.name()));
+				Object cn = properties.get(NodeConstants.CN);
+				if (cn != null) {
+					props.put(NodeConstants.CN, cn);
+					// props.put(NodeConstants.JCR_REPOSITORY_ALIAS, cn);
+					pidToCn.put(pid, cn);
+				}
+				bc.registerService(RepositoryContext.class, repositoryContext, props);
+			} else {
+				try {
+					Object cn = properties.get(NodeConstants.CN);
+					Object defaultWorkspace = properties.get(RepoConf.defaultWorkspace.name());
+					if (defaultWorkspace == null)
+						defaultWorkspace = RepoConf.defaultWorkspace.getDefault();
+					URI uri = new URI(labeledUri.toString());
+					RepositoryFactory repositoryFactory = bc
+							.getService(bc.getServiceReference(RepositoryFactory.class));
+					Map<String, String> parameters = new HashMap<String, String>();
+					parameters.put(RepoConf.labeledUri.name(), uri.toString());
+					parameters.put(RepoConf.defaultWorkspace.name(), defaultWorkspace.toString());
+					Repository repository = repositoryFactory.getRepository(parameters);
+					// Repository repository = NodeUtils.getRepositoryByUri(repositoryFactory,
+					// uri.toString());
+					Dictionary<String, Object> props = LangUtils.dico(Constants.SERVICE_PID, pid);
+					props.put(RepoConf.labeledUri.name(),
+							new URI(uri.getScheme(), null, uri.getHost(), uri.getPort(), uri.getPath(), null, null)
+									.toString());
+					if (cn != null) {
+						props.put(NodeConstants.CN, cn);
+						// props.put(NodeConstants.JCR_REPOSITORY_ALIAS, cn);
+						pidToCn.put(pid, cn);
+					}
+					bc.registerService(Repository.class, repository, props);
+
+					// home
+					// TODO make a sperate home configurable
+					if (cn.equals(NodeConstants.NODE)) {
+						Dictionary<String, Object> homeProps = LangUtils.dico(NodeConstants.CN, NodeConstants.HOME);
+						HomeRepository homeRepository = new HomeRepository(repository, true);
+						bc.registerService(Repository.class, homeRepository, homeProps);
+					}
+				} catch (Exception e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
 		} catch (Exception e) {
-			throw new ArgeoException("Cannot create Jackrabbit repository " + pid, e);
+			throw new CmsException("Cannot create Jackrabbit repository " + pid, e);
 		}
 
 	}
@@ -67,6 +119,9 @@ class RepositoryServiceFactory implements ManagedServiceFactory {
 		for (String pid : repositories.keySet()) {
 			try {
 				repositories.get(pid).getRepository().shutdown();
+				if (log.isDebugEnabled())
+					log.debug("Shut down repository " + pid
+							+ (pidToCn.containsKey(pid) ? " (" + pidToCn.get(pid) + ")" : ""));
 			} catch (Exception e) {
 				log.error("Error when shutting down Jackrabbit repository " + pid, e);
 			}