X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjackrabbit%2FJackrabbitRepositoryFactory.java;h=6fe5bf3406bcde3bcb3b5d6de7649d2209e40bb5;hb=8b8ee149b20e2578a55e17413fa5f7399ff7ba14;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..6fe5bf340 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
@@ -15,6 +15,7 @@ import org.argeo.ArgeoException;
 import org.argeo.jcr.ArgeoJcrConstants;
 import org.argeo.jcr.DefaultRepositoryFactory;
 
+/** Repository factory which can access remote Jackrabbit repositories */
 public class JackrabbitRepositoryFactory extends DefaultRepositoryFactory
 		implements RepositoryFactory, ArgeoJcrConstants {
 	private final static Log log = LogFactory
@@ -26,21 +27,23 @@ public class JackrabbitRepositoryFactory extends DefaultRepositoryFactory
 		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 " + repository
+				+ " from uri " + uri);
 
 		return repository;
 	}
-
 }