X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FRepositoryServiceFactory.java;h=630a453c2d5a40008c0d0af9af127c6278290b89;hb=d169026cb1939009fd90ac46a11f480cb3d803c0;hp=6ec27659063087838443a89ef8f1a1d89eb5e737;hpb=0243aa5633af84d8608ba912483dbaaaefac42f1;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 6ec276590..630a453c2 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,24 +1,28 @@
 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.core.RepositoryContext;
-import org.argeo.cms.CmsException;
-import org.argeo.node.NodeConstants;
+import org.argeo.api.NodeConstants;
+import org.argeo.cms.internal.jcr.RepoConf;
+import org.argeo.cms.internal.jcr.RepositoryBuilder;
 import org.argeo.util.LangUtils;
-import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
-import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedServiceFactory;
 
+/** A {@link ManagedServiceFactory} creating or referencing JCR repositories. */
 class RepositoryServiceFactory implements ManagedServiceFactory {
 	private final static Log log = LogFactory.getLog(RepositoryServiceFactory.class);
-	private final BundleContext bc = FrameworkUtil.getBundle(RepositoryServiceFactory.class).getBundleContext();
+//	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>();
@@ -31,7 +35,7 @@ class RepositoryServiceFactory implements ManagedServiceFactory {
 	@Override
 	public void updated(String pid, Dictionary<String, ?> properties) throws ConfigurationException {
 		if (repositories.containsKey(pid))
-			throw new CmsException("Already a repository registered for " + pid);
+			throw new IllegalArgumentException("Already a repository registered for " + pid);
 
 		if (properties == null)
 			return;
@@ -42,21 +46,62 @@ class RepositoryServiceFactory implements ManagedServiceFactory {
 		}
 
 		try {
-			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);
+			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.dict(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);
+				}
+				Activator.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));
+					RepositoryFactory repositoryFactory = Activator.getService(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.dict(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);
+					}
+					Activator.registerService(Repository.class, repository, props);
+
+					// home
+					if (cn.equals(NodeConstants.NODE_REPOSITORY)) {
+						Dictionary<String, Object> homeProps = LangUtils.dict(NodeConstants.CN,
+								NodeConstants.EGO_REPOSITORY);
+						EgoRepository homeRepository = new EgoRepository(repository, true);
+						Activator.registerService(Repository.class, homeRepository, homeProps);
+					}
+				} catch (Exception e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 			}
-			bc.registerService(RepositoryContext.class, repositoryContext, props);
 		} catch (Exception e) {
-			throw new CmsException("Cannot create Jackrabbit repository " + pid, e);
+			throw new IllegalStateException("Cannot create Jackrabbit repository " + pid, e);
 		}
 
 	}
@@ -81,4 +126,5 @@ class RepositoryServiceFactory implements ManagedServiceFactory {
 			}
 		}
 	}
+
 }