X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjackrabbit%2FJackrabbitContainer.java;h=2d22caae6658a1ddce8409d27413be49d01e127c;hb=3049428581e087f337011c4a5095b68513e84721;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..2d22caae6 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,10 @@ 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.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;
@@ -22,7 +24,9 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 	private Resource configuration;
 	private File homeDirectory;
 
-	private RepositoryImpl repository;
+	private Boolean inMemory = false;
+
+	private Repository repository;
 
 	public void afterPropertiesSet() throws Exception {
 		RepositoryConfig config;
@@ -36,12 +40,21 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 			IOUtils.closeQuietly(in);
 		}
 
-		repository = RepositoryImpl.create(config);
+		if (inMemory)
+			repository = new TransientRepository(config);
+		else
+			repository = RepositoryImpl.create(config);
 	}
 
 	public void destroy() throws Exception {
-		if (repository != null)
-			repository.shutdown();
+		if (repository != null) {
+			if (repository instanceof RepositoryImpl)
+				((RepositoryImpl) repository).shutdown();
+		}
+
+		if (inMemory)
+			if (homeDirectory.exists())
+				FileUtils.deleteDirectory(homeDirectory);
 	}
 
 	// JCR REPOSITORY (delegated)
@@ -54,23 +67,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