X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjackrabbit%2FJackrabbitRepositoryFactory.java;h=5be370fe12a0c4c981e2fa0d4387cc01177a17c9;hb=2ba7cb08946a79978e74b8e1c1d04fe607450505;hp=9f2926cb34d635d35e33215d6c811e70d80007d8;hpb=10c220cf49f5b146bac50ed7fe2578135cd466f1;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java
index 9f2926cb3..5be370fe1 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java
@@ -2,6 +2,7 @@ package org.argeo.jackrabbit;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
 
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -14,33 +15,54 @@ import org.apache.jackrabbit.jcr2dav.Jcr2davRepositoryFactory;
 import org.argeo.ArgeoException;
 import org.argeo.jcr.ArgeoJcrConstants;
 import org.argeo.jcr.DefaultRepositoryFactory;
+import org.osgi.framework.BundleContext;
 
+/** Repository factory which can access remote Jackrabbit repositories */
 public class JackrabbitRepositoryFactory extends DefaultRepositoryFactory
 		implements RepositoryFactory, ArgeoJcrConstants {
 	private final static Log log = LogFactory
 			.getLog(JackrabbitRepositoryFactory.class);
 
-	@SuppressWarnings("rawtypes")
+	private BundleContext bundleContext;
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public Repository getRepository(Map parameters) throws RepositoryException {
 		Repository repository = super.getRepository(parameters);
 		if (repository != null)
 			return repository;
 
-		if (parameters.containsKey(JCR_REPOSITORY_URI)) {
-			String uri = parameters.get(JCR_REPOSITORY_URI).toString();
-			Map<String, String> params = new HashMap<String, String>();
-			
-			params.put(JcrUtils.REPOSITORY_URI, uri);
-			repository = new Jcr2davRepositoryFactory().getRepository(params);
-			if (repository == null)
-				throw new ArgeoException("Remote Davex repository " + uri
-						+ " not found");
-			log.info("Initialized remote Jackrabbit repository " + repository
-					+ " from uri " + uri);
+		String uri;
+		if (parameters.containsKey(JCR_REPOSITORY_URI))
+			uri = parameters.get(JCR_REPOSITORY_URI).toString();
+		else if (parameters.containsKey(JcrUtils.REPOSITORY_URI))
+			uri = parameters.get(JcrUtils.REPOSITORY_URI).toString();
+		else
+			return null;
+
+		Map<String, String> params = new HashMap<String, String>();
+		params.put(JcrUtils.REPOSITORY_URI, uri);
+		repository = new Jcr2davRepositoryFactory().getRepository(params);
+		if (repository == null)
+			throw new ArgeoException("Remote Davex repository " + uri
+					+ " not found");
+		log.info("Initialized remote Jackrabbit repository from uri " + uri);
 
+		if (parameters.containsKey(JCR_REPOSITORY_ALIAS)
+				&& bundleContext != null) {
+			Properties properties = new Properties();
+			properties.putAll(parameters);
+			bundleContext.registerService(Repository.class.getName(),
+					repository, properties);
+			log.info("Registered under alias '"
+					+ parameters.get(JCR_REPOSITORY_ALIAS)
+					+ "' the remote JCR repository from uri " + uri);
 		}
 
 		return repository;
 	}
 
+	public void setBundleContext(BundleContext bundleContext) {
+		this.bundleContext = bundleContext;
+	}
+
 }