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=f6ae9357e201457a6eb8f439088b807f078f2b1b;hb=a668345e948f3f6da7475279bbe330e129fb1841;hp=2d22caae6658a1ddce8409d27413be49d01e127c;hpb=460170049599090170c48ae447c6c68f1fcb2f63;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 2d22caae6..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
@@ -12,6 +12,8 @@ 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;
@@ -21,6 +23,8 @@ 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;
 
@@ -29,6 +33,11 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 	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 {
@@ -44,17 +53,28 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 			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) {
 			if (repository instanceof RepositoryImpl)
 				((RepositoryImpl) repository).shutdown();
+			else if (repository instanceof TransientRepository)
+				((TransientRepository) repository).shutdown();
 		}
 
 		if (inMemory)
-			if (homeDirectory.exists())
+			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)
@@ -95,4 +115,8 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 		this.configuration = configuration;
 	}
 
+	public void setInMemory(Boolean inMemory) {
+		this.inMemory = inMemory;
+	}
+
 }