X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjackrabbit%2FJackrabbitContainer.java;h=f6ae9357e201457a6eb8f439088b807f078f2b1b;hb=6f9b81862316741292bf782395f90f2c7e57bfc7;hp=2118ff1a613e20b718db350a98cb7b541b2bc93d;hpb=bf61aea62d1cb0f17edddd454f86348d5a64465c;p=lgpl%2Fargeo-commons.git diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java index 2118ff1a6..f6ae9357e 100644 --- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java @@ -10,8 +10,12 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; +import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.core.RepositoryImpl; +import org.apache.jackrabbit.core.TransientRepository; import org.apache.jackrabbit.core.config.RepositoryConfig; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; @@ -19,12 +23,21 @@ import org.springframework.core.io.Resource; public class JackrabbitContainer implements InitializingBean, DisposableBean, Repository { + private Log log = LogFactory.getLog(JackrabbitContainer.class); + private Resource configuration; private File homeDirectory; - private RepositoryImpl repository; + private Boolean inMemory = false; + + private Repository repository; public void afterPropertiesSet() throws Exception { + if (inMemory && homeDirectory.exists()) { + FileUtils.deleteDirectory(homeDirectory); + log.warn("Deleted Jackrabbit home directory " + homeDirectory); + } + RepositoryConfig config; InputStream in = configuration.getInputStream(); try { @@ -36,12 +49,32 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, IOUtils.closeQuietly(in); } - repository = RepositoryImpl.create(config); + if (inMemory) + repository = new TransientRepository(config); + else + repository = RepositoryImpl.create(config); + + log.info("Initialized Jackrabbit repository " + repository + " in " + + homeDirectory + " with config " + configuration); } public void destroy() throws Exception { - if (repository != null) - repository.shutdown(); + if (repository != null) { + if (repository instanceof RepositoryImpl) + ((RepositoryImpl) repository).shutdown(); + else if (repository instanceof TransientRepository) + ((TransientRepository) repository).shutdown(); + } + + if (inMemory) + if (homeDirectory.exists()) { + FileUtils.deleteDirectory(homeDirectory); + if (log.isDebugEnabled()) + log.debug("Deleted Jackrabbit home directory " + + homeDirectory); + } + log.info("Destroyed Jackrabbit repository " + repository + " in " + + homeDirectory + " with config " + configuration); } // JCR REPOSITORY (delegated) @@ -54,23 +87,23 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, } public Session login() throws LoginException, RepositoryException { - return login(); + return repository.login(); } public Session login(Credentials credentials, String workspaceName) throws LoginException, NoSuchWorkspaceException, RepositoryException { - return login(credentials, workspaceName); + return repository.login(credentials, workspaceName); } public Session login(Credentials credentials) throws LoginException, RepositoryException { - return login(credentials); + return repository.login(credentials); } public Session login(String workspaceName) throws LoginException, NoSuchWorkspaceException, RepositoryException { - return login(workspaceName); + return repository.login(workspaceName); } // BEANS METHODS @@ -82,4 +115,8 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, this.configuration = configuration; } + public void setInMemory(Boolean inMemory) { + this.inMemory = inMemory; + } + }