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=5be370fe12a0c4c981e2fa0d4387cc01177a17c9;hb=4d665b0700136573b05879aa19897d8f448d8ca4;hp=6fe5bf3406bcde3bcb3b5d6de7649d2209e40bb5;hpb=8b8ee149b20e2578a55e17413fa5f7399ff7ba14;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 6fe5bf340..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,6 +15,7 @@ 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 @@ -21,7 +23,9 @@ public class JackrabbitRepositoryFactory extends DefaultRepositoryFactory 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) @@ -41,9 +45,24 @@ public class JackrabbitRepositoryFactory extends DefaultRepositoryFactory if (repository == null) throw new ArgeoException("Remote Davex repository " + uri + " not found"); - log.info("Initialized remote Jackrabbit repository " + repository - + " from uri " + uri); + 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; + } + }