X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjackrabbit%2FJackrabbitContainer.java;h=6d7237a648a57af585c6c3d0a6011684bd75c89d;hb=a5edbf6176d62305155b4be10601aa4156d72709;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..6d7237a64 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
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.server.jackrabbit;
 
 import java.io.File;
@@ -9,9 +25,12 @@ import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.Value;
 
 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 +40,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 +50,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 +70,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)
@@ -86,6 +123,26 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 		return repository.login(workspaceName);
 	}
 
+	public boolean isStandardDescriptor(String key) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean isSingleValueDescriptor(String key) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public Value getDescriptorValue(String key) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public Value[] getDescriptorValues(String key) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 	// BEANS METHODS
 	public void setHomeDirectory(File homeDirectory) {
 		this.homeDirectory = homeDirectory;
@@ -95,4 +152,8 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 		this.configuration = configuration;
 	}
 
+	public void setInMemory(Boolean inMemory) {
+		this.inMemory = inMemory;
+	}
+
 }