From: Mathieu Baudier Date: Thu, 9 Feb 2012 14:09:28 +0000 (+0000) Subject: Extends Jackrabbit factory capabilities X-Git-Tag: argeo-commons-2.1.30~1031 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=f4ef63b879433249c89bc031cd03e34864f73bfa;p=lgpl%2Fargeo-commons.git Extends Jackrabbit factory capabilities git-svn-id: https://svn.argeo.org/commons/trunk@5029 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- 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 5be370fe1..65bdf2939 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,54 +15,65 @@ 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 */ +/** + * Repository factory which can create new repositories and access remote + * Jackrabbit repositories + */ public class JackrabbitRepositoryFactory extends DefaultRepositoryFactory implements RepositoryFactory, ArgeoJcrConstants { private final static Log log = LogFactory .getLog(JackrabbitRepositoryFactory.class); - private BundleContext bundleContext; - @SuppressWarnings({ "rawtypes", "unchecked" }) public Repository getRepository(Map parameters) throws RepositoryException { + // check if can be found by alias Repository repository = super.getRepository(parameters); if (repository != null) return repository; - String uri; + // check if remote + String uri = null; 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; + if (uri == null) + repository = createRemoteRepository(uri); + + if (parameters.containsKey(JCR_REPOSITORY_ALIAS)) { + Properties properties = new Properties(); + properties.putAll(parameters); + String alias = parameters.get(JCR_REPOSITORY_ALIAS).toString(); + publish(alias, repository, properties); + log.info("Registered JCR repository under alias '" + alias + + "' with properties " + properties); + } + + return repository; + } + + protected Repository createRemoteRepository(String uri) + throws RepositoryException { Map params = new HashMap(); params.put(JcrUtils.REPOSITORY_URI, uri); - repository = new Jcr2davRepositoryFactory().getRepository(params); + Repository 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; + /** + * Called after the repository has been initialized. Does nothing by + * default. + */ + @SuppressWarnings("rawtypes") + protected void postInitialization(Repository repository, Map parameters) { + } } diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/OsgiJackrabbitRepositoryFactory.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/OsgiJackrabbitRepositoryFactory.java new file mode 100644 index 000000000..d837a4026 --- /dev/null +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/OsgiJackrabbitRepositoryFactory.java @@ -0,0 +1,36 @@ +package org.argeo.jackrabbit; + +import java.util.Properties; + +import javax.jcr.Repository; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.osgi.framework.BundleContext; + +/** + * OSGi-aware Jackrabbit repository factory which can retrieve/publish + * {@link Repository} as OSGi services. + */ +public class OsgiJackrabbitRepositoryFactory extends + JackrabbitRepositoryFactory { + private final static Log log = LogFactory + .getLog(OsgiJackrabbitRepositoryFactory.class); + private BundleContext bundleContext; + + protected void publish(String alias, Repository repository, + Properties properties) { + if (bundleContext != null) { + // do not modify reference + Properties props = new Properties(properties); + props.setProperty(JCR_REPOSITORY_ALIAS, alias); + bundleContext.registerService(Repository.class.getName(), + repository, props); + } + } + + public void setBundleContext(BundleContext bundleContext) { + this.bundleContext = bundleContext; + } + +} diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-inMemory.xml b/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-inMemory.xml index 348dc288b..417f8fe7d 100644 --- a/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-inMemory.xml +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-inMemory.xml @@ -1,6 +1,7 @@ + diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-memory.xml b/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-memory.xml new file mode 100644 index 000000000..9f49e551b --- /dev/null +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-memory.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file