From 8c2f9a6ead2db97e1713f2ec5e486ce7c45fbc13 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 9 Nov 2020 11:09:43 +0100
Subject: [PATCH] Merge Argeo Util and parts of Argeo JCR in Argeo Core.

---
 dep/org.argeo.dep.cms.client/pom.xml          |   5 -
 org.argeo.core/bnd.bnd                        |   4 +
 org.argeo.core/build.properties               |  29 +++-
 .../ext/test/log4j.properties                 |   0
 .../ext/test/org/argeo/fs/FsUtilsTest.java    |   0
 .../org/argeo/jcr/fs/JcrFileSystemTest.java   |   0
 .../org/argeo/util/CsvParserEncodingTest.java |   0
 .../argeo/util/CsvParserParseFileTest.java    |   0
 .../test/org/argeo/util/CsvParserTest.java    |   0
 .../CsvParserWithQuotedSeparatorTest.java     |   0
 .../test/org/argeo/util/CsvWriterTest.java    |   0
 .../ext/test/org/argeo/util/ReferenceFile.csv |   0
 .../ext/test/org/argeo/util/TestParse-ISO.csv |   0
 .../test/org/argeo/util/TestParse-UTF-8.csv   |   0
 .../test/org/argeo/util/ThroughputTest.java   |   0
 org.argeo.core/pom.xml                        |   5 -
 .../org/argeo/fs/BasicSyncFileVisitor.java    |   0
 .../src/org/argeo/fs/FsUtils.java             |   0
 .../src/org/argeo/fs/package-info.java        |   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
 .../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/sync/SyncException.java     |   0
 .../src/org/argeo/sync/SyncResult.java        |   0
 .../src/org/argeo/sync/package-info.java      |   0
 .../src/org/argeo/util/CsvParser.java         |   0
 .../argeo/util/CsvParserWithLinesAsMap.java   |   0
 .../src/org/argeo/util/CsvWriter.java         |   0
 .../src/org/argeo/util/DictionaryKeys.java    |   0
 .../src/org/argeo/util/DigestUtils.java       |   0
 .../src/org/argeo/util/DirH.java              |   0
 .../src/org/argeo/util/LangUtils.java         |   0
 .../src/org/argeo/util/OS.java                |   0
 .../org/argeo/util/PasswordEncryption.java    |   0
 .../src/org/argeo/util/ServiceChannel.java    |   0
 .../src/org/argeo/util/StreamUtils.java       |   0
 .../src/org/argeo/util/Tester.java            |   0
 .../src/org/argeo/util/TesterStatus.java      |   0
 .../src/org/argeo/util/Throughput.java        |   0
 .../src/org/argeo/util/UuidUtils.java         |   0
 .../src/org/argeo/util/package-info.java      |   0
 org.argeo.eclipse.ui.rap/pom.xml              |   5 -
 org.argeo.enterprise/build.properties         |   4 +-
 org.argeo.enterprise/pom.xml                  |   8 -
 org.argeo.jcr/bnd.bnd                         |   8 +-
 org.argeo.jcr/build.properties                |  23 ---
 org.argeo.jcr/pom.xml                         |   7 -
 org.argeo.jcr/repository.xml                  | 152 ------------------
 .../repository/repository/meta/rootUUID       |   1 -
 .../repository/namespaces/ns_idx.properties   |   8 -
 .../repository/namespaces/ns_reg.properties   |   8 -
 .../workspaces/default/workspace.xml          |  25 ---
 org.argeo.util/.classpath                     |  10 --
 org.argeo.util/.gitignore                     |   2 -
 org.argeo.util/.project                       |  28 ----
 org.argeo.util/META-INF/.gitignore            |   1 -
 org.argeo.util/bnd.bnd                        |   0
 org.argeo.util/build.properties               |   3 -
 org.argeo.util/pom.xml                        |  12 --
 pom.xml                                       |   1 -
 88 files changed, 31 insertions(+), 318 deletions(-)
 rename {org.argeo.jcr => org.argeo.core}/ext/test/log4j.properties (100%)
 rename {org.argeo.jcr => org.argeo.core}/ext/test/org/argeo/fs/FsUtilsTest.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/ext/test/org/argeo/jcr/fs/JcrFileSystemTest.java (100%)
 rename {org.argeo.util => org.argeo.core}/ext/test/org/argeo/util/CsvParserEncodingTest.java (100%)
 rename {org.argeo.util => org.argeo.core}/ext/test/org/argeo/util/CsvParserParseFileTest.java (100%)
 rename {org.argeo.util => org.argeo.core}/ext/test/org/argeo/util/CsvParserTest.java (100%)
 rename {org.argeo.util => org.argeo.core}/ext/test/org/argeo/util/CsvParserWithQuotedSeparatorTest.java (100%)
 rename {org.argeo.util => org.argeo.core}/ext/test/org/argeo/util/CsvWriterTest.java (100%)
 rename {org.argeo.util => org.argeo.core}/ext/test/org/argeo/util/ReferenceFile.csv (100%)
 rename {org.argeo.util => org.argeo.core}/ext/test/org/argeo/util/TestParse-ISO.csv (100%)
 rename {org.argeo.util => org.argeo.core}/ext/test/org/argeo/util/TestParse-UTF-8.csv (100%)
 rename {org.argeo.util => org.argeo.core}/ext/test/org/argeo/util/ThroughputTest.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/fs/BasicSyncFileVisitor.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/fs/FsUtils.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/fs/package-info.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/JackrabbitAdminLoginModule.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/client/ClientDavexRepositoryFactory.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/client/ClientDavexRepositoryService.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/client/ClientDavexRepositoryServiceFactory.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/client/JackrabbitClient.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/client/NonSerialBasicAuthCache.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/fs/AbstractJackrabbitFsProvider.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/fs/DavexFsProvider.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/fs/JackrabbitMemoryFsProvider.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/fs/fs-memory.xml (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/fs/package-info.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/package-info.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/repository-h2.xml (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/repository-localfs.xml (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/repository-memory.xml (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/repository-postgresql-ds.xml (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/repository-postgresql.xml (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/security/JackrabbitSecurityUtils.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/security/package-info.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/unit/jaas.config (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/unit/package-info.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/unit/repository-h2.xml (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jackrabbit/unit/repository-memory.xml (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jcr/proxy/AbstractUrlProxy.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jcr/proxy/ResourceProxy.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jcr/proxy/ResourceProxyServlet.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jcr/proxy/package-info.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jcr/unit/AbstractJcrTestCase.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/jcr/unit/package-info.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/sync/SyncException.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/sync/SyncResult.java (100%)
 rename {org.argeo.jcr => org.argeo.core}/src/org/argeo/sync/package-info.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/CsvParser.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/CsvParserWithLinesAsMap.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/CsvWriter.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/DictionaryKeys.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/DigestUtils.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/DirH.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/LangUtils.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/OS.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/PasswordEncryption.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/ServiceChannel.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/StreamUtils.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/Tester.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/TesterStatus.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/Throughput.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/UuidUtils.java (100%)
 rename {org.argeo.util => org.argeo.core}/src/org/argeo/util/package-info.java (100%)
 delete mode 100644 org.argeo.jcr/repository.xml
 delete mode 100644 org.argeo.jcr/repository/repository/meta/rootUUID
 delete mode 100644 org.argeo.jcr/repository/repository/namespaces/ns_idx.properties
 delete mode 100644 org.argeo.jcr/repository/repository/namespaces/ns_reg.properties
 delete mode 100644 org.argeo.jcr/repository/workspaces/default/workspace.xml
 delete mode 100644 org.argeo.util/.classpath
 delete mode 100644 org.argeo.util/.gitignore
 delete mode 100644 org.argeo.util/.project
 delete mode 100644 org.argeo.util/META-INF/.gitignore
 delete mode 100644 org.argeo.util/bnd.bnd
 delete mode 100644 org.argeo.util/build.properties
 delete mode 100644 org.argeo.util/pom.xml

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 836577bb6..e2492c3a0 100644
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -12,11 +12,6 @@
 	<dependencies>
 
 		<!-- Argeo Commons -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.util</artifactId>
-			<version>2.1.89-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.enterprise</artifactId>
diff --git a/org.argeo.core/bnd.bnd b/org.argeo.core/bnd.bnd
index bc810ff41..469d8e286 100644
--- a/org.argeo.core/bnd.bnd
+++ b/org.argeo.core/bnd.bnd
@@ -1,4 +1,8 @@
 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,\
 *
\ No newline at end of file
diff --git a/org.argeo.core/build.properties b/org.argeo.core/build.properties
index 84397864d..49a93ba4a 100644
--- a/org.argeo.core/build.properties
+++ b/org.argeo.core/build.properties
@@ -2,9 +2,28 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .
-additional.bundles = org.apache.jackrabbit.data,\
-                     org.slf4j.log4j12,\
+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,\
-                     bcprov,\
-                     org.junit,\
-                     org.hamcrest
+                     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.jcr/ext/test/log4j.properties b/org.argeo.core/ext/test/log4j.properties
similarity index 100%
rename from org.argeo.jcr/ext/test/log4j.properties
rename to org.argeo.core/ext/test/log4j.properties
diff --git a/org.argeo.jcr/ext/test/org/argeo/fs/FsUtilsTest.java b/org.argeo.core/ext/test/org/argeo/fs/FsUtilsTest.java
similarity index 100%
rename from org.argeo.jcr/ext/test/org/argeo/fs/FsUtilsTest.java
rename to org.argeo.core/ext/test/org/argeo/fs/FsUtilsTest.java
diff --git a/org.argeo.jcr/ext/test/org/argeo/jcr/fs/JcrFileSystemTest.java b/org.argeo.core/ext/test/org/argeo/jcr/fs/JcrFileSystemTest.java
similarity index 100%
rename from org.argeo.jcr/ext/test/org/argeo/jcr/fs/JcrFileSystemTest.java
rename to org.argeo.core/ext/test/org/argeo/jcr/fs/JcrFileSystemTest.java
diff --git a/org.argeo.util/ext/test/org/argeo/util/CsvParserEncodingTest.java b/org.argeo.core/ext/test/org/argeo/util/CsvParserEncodingTest.java
similarity index 100%
rename from org.argeo.util/ext/test/org/argeo/util/CsvParserEncodingTest.java
rename to org.argeo.core/ext/test/org/argeo/util/CsvParserEncodingTest.java
diff --git a/org.argeo.util/ext/test/org/argeo/util/CsvParserParseFileTest.java b/org.argeo.core/ext/test/org/argeo/util/CsvParserParseFileTest.java
similarity index 100%
rename from org.argeo.util/ext/test/org/argeo/util/CsvParserParseFileTest.java
rename to org.argeo.core/ext/test/org/argeo/util/CsvParserParseFileTest.java
diff --git a/org.argeo.util/ext/test/org/argeo/util/CsvParserTest.java b/org.argeo.core/ext/test/org/argeo/util/CsvParserTest.java
similarity index 100%
rename from org.argeo.util/ext/test/org/argeo/util/CsvParserTest.java
rename to org.argeo.core/ext/test/org/argeo/util/CsvParserTest.java
diff --git a/org.argeo.util/ext/test/org/argeo/util/CsvParserWithQuotedSeparatorTest.java b/org.argeo.core/ext/test/org/argeo/util/CsvParserWithQuotedSeparatorTest.java
similarity index 100%
rename from org.argeo.util/ext/test/org/argeo/util/CsvParserWithQuotedSeparatorTest.java
rename to org.argeo.core/ext/test/org/argeo/util/CsvParserWithQuotedSeparatorTest.java
diff --git a/org.argeo.util/ext/test/org/argeo/util/CsvWriterTest.java b/org.argeo.core/ext/test/org/argeo/util/CsvWriterTest.java
similarity index 100%
rename from org.argeo.util/ext/test/org/argeo/util/CsvWriterTest.java
rename to org.argeo.core/ext/test/org/argeo/util/CsvWriterTest.java
diff --git a/org.argeo.util/ext/test/org/argeo/util/ReferenceFile.csv b/org.argeo.core/ext/test/org/argeo/util/ReferenceFile.csv
similarity index 100%
rename from org.argeo.util/ext/test/org/argeo/util/ReferenceFile.csv
rename to org.argeo.core/ext/test/org/argeo/util/ReferenceFile.csv
diff --git a/org.argeo.util/ext/test/org/argeo/util/TestParse-ISO.csv b/org.argeo.core/ext/test/org/argeo/util/TestParse-ISO.csv
similarity index 100%
rename from org.argeo.util/ext/test/org/argeo/util/TestParse-ISO.csv
rename to org.argeo.core/ext/test/org/argeo/util/TestParse-ISO.csv
diff --git a/org.argeo.util/ext/test/org/argeo/util/TestParse-UTF-8.csv b/org.argeo.core/ext/test/org/argeo/util/TestParse-UTF-8.csv
similarity index 100%
rename from org.argeo.util/ext/test/org/argeo/util/TestParse-UTF-8.csv
rename to org.argeo.core/ext/test/org/argeo/util/TestParse-UTF-8.csv
diff --git a/org.argeo.util/ext/test/org/argeo/util/ThroughputTest.java b/org.argeo.core/ext/test/org/argeo/util/ThroughputTest.java
similarity index 100%
rename from org.argeo.util/ext/test/org/argeo/util/ThroughputTest.java
rename to org.argeo.core/ext/test/org/argeo/util/ThroughputTest.java
diff --git a/org.argeo.core/pom.xml b/org.argeo.core/pom.xml
index 96549e653..5dfcdde21 100644
--- a/org.argeo.core/pom.xml
+++ b/org.argeo.core/pom.xml
@@ -10,11 +10,6 @@
 	<artifactId>org.argeo.core</artifactId>
 	<name>Commons Third Parties Utilities</name>
 	<dependencies>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.util</artifactId>
-			<version>2.1.89-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.enterprise</artifactId>
diff --git a/org.argeo.jcr/src/org/argeo/fs/BasicSyncFileVisitor.java b/org.argeo.core/src/org/argeo/fs/BasicSyncFileVisitor.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/fs/BasicSyncFileVisitor.java
rename to org.argeo.core/src/org/argeo/fs/BasicSyncFileVisitor.java
diff --git a/org.argeo.jcr/src/org/argeo/fs/FsUtils.java b/org.argeo.core/src/org/argeo/fs/FsUtils.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/fs/FsUtils.java
rename to org.argeo.core/src/org/argeo/fs/FsUtils.java
diff --git a/org.argeo.jcr/src/org/argeo/fs/package-info.java b/org.argeo.core/src/org/argeo/fs/package-info.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/fs/package-info.java
rename to org.argeo.core/src/org/argeo/fs/package-info.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitAdminLoginModule.java b/org.argeo.core/src/org/argeo/jackrabbit/JackrabbitAdminLoginModule.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitAdminLoginModule.java
rename to org.argeo.core/src/org/argeo/jackrabbit/JackrabbitAdminLoginModule.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java b/org.argeo.core/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java
rename to org.argeo.core/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryFactory.java b/org.argeo.core/src/org/argeo/jackrabbit/client/ClientDavexRepositoryFactory.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryFactory.java
rename to org.argeo.core/src/org/argeo/jackrabbit/client/ClientDavexRepositoryFactory.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryService.java b/org.argeo.core/src/org/argeo/jackrabbit/client/ClientDavexRepositoryService.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryService.java
rename to org.argeo.core/src/org/argeo/jackrabbit/client/ClientDavexRepositoryService.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryServiceFactory.java b/org.argeo.core/src/org/argeo/jackrabbit/client/ClientDavexRepositoryServiceFactory.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryServiceFactory.java
rename to org.argeo.core/src/org/argeo/jackrabbit/client/ClientDavexRepositoryServiceFactory.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/client/JackrabbitClient.java b/org.argeo.core/src/org/argeo/jackrabbit/client/JackrabbitClient.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/client/JackrabbitClient.java
rename to org.argeo.core/src/org/argeo/jackrabbit/client/JackrabbitClient.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/client/NonSerialBasicAuthCache.java b/org.argeo.core/src/org/argeo/jackrabbit/client/NonSerialBasicAuthCache.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/client/NonSerialBasicAuthCache.java
rename to org.argeo.core/src/org/argeo/jackrabbit/client/NonSerialBasicAuthCache.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/fs/AbstractJackrabbitFsProvider.java b/org.argeo.core/src/org/argeo/jackrabbit/fs/AbstractJackrabbitFsProvider.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/fs/AbstractJackrabbitFsProvider.java
rename to org.argeo.core/src/org/argeo/jackrabbit/fs/AbstractJackrabbitFsProvider.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/fs/DavexFsProvider.java b/org.argeo.core/src/org/argeo/jackrabbit/fs/DavexFsProvider.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/fs/DavexFsProvider.java
rename to org.argeo.core/src/org/argeo/jackrabbit/fs/DavexFsProvider.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/fs/JackrabbitMemoryFsProvider.java b/org.argeo.core/src/org/argeo/jackrabbit/fs/JackrabbitMemoryFsProvider.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/fs/JackrabbitMemoryFsProvider.java
rename to org.argeo.core/src/org/argeo/jackrabbit/fs/JackrabbitMemoryFsProvider.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/fs/fs-memory.xml b/org.argeo.core/src/org/argeo/jackrabbit/fs/fs-memory.xml
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/fs/fs-memory.xml
rename to org.argeo.core/src/org/argeo/jackrabbit/fs/fs-memory.xml
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/fs/package-info.java b/org.argeo.core/src/org/argeo/jackrabbit/fs/package-info.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/fs/package-info.java
rename to org.argeo.core/src/org/argeo/jackrabbit/fs/package-info.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/package-info.java b/org.argeo.core/src/org/argeo/jackrabbit/package-info.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/package-info.java
rename to org.argeo.core/src/org/argeo/jackrabbit/package-info.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/repository-h2.xml b/org.argeo.core/src/org/argeo/jackrabbit/repository-h2.xml
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/repository-h2.xml
rename to org.argeo.core/src/org/argeo/jackrabbit/repository-h2.xml
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/repository-localfs.xml b/org.argeo.core/src/org/argeo/jackrabbit/repository-localfs.xml
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/repository-localfs.xml
rename to org.argeo.core/src/org/argeo/jackrabbit/repository-localfs.xml
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/repository-memory.xml b/org.argeo.core/src/org/argeo/jackrabbit/repository-memory.xml
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/repository-memory.xml
rename to org.argeo.core/src/org/argeo/jackrabbit/repository-memory.xml
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/repository-postgresql-ds.xml b/org.argeo.core/src/org/argeo/jackrabbit/repository-postgresql-ds.xml
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/repository-postgresql-ds.xml
rename to org.argeo.core/src/org/argeo/jackrabbit/repository-postgresql-ds.xml
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/repository-postgresql.xml b/org.argeo.core/src/org/argeo/jackrabbit/repository-postgresql.xml
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/repository-postgresql.xml
rename to org.argeo.core/src/org/argeo/jackrabbit/repository-postgresql.xml
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/security/JackrabbitSecurityUtils.java b/org.argeo.core/src/org/argeo/jackrabbit/security/JackrabbitSecurityUtils.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/security/JackrabbitSecurityUtils.java
rename to org.argeo.core/src/org/argeo/jackrabbit/security/JackrabbitSecurityUtils.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/security/package-info.java b/org.argeo.core/src/org/argeo/jackrabbit/security/package-info.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/security/package-info.java
rename to org.argeo.core/src/org/argeo/jackrabbit/security/package-info.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java b/org.argeo.core/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java
rename to org.argeo.core/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/unit/jaas.config b/org.argeo.core/src/org/argeo/jackrabbit/unit/jaas.config
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/unit/jaas.config
rename to org.argeo.core/src/org/argeo/jackrabbit/unit/jaas.config
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/unit/package-info.java b/org.argeo.core/src/org/argeo/jackrabbit/unit/package-info.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/unit/package-info.java
rename to org.argeo.core/src/org/argeo/jackrabbit/unit/package-info.java
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml b/org.argeo.core/src/org/argeo/jackrabbit/unit/repository-h2.xml
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml
rename to org.argeo.core/src/org/argeo/jackrabbit/unit/repository-h2.xml
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/unit/repository-memory.xml b/org.argeo.core/src/org/argeo/jackrabbit/unit/repository-memory.xml
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jackrabbit/unit/repository-memory.xml
rename to org.argeo.core/src/org/argeo/jackrabbit/unit/repository-memory.xml
diff --git a/org.argeo.jcr/src/org/argeo/jcr/proxy/AbstractUrlProxy.java b/org.argeo.core/src/org/argeo/jcr/proxy/AbstractUrlProxy.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/proxy/AbstractUrlProxy.java
rename to org.argeo.core/src/org/argeo/jcr/proxy/AbstractUrlProxy.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/proxy/ResourceProxy.java b/org.argeo.core/src/org/argeo/jcr/proxy/ResourceProxy.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/proxy/ResourceProxy.java
rename to org.argeo.core/src/org/argeo/jcr/proxy/ResourceProxy.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/proxy/ResourceProxyServlet.java b/org.argeo.core/src/org/argeo/jcr/proxy/ResourceProxyServlet.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/proxy/ResourceProxyServlet.java
rename to org.argeo.core/src/org/argeo/jcr/proxy/ResourceProxyServlet.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/proxy/package-info.java b/org.argeo.core/src/org/argeo/jcr/proxy/package-info.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/proxy/package-info.java
rename to org.argeo.core/src/org/argeo/jcr/proxy/package-info.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java b/org.argeo.core/src/org/argeo/jcr/unit/AbstractJcrTestCase.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java
rename to org.argeo.core/src/org/argeo/jcr/unit/AbstractJcrTestCase.java
diff --git a/org.argeo.jcr/src/org/argeo/jcr/unit/package-info.java b/org.argeo.core/src/org/argeo/jcr/unit/package-info.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/jcr/unit/package-info.java
rename to org.argeo.core/src/org/argeo/jcr/unit/package-info.java
diff --git a/org.argeo.jcr/src/org/argeo/sync/SyncException.java b/org.argeo.core/src/org/argeo/sync/SyncException.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/sync/SyncException.java
rename to org.argeo.core/src/org/argeo/sync/SyncException.java
diff --git a/org.argeo.jcr/src/org/argeo/sync/SyncResult.java b/org.argeo.core/src/org/argeo/sync/SyncResult.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/sync/SyncResult.java
rename to org.argeo.core/src/org/argeo/sync/SyncResult.java
diff --git a/org.argeo.jcr/src/org/argeo/sync/package-info.java b/org.argeo.core/src/org/argeo/sync/package-info.java
similarity index 100%
rename from org.argeo.jcr/src/org/argeo/sync/package-info.java
rename to org.argeo.core/src/org/argeo/sync/package-info.java
diff --git a/org.argeo.util/src/org/argeo/util/CsvParser.java b/org.argeo.core/src/org/argeo/util/CsvParser.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/CsvParser.java
rename to org.argeo.core/src/org/argeo/util/CsvParser.java
diff --git a/org.argeo.util/src/org/argeo/util/CsvParserWithLinesAsMap.java b/org.argeo.core/src/org/argeo/util/CsvParserWithLinesAsMap.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/CsvParserWithLinesAsMap.java
rename to org.argeo.core/src/org/argeo/util/CsvParserWithLinesAsMap.java
diff --git a/org.argeo.util/src/org/argeo/util/CsvWriter.java b/org.argeo.core/src/org/argeo/util/CsvWriter.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/CsvWriter.java
rename to org.argeo.core/src/org/argeo/util/CsvWriter.java
diff --git a/org.argeo.util/src/org/argeo/util/DictionaryKeys.java b/org.argeo.core/src/org/argeo/util/DictionaryKeys.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/DictionaryKeys.java
rename to org.argeo.core/src/org/argeo/util/DictionaryKeys.java
diff --git a/org.argeo.util/src/org/argeo/util/DigestUtils.java b/org.argeo.core/src/org/argeo/util/DigestUtils.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/DigestUtils.java
rename to org.argeo.core/src/org/argeo/util/DigestUtils.java
diff --git a/org.argeo.util/src/org/argeo/util/DirH.java b/org.argeo.core/src/org/argeo/util/DirH.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/DirH.java
rename to org.argeo.core/src/org/argeo/util/DirH.java
diff --git a/org.argeo.util/src/org/argeo/util/LangUtils.java b/org.argeo.core/src/org/argeo/util/LangUtils.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/LangUtils.java
rename to org.argeo.core/src/org/argeo/util/LangUtils.java
diff --git a/org.argeo.util/src/org/argeo/util/OS.java b/org.argeo.core/src/org/argeo/util/OS.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/OS.java
rename to org.argeo.core/src/org/argeo/util/OS.java
diff --git a/org.argeo.util/src/org/argeo/util/PasswordEncryption.java b/org.argeo.core/src/org/argeo/util/PasswordEncryption.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/PasswordEncryption.java
rename to org.argeo.core/src/org/argeo/util/PasswordEncryption.java
diff --git a/org.argeo.util/src/org/argeo/util/ServiceChannel.java b/org.argeo.core/src/org/argeo/util/ServiceChannel.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/ServiceChannel.java
rename to org.argeo.core/src/org/argeo/util/ServiceChannel.java
diff --git a/org.argeo.util/src/org/argeo/util/StreamUtils.java b/org.argeo.core/src/org/argeo/util/StreamUtils.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/StreamUtils.java
rename to org.argeo.core/src/org/argeo/util/StreamUtils.java
diff --git a/org.argeo.util/src/org/argeo/util/Tester.java b/org.argeo.core/src/org/argeo/util/Tester.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/Tester.java
rename to org.argeo.core/src/org/argeo/util/Tester.java
diff --git a/org.argeo.util/src/org/argeo/util/TesterStatus.java b/org.argeo.core/src/org/argeo/util/TesterStatus.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/TesterStatus.java
rename to org.argeo.core/src/org/argeo/util/TesterStatus.java
diff --git a/org.argeo.util/src/org/argeo/util/Throughput.java b/org.argeo.core/src/org/argeo/util/Throughput.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/Throughput.java
rename to org.argeo.core/src/org/argeo/util/Throughput.java
diff --git a/org.argeo.util/src/org/argeo/util/UuidUtils.java b/org.argeo.core/src/org/argeo/util/UuidUtils.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/UuidUtils.java
rename to org.argeo.core/src/org/argeo/util/UuidUtils.java
diff --git a/org.argeo.util/src/org/argeo/util/package-info.java b/org.argeo.core/src/org/argeo/util/package-info.java
similarity index 100%
rename from org.argeo.util/src/org/argeo/util/package-info.java
rename to org.argeo.core/src/org/argeo/util/package-info.java
diff --git a/org.argeo.eclipse.ui.rap/pom.xml b/org.argeo.eclipse.ui.rap/pom.xml
index 98ffe0274..df5b3baa4 100644
--- a/org.argeo.eclipse.ui.rap/pom.xml
+++ b/org.argeo.eclipse.ui.rap/pom.xml
@@ -15,11 +15,6 @@
 			<artifactId>org.argeo.eclipse.ui</artifactId>
 			<version>2.1.89-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.util</artifactId>
-			<version>2.1.89-SNAPSHOT</version>
-		</dependency>
 
 		<!-- UI -->
 		<dependency>
diff --git a/org.argeo.enterprise/build.properties b/org.argeo.enterprise/build.properties
index cd379dca9..b82dd50ea 100644
--- a/org.argeo.enterprise/build.properties
+++ b/org.argeo.enterprise/build.properties
@@ -1,4 +1,4 @@
 source.. = src/,\
            ext/test/
-additional.bundles = org.junit,\
-                     org.argeo.util
+additional.bundles = org.junit
+
diff --git a/org.argeo.enterprise/pom.xml b/org.argeo.enterprise/pom.xml
index 9196aa5b4..a61f69dab 100644
--- a/org.argeo.enterprise/pom.xml
+++ b/org.argeo.enterprise/pom.xml
@@ -9,12 +9,4 @@
 	</parent>
 	<artifactId>org.argeo.enterprise</artifactId>
 	<name>Commons Enterprise</name>
-	<dependencies>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.util</artifactId>
-			<version>2.1.89-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.jcr/bnd.bnd b/org.argeo.jcr/bnd.bnd
index 551686bd0..4df501710 100644
--- a/org.argeo.jcr/bnd.bnd
+++ b/org.argeo.jcr/bnd.bnd
@@ -1,11 +1,5 @@
 Provide-Capability:\
 cms.datamodel; name=jcrx; cnd=/org/argeo/jcr/jcrx.cnd; abstract=true
 
-Import-Package: junit.framework;resolution:=optional,\
-org.xml.sax;version="0.0.0",\
-org.apache.jackrabbit.*;resolution:=optional,\
-org.apache.jackrabbit.webdav.jcr;resolution:=optional,\
-org.apache.jackrabbit.webdav.server;resolution:=optional,\
-org.h2;resolution:=optional,\
-org.postgresql;resolution:=optional,\
+Import-Package:\
 *
diff --git a/org.argeo.jcr/build.properties b/org.argeo.jcr/build.properties
index 027445903..acb5245c8 100644
--- a/org.argeo.jcr/build.properties
+++ b/org.argeo.jcr/build.properties
@@ -3,26 +3,3 @@ source.. = src/,\
 output.. = bin/
 bin.includes = META-INF/,\
                .
-additional.bundles = org.junit,\
-                     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
diff --git a/org.argeo.jcr/pom.xml b/org.argeo.jcr/pom.xml
index d8587aa02..60b5daa85 100644
--- a/org.argeo.jcr/pom.xml
+++ b/org.argeo.jcr/pom.xml
@@ -8,11 +8,4 @@
 	</parent>
 	<artifactId>org.argeo.jcr</artifactId>
 	<name>Commons JCR</name>
-	<dependencies>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.util</artifactId>
-			<version>2.1.89-SNAPSHOT</version>
-		</dependency>
-	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.jcr/repository.xml b/org.argeo.jcr/repository.xml
deleted file mode 100644
index 745079e2a..000000000
--- a/org.argeo.jcr/repository.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?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 2.0//EN"
-          "http://jackrabbit.apache.org/dtd/repository-2.0.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>
-
-    <!--
-        data store configuration
-    -->
-    <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"/>
-
-    <!--
-        security configuration
-    -->
-    <Security appName="Jackrabbit">
-        <!--
-            security manager:
-            class: FQN of class implementing the JackrabbitSecurityManager interface
-        -->
-        <SecurityManager class="org.apache.jackrabbit.core.DefaultSecurityManager" 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.DefaultAccessManager">
-            <!-- <param name="config" value="${rep.home}/access.xml"/> -->
-        </AccessManager>
-
-        <LoginModule class="org.apache.jackrabbit.core.security.authentication.DefaultLoginModule">
-           <!-- 
-              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.pool.DerbyPersistenceManager">
-          <param name="url" value="jdbc:derby:${wsp.home}/db;create=true"/>
-          <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="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.pool.DerbyPersistenceManager">
-          <param name="url" value="jdbc:derby:${rep.home}/version/db;create=true"/>
-          <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="supportHighlighting" value="true"/>
-    </SearchIndex>
-
-    <!--
-        Run with a cluster journal
-    -->
-    <Cluster id="node1">
-        <Journal class="org.apache.jackrabbit.core.journal.MemoryJournal"/>
-    </Cluster>
-</Repository>
diff --git a/org.argeo.jcr/repository/repository/meta/rootUUID b/org.argeo.jcr/repository/repository/meta/rootUUID
deleted file mode 100644
index df092932a..000000000
--- a/org.argeo.jcr/repository/repository/meta/rootUUID
+++ /dev/null
@@ -1 +0,0 @@
-cafebabe-cafe-babe-cafe-babecafebabe
\ No newline at end of file
diff --git a/org.argeo.jcr/repository/repository/namespaces/ns_idx.properties b/org.argeo.jcr/repository/repository/namespaces/ns_idx.properties
deleted file mode 100644
index 7e757f0aa..000000000
--- a/org.argeo.jcr/repository/repository/namespaces/ns_idx.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Oct 28 20:14:30 CEST 2016
-http\://www.jcp.org/jcr/1.0=1570322
-internal=16762557
-http\://www.jcp.org/jcr/sv/1.0=16463688
-http\://www.jcp.org/jcr/mix/1.0=14361695
-http\://www.jcp.org/jcr/nt/1.0=5688619
-.empty.key=0
-http\://www.w3.org/XML/1998/namespace=6829023
diff --git a/org.argeo.jcr/repository/repository/namespaces/ns_reg.properties b/org.argeo.jcr/repository/repository/namespaces/ns_reg.properties
deleted file mode 100644
index f40bf219b..000000000
--- a/org.argeo.jcr/repository/repository/namespaces/ns_reg.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Oct 28 20:14:30 CEST 2016
-jcr=http\://www.jcp.org/jcr/1.0
-sv=http\://www.jcp.org/jcr/sv/1.0
-xml=http\://www.w3.org/XML/1998/namespace
-nt=http\://www.jcp.org/jcr/nt/1.0
-mix=http\://www.jcp.org/jcr/mix/1.0
-rep=internal
-.empty.key=
diff --git a/org.argeo.jcr/repository/workspaces/default/workspace.xml b/org.argeo.jcr/repository/workspaces/default/workspace.xml
deleted file mode 100644
index a32f9c756..000000000
--- a/org.argeo.jcr/repository/workspaces/default/workspace.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><Workspace name="default">
-        <!--
-            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.pool.DerbyPersistenceManager">
-          <param name="url" value="jdbc:derby:${wsp.home}/db;create=true"/>
-          <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="supportHighlighting" value="true"/>
-        </SearchIndex>
-    </Workspace>
diff --git a/org.argeo.util/.classpath b/org.argeo.util/.classpath
deleted file mode 100644
index 4e5da1da6..000000000
--- a/org.argeo.util/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src" />
-	<classpathentry kind="src" path="ext/test" />
-	<classpathentry kind="con"
-		path="org.eclipse.pde.core.requiredPlugins" />
-	<classpathentry kind="con"
-		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8" />
-	<classpathentry kind="output" path="bin" />
-</classpath>
diff --git a/org.argeo.util/.gitignore b/org.argeo.util/.gitignore
deleted file mode 100644
index 09e3bc9b2..000000000
--- a/org.argeo.util/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/target/
diff --git a/org.argeo.util/.project b/org.argeo.util/.project
deleted file mode 100644
index 171ff88dc..000000000
--- a/org.argeo.util/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.argeo.util</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.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.argeo.util/META-INF/.gitignore b/org.argeo.util/META-INF/.gitignore
deleted file mode 100644
index 4854a41b9..000000000
--- a/org.argeo.util/META-INF/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF
diff --git a/org.argeo.util/bnd.bnd b/org.argeo.util/bnd.bnd
deleted file mode 100644
index e69de29bb..000000000
diff --git a/org.argeo.util/build.properties b/org.argeo.util/build.properties
deleted file mode 100644
index d34068df7..000000000
--- a/org.argeo.util/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-source.. = src/,\
-           ext/test/
-output.. = bin/
diff --git a/org.argeo.util/pom.xml b/org.argeo.util/pom.xml
deleted file mode 100644
index 51a0e9c3b..000000000
--- a/org.argeo.util/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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.1.89-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>org.argeo.util</artifactId>
-	<name>Commons Utilities</name>
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e143ba9e9..fbc2d287f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,6 @@
 	</properties>
 	<modules>
 		<!-- Base -->
-		<module>org.argeo.util</module>
 		<module>org.argeo.enterprise</module>
 		<module>org.argeo.jcr</module>
 		<module>org.argeo.osgi.boot</module>
-- 
2.30.2