From a668345e948f3f6da7475279bbe330e129fb1841 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 30 Apr 2010 08:19:35 +0000
Subject: [PATCH] Split server Jackrabbit into JCR

git-svn-id: https://svn.argeo.org/commons/trunk@3542 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.server.jackrabbit/.classpath    |   2 -
 .../build.properties                          |   3 +-
 .../jackrabbit/unit/AbstractJcrTestCase.java  |  10 +-
 .../runtime/org.argeo.server.jcr/.classpath   |   2 +
 .../org.argeo.server.jcr/META-INF/MANIFEST.MF |  36 ++++-
 .../org.argeo.server.jcr/build.properties     |  14 +-
 server/runtime/org.argeo.server.jcr/pom.xml   |  33 ++--
 .../repository.xml                            |   0
 .../java/org/argeo/jcr/ArgeoJcrConstants.java |   0
 .../java/org/argeo/jcr/BeanNodeMapper.java    |   0
 .../src/main/java/org/argeo/jcr/JcrUtils.java |   0
 .../main/java/org/argeo/jcr/NodeMapper.java   |   0
 .../org/argeo/jcr/NodeMapperProvider.java     |   0
 .../jcr/ThreadBoundJcrSessionFactory.java     |   0
 .../argeo/server/jcr/DefaultJcrListener.java  |   0
 .../argeo/server/jcr/JcrResourceAdapter.java  |   0
 .../server/jcr/mvc/JcrBrowserController.java  |   0
 .../server/jcr/mvc/JcrManagerController.java  |   0
 .../argeo/server/jcr/mvc/JcrMvcConstants.java |   0
 .../jcr/mvc/JcrXmlServerSerializer.java       |   0
 .../mvc/OpenSessionInViewJcrInterceptor.java  |   0
 .../java/org/argeo/jcr/CollectionsObject.java |   0
 .../test/java/org/argeo/jcr/MapperTest.java   |  11 ++
 .../test/java/org/argeo/jcr/OtherObject.java  |   0
 .../test/java/org/argeo/jcr/SimpleObject.java |   0
 .../server/jcr/JcrResourceAdapterTest.java    |   7 +
 .../src/test/resources/log4j.properties       |   0
 .../argeo/server/jcr/applicationContext.xml   |   2 +-
 .../org/argeo/server/jcr/dummy00.xls          | Bin
 .../org/argeo/server/jcr/dummy01.xls          | Bin
 .../org/argeo/server/jcr/dummy02.xls          | Bin
 .../org/argeo/server/jcr/dummy03.xls          | Bin
 .../argeo/server/jcr/repository-inMemory.xml  | 152 ++++++++++++++++++
 .../org/argeo/server/jcr/repository.xml       |   0
 34 files changed, 238 insertions(+), 34 deletions(-)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/repository.xml (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/ArgeoJcrConstants.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/BeanNodeMapper.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/JcrUtils.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/NodeMapper.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/NodeMapperProvider.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/main/java/org/argeo/server/jcr/DefaultJcrListener.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/main/java/org/argeo/server/jcr/JcrResourceAdapter.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/main/java/org/argeo/server/jcr/mvc/JcrBrowserController.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/main/java/org/argeo/server/jcr/mvc/JcrManagerController.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/main/java/org/argeo/server/jcr/mvc/JcrMvcConstants.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/main/java/org/argeo/server/jcr/mvc/JcrXmlServerSerializer.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/main/java/org/argeo/server/jcr/mvc/OpenSessionInViewJcrInterceptor.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/test/java/org/argeo/jcr/CollectionsObject.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/test/java/org/argeo/jcr/MapperTest.java (70%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/test/java/org/argeo/jcr/OtherObject.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/test/java/org/argeo/jcr/SimpleObject.java (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java (93%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/test/resources/log4j.properties (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/test/resources/org/argeo/server/jcr/applicationContext.xml (92%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/test/resources/org/argeo/server/jcr/dummy00.xls (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/test/resources/org/argeo/server/jcr/dummy01.xls (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/test/resources/org/argeo/server/jcr/dummy02.xls (100%)
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/test/resources/org/argeo/server/jcr/dummy03.xls (100%)
 create mode 100644 server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository-inMemory.xml
 rename server/runtime/{org.argeo.server.jackrabbit => org.argeo.server.jcr}/src/test/resources/org/argeo/server/jcr/repository.xml (100%)

diff --git a/server/runtime/org.argeo.server.jackrabbit/.classpath b/server/runtime/org.argeo.server.jackrabbit/.classpath
index 3e6ecf767..73ba12c2e 100644
--- a/server/runtime/org.argeo.server.jackrabbit/.classpath
+++ b/server/runtime/org.argeo.server.jackrabbit/.classpath
@@ -2,8 +2,6 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/server/runtime/org.argeo.server.jackrabbit/build.properties b/server/runtime/org.argeo.server.jackrabbit/build.properties
index a90395047..fdf424dbc 100644
--- a/server/runtime/org.argeo.server.jackrabbit/build.properties
+++ b/server/runtime/org.argeo.server.jackrabbit/build.properties
@@ -4,7 +4,8 @@ additional.bundles = com.springsource.slf4j.api,\
                      com.springsource.org.apache.commons.collections,\
                      com.springsource.edu.oswego.cs.dl.util.concurrent,\
                      com.springsource.org.apache.derby,\
-                     com.springsource.org.apache.lucene
+                     com.springsource.org.apache.lucene,\
+                     org.springframework.context
 source.. = src/main/java/,\
            src/test/java/,\
            src/test/resources/,\
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.jackrabbit/src/main/java/org/argeo/server/jackrabbit/unit/AbstractJcrTestCase.java
index a70c6e9d0..78c477a22 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/unit/AbstractJcrTestCase.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/unit/AbstractJcrTestCase.java
@@ -11,13 +11,13 @@ import junit.framework.TestCase;
 import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.core.TransientRepository;
 import org.argeo.ArgeoException;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
 
 public abstract class AbstractJcrTestCase extends TestCase {
 	private TransientRepository repository;
 	private Session session = null;
 
+	protected abstract File getRepositoryFile() throws Exception;
+
 	@Override
 	protected void setUp() throws Exception {
 		File homeDir = new File(System.getProperty("java.io.tmpdir"),
@@ -44,12 +44,6 @@ public abstract class AbstractJcrTestCase extends TestCase {
 		return session;
 	}
 
-	protected File getRepositoryFile() throws Exception {
-		Resource res = new ClassPathResource(
-				"org/argeo/server/jackrabbit/repository-inMemory.xml");
-		return res.getFile();
-	}
-
 	protected Repository getRepository() {
 		return repository;
 	}
diff --git a/server/runtime/org.argeo.server.jcr/.classpath b/server/runtime/org.argeo.server.jcr/.classpath
index 8b978d9ed..6cb018918 100644
--- a/server/runtime/org.argeo.server.jcr/.classpath
+++ b/server/runtime/org.argeo.server.jcr/.classpath
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/server/runtime/org.argeo.server.jcr/META-INF/MANIFEST.MF b/server/runtime/org.argeo.server.jcr/META-INF/MANIFEST.MF
index 202455e14..39e03ff76 100644
--- a/server/runtime/org.argeo.server.jcr/META-INF/MANIFEST.MF
+++ b/server/runtime/org.argeo.server.jcr/META-INF/MANIFEST.MF
@@ -1,13 +1,45 @@
 Manifest-Version: 1.0
 Created-By: 1.5.0_16 (Sun Microsystems Inc.)
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: javax.activation;version="1.1",javax.jcr;version="1.0"
+ ,javax.jcr.nodetype;version="1.0",javax.jcr.observation;version="1.0"
+ ,javax.jcr.query;version="1.0",javax.jcr.version;version="1.0",javax.
+ servlet;version="2.5",javax.servlet.http;version="2.5",javax.xml.pars
+ ers,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.s
+ tream,org.apache.commons.fileupload;version="1.2",org.apache.commons.
+ fileupload.disk;version="1.2",org.apache.commons.fileupload.servlet;v
+ ersion="1.2",org.apache.commons.io;version="1.4",org.apache.commons.l
+ ogging;version="1.1",org.argeo;version="0.1",org.argeo.jcr;version="0
+ .1",org.argeo.server;version="0.1",org.argeo.server.jcr;version="0.1"
+ ,org.argeo.server.jcr.mvc;version="0.1",org.argeo.server.mvc;version=
+ "0.1",org.springframework.beans;version="2.5",org.springframework.bea
+ ns.factory;version="2.5",org.springframework.core.io;version="2.5",or
+ g.springframework.stereotype;version="2.5",org.springframework.ui;ver
+ sion="2.5",org.springframework.web.bind.annotation;version="2.5",org.
+ springframework.web.context.request;version="2.5",org.springframework
+ .xml.dom;version="1.5",org.w3c.dom,org.xml.sax
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Version: 0.1.3.SNAPSHOT-r3539
+Export-Package: org.argeo.jcr;uses:="org.springframework.beans,javax.j
+ cr,org.argeo,javax.jcr.query,org.apache.commons.logging,javax.jcr.nod
+ etype,org.springframework.beans.factory";version="0.1.3.SNAPSHOT-r354
+ 0",org.argeo.server.jcr.mvc;uses:="org.springframework.web.context.re
+ quest,org.springframework.web.bind.annotation,org.springframework.ste
+ reotype,javax.jcr.query,javax.jcr,javax.servlet.http,org.apache.commo
+ ns.logging,org.argeo.server,org.apache.commons.fileupload,org.argeo.s
+ erver.jcr,org.springframework.core.io,org.apache.commons.fileupload.s
+ ervlet,org.argeo.server.mvc,org.apache.commons.fileupload.disk,org.xm
+ l.sax,org.w3c.dom,org.argeo,javax.xml.transform,javax.xml.transform.d
+ om,javax.servlet,org.springframework.xml.dom,javax.xml.parsers,javax.
+ xml.transform.stream,org.springframework.ui";version="0.1.3.SNAPSHOT-
+ r3540",org.argeo.server.jcr;uses:="javax.jcr.observation,org.apache.c
+ ommons.logging,javax.jcr,org.argeo,javax.activation,org.argeo.jcr,org
+ .springframework.core.io,org.apache.commons.io,javax.jcr.version,org.
+ springframework.beans.factory";version="0.1.3.SNAPSHOT-r3540"
+Bundle-Version: 0.1.3.SNAPSHOT-r3540
 Bundle-Name: Commons Server JCR
 Bundle-DocURL: http://www.argeo.org
 Bundle-ManifestVersion: 2
 Bundle-Vendor: Argeo
-Fragment-Host: org.argeo.dep.osgi.jackrabbit
 Bundle-SymbolicName: org.argeo.server.jcr
 Tool: Bnd-0.0.357
 
diff --git a/server/runtime/org.argeo.server.jcr/build.properties b/server/runtime/org.argeo.server.jcr/build.properties
index 5fc538bc8..500039909 100644
--- a/server/runtime/org.argeo.server.jcr/build.properties
+++ b/server/runtime/org.argeo.server.jcr/build.properties
@@ -1,4 +1,16 @@
-source.. = src/main/java/
+source.. = src/main/java/,\
+           src/test/java/,\
+           src/test/resources/
 output.. = target/classes/
 bin.includes = META-INF/,\
                .
+additional.bundles = org.argeo.server.jackrabbit,\
+                     com.springsource.slf4j.api,\
+                     com.springsource.slf4j.log4j,\
+                     com.springsource.org.apache.log4j,\
+                     com.springsource.org.apache.commons.collections,\
+                     com.springsource.edu.oswego.cs.dl.util.concurrent,\
+                     com.springsource.org.apache.derby,\
+                     com.springsource.org.apache.lucene,\
+                     com.springsource.junit
+
diff --git a/server/runtime/org.argeo.server.jcr/pom.xml b/server/runtime/org.argeo.server.jcr/pom.xml
index 44b1a1b2f..d4ba29fd8 100644
--- a/server/runtime/org.argeo.server.jcr/pom.xml
+++ b/server/runtime/org.argeo.server.jcr/pom.xml
@@ -29,7 +29,6 @@
 				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
 					<instructions>
-						<Fragment-Host>org.argeo.dep.osgi.jackrabbit</Fragment-Host>
 						<Export-Package>
 							org.argeo.jcr.*,
 							org.argeo.server.jcr.*
@@ -52,25 +51,10 @@
 			<version>0.1.3-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Jack Rabbit -->
+		<!-- JCR -->
 		<dependency>
-			<groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.jackrabbit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet</artifactId>
-		</dependency>
-
-		<!-- Apache Commons -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.io</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>com.springsource.javax.activation</artifactId>
+			<groupId>javax.jcr</groupId>
+			<artifactId>com.springsource.javax.jcr</artifactId>
 		</dependency>
 
 		<!-- Spring -->
@@ -94,6 +78,11 @@
 			<artifactId>org.springframework.xml</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>com.springsource.javax.activation</artifactId>
+		</dependency>
+
 		<!-- Logging -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -112,6 +101,12 @@
 		</dependency>
 
 		<!-- TEST -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.jackrabbit</artifactId>
+			<version>0.1.3-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.basic</groupId>
 			<artifactId>org.argeo.support.junit</artifactId>
diff --git a/server/runtime/org.argeo.server.jackrabbit/repository.xml b/server/runtime/org.argeo.server.jcr/repository.xml
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/repository.xml
rename to server/runtime/org.argeo.server.jcr/repository.xml
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/ArgeoJcrConstants.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrConstants.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/ArgeoJcrConstants.java
rename to server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrConstants.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/BeanNodeMapper.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/BeanNodeMapper.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/BeanNodeMapper.java
rename to server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/BeanNodeMapper.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/JcrUtils.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/JcrUtils.java
rename to server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/NodeMapper.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/NodeMapper.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/NodeMapper.java
rename to server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/NodeMapper.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/NodeMapperProvider.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/NodeMapperProvider.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/NodeMapperProvider.java
rename to server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/NodeMapperProvider.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
rename to server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/DefaultJcrListener.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/DefaultJcrListener.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/DefaultJcrListener.java
rename to server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/DefaultJcrListener.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/JcrResourceAdapter.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/JcrResourceAdapter.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/JcrResourceAdapter.java
rename to server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/JcrResourceAdapter.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/mvc/JcrBrowserController.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/mvc/JcrBrowserController.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/mvc/JcrBrowserController.java
rename to server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/mvc/JcrBrowserController.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/mvc/JcrManagerController.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/mvc/JcrManagerController.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/mvc/JcrManagerController.java
rename to server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/mvc/JcrManagerController.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/mvc/JcrMvcConstants.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/mvc/JcrMvcConstants.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/mvc/JcrMvcConstants.java
rename to server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/mvc/JcrMvcConstants.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/mvc/JcrXmlServerSerializer.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/mvc/JcrXmlServerSerializer.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/mvc/JcrXmlServerSerializer.java
rename to server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/mvc/JcrXmlServerSerializer.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/mvc/OpenSessionInViewJcrInterceptor.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/mvc/OpenSessionInViewJcrInterceptor.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/mvc/OpenSessionInViewJcrInterceptor.java
rename to server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/mvc/OpenSessionInViewJcrInterceptor.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/test/java/org/argeo/jcr/CollectionsObject.java b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/CollectionsObject.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/test/java/org/argeo/jcr/CollectionsObject.java
rename to server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/CollectionsObject.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/test/java/org/argeo/jcr/MapperTest.java b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/MapperTest.java
similarity index 70%
rename from server/runtime/org.argeo.server.jackrabbit/src/test/java/org/argeo/jcr/MapperTest.java
rename to server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/MapperTest.java
index 1b2258266..cdc8b640f 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/test/java/org/argeo/jcr/MapperTest.java
+++ b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/MapperTest.java
@@ -1,8 +1,12 @@
 package org.argeo.jcr;
 
+import java.io.File;
+
 import javax.jcr.Node;
 
 import org.argeo.server.jackrabbit.unit.AbstractJcrTestCase;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 
 public class MapperTest extends AbstractJcrTestCase {
 	public void testSimpleObject() throws Exception {
@@ -26,4 +30,11 @@ public class MapperTest extends AbstractJcrTestCase {
 		session().save();
 		JcrUtils.debug(node);
 	}
+
+	protected File getRepositoryFile() throws Exception {
+		Resource res = new ClassPathResource(
+				"org/argeo/server/jcr/repository-inMemory.xml");
+		return res.getFile();
+	}
+
 }
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/test/java/org/argeo/jcr/OtherObject.java b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/OtherObject.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/test/java/org/argeo/jcr/OtherObject.java
rename to server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/OtherObject.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/test/java/org/argeo/jcr/SimpleObject.java b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/SimpleObject.java
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/test/java/org/argeo/jcr/SimpleObject.java
rename to server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/SimpleObject.java
diff --git a/server/runtime/org.argeo.server.jackrabbit/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
similarity index 93%
rename from server/runtime/org.argeo.server.jackrabbit/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java
rename to server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java
index f7e22b964..1588fd7e0 100644
--- a/server/runtime/org.argeo.server.jackrabbit/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
@@ -1,5 +1,6 @@
 package org.argeo.server.jcr;
 
+import java.io.File;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -85,4 +86,10 @@ public class JcrResourceAdapterTest extends AbstractJcrTestCase {
 		super.tearDown();
 	}
 
+	protected File getRepositoryFile() throws Exception {
+		Resource res = new ClassPathResource(
+				"org/argeo/server/jcr/repository-inMemory.xml");
+		return res.getFile();
+	}
+
 }
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/test/resources/log4j.properties b/server/runtime/org.argeo.server.jcr/src/test/resources/log4j.properties
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/test/resources/log4j.properties
rename to server/runtime/org.argeo.server.jcr/src/test/resources/log4j.properties
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/test/resources/org/argeo/server/jcr/applicationContext.xml b/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/applicationContext.xml
similarity index 92%
rename from server/runtime/org.argeo.server.jackrabbit/src/test/resources/org/argeo/server/jcr/applicationContext.xml
rename to server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/applicationContext.xml
index 78a34af4d..d40c4650a 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/test/resources/org/argeo/server/jcr/applicationContext.xml
+++ b/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/applicationContext.xml
@@ -34,7 +34,7 @@
 	<bean id="argeo.jcr.repository.inMemory" class="org.argeo.server.jackrabbit.JackrabbitContainer">
 		<property name="homeDirectory" value="${java.io.tmpdir}/jackrabbit-slc-unit" />
 		<property name="configuration"
-			value="classpath:/org/argeo/server/jackrabbit/repository-inMemory.xml" />
+			value="classpath:/org/argeo/server/jcr/repository-inMemory.xml" />
 	</bean>
 
 </beans>
\ No newline at end of file
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/test/resources/org/argeo/server/jcr/dummy00.xls b/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy00.xls
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/test/resources/org/argeo/server/jcr/dummy00.xls
rename to server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy00.xls
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/test/resources/org/argeo/server/jcr/dummy01.xls b/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy01.xls
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/test/resources/org/argeo/server/jcr/dummy01.xls
rename to server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy01.xls
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/test/resources/org/argeo/server/jcr/dummy02.xls b/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy02.xls
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/test/resources/org/argeo/server/jcr/dummy02.xls
rename to server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy02.xls
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/test/resources/org/argeo/server/jcr/dummy03.xls b/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy03.xls
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/test/resources/org/argeo/server/jcr/dummy03.xls
rename to server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy03.xls
diff --git a/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository-inMemory.xml b/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository-inMemory.xml
new file mode 100644
index 000000000..d980f8bd1
--- /dev/null
+++ b/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository-inMemory.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to You 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.
+	-->
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
+                            "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
+	<!--
+		Example Repository Configuration File Used by -
+		org.apache.jackrabbit.core.config.RepositoryConfigTest.java -
+	-->
+<Repository>
+	<!--
+		virtual file system where the repository stores global state (e.g.
+		registered namespaces, custom node types, etc.)
+	-->
+	<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+		<param name="path" value="${rep.home}/repository" />
+	</FileSystem>
+
+	<!--
+        security configuration
+    -->
+	<Security appName="Jackrabbit">
+		<!--
+			security manager: class: FQN of class implementing the
+			JackrabbitSecurityManager interface
+		-->
+		<SecurityManager
+			class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
+			workspaceName="security">
+			<!--
+				workspace access: class: FQN of class implementing the
+				WorkspaceAccessManager interface
+			-->
+			<!-- <WorkspaceAccessManager class="..."/> -->
+			<!-- <param name="config" value="${rep.home}/security.xml"/> -->
+		</SecurityManager>
+
+		<!--
+			access manager: class: FQN of class implementing the AccessManager
+			interface
+		-->
+		<AccessManager
+			class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
+			<!-- <param name="config" value="${rep.home}/access.xml"/> -->
+		</AccessManager>
+
+		<LoginModule
+			class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">
+			<!--
+				anonymous user name ('anonymous' is the default value)
+			-->
+			<param name="anonymousId" value="anonymous" />
+			<!--
+				administrator user id (default value if param is missing is 'admin')
+			-->
+			<param name="adminId" value="admin" />
+		</LoginModule>
+	</Security>
+
+	<!--
+		location of workspaces root directory and name of default workspace
+	-->
+	<Workspaces rootPath="${rep.home}/workspaces"
+		defaultWorkspace="default" />
+	<!--
+		workspace configuration template: used to create the initial workspace
+		if there's no workspace yet
+	-->
+	<Workspace name="${wsp.name}">
+		<!--
+			virtual file system of the workspace: class: FQN of class
+			implementing the FileSystem interface
+		-->
+		<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+			<param name="path" value="${wsp.home}" />
+		</FileSystem>
+		<!--
+			persistence manager of the workspace: class: FQN of class
+			implementing the PersistenceManager interface
+		-->
+		<PersistenceManager
+			class="org.apache.jackrabbit.core.persistence.bundle.DerbyPersistenceManager">
+			<!--
+				<param name="url" value="jdbc:derby:memory:db;create=true" />
+			-->
+			<param name="url" value="jdbc:derby:${wsp.home}/db;create=true" />
+			<param name="driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
+			<param name="schemaObjectPrefix" value="${wsp.name}_" />
+		</PersistenceManager>
+		<!--
+			Search index and the file system it uses. class: FQN of class
+			implementing the QueryHandler interface
+		-->
+		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+			<param name="path" value="${wsp.home}/index" />
+			<param name="extractorPoolSize" value="2" />
+			<param name="supportHighlighting" value="true" />
+		</SearchIndex>
+	</Workspace>
+
+	<!--
+        Configures the versioning
+    -->
+	<Versioning rootPath="${rep.home}/version">
+		<!--
+			Configures the filesystem to use for versioning for the respective
+			persistence manager
+		-->
+		<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+			<param name="path" value="${rep.home}/version" />
+		</FileSystem>
+
+		<!--
+			Configures the persistence manager to be used for persisting version
+			state. Please note that the current versioning implementation is
+			based on a 'normal' persistence manager, but this could change in
+			future implementations.
+		-->
+		<PersistenceManager
+			class="org.apache.jackrabbit.core.persistence.bundle.DerbyPersistenceManager">
+			<!--
+				<param name="url" value="jdbc:derby:memory:version;create=true" />
+			-->
+			<param name="url" value="jdbc:derby:${rep.home}/version/db;create=true" />
+			<param name="driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
+			<param name="schemaObjectPrefix" value="version_" />
+		</PersistenceManager>
+	</Versioning>
+
+	<!--
+		Search index for content that is shared repository wide (/jcr:system
+		tree, contains mainly versions)
+	-->
+	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+		<param name="path" value="${rep.home}/repository/index" />
+		<param name="extractorPoolSize" value="2" />
+		<param name="supportHighlighting" value="true" />
+	</SearchIndex>
+</Repository>
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/test/resources/org/argeo/server/jcr/repository.xml b/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository.xml
similarity index 100%
rename from server/runtime/org.argeo.server.jackrabbit/src/test/resources/org/argeo/server/jcr/repository.xml
rename to server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository.xml
-- 
2.30.2