From a5edbf6176d62305155b4be10601aa4156d72709 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 9 Jan 2011 16:15:34 +0000
Subject: [PATCH] Improve JCR and Jackrabbit

git-svn-id: https://svn.argeo.org/commons/trunk@3998 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 pom.xml                                          | 12 ++++++++++--
 security/dep/pom.xml                             |  2 +-
 .../pom.xml                                      |  4 ----
 .../runtime/org.argeo.server.jackrabbit/pom.xml  |  8 +-------
 .../org.argeo.server.jcr/build.properties        |  1 +
 server/runtime/org.argeo.server.jcr/pom.xml      |  4 ++++
 .../org/argeo/jcr}/unit/AbstractJcrTestCase.java | 16 +++++++++++-----
 .../src/test/java/org/argeo/jcr/MapperTest.java  | 10 +++++++++-
 .../argeo/server/jcr/JcrResourceAdapterTest.java | 11 ++++++++++-
 9 files changed, 47 insertions(+), 21 deletions(-)
 rename server/runtime/{org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit => org.argeo.server.jcr/src/main/java/org/argeo/jcr}/unit/AbstractJcrTestCase.java (89%)

diff --git a/pom.xml b/pom.xml
index 8f6ae885f..de428292f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,9 +142,10 @@ limitations under the License.
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>buildnumber-maven-plugin</artifactId>
+				<version>1.0-beta-4</version>
 				<executions>
 					<execution>
-						<phase>validate</phase>
+						<phase>generate-resources</phase>
 						<goals>
 							<goal>create</goal>
 						</goals>
@@ -153,7 +154,14 @@ limitations under the License.
 				<configuration>
 					<doCheck>false</doCheck>
 					<doUpdate>false</doUpdate>
-					<useLastCommittedRevision>true</useLastCommittedRevision>
+					<format>{0,date,yyyyMMdd_HHmmss}</format>
+					<items>
+						<item>timestamp</item>
+					</items>
+					<revisionOnScmFailure>git</revisionOnScmFailure>
+					<providerImplementations>
+						<git>svn</git>
+					</providerImplementations>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/security/dep/pom.xml b/security/dep/pom.xml
index dd5bbfee6..fe6851e51 100644
--- a/security/dep/pom.xml
+++ b/security/dep/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<version>0.2.2-SNAPSHOT</version>
-		<artifactId>server</artifactId>
+		<artifactId>security</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.commons.security</groupId>
diff --git a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml b/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
index 16b7df005..11e658918 100644
--- a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
+++ b/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
@@ -100,10 +100,6 @@
 			<groupId>edu.oswego.cs.concurrent</groupId>
 			<artifactId>com.springsource.edu.oswego.cs.dl.util.concurrent</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>com.springsource.org.apache.derby</artifactId>
-		</dependency>
 
 		<!-- For webdav -->
 		<dependency>
diff --git a/server/runtime/org.argeo.server.jackrabbit/pom.xml b/server/runtime/org.argeo.server.jackrabbit/pom.xml
index 79d9ee198..808bae686 100644
--- a/server/runtime/org.argeo.server.jackrabbit/pom.xml
+++ b/server/runtime/org.argeo.server.jackrabbit/pom.xml
@@ -57,7 +57,7 @@
 			<version>0.2.2-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Jack Rabbit -->
+		<!-- Jackrabbit -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.dep.jackrabbit.server</artifactId>
@@ -112,12 +112,6 @@
 			<artifactId>com.springsource.org.apache.commons.fileupload</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.junit</groupId>
-			<artifactId>com.springsource.junit</artifactId>
-			<optional>true</optional>
-		</dependency>
-
 		<!-- TEST -->
 		<dependency>
 			<groupId>org.argeo.commons.basic</groupId>
diff --git a/server/runtime/org.argeo.server.jcr/build.properties b/server/runtime/org.argeo.server.jcr/build.properties
index d657ce9d2..2f77ca900 100644
--- a/server/runtime/org.argeo.server.jcr/build.properties
+++ b/server/runtime/org.argeo.server.jcr/build.properties
@@ -16,4 +16,5 @@ additional.bundles = org.argeo.server.jackrabbit,\
                      com.springsource.org.apache.xml.serializer,\
                      com.springsource.org.apache.commons.dbcp,\
                      com.springsource.org.apache.commons.pool,\
+                     org.argeo.dep.osgi.jackrabbit
 
diff --git a/server/runtime/org.argeo.server.jcr/pom.xml b/server/runtime/org.argeo.server.jcr/pom.xml
index c9bd5d402..823b050f2 100644
--- a/server/runtime/org.argeo.server.jcr/pom.xml
+++ b/server/runtime/org.argeo.server.jcr/pom.xml
@@ -123,6 +123,10 @@
 			<version>0.2.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>com.springsource.org.apache.derby</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.basic</groupId>
 			<artifactId>org.argeo.support.junit</artifactId>
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/unit/AbstractJcrTestCase.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/unit/AbstractJcrTestCase.java
similarity index 89%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/unit/AbstractJcrTestCase.java
rename to server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/unit/AbstractJcrTestCase.java
index db6203656..e1433604a 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/unit/AbstractJcrTestCase.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/unit/AbstractJcrTestCase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.argeo.server.jackrabbit.unit;
+package org.argeo.jcr.unit;
 
 import java.io.File;
 
@@ -27,24 +27,30 @@ import junit.framework.TestCase;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.jackrabbit.core.TransientRepository;
 import org.argeo.ArgeoException;
 
 public abstract class AbstractJcrTestCase extends TestCase {
 	private final static Log log = LogFactory.getLog(AbstractJcrTestCase.class);
 
-	private TransientRepository repository;
+	private Repository repository;
 	private Session session = null;
 
 	protected abstract File getRepositoryFile() throws Exception;
 
+	protected abstract Repository createRepository() throws Exception;
+
 	@Override
 	protected void setUp() throws Exception {
+		File homeDir = getHomeDir();
+		FileUtils.deleteDirectory(homeDir);
+		repository = createRepository();
+	}
+
+	protected File getHomeDir() {
 		File homeDir = new File(System.getProperty("java.io.tmpdir"),
 				AbstractJcrTestCase.class.getSimpleName() + "-"
 						+ System.getProperty("user.name"));
-		FileUtils.deleteDirectory(homeDir);
-		repository = new TransientRepository(getRepositoryFile(), homeDir);
+		return homeDir;
 	}
 
 	@Override
diff --git a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/MapperTest.java b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/MapperTest.java
index 87be7e2f2..121d72298 100644
--- a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/MapperTest.java
+++ b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/MapperTest.java
@@ -19,8 +19,10 @@ package org.argeo.jcr;
 import java.io.File;
 
 import javax.jcr.Node;
+import javax.jcr.Repository;
 
-import org.argeo.server.jackrabbit.unit.AbstractJcrTestCase;
+import org.apache.jackrabbit.core.TransientRepository;
+import org.argeo.jcr.unit.AbstractJcrTestCase;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
@@ -53,4 +55,10 @@ public class MapperTest extends AbstractJcrTestCase {
 		return res.getFile();
 	}
 
+	protected Repository createRepository() throws Exception{
+		Repository repository = new TransientRepository(getRepositoryFile(), getHomeDir());
+		return repository;
+	}
+
+	
 }
diff --git a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java
index 525208c43..51e3af2d8 100644
--- a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java
+++ b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java
@@ -22,11 +22,14 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.List;
 
+import javax.jcr.Repository;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.jackrabbit.core.TransientRepository;
 import org.argeo.jcr.JcrResourceAdapter;
-import org.argeo.server.jackrabbit.unit.AbstractJcrTestCase;
+import org.argeo.jcr.unit.AbstractJcrTestCase;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
@@ -107,4 +110,10 @@ public class JcrResourceAdapterTest extends AbstractJcrTestCase {
 		return res.getFile();
 	}
 
+	protected Repository createRepository() throws Exception {
+		Repository repository = new TransientRepository(getRepositoryFile(),
+				getHomeDir());
+		return repository;
+	}
+
 }
-- 
2.30.2