From: Mathieu Baudier Date: Sun, 2 Dec 2012 15:38:08 +0000 (+0000) Subject: Introduce file repository creation via repository factory X-Git-Tag: argeo-commons-2.1.30~732 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=14f8dca619ac09e209a7b9f1d2d359fee6a1adb0;p=lgpl%2Fargeo-commons.git Introduce file repository creation via repository factory git-svn-id: https://svn.argeo.org/commons/trunk@5890 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/demo/argeo_node_rcp.properties b/demo/argeo_node_rcp.properties index e240a9913..df2da86e6 100644 --- a/demo/argeo_node_rcp.properties +++ b/demo/argeo_node_rcp.properties @@ -2,10 +2,15 @@ argeo.osgi.start=\ org.springframework.osgi.extender,\ org.argeo.node.repo.jackrabbit,\ org.argeo.security.dao.os,\ -org.argeo.dep.osgi.catalina.start,\ -org.springframework.osgi.web.extender,\ -org.argeo.jackrabbit.webapp,\ + +#org.argeo.dep.osgi.catalina.start,\ +#org.springframework.osgi.web.extender,\ +#org.argeo.jackrabbit.webapp,\ log4j.configuration=file:../../log4j.properties org.argeo.security.ui.initialPerspective=org.argeo.jcr.ui.explorer.perspective eclipse.application=org.argeo.security.ui.rcp.secureUi + +#argeo.node.repo.configuration=classpath:/org/argeo/jackrabbit/repository-fs.xml +#argeo.node.repo.configuration=classpath:/org/argeo/jackrabbit/repository-memory.xml +#argeo.node.repo.configuration=osgibundle:repository-h2.xml diff --git a/server/modules/org.argeo.node.repo.jackrabbit/repository-fs.xml b/server/modules/org.argeo.node.repo.jackrabbit/repository-fs.xml deleted file mode 100644 index 27a5c6325..000000000 --- a/server/modules/org.argeo.node.repo.jackrabbit/repository-fs.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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 9cb846dfd..e994a5cff 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,8 @@ */ package org.argeo.jackrabbit; +import java.io.File; +import java.io.InputStream; import java.util.HashMap; import java.util.Map; import java.util.Properties; @@ -23,13 +25,20 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.RepositoryFactory; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.commons.JcrUtils; +import org.apache.jackrabbit.core.RepositoryImpl; +import org.apache.jackrabbit.core.config.RepositoryConfig; +import org.apache.jackrabbit.core.config.RepositoryConfigurationParser; import org.apache.jackrabbit.jcr2dav.Jcr2davRepositoryFactory; import org.argeo.ArgeoException; import org.argeo.jcr.ArgeoJcrConstants; import org.argeo.jcr.DefaultRepositoryFactory; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; +import org.xml.sax.InputSource; /** * Repository factory which can create new repositories and access remote @@ -37,9 +46,13 @@ import org.argeo.jcr.DefaultRepositoryFactory; */ public class JackrabbitRepositoryFactory extends DefaultRepositoryFactory implements RepositoryFactory, ArgeoJcrConstants { + private final static Log log = LogFactory .getLog(JackrabbitRepositoryFactory.class); + private Resource fileRepositoryConfiguration = new ClassPathResource( + "/org/argeo/jackrabbit/repository-h2.xml"); + @SuppressWarnings({ "rawtypes", "unchecked" }) public Repository getRepository(Map parameters) throws RepositoryException { // check if can be found by alias @@ -57,6 +70,8 @@ public class JackrabbitRepositoryFactory extends DefaultRepositoryFactory if (uri != null) { if (uri.startsWith("http"))// http, https repository = createRemoteRepository(uri); + else if (uri.startsWith("file"))// http, https + repository = createFileRepository(uri, parameters); else if (uri.startsWith("vm")) { log.warn("URI " + uri @@ -91,6 +106,46 @@ public class JackrabbitRepositoryFactory extends DefaultRepositoryFactory return repository; } + @SuppressWarnings({ "rawtypes", "unchecked" }) + protected Repository createFileRepository(final String uri, Map parameters) + throws RepositoryException { + InputStream configurationIn = null; + try { + Properties vars = new Properties(); + vars.putAll(parameters); + String dirPath = uri.substring("file:".length()); + File homeDir = new File(dirPath); + if (homeDir.exists() && !homeDir.isDirectory()) + throw new ArgeoException("Repository home " + dirPath + + " is not a directory"); + if (!homeDir.exists()) + homeDir.mkdirs(); + configurationIn = fileRepositoryConfiguration.getInputStream(); + vars.put(RepositoryConfigurationParser.REPOSITORY_HOME_VARIABLE, + homeDir.getCanonicalPath()); + RepositoryConfig repositoryConfig = RepositoryConfig.create( + new InputSource(configurationIn), vars); + + // TransientRepository repository = new + // TransientRepository(repositoryConfig); + final RepositoryImpl repository = RepositoryImpl + .create(repositoryConfig); + Runtime.getRuntime().addShutdownHook( + new Thread("Clean JCR repository " + uri) { + public void run() { + repository.shutdown(); + log.info("Destroyed repository " + uri); + } + }); + log.info("Initialized file Jackrabbit repository from uri " + uri); + return repository; + } catch (Exception e) { + throw new ArgeoException("Cannot create repository " + uri, e); + } finally { + IOUtils.closeQuietly(configurationIn); + } + } + /** * Called after the repository has been initialised. Does nothing by * default. @@ -100,4 +155,9 @@ public class JackrabbitRepositoryFactory extends DefaultRepositoryFactory } + public void setFileRepositoryConfiguration( + Resource fileRepositoryConfiguration) { + this.fileRepositoryConfiguration = fileRepositoryConfiguration; + } + } diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-fs.xml b/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-fs.xml new file mode 100644 index 000000000..609fc8b33 --- /dev/null +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-fs.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-h2.xml b/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-h2.xml new file mode 100644 index 000000000..b6a92528a --- /dev/null +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-h2.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 deleted file mode 100644 index 6bd31f879..000000000 --- a/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-inMemory.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file