From 623a0db2d0f161c101b9e41abcaccc04d478d32a Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 5 Dec 2021 06:16:18 +0100
Subject: [PATCH] Put all JCR projects together.

---
 dep/org.argeo.dep.cms.client/pom.xml          | 10 +++----
 dep/org.argeo.dep.cms.node/pom.xml            |  9 +++++-
 org.argeo.cms.jcr/.classpath                  | 12 ++++++++
 org.argeo.cms.jcr/.project                    | 28 +++++++++++++++++
 .../.settings/org.eclipse.jdt.core.prefs      |  0
 org.argeo.cms.jcr/bnd.bnd                     | 12 ++++++++
 org.argeo.cms.jcr/build.properties            | 30 +++++++++++++++++++
 .../org/argeo/jcr/fs/JcrFileSystemTest.java   |  0
 org.argeo.cms.jcr/pom.xml                     | 29 ++++++++++++++++++
 .../src/org/argeo/cli/jcr/JcrCommands.java    |  0
 .../src/org/argeo/cli/jcr/JcrSync.java        |  0
 .../src/org/argeo/cli/jcr/package-info.java   |  0
 .../org/argeo/cli/jcr/repository-localfs.xml  |  0
 .../JackrabbitAdminLoginModule.java           |  0
 .../JackrabbitDataModelMigration.java         |  0
 .../client/ClientDavexRepositoryFactory.java  |  0
 .../client/ClientDavexRepositoryService.java  |  0
 .../ClientDavexRepositoryServiceFactory.java  |  0
 .../jackrabbit/client/JackrabbitClient.java   |  0
 .../client/NonSerialBasicAuthCache.java       |  0
 .../fs/AbstractJackrabbitFsProvider.java      |  0
 .../argeo/jackrabbit/fs/DavexFsProvider.java  |  0
 .../fs/JackrabbitMemoryFsProvider.java        |  0
 .../src/org/argeo/jackrabbit/fs/fs-memory.xml |  0
 .../org/argeo/jackrabbit/fs/package-info.java |  0
 .../org/argeo/jackrabbit/package-info.java    |  0
 .../org/argeo/jackrabbit/repository-h2.xml    |  0
 .../argeo/jackrabbit/repository-localfs.xml   |  0
 .../argeo/jackrabbit/repository-memory.xml    |  0
 .../jackrabbit/repository-postgresql-ds.xml   |  0
 .../jackrabbit/repository-postgresql.xml      |  0
 .../security/JackrabbitSecurityUtils.java     |  0
 .../jackrabbit/security/package-info.java     |  0
 .../unit/AbstractJackrabbitTestCase.java      |  0
 .../src/org/argeo/jackrabbit/unit/jaas.config |  0
 .../argeo/jackrabbit/unit/package-info.java   |  0
 .../argeo/jackrabbit/unit/repository-h2.xml   |  0
 .../jackrabbit/unit/repository-memory.xml     |  0
 .../src/org/argeo/jcr/Bin.java                |  0
 .../org/argeo/jcr/CollectionNodeIterator.java |  0
 .../src/org/argeo/jcr/DefaultJcrListener.java |  0
 .../src/org/argeo/jcr/Jcr.java                |  0
 .../src/org/argeo/jcr/JcrAuthorizations.java  |  0
 .../src/org/argeo/jcr/JcrCallback.java        |  0
 .../src/org/argeo/jcr/JcrException.java       |  0
 .../src/org/argeo/jcr/JcrMonitor.java         |  0
 .../org/argeo/jcr/JcrRepositoryWrapper.java   |  0
 .../org/argeo/jcr/JcrUrlStreamHandler.java    |  0
 .../src/org/argeo/jcr/JcrUtils.java           |  0
 .../src/org/argeo/jcr/JcrxApi.java            |  0
 .../src/org/argeo/jcr/JcrxName.java           |  0
 .../src/org/argeo/jcr/JcrxType.java           |  0
 .../src/org/argeo/jcr/PropertyDiff.java       |  0
 .../src/org/argeo/jcr/SimplePrincipal.java    |  0
 .../jcr/ThreadBoundJcrSessionFactory.java     |  0
 .../src/org/argeo/jcr/VersionDiff.java        |  0
 .../src/org/argeo/jcr/fs/BinaryChannel.java   |  0
 .../argeo/jcr/fs/JcrBasicfileAttributes.java  |  0
 .../src/org/argeo/jcr/fs/JcrFileSystem.java   |  0
 .../argeo/jcr/fs/JcrFileSystemProvider.java   |  0
 .../src/org/argeo/jcr/fs/JcrFsException.java  |  0
 .../src/org/argeo/jcr/fs/JcrPath.java         |  0
 .../org/argeo/jcr/fs/NodeDirectoryStream.java |  0
 .../org/argeo/jcr/fs/NodeFileAttributes.java  |  0
 .../src/org/argeo/jcr/fs/Text.java            |  0
 .../org/argeo/jcr/fs/WorkspaceFileStore.java  |  0
 .../src/org/argeo/jcr/fs/package-info.java    |  0
 .../src/org/argeo/jcr/jcrx.cnd                |  0
 .../src/org/argeo/jcr/package-info.java       |  0
 .../org/argeo/jcr/proxy/AbstractUrlProxy.java |  0
 .../org/argeo/jcr/proxy/ResourceProxy.java    |  0
 .../argeo/jcr/proxy/ResourceProxyServlet.java |  0
 .../src/org/argeo/jcr/proxy/package-info.java |  0
 .../argeo/jcr/unit/AbstractJcrTestCase.java   |  0
 .../src/org/argeo/jcr/unit/package-info.java  |  0
 .../src/org/argeo/jcr/xml/JcrXmlUtils.java    |  0
 .../src/org/argeo/jcr/xml/removePrefixes.xsl  |  0
 .../AbstractMaintenanceService.java           |  0
 .../maintenance/SimpleRoleRegistration.java   |  0
 .../backup/BackupContentHandler.java          |  0
 .../maintenance/backup/LogicalBackup.java     |  0
 .../maintenance/backup/LogicalRestore.java    |  0
 .../maintenance/backup/package-info.java      |  0
 .../argeo/maintenance/internal/Activator.java |  0
 .../org/argeo/maintenance/package-info.java   |  0
 org.argeo.cms/pom.xml                         | 12 ++++----
 org.argeo.core/bnd.bnd                        |  9 ------
 org.argeo.core/build.properties               | 27 ++---------------
 org.argeo.core/pom.xml                        | 10 +++----
 .../src/org/argeo/cli/fs/PathSync.java        |  6 ++--
 pom.xml                                       |  5 ++--
 91 files changed, 143 insertions(+), 56 deletions(-)
 create mode 100644 org.argeo.cms.jcr/.classpath
 create mode 100644 org.argeo.cms.jcr/.project
 rename {org.argeo.core => org.argeo.cms.jcr}/.settings/org.eclipse.jdt.core.prefs (100%)
 create mode 100644 org.argeo.cms.jcr/bnd.bnd
 create mode 100644 org.argeo.cms.jcr/build.properties
 rename {org.argeo.core => org.argeo.cms.jcr}/ext/test/org/argeo/jcr/fs/JcrFileSystemTest.java (100%)
 create mode 100644 org.argeo.cms.jcr/pom.xml
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/cli/jcr/JcrCommands.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/cli/jcr/JcrSync.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/cli/jcr/package-info.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/cli/jcr/repository-localfs.xml (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/JackrabbitAdminLoginModule.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/client/ClientDavexRepositoryFactory.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/client/ClientDavexRepositoryService.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/client/ClientDavexRepositoryServiceFactory.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/client/JackrabbitClient.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/client/NonSerialBasicAuthCache.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/fs/AbstractJackrabbitFsProvider.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/fs/DavexFsProvider.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/fs/JackrabbitMemoryFsProvider.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/fs/fs-memory.xml (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/fs/package-info.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/package-info.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/repository-h2.xml (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/repository-localfs.xml (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/repository-memory.xml (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/repository-postgresql-ds.xml (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/repository-postgresql.xml (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/security/JackrabbitSecurityUtils.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/security/package-info.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/unit/jaas.config (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/unit/package-info.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/unit/repository-h2.xml (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jackrabbit/unit/repository-memory.xml (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/Bin.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/CollectionNodeIterator.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/DefaultJcrListener.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/Jcr.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/JcrAuthorizations.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/JcrCallback.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/JcrException.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/JcrMonitor.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/JcrRepositoryWrapper.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/JcrUrlStreamHandler.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/JcrUtils.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/JcrxApi.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/JcrxName.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/JcrxType.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/PropertyDiff.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/SimplePrincipal.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/ThreadBoundJcrSessionFactory.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/VersionDiff.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/fs/BinaryChannel.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/fs/JcrBasicfileAttributes.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/fs/JcrFileSystem.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/fs/JcrFileSystemProvider.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/fs/JcrFsException.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/fs/JcrPath.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/fs/NodeDirectoryStream.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/fs/NodeFileAttributes.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/fs/Text.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/fs/WorkspaceFileStore.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/fs/package-info.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/jcrx.cnd (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/package-info.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jcr/proxy/AbstractUrlProxy.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jcr/proxy/ResourceProxy.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jcr/proxy/ResourceProxyServlet.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jcr/proxy/package-info.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jcr/unit/AbstractJcrTestCase.java (100%)
 rename {org.argeo.core => org.argeo.cms.jcr}/src/org/argeo/jcr/unit/package-info.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/xml/JcrXmlUtils.java (100%)
 rename {org.argeo.jcr => org.argeo.cms.jcr}/src/org/argeo/jcr/xml/removePrefixes.xsl (100%)
 rename {org.argeo.maintenance => org.argeo.cms.jcr}/src/org/argeo/maintenance/AbstractMaintenanceService.java (100%)
 rename {org.argeo.maintenance => org.argeo.cms.jcr}/src/org/argeo/maintenance/SimpleRoleRegistration.java (100%)
 rename {org.argeo.maintenance => org.argeo.cms.jcr}/src/org/argeo/maintenance/backup/BackupContentHandler.java (100%)
 rename {org.argeo.maintenance => org.argeo.cms.jcr}/src/org/argeo/maintenance/backup/LogicalBackup.java (100%)
 rename {org.argeo.maintenance => org.argeo.cms.jcr}/src/org/argeo/maintenance/backup/LogicalRestore.java (100%)
 rename {org.argeo.maintenance => org.argeo.cms.jcr}/src/org/argeo/maintenance/backup/package-info.java (100%)
 rename {org.argeo.maintenance => org.argeo.cms.jcr}/src/org/argeo/maintenance/internal/Activator.java (100%)
 rename {org.argeo.maintenance => org.argeo.cms.jcr}/src/org/argeo/maintenance/package-info.java (100%)

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 423b9b32c..2381d27b3 100644
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -17,11 +17,11 @@
 			<artifactId>org.argeo.enterprise</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.jcr</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.commons</groupId> -->
+<!-- 			<artifactId>org.argeo.jcr</artifactId> -->
+<!-- 			<version>2.3-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.core</artifactId>
diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index f88a1ded9..4afc1f41a 100644
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -9,6 +9,7 @@
 	</parent>
 	<artifactId>org.argeo.dep.cms.node</artifactId>
 	<name>CMS Node</name>
+	
 	<dependencies>
 
 		<!-- Parent dependencies -->
@@ -26,15 +27,21 @@
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
+		
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.cms</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.maintenance</artifactId>
+			<artifactId>org.argeo.cms.jcr</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.commons</groupId> -->
+<!-- 			<artifactId>org.argeo.maintenance</artifactId> -->
+<!-- 			<version>2.3-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
 
 		<!-- CMS Dependencies -->
 		<!-- <dependency> -->
diff --git a/org.argeo.cms.jcr/.classpath b/org.argeo.cms.jcr/.classpath
new file mode 100644
index 000000000..20cad808a
--- /dev/null
+++ b/org.argeo.cms.jcr/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="ext/test"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.argeo.cms.jcr/.project b/org.argeo.cms.jcr/.project
new file mode 100644
index 000000000..9b33a445c
--- /dev/null
+++ b/org.argeo.cms.jcr/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.cms.jcr</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.argeo.core/.settings/org.eclipse.jdt.core.prefs b/org.argeo.cms.jcr/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.argeo.core/.settings/org.eclipse.jdt.core.prefs
rename to org.argeo.cms.jcr/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.argeo.cms.jcr/bnd.bnd b/org.argeo.cms.jcr/bnd.bnd
new file mode 100644
index 000000000..5a8e8ab0b
--- /dev/null
+++ b/org.argeo.cms.jcr/bnd.bnd
@@ -0,0 +1,12 @@
+Provide-Capability:\
+cms.datamodel; name=jcrx; cnd=/org/argeo/jcr/jcrx.cnd; abstract=true
+
+Import-Package:\
+org.apache.jackrabbit.api,\
+org.apache.jackrabbit.commons,\
+org.apache.jackrabbit.spi,\
+org.apache.jackrabbit.spi2dav,\
+org.apache.jackrabbit.spi2davex,\
+org.apache.jackrabbit.webdav,\
+junit.*;resolution:=optional,\
+*
\ No newline at end of file
diff --git a/org.argeo.cms.jcr/build.properties b/org.argeo.cms.jcr/build.properties
new file mode 100644
index 000000000..8667a0edf
--- /dev/null
+++ b/org.argeo.cms.jcr/build.properties
@@ -0,0 +1,30 @@
+source.. = src/,\
+           ext/test/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
+additional.bundles = org.junit,\
+                     org.hamcrest,\
+                     org.apache.jackrabbit.core,\
+                     javax.jcr,\
+                     org.apache.jackrabbit.api,\
+                     org.apache.jackrabbit.data,\
+                     org.apache.jackrabbit.jcr.commons,\
+                     org.apache.jackrabbit.spi,\
+                     org.apache.jackrabbit.spi.commons,\
+                     org.slf4j.api,\
+                     org.slf4j.log4j12,\
+                     org.apache.log4j,\
+                     org.apache.commons.collections,\
+                     EDU.oswego.cs.dl.util.concurrent,\
+                     org.apache.lucene,\
+                     org.apache.tika.core,\
+                     org.apache.commons.dbcp,\
+                     org.apache.commons.pool,\
+                     com.google.guava,\
+                     org.apache.jackrabbit.jcr2spi,\
+                     org.apache.jackrabbit.spi2dav,\
+                     org.apache.httpcomponents.httpclient,\
+                     org.apache.httpcomponents.httpcore,\
+                     org.apache.tika.parsers
+               
\ No newline at end of file
diff --git a/org.argeo.core/ext/test/org/argeo/jcr/fs/JcrFileSystemTest.java b/org.argeo.cms.jcr/ext/test/org/argeo/jcr/fs/JcrFileSystemTest.java
similarity index 100%
rename from org.argeo.core/ext/test/org/argeo/jcr/fs/JcrFileSystemTest.java
rename to org.argeo.cms.jcr/ext/test/org/argeo/jcr/fs/JcrFileSystemTest.java
diff --git a/org.argeo.cms.jcr/pom.xml b/org.argeo.cms.jcr/pom.xml
new file mode 100644
index 000000000..396cabecb
--- /dev/null
+++ b/org.argeo.cms.jcr/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.commons</groupId>
+		<artifactId>argeo-commons</artifactId>
+		<version>2.3-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.cms.jcr</artifactId>
+	<name>Commons CMS JCR</name>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.api</artifactId>
+			<version>2.3-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.enterprise</artifactId>
+			<version>2.3-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.core</artifactId>
+			<version>2.3-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/org.argeo.core/src/org/argeo/cli/jcr/JcrCommands.java b/org.argeo.cms.jcr/src/org/argeo/cli/jcr/JcrCommands.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/cli/jcr/JcrCommands.java
rename to org.argeo.cms.jcr/src/org/argeo/cli/jcr/JcrCommands.java
diff --git a/org.argeo.core/src/org/argeo/cli/jcr/JcrSync.java b/org.argeo.cms.jcr/src/org/argeo/cli/jcr/JcrSync.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/cli/jcr/JcrSync.java
rename to org.argeo.cms.jcr/src/org/argeo/cli/jcr/JcrSync.java
diff --git a/org.argeo.core/src/org/argeo/cli/jcr/package-info.java b/org.argeo.cms.jcr/src/org/argeo/cli/jcr/package-info.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/cli/jcr/package-info.java
rename to org.argeo.cms.jcr/src/org/argeo/cli/jcr/package-info.java
diff --git a/org.argeo.core/src/org/argeo/cli/jcr/repository-localfs.xml b/org.argeo.cms.jcr/src/org/argeo/cli/jcr/repository-localfs.xml
similarity index 100%
rename from org.argeo.core/src/org/argeo/cli/jcr/repository-localfs.xml
rename to org.argeo.cms.jcr/src/org/argeo/cli/jcr/repository-localfs.xml
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/JackrabbitAdminLoginModule.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/JackrabbitAdminLoginModule.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/JackrabbitAdminLoginModule.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/JackrabbitAdminLoginModule.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/client/ClientDavexRepositoryFactory.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryFactory.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/client/ClientDavexRepositoryFactory.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryFactory.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/client/ClientDavexRepositoryService.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryService.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/client/ClientDavexRepositoryService.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryService.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/client/ClientDavexRepositoryServiceFactory.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryServiceFactory.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/client/ClientDavexRepositoryServiceFactory.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryServiceFactory.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/client/JackrabbitClient.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/JackrabbitClient.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/client/JackrabbitClient.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/JackrabbitClient.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/client/NonSerialBasicAuthCache.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/NonSerialBasicAuthCache.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/client/NonSerialBasicAuthCache.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/NonSerialBasicAuthCache.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/fs/AbstractJackrabbitFsProvider.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/fs/AbstractJackrabbitFsProvider.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/fs/AbstractJackrabbitFsProvider.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/fs/AbstractJackrabbitFsProvider.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/fs/DavexFsProvider.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/fs/DavexFsProvider.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/fs/DavexFsProvider.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/fs/DavexFsProvider.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/fs/JackrabbitMemoryFsProvider.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/fs/JackrabbitMemoryFsProvider.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/fs/JackrabbitMemoryFsProvider.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/fs/JackrabbitMemoryFsProvider.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/fs/fs-memory.xml b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/fs/fs-memory.xml
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/fs/fs-memory.xml
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/fs/fs-memory.xml
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/fs/package-info.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/fs/package-info.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/fs/package-info.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/fs/package-info.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/package-info.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/package-info.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/package-info.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/package-info.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/repository-h2.xml b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/repository-h2.xml
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/repository-h2.xml
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/repository-h2.xml
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/repository-localfs.xml b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/repository-localfs.xml
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/repository-localfs.xml
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/repository-localfs.xml
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/repository-memory.xml b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/repository-memory.xml
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/repository-memory.xml
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/repository-memory.xml
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/repository-postgresql-ds.xml b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/repository-postgresql-ds.xml
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/repository-postgresql-ds.xml
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/repository-postgresql-ds.xml
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/repository-postgresql.xml b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/repository-postgresql.xml
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/repository-postgresql.xml
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/repository-postgresql.xml
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/security/JackrabbitSecurityUtils.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/security/JackrabbitSecurityUtils.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/security/JackrabbitSecurityUtils.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/security/JackrabbitSecurityUtils.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/security/package-info.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/security/package-info.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/security/package-info.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/security/package-info.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/unit/jaas.config b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/jaas.config
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/unit/jaas.config
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/jaas.config
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/unit/package-info.java b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/package-info.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/unit/package-info.java
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/package-info.java
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/unit/repository-h2.xml b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/unit/repository-h2.xml
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml
diff --git a/org.argeo.core/src/org/argeo/jackrabbit/unit/repository-memory.xml b/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/repository-memory.xml
similarity index 100%
rename from org.argeo.core/src/org/argeo/jackrabbit/unit/repository-memory.xml
rename to org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/repository-memory.xml
diff --git a/org.argeo.jcr/src/org/argeo/jcr/Bin.java b/org.argeo.cms.jcr/src/org/argeo/jcr/Bin.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/Bin.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/Bin.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/CollectionNodeIterator.java b/org.argeo.cms.jcr/src/org/argeo/jcr/CollectionNodeIterator.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/CollectionNodeIterator.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/CollectionNodeIterator.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/DefaultJcrListener.java b/org.argeo.cms.jcr/src/org/argeo/jcr/DefaultJcrListener.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/DefaultJcrListener.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/DefaultJcrListener.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/Jcr.java b/org.argeo.cms.jcr/src/org/argeo/jcr/Jcr.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/Jcr.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/Jcr.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrAuthorizations.java b/org.argeo.cms.jcr/src/org/argeo/jcr/JcrAuthorizations.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/JcrAuthorizations.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/JcrAuthorizations.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrCallback.java b/org.argeo.cms.jcr/src/org/argeo/jcr/JcrCallback.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/JcrCallback.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/JcrCallback.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrException.java b/org.argeo.cms.jcr/src/org/argeo/jcr/JcrException.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/JcrException.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/JcrException.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrMonitor.java b/org.argeo.cms.jcr/src/org/argeo/jcr/JcrMonitor.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/JcrMonitor.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/JcrMonitor.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrRepositoryWrapper.java b/org.argeo.cms.jcr/src/org/argeo/jcr/JcrRepositoryWrapper.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/JcrRepositoryWrapper.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/JcrRepositoryWrapper.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrUrlStreamHandler.java b/org.argeo.cms.jcr/src/org/argeo/jcr/JcrUrlStreamHandler.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/JcrUrlStreamHandler.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/JcrUrlStreamHandler.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrUtils.java b/org.argeo.cms.jcr/src/org/argeo/jcr/JcrUtils.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/JcrUtils.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/JcrUtils.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrxApi.java b/org.argeo.cms.jcr/src/org/argeo/jcr/JcrxApi.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/JcrxApi.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/JcrxApi.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrxName.java b/org.argeo.cms.jcr/src/org/argeo/jcr/JcrxName.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/JcrxName.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/JcrxName.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrxType.java b/org.argeo.cms.jcr/src/org/argeo/jcr/JcrxType.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/JcrxType.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/JcrxType.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/PropertyDiff.java b/org.argeo.cms.jcr/src/org/argeo/jcr/PropertyDiff.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/PropertyDiff.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/PropertyDiff.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/SimplePrincipal.java b/org.argeo.cms.jcr/src/org/argeo/jcr/SimplePrincipal.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/SimplePrincipal.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/SimplePrincipal.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/ThreadBoundJcrSessionFactory.java b/org.argeo.cms.jcr/src/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/VersionDiff.java b/org.argeo.cms.jcr/src/org/argeo/jcr/VersionDiff.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/VersionDiff.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/VersionDiff.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/BinaryChannel.java b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/BinaryChannel.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/fs/BinaryChannel.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/fs/BinaryChannel.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/JcrBasicfileAttributes.java b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrBasicfileAttributes.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/fs/JcrBasicfileAttributes.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrBasicfileAttributes.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystem.java b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrFileSystem.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystem.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrFileSystem.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFsException.java b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrFsException.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/fs/JcrFsException.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrFsException.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/JcrPath.java b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrPath.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/fs/JcrPath.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrPath.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/NodeDirectoryStream.java b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/NodeDirectoryStream.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/fs/NodeDirectoryStream.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/fs/NodeDirectoryStream.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/NodeFileAttributes.java b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/NodeFileAttributes.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/fs/NodeFileAttributes.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/fs/NodeFileAttributes.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/Text.java b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/Text.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/fs/Text.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/fs/Text.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/WorkspaceFileStore.java b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/WorkspaceFileStore.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/fs/WorkspaceFileStore.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/fs/WorkspaceFileStore.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/package-info.java b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/package-info.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/fs/package-info.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/fs/package-info.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/jcrx.cnd b/org.argeo.cms.jcr/src/org/argeo/jcr/jcrx.cnd
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/jcrx.cnd
rename to org.argeo.cms.jcr/src/org/argeo/jcr/jcrx.cnd
diff --git a/org.argeo.jcr/src/org/argeo/jcr/package-info.java b/org.argeo.cms.jcr/src/org/argeo/jcr/package-info.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/package-info.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/package-info.java
diff --git a/org.argeo.core/src/org/argeo/jcr/proxy/AbstractUrlProxy.java b/org.argeo.cms.jcr/src/org/argeo/jcr/proxy/AbstractUrlProxy.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jcr/proxy/AbstractUrlProxy.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/proxy/AbstractUrlProxy.java
diff --git a/org.argeo.core/src/org/argeo/jcr/proxy/ResourceProxy.java b/org.argeo.cms.jcr/src/org/argeo/jcr/proxy/ResourceProxy.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jcr/proxy/ResourceProxy.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/proxy/ResourceProxy.java
diff --git a/org.argeo.core/src/org/argeo/jcr/proxy/ResourceProxyServlet.java b/org.argeo.cms.jcr/src/org/argeo/jcr/proxy/ResourceProxyServlet.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jcr/proxy/ResourceProxyServlet.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/proxy/ResourceProxyServlet.java
diff --git a/org.argeo.core/src/org/argeo/jcr/proxy/package-info.java b/org.argeo.cms.jcr/src/org/argeo/jcr/proxy/package-info.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jcr/proxy/package-info.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/proxy/package-info.java
diff --git a/org.argeo.core/src/org/argeo/jcr/unit/AbstractJcrTestCase.java b/org.argeo.cms.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jcr/unit/AbstractJcrTestCase.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java
diff --git a/org.argeo.core/src/org/argeo/jcr/unit/package-info.java b/org.argeo.cms.jcr/src/org/argeo/jcr/unit/package-info.java
similarity index 100%
rename from org.argeo.core/src/org/argeo/jcr/unit/package-info.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/unit/package-info.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/xml/JcrXmlUtils.java b/org.argeo.cms.jcr/src/org/argeo/jcr/xml/JcrXmlUtils.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/xml/JcrXmlUtils.java
rename to org.argeo.cms.jcr/src/org/argeo/jcr/xml/JcrXmlUtils.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/xml/removePrefixes.xsl b/org.argeo.cms.jcr/src/org/argeo/jcr/xml/removePrefixes.xsl
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/xml/removePrefixes.xsl
rename to org.argeo.cms.jcr/src/org/argeo/jcr/xml/removePrefixes.xsl
diff --git a/org.argeo.maintenance/src/org/argeo/maintenance/AbstractMaintenanceService.java b/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java
similarity index 100%
rename from org.argeo.maintenance/src/org/argeo/maintenance/AbstractMaintenanceService.java
rename to org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java
diff --git a/org.argeo.maintenance/src/org/argeo/maintenance/SimpleRoleRegistration.java b/org.argeo.cms.jcr/src/org/argeo/maintenance/SimpleRoleRegistration.java
similarity index 100%
rename from org.argeo.maintenance/src/org/argeo/maintenance/SimpleRoleRegistration.java
rename to org.argeo.cms.jcr/src/org/argeo/maintenance/SimpleRoleRegistration.java
diff --git a/org.argeo.maintenance/src/org/argeo/maintenance/backup/BackupContentHandler.java b/org.argeo.cms.jcr/src/org/argeo/maintenance/backup/BackupContentHandler.java
similarity index 100%
rename from org.argeo.maintenance/src/org/argeo/maintenance/backup/BackupContentHandler.java
rename to org.argeo.cms.jcr/src/org/argeo/maintenance/backup/BackupContentHandler.java
diff --git a/org.argeo.maintenance/src/org/argeo/maintenance/backup/LogicalBackup.java b/org.argeo.cms.jcr/src/org/argeo/maintenance/backup/LogicalBackup.java
similarity index 100%
rename from org.argeo.maintenance/src/org/argeo/maintenance/backup/LogicalBackup.java
rename to org.argeo.cms.jcr/src/org/argeo/maintenance/backup/LogicalBackup.java
diff --git a/org.argeo.maintenance/src/org/argeo/maintenance/backup/LogicalRestore.java b/org.argeo.cms.jcr/src/org/argeo/maintenance/backup/LogicalRestore.java
similarity index 100%
rename from org.argeo.maintenance/src/org/argeo/maintenance/backup/LogicalRestore.java
rename to org.argeo.cms.jcr/src/org/argeo/maintenance/backup/LogicalRestore.java
diff --git a/org.argeo.maintenance/src/org/argeo/maintenance/backup/package-info.java b/org.argeo.cms.jcr/src/org/argeo/maintenance/backup/package-info.java
similarity index 100%
rename from org.argeo.maintenance/src/org/argeo/maintenance/backup/package-info.java
rename to org.argeo.cms.jcr/src/org/argeo/maintenance/backup/package-info.java
diff --git a/org.argeo.maintenance/src/org/argeo/maintenance/internal/Activator.java b/org.argeo.cms.jcr/src/org/argeo/maintenance/internal/Activator.java
similarity index 100%
rename from org.argeo.maintenance/src/org/argeo/maintenance/internal/Activator.java
rename to org.argeo.cms.jcr/src/org/argeo/maintenance/internal/Activator.java
diff --git a/org.argeo.maintenance/src/org/argeo/maintenance/package-info.java b/org.argeo.cms.jcr/src/org/argeo/maintenance/package-info.java
similarity index 100%
rename from org.argeo.maintenance/src/org/argeo/maintenance/package-info.java
rename to org.argeo.cms.jcr/src/org/argeo/maintenance/package-info.java
diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml
index e19f92e01..0a313033b 100644
--- a/org.argeo.cms/pom.xml
+++ b/org.argeo.cms/pom.xml
@@ -18,7 +18,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.jcr</artifactId>
+			<artifactId>org.argeo.cms.jcr</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
@@ -31,10 +31,10 @@
 			<artifactId>org.argeo.core</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.maintenance</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.commons</groupId> -->
+<!-- 			<artifactId>org.argeo.maintenance</artifactId> -->
+<!-- 			<version>2.3-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.core/bnd.bnd b/org.argeo.core/bnd.bnd
index f096e4f29..e69de29bb 100644
--- a/org.argeo.core/bnd.bnd
+++ b/org.argeo.core/bnd.bnd
@@ -1,9 +0,0 @@
-Import-Package:\
-org.apache.jackrabbit.api,\
-org.apache.jackrabbit.commons,\
-org.apache.jackrabbit.spi,\
-org.apache.jackrabbit.spi2dav,\
-org.apache.jackrabbit.spi2davex,\
-org.apache.jackrabbit.webdav,\
-junit.*;resolution:=optional,\
-*
\ No newline at end of file
diff --git a/org.argeo.core/build.properties b/org.argeo.core/build.properties
index 49a93ba4a..353d0422a 100644
--- a/org.argeo.core/build.properties
+++ b/org.argeo.core/build.properties
@@ -1,29 +1,6 @@
-source.. = src/
+source.. = src/,\
+           ext/test/
 output.. = bin/
 bin.includes = META-INF/,\
                .
-additional.bundles = org.junit,\
-                     org.hamcrest,\
-                     org.apache.jackrabbit.core,\
-                     javax.jcr,\
-                     org.apache.jackrabbit.api,\
-                     org.apache.jackrabbit.data,\
-                     org.apache.jackrabbit.jcr.commons,\
-                     org.apache.jackrabbit.spi,\
-                     org.apache.jackrabbit.spi.commons,\
-                     org.slf4j.api,\
-                     org.slf4j.log4j12,\
-                     org.apache.log4j,\
-                     org.apache.commons.collections,\
-                     EDU.oswego.cs.dl.util.concurrent,\
-                     org.apache.lucene,\
-                     org.apache.tika.core,\
-                     org.apache.commons.dbcp,\
-                     org.apache.commons.pool,\
-                     com.google.guava,\
-                     org.apache.jackrabbit.jcr2spi,\
-                     org.apache.jackrabbit.spi2dav,\
-                     org.apache.httpcomponents.httpclient,\
-                     org.apache.httpcomponents.httpcore,\
-                     org.apache.tika.parsers
                      
\ No newline at end of file
diff --git a/org.argeo.core/pom.xml b/org.argeo.core/pom.xml
index 37d89574d..ad5afd468 100644
--- a/org.argeo.core/pom.xml
+++ b/org.argeo.core/pom.xml
@@ -15,10 +15,10 @@
 			<artifactId>org.argeo.enterprise</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.jcr</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.commons</groupId> -->
+<!-- 			<artifactId>org.argeo.jcr</artifactId> -->
+<!-- 			<version>2.3-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.core/src/org/argeo/cli/fs/PathSync.java b/org.argeo.core/src/org/argeo/cli/fs/PathSync.java
index 902318c44..9ab9cafad 100644
--- a/org.argeo.core/src/org/argeo/cli/fs/PathSync.java
+++ b/org.argeo.core/src/org/argeo/cli/fs/PathSync.java
@@ -8,7 +8,6 @@ import java.nio.file.Paths;
 import java.nio.file.spi.FileSystemProvider;
 import java.util.concurrent.Callable;
 
-import org.argeo.jackrabbit.fs.DavexFsProvider;
 import org.argeo.sync.SyncResult;
 
 /** Synchronises two paths. */
@@ -49,8 +48,9 @@ public class PathSync implements Callable<SyncResult<Path>> {
 			FileSystemProvider fsProvider = FileSystems.getDefault().provider();
 			path = fsProvider.getPath(uri);
 		} else if (uri.getScheme().equals("davex")) {
-			FileSystemProvider fsProvider = new DavexFsProvider();
-			path = fsProvider.getPath(uri);
+			throw new UnsupportedOperationException();
+//			FileSystemProvider fsProvider = new DavexFsProvider();
+//			path = fsProvider.getPath(uri);
 //		} else if (uri.getScheme().equals("sftp")) {
 //			Sftp sftp = new Sftp(uri);
 //			path = sftp.getBasePath();
diff --git a/pom.xml b/pom.xml
index d6f35ab9c..c4d70f610 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 	<modules>
 		<!-- Base -->
 		<module>org.argeo.enterprise</module>
-		<module>org.argeo.jcr</module>
+<!-- 		<module>org.argeo.jcr</module> -->
 		<module>org.argeo.osgi.boot</module>
 		<module>org.argeo.core</module>
 		<!-- Eclipse -->
@@ -27,8 +27,9 @@
 		<module>org.argeo.eclipse.ui.rap</module>
 		<!-- CMS -->
 		<module>org.argeo.api</module>
-		<module>org.argeo.maintenance</module>
+<!-- 		<module>org.argeo.maintenance</module> -->
 		<module>org.argeo.cms</module>
+		<module>org.argeo.cms.jcr</module>
 		<module>org.argeo.cms.ui.theme</module>
 		<module>org.argeo.cms.ui</module>
 		<module>org.argeo.cms.ui.rap</module>
-- 
2.30.2