Improve remoting

[lgpl/argeo-commons.git] / server / runtime / org.argeo.server.jackrabbit / src / main / java / org / argeo / jackrabbit / JackrabbitRepositoryFactory.java

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 87e9e69298a22ce8c1c18c0288966429957a08f5..13ca680fa2a042cf96bbc0bfe11361a71de40188 100644 (file)
--- 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
@@ -54,9 +54,18 @@ public class JackrabbitRepositoryFactory extends DefaultRepositoryFactory
                else if (parameters.containsKey(JcrUtils.REPOSITORY_URI))
                        uri = parameters.get(JcrUtils.REPOSITORY_URI).toString();
 
-               if (uri != null)
-                       repository = createRemoteRepository(uri);
+               if (uri != null) {
+                       if (uri.startsWith("http"))// http, https
+                               repository = createRemoteRepository(uri);
+                       else if (uri.startsWith("vm")) {
+                               log.warn("URI "
+                                               + uri
+                                               + " should have been managed by generic JCR repository factory");
+                               repository = getRepositoryByAlias(getAliasFromURI(uri));
+                       }
+               }
 
+               // publish under alias
                if (parameters.containsKey(JCR_REPOSITORY_ALIAS)) {
                        Properties properties = new Properties();
                        properties.putAll(parameters);
@@ -83,7 +92,7 @@ public class JackrabbitRepositoryFactory extends DefaultRepositoryFactory
        }
 
        /**
-        * Called after the repository has been initialized. Does nothing by
+        * Called after the repository has been initialised. Does nothing by
         * default.
         */
        @SuppressWarnings("rawtypes")