From 7d2a002f5dcfe8a8c7b29803b70d4b1aff265ed1 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 22 Jan 2022 06:14:42 +0100
Subject: [PATCH] Rename GCR to ACR.

---
 dep/org.argeo.dep.cms.base/pom.xml            | 17 ++++-------
 .../.classpath                                |  0
 {org.argeo.api => org.argeo.api.acr}/.project |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  9 ++++++
 .../.settings/org.eclipse.pde.core.prefs      |  3 ++
 org.argeo.api.acr/bnd.bnd                     |  4 +++
 .../build.properties                          |  0
 {org.argeo.api => org.argeo.api.acr}/pom.xml  |  6 ++--
 .../argeo/api/acr}/AttributeFormatter.java    |  2 +-
 .../org/argeo/api/acr}/CompositeString.java   |  2 +-
 .../src/org/argeo/api/acr}/Content.java       |  2 +-
 .../ContentFeatureUnsupportedException.java   |  2 +-
 .../src/org/argeo/api/acr}/ContentName.java   |  2 +-
 .../argeo/api/acr}/ContentNameSupplier.java   |  2 +-
 .../api/acr}/ContentNotFoundException.java    |  2 +-
 .../org/argeo/api/acr}/ContentRepository.java |  2 +-
 .../api/acr}/ContentResourceException.java    |  2 +-
 .../org/argeo/api/acr}/ContentSession.java    |  2 +-
 .../src/org/argeo/api/acr}/ContentStore.java  |  2 +-
 .../src/org/argeo/api/acr}/ContentUtils.java  |  2 +-
 .../org/argeo/api/acr}/CrAttributeType.java   |  2 +-
 .../src/org/argeo/api/acr}/CrName.java        |  2 +-
 .../org/argeo/api/acr}/fs/AbstractFsPath.java |  2 +-
 .../argeo/api/acr}/fs/AbstractFsStore.java    |  2 +-
 .../argeo/api/acr}/fs/AbstractFsSystem.java   |  2 +-
 .../argeo/api/acr}/spi/AbstractContent.java   |  6 ++--
 .../argeo/api/acr}/spi/ContentProvider.java   |  4 +--
 .../argeo/api/acr}/spi/ProvidedContent.java   |  4 +--
 .../argeo/api/acr/spi/ProvidedRepository.java |  6 ++++
 .../argeo/api/acr}/spi/ProvidedSession.java   |  6 ++--
 org.argeo.api.cms/.classpath                  |  7 +++++
 org.argeo.api.cms/.project                    | 28 +++++++++++++++++++
 .../META-INF/.gitignore                       |  0
 org.argeo.api.cms/bnd.bnd                     |  4 +++
 org.argeo.api.cms/build.properties            |  4 +++
 org.argeo.api.cms/pom.xml                     | 15 ++++++++++
 .../org/argeo/api/cms/AnonymousPrincipal.java |  0
 .../src/org/argeo/api/cms/Cms2DSize.java      |  0
 .../src/org/argeo/api/cms/CmsApp.java         |  0
 .../src/org/argeo/api/cms/CmsAppListener.java |  0
 .../src/org/argeo/api/cms/CmsAuth.java        |  0
 .../src/org/argeo/api/cms/CmsConstants.java   |  0
 .../src/org/argeo/api/cms/CmsContext.java     |  0
 .../src/org/argeo/api/cms/CmsDeployment.java  |  0
 .../src/org/argeo/api/cms/CmsEditable.java    |  0
 .../src/org/argeo/api/cms/CmsEvent.java       |  0
 .../org/argeo/api/cms/CmsImageManager.java    |  0
 .../src/org/argeo/api/cms/CmsLog.java         |  0
 .../src/org/argeo/api/cms/CmsSession.java     |  0
 .../src/org/argeo/api/cms/CmsSessionId.java   |  0
 .../src/org/argeo/api/cms/CmsState.java       |  0
 .../src/org/argeo/api/cms/CmsStyle.java       |  0
 .../src/org/argeo/api/cms/CmsTheme.java       |  0
 .../src/org/argeo/api/cms/CmsUi.java          |  0
 .../src/org/argeo/api/cms/CmsView.java        |  0
 .../org/argeo/api/cms/DataAdminPrincipal.java |  0
 .../src/org/argeo/api/cms/MvcProvider.java    |  0
 .../src/org/argeo/api/cms/UxContext.java      |  0
 org.argeo.api/bnd.bnd                         |  4 ---
 .../argeo/api/gcr/spi/ProvidedRepository.java |  6 ----
 .../cms/jcr/{gcr => acr}/JcrContent.java      |  8 +++---
 .../jcr/{gcr => acr}/JcrContentProvider.java  |  8 +++---
 .../src/org/argeo/jcr/fs/JcrFileSystem.java   |  4 +--
 .../src/org/argeo/jcr/fs/JcrPath.java         |  2 +-
 .../org/argeo/jcr/fs/WorkspaceFileStore.java  |  2 +-
 .../argeo/cms/swt/gcr/GcrContentTreeView.java |  4 +--
 .../org/argeo/cms/swt/gcr/SwtUiProvider.java  |  2 +-
 org.argeo.cms.tp/pom.xml                      |  4 +--
 org.argeo.cms/pom.xml                         | 17 ++++-------
 .../{gcr => acr}/CmsContentRepository.java    | 14 +++++-----
 .../argeo/cms/{gcr => acr}/fs/FsContent.java  | 16 +++++------
 .../{gcr => acr}/fs/FsContentProvider.java    | 10 +++----
 .../cms/{gcr => acr}/xml/DomContent.java      | 12 ++++----
 .../{gcr => acr}/xml/DomContentProvider.java  | 10 +++----
 .../cms/{gcr => acr}/xml/ElementIterator.java |  6 ++--
 pom.xml                                       |  5 ++--
 76 files changed, 176 insertions(+), 117 deletions(-)
 rename {org.argeo.api => org.argeo.api.acr}/.classpath (100%)
 rename {org.argeo.api => org.argeo.api.acr}/.project (95%)
 create mode 100644 org.argeo.api.acr/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 org.argeo.api.acr/.settings/org.eclipse.pde.core.prefs
 create mode 100644 org.argeo.api.acr/bnd.bnd
 rename {org.argeo.api => org.argeo.api.acr}/build.properties (100%)
 rename {org.argeo.api => org.argeo.api.acr}/pom.xml (82%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/AttributeFormatter.java (96%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/CompositeString.java (99%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/Content.java (99%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/ContentFeatureUnsupportedException.java (95%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/ContentName.java (99%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/ContentNameSupplier.java (99%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/ContentNotFoundException.java (93%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/ContentRepository.java (92%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/ContentResourceException.java (95%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/ContentSession.java (98%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/ContentStore.java (57%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/ContentUtils.java (98%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/CrAttributeType.java (99%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/CrName.java (96%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/fs/AbstractFsPath.java (99%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/fs/AbstractFsStore.java (76%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/fs/AbstractFsSystem.java (87%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/spi/AbstractContent.java (97%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/spi/ContentProvider.java (64%)
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/spi/ProvidedContent.java (64%)
 create mode 100644 org.argeo.api.acr/src/org/argeo/api/acr/spi/ProvidedRepository.java
 rename {org.argeo.api/src/org/argeo/api/gcr => org.argeo.api.acr/src/org/argeo/api/acr}/spi/ProvidedSession.java (94%)
 create mode 100644 org.argeo.api.cms/.classpath
 create mode 100644 org.argeo.api.cms/.project
 rename {org.argeo.api => org.argeo.api.cms}/META-INF/.gitignore (100%)
 create mode 100644 org.argeo.api.cms/bnd.bnd
 create mode 100644 org.argeo.api.cms/build.properties
 create mode 100644 org.argeo.api.cms/pom.xml
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/AnonymousPrincipal.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/Cms2DSize.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsApp.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsAppListener.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsAuth.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsConstants.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsContext.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsDeployment.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsEditable.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsEvent.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsImageManager.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsLog.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsSession.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsSessionId.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsState.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsStyle.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsTheme.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsUi.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/CmsView.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/DataAdminPrincipal.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/MvcProvider.java (100%)
 rename {org.argeo.api => org.argeo.api.cms}/src/org/argeo/api/cms/UxContext.java (100%)
 delete mode 100644 org.argeo.api/bnd.bnd
 delete mode 100644 org.argeo.api/src/org/argeo/api/gcr/spi/ProvidedRepository.java
 rename org.argeo.cms.jcr/src/org/argeo/cms/jcr/{gcr => acr}/JcrContent.java (96%)
 rename org.argeo.cms.jcr/src/org/argeo/cms/jcr/{gcr => acr}/JcrContentProvider.java (90%)
 rename org.argeo.cms/src/org/argeo/cms/{gcr => acr}/CmsContentRepository.java (92%)
 rename org.argeo.cms/src/org/argeo/cms/{gcr => acr}/fs/FsContent.java (94%)
 rename org.argeo.cms/src/org/argeo/cms/{gcr => acr}/fs/FsContentProvider.java (74%)
 rename org.argeo.cms/src/org/argeo/cms/{gcr => acr}/xml/DomContent.java (96%)
 rename org.argeo.cms/src/org/argeo/cms/{gcr => acr}/xml/DomContentProvider.java (93%)
 rename org.argeo.cms/src/org/argeo/cms/{gcr => acr}/xml/ElementIterator.java (91%)

diff --git a/dep/org.argeo.dep.cms.base/pom.xml b/dep/org.argeo.dep.cms.base/pom.xml
index a46e8ec30..3a2af17f1 100644
--- a/dep/org.argeo.dep.cms.base/pom.xml
+++ b/dep/org.argeo.dep.cms.base/pom.xml
@@ -24,20 +24,15 @@
 			<artifactId>org.argeo.util</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> -->
-		<!-- <version>2.3-SNAPSHOT</version> -->
-		<!-- </dependency> -->
 
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.api</artifactId>
+			<artifactId>org.argeo.api.acr</artifactId>
+			<version>2.3-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.api.cms</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
diff --git a/org.argeo.api/.classpath b/org.argeo.api.acr/.classpath
similarity index 100%
rename from org.argeo.api/.classpath
rename to org.argeo.api.acr/.classpath
diff --git a/org.argeo.api/.project b/org.argeo.api.acr/.project
similarity index 95%
rename from org.argeo.api/.project
rename to org.argeo.api.acr/.project
index a396aadc8..d7a785e1d 100644
--- a/org.argeo.api/.project
+++ b/org.argeo.api.acr/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.argeo.api</name>
+	<name>org.argeo.api.acr</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.argeo.api.acr/.settings/org.eclipse.jdt.core.prefs b/org.argeo.api.acr/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..c9545f06a
--- /dev/null
+++ b/org.argeo.api.acr/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.argeo.api.acr/.settings/org.eclipse.pde.core.prefs b/org.argeo.api.acr/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 000000000..f29e940a0
--- /dev/null
+++ b/org.argeo.api.acr/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.argeo.api.acr/bnd.bnd b/org.argeo.api.acr/bnd.bnd
new file mode 100644
index 000000000..6e839c070
--- /dev/null
+++ b/org.argeo.api.acr/bnd.bnd
@@ -0,0 +1,4 @@
+Import-Package: \
+javax.security.*
+
+Export-Package: org.argeo.api.acr.*
\ No newline at end of file
diff --git a/org.argeo.api/build.properties b/org.argeo.api.acr/build.properties
similarity index 100%
rename from org.argeo.api/build.properties
rename to org.argeo.api.acr/build.properties
diff --git a/org.argeo.api/pom.xml b/org.argeo.api.acr/pom.xml
similarity index 82%
rename from org.argeo.api/pom.xml
rename to org.argeo.api.acr/pom.xml
index 82ad85552..bc2383831 100644
--- a/org.argeo.api/pom.xml
+++ b/org.argeo.api.acr/pom.xml
@@ -7,9 +7,7 @@
 		<version>2.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
-	<artifactId>org.argeo.api</artifactId>
-	<name>CMS APIs</name>
+	<artifactId>org.argeo.api.acr</artifactId>
+	<name>ACR API</name>
 	<packaging>jar</packaging>
-	<dependencies>
-	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.api/src/org/argeo/api/gcr/AttributeFormatter.java b/org.argeo.api.acr/src/org/argeo/api/acr/AttributeFormatter.java
similarity index 96%
rename from org.argeo.api/src/org/argeo/api/gcr/AttributeFormatter.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/AttributeFormatter.java
index a628cda78..41600331a 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/AttributeFormatter.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/AttributeFormatter.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr;
+package org.argeo.api.acr;
 
 /**
  * An attribute type MUST consistently parse a string to an object so that
diff --git a/org.argeo.api/src/org/argeo/api/gcr/CompositeString.java b/org.argeo.api.acr/src/org/argeo/api/acr/CompositeString.java
similarity index 99%
rename from org.argeo.api/src/org/argeo/api/gcr/CompositeString.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/CompositeString.java
index f979357b1..b83fe301e 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/CompositeString.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/CompositeString.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr;
+package org.argeo.api.acr;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/org.argeo.api/src/org/argeo/api/gcr/Content.java b/org.argeo.api.acr/src/org/argeo/api/acr/Content.java
similarity index 99%
rename from org.argeo.api/src/org/argeo/api/gcr/Content.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/Content.java
index fa4d50713..edcfaea10 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/Content.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/Content.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr;
+package org.argeo.api.acr;
 
 import java.util.List;
 import java.util.Map;
diff --git a/org.argeo.api/src/org/argeo/api/gcr/ContentFeatureUnsupportedException.java b/org.argeo.api.acr/src/org/argeo/api/acr/ContentFeatureUnsupportedException.java
similarity index 95%
rename from org.argeo.api/src/org/argeo/api/gcr/ContentFeatureUnsupportedException.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/ContentFeatureUnsupportedException.java
index 0e97a2427..485caa9a4 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/ContentFeatureUnsupportedException.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ContentFeatureUnsupportedException.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr;
+package org.argeo.api.acr;
 
 /** When a feature is not supported by the underlying repository. */
 public class ContentFeatureUnsupportedException extends UnsupportedOperationException {
diff --git a/org.argeo.api/src/org/argeo/api/gcr/ContentName.java b/org.argeo.api.acr/src/org/argeo/api/acr/ContentName.java
similarity index 99%
rename from org.argeo.api/src/org/argeo/api/gcr/ContentName.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/ContentName.java
index b23042528..341a3e297 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/ContentName.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ContentName.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr;
+package org.argeo.api.acr;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
diff --git a/org.argeo.api/src/org/argeo/api/gcr/ContentNameSupplier.java b/org.argeo.api.acr/src/org/argeo/api/acr/ContentNameSupplier.java
similarity index 99%
rename from org.argeo.api/src/org/argeo/api/gcr/ContentNameSupplier.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/ContentNameSupplier.java
index 0c1020148..e3c721fef 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/ContentNameSupplier.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ContentNameSupplier.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr;
+package org.argeo.api.acr;
 
 import java.util.Collections;
 import java.util.Iterator;
diff --git a/org.argeo.api/src/org/argeo/api/gcr/ContentNotFoundException.java b/org.argeo.api.acr/src/org/argeo/api/acr/ContentNotFoundException.java
similarity index 93%
rename from org.argeo.api/src/org/argeo/api/gcr/ContentNotFoundException.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/ContentNotFoundException.java
index 8a0909342..b86c92c1e 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/ContentNotFoundException.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ContentNotFoundException.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr;
+package org.argeo.api.acr;
 
 /** When a countent was requested which does not exists, equivalent to HTTP code 404.*/
 public class ContentNotFoundException extends RuntimeException {
diff --git a/org.argeo.api/src/org/argeo/api/gcr/ContentRepository.java b/org.argeo.api.acr/src/org/argeo/api/acr/ContentRepository.java
similarity index 92%
rename from org.argeo.api/src/org/argeo/api/gcr/ContentRepository.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/ContentRepository.java
index 0807075ce..3b2f156e0 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/ContentRepository.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ContentRepository.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr;
+package org.argeo.api.acr;
 
 import java.util.Locale;
 import java.util.function.Supplier;
diff --git a/org.argeo.api/src/org/argeo/api/gcr/ContentResourceException.java b/org.argeo.api.acr/src/org/argeo/api/acr/ContentResourceException.java
similarity index 95%
rename from org.argeo.api/src/org/argeo/api/gcr/ContentResourceException.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/ContentResourceException.java
index fa7195e7f..e418c4ff7 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/ContentResourceException.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ContentResourceException.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr;
+package org.argeo.api.acr;
 
 /**
  * When there is a problem the underlying resources, typically IO, network, DB
diff --git a/org.argeo.api/src/org/argeo/api/gcr/ContentSession.java b/org.argeo.api.acr/src/org/argeo/api/acr/ContentSession.java
similarity index 98%
rename from org.argeo.api/src/org/argeo/api/gcr/ContentSession.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/ContentSession.java
index 6c80189b2..215bb9e22 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/ContentSession.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ContentSession.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr;
+package org.argeo.api.acr;
 
 import java.util.Locale;
 import java.util.Objects;
diff --git a/org.argeo.api/src/org/argeo/api/gcr/ContentStore.java b/org.argeo.api.acr/src/org/argeo/api/acr/ContentStore.java
similarity index 57%
rename from org.argeo.api/src/org/argeo/api/gcr/ContentStore.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/ContentStore.java
index c9c90bc38..cda5d91f8 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/ContentStore.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ContentStore.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr;
+package org.argeo.api.acr;
 
 public interface ContentStore {
 
diff --git a/org.argeo.api/src/org/argeo/api/gcr/ContentUtils.java b/org.argeo.api.acr/src/org/argeo/api/acr/ContentUtils.java
similarity index 98%
rename from org.argeo.api/src/org/argeo/api/gcr/ContentUtils.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/ContentUtils.java
index cf5115590..2036c8622 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/ContentUtils.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ContentUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr;
+package org.argeo.api.acr;
 
 import java.io.PrintStream;
 import java.net.URI;
diff --git a/org.argeo.api/src/org/argeo/api/gcr/CrAttributeType.java b/org.argeo.api.acr/src/org/argeo/api/acr/CrAttributeType.java
similarity index 99%
rename from org.argeo.api/src/org/argeo/api/gcr/CrAttributeType.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/CrAttributeType.java
index 1e3445653..ffa28af0a 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/CrAttributeType.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/CrAttributeType.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr;
+package org.argeo.api.acr;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/org.argeo.api/src/org/argeo/api/gcr/CrName.java b/org.argeo.api.acr/src/org/argeo/api/acr/CrName.java
similarity index 96%
rename from org.argeo.api/src/org/argeo/api/gcr/CrName.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/CrName.java
index 283e5cc71..099be9fda 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/CrName.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/CrName.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr;
+package org.argeo.api.acr;
 
 /** Standard names. */
 public enum CrName implements ContentNameSupplier {
diff --git a/org.argeo.api/src/org/argeo/api/gcr/fs/AbstractFsPath.java b/org.argeo.api.acr/src/org/argeo/api/acr/fs/AbstractFsPath.java
similarity index 99%
rename from org.argeo.api/src/org/argeo/api/gcr/fs/AbstractFsPath.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/fs/AbstractFsPath.java
index c83fe385b..fa95dafdd 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/fs/AbstractFsPath.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/fs/AbstractFsPath.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr.fs;
+package org.argeo.api.acr.fs;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/org.argeo.api/src/org/argeo/api/gcr/fs/AbstractFsStore.java b/org.argeo.api.acr/src/org/argeo/api/acr/fs/AbstractFsStore.java
similarity index 76%
rename from org.argeo.api/src/org/argeo/api/gcr/fs/AbstractFsStore.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/fs/AbstractFsStore.java
index 00887346d..129476685 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/fs/AbstractFsStore.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/fs/AbstractFsStore.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr.fs;
+package org.argeo.api.acr.fs;
 
 import java.nio.file.FileStore;
 
diff --git a/org.argeo.api/src/org/argeo/api/gcr/fs/AbstractFsSystem.java b/org.argeo.api.acr/src/org/argeo/api/acr/fs/AbstractFsSystem.java
similarity index 87%
rename from org.argeo.api/src/org/argeo/api/gcr/fs/AbstractFsSystem.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/fs/AbstractFsSystem.java
index 36369ca6e..3bf10f6b6 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/fs/AbstractFsSystem.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/fs/AbstractFsSystem.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr.fs;
+package org.argeo.api.acr.fs;
 
 import java.nio.file.FileSystem;
 
diff --git a/org.argeo.api/src/org/argeo/api/gcr/spi/AbstractContent.java b/org.argeo.api.acr/src/org/argeo/api/acr/spi/AbstractContent.java
similarity index 97%
rename from org.argeo.api/src/org/argeo/api/gcr/spi/AbstractContent.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/spi/AbstractContent.java
index 2d3bcde93..6bfc7cd5f 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/spi/AbstractContent.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/spi/AbstractContent.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr.spi;
+package org.argeo.api.acr.spi;
 
 import java.util.AbstractMap;
 import java.util.AbstractSet;
@@ -12,8 +12,8 @@ import java.util.Set;
 
 import javax.xml.namespace.QName;
 
-import org.argeo.api.gcr.Content;
-import org.argeo.api.gcr.CrName;
+import org.argeo.api.acr.Content;
+import org.argeo.api.acr.CrName;
 
 public abstract class AbstractContent extends AbstractMap<QName, Object> implements Content {
 
diff --git a/org.argeo.api/src/org/argeo/api/gcr/spi/ContentProvider.java b/org.argeo.api.acr/src/org/argeo/api/acr/spi/ContentProvider.java
similarity index 64%
rename from org.argeo.api/src/org/argeo/api/gcr/spi/ContentProvider.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/spi/ContentProvider.java
index 3a24ca24b..d83cf49c9 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/spi/ContentProvider.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/spi/ContentProvider.java
@@ -1,6 +1,6 @@
-package org.argeo.api.gcr.spi;
+package org.argeo.api.acr.spi;
 
-import org.argeo.api.gcr.Content;
+import org.argeo.api.acr.Content;
 
 public interface ContentProvider {
 
diff --git a/org.argeo.api/src/org/argeo/api/gcr/spi/ProvidedContent.java b/org.argeo.api.acr/src/org/argeo/api/acr/spi/ProvidedContent.java
similarity index 64%
rename from org.argeo.api/src/org/argeo/api/gcr/spi/ProvidedContent.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/spi/ProvidedContent.java
index e75f62d45..d9fc781d0 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/spi/ProvidedContent.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/spi/ProvidedContent.java
@@ -1,6 +1,6 @@
-package org.argeo.api.gcr.spi;
+package org.argeo.api.acr.spi;
 
-import org.argeo.api.gcr.Content;
+import org.argeo.api.acr.Content;
 
 public interface ProvidedContent extends Content {
 	ProvidedSession getSession();
diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/spi/ProvidedRepository.java b/org.argeo.api.acr/src/org/argeo/api/acr/spi/ProvidedRepository.java
new file mode 100644
index 000000000..c3052c375
--- /dev/null
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/spi/ProvidedRepository.java
@@ -0,0 +1,6 @@
+package org.argeo.api.acr.spi;
+
+import org.argeo.api.acr.ContentRepository;
+
+public interface ProvidedRepository extends ContentRepository {
+}
diff --git a/org.argeo.api/src/org/argeo/api/gcr/spi/ProvidedSession.java b/org.argeo.api.acr/src/org/argeo/api/acr/spi/ProvidedSession.java
similarity index 94%
rename from org.argeo.api/src/org/argeo/api/gcr/spi/ProvidedSession.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/spi/ProvidedSession.java
index 4e93684e5..f90d67475 100644
--- a/org.argeo.api/src/org/argeo/api/gcr/spi/ProvidedSession.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/spi/ProvidedSession.java
@@ -1,4 +1,4 @@
-package org.argeo.api.gcr.spi;
+package org.argeo.api.acr.spi;
 
 import java.util.Collections;
 import java.util.Iterator;
@@ -7,8 +7,8 @@ import java.util.Set;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.NamespaceContext;
 
-import org.argeo.api.gcr.ContentNameSupplier;
-import org.argeo.api.gcr.ContentSession;
+import org.argeo.api.acr.ContentNameSupplier;
+import org.argeo.api.acr.ContentSession;
 
 public interface ProvidedSession extends ContentSession, NamespaceContext {
 	ProvidedRepository getRepository();
diff --git a/org.argeo.api.cms/.classpath b/org.argeo.api.cms/.classpath
new file mode 100644
index 000000000..e801ebfb4
--- /dev/null
+++ b/org.argeo.api.cms/.classpath
@@ -0,0 +1,7 @@
+<?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"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.argeo.api.cms/.project b/org.argeo.api.cms/.project
new file mode 100644
index 000000000..17631c896
--- /dev/null
+++ b/org.argeo.api.cms/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.api.cms</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.api/META-INF/.gitignore b/org.argeo.api.cms/META-INF/.gitignore
similarity index 100%
rename from org.argeo.api/META-INF/.gitignore
rename to org.argeo.api.cms/META-INF/.gitignore
diff --git a/org.argeo.api.cms/bnd.bnd b/org.argeo.api.cms/bnd.bnd
new file mode 100644
index 000000000..51c4e663c
--- /dev/null
+++ b/org.argeo.api.cms/bnd.bnd
@@ -0,0 +1,4 @@
+Import-Package: \
+javax.security.*
+
+Export-Package: org.argeo.api.cms.*
\ No newline at end of file
diff --git a/org.argeo.api.cms/build.properties b/org.argeo.api.cms/build.properties
new file mode 100644
index 000000000..34d2e4d2d
--- /dev/null
+++ b/org.argeo.api.cms/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/org.argeo.api.cms/pom.xml b/org.argeo.api.cms/pom.xml
new file mode 100644
index 000000000..b1cfca0d3
--- /dev/null
+++ b/org.argeo.api.cms/pom.xml
@@ -0,0 +1,15 @@
+<?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.api.cms</artifactId>
+	<name>CMS API</name>
+	<packaging>jar</packaging>
+</project>
\ No newline at end of file
diff --git a/org.argeo.api/src/org/argeo/api/cms/AnonymousPrincipal.java b/org.argeo.api.cms/src/org/argeo/api/cms/AnonymousPrincipal.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/AnonymousPrincipal.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/AnonymousPrincipal.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/Cms2DSize.java b/org.argeo.api.cms/src/org/argeo/api/cms/Cms2DSize.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/Cms2DSize.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/Cms2DSize.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsApp.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsApp.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsApp.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsApp.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsAppListener.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsAppListener.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsAppListener.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsAppListener.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsAuth.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsAuth.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsAuth.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsAuth.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsConstants.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsConstants.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsConstants.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsConstants.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsContext.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsContext.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsContext.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsContext.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsDeployment.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsDeployment.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsDeployment.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsDeployment.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsEditable.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsEditable.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsEditable.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsEditable.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsEvent.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsEvent.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsEvent.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsEvent.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsImageManager.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsImageManager.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsImageManager.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsImageManager.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsLog.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsLog.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsLog.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsLog.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsSession.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsSession.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsSession.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsSession.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsSessionId.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsSessionId.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsSessionId.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsSessionId.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsState.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsState.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsState.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsState.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsStyle.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsStyle.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsStyle.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsStyle.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsTheme.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsTheme.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsTheme.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsTheme.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsUi.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsUi.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsUi.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsUi.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsView.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsView.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/CmsView.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/CmsView.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/DataAdminPrincipal.java b/org.argeo.api.cms/src/org/argeo/api/cms/DataAdminPrincipal.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/DataAdminPrincipal.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/DataAdminPrincipal.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/MvcProvider.java b/org.argeo.api.cms/src/org/argeo/api/cms/MvcProvider.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/MvcProvider.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/MvcProvider.java
diff --git a/org.argeo.api/src/org/argeo/api/cms/UxContext.java b/org.argeo.api.cms/src/org/argeo/api/cms/UxContext.java
similarity index 100%
rename from org.argeo.api/src/org/argeo/api/cms/UxContext.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/UxContext.java
diff --git a/org.argeo.api/bnd.bnd b/org.argeo.api/bnd.bnd
deleted file mode 100644
index a8a1e4f6a..000000000
--- a/org.argeo.api/bnd.bnd
+++ /dev/null
@@ -1,4 +0,0 @@
-Import-Package: javax.naming.*,\
-javax.security.*
-
-Export-Package: org.argeo.api.*
\ No newline at end of file
diff --git a/org.argeo.api/src/org/argeo/api/gcr/spi/ProvidedRepository.java b/org.argeo.api/src/org/argeo/api/gcr/spi/ProvidedRepository.java
deleted file mode 100644
index 2db13f9a1..000000000
--- a/org.argeo.api/src/org/argeo/api/gcr/spi/ProvidedRepository.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.argeo.api.gcr.spi;
-
-import org.argeo.api.gcr.ContentRepository;
-
-public interface ProvidedRepository extends ContentRepository {
-}
diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/gcr/JcrContent.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContent.java
similarity index 96%
rename from org.argeo.cms.jcr/src/org/argeo/cms/jcr/gcr/JcrContent.java
rename to org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContent.java
index af63ead61..04c5d2d8c 100644
--- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/gcr/JcrContent.java
+++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContent.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.jcr.gcr;
+package org.argeo.cms.jcr.acr;
 
 import java.util.Calendar;
 import java.util.Iterator;
@@ -14,9 +14,9 @@ import javax.jcr.Value;
 import javax.jcr.nodetype.NodeType;
 import javax.xml.namespace.QName;
 
-import org.argeo.api.gcr.Content;
-import org.argeo.api.gcr.spi.AbstractContent;
-import org.argeo.api.gcr.spi.ProvidedSession;
+import org.argeo.api.acr.Content;
+import org.argeo.api.acr.spi.AbstractContent;
+import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
 
diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/gcr/JcrContentProvider.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java
similarity index 90%
rename from org.argeo.cms.jcr/src/org/argeo/cms/jcr/gcr/JcrContentProvider.java
rename to org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java
index 761c087f0..ef8e375d0 100644
--- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/gcr/JcrContentProvider.java
+++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.jcr.gcr;
+package org.argeo.cms.jcr.acr;
 
 import java.util.Arrays;
 import java.util.Iterator;
@@ -8,9 +8,9 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.xml.namespace.NamespaceContext;
 
-import org.argeo.api.gcr.Content;
-import org.argeo.api.gcr.spi.ContentProvider;
-import org.argeo.api.gcr.spi.ProvidedSession;
+import org.argeo.api.acr.Content;
+import org.argeo.api.acr.spi.ContentProvider;
+import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
diff --git a/org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrFileSystem.java b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrFileSystem.java
index 3d0fcfe66..4b329810f 100644
--- a/org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrFileSystem.java
+++ b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrFileSystem.java
@@ -23,8 +23,8 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 
-import org.argeo.api.gcr.fs.AbstractFsStore;
-import org.argeo.api.gcr.fs.AbstractFsSystem;
+import org.argeo.api.acr.fs.AbstractFsStore;
+import org.argeo.api.acr.fs.AbstractFsSystem;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrUtils;
 
diff --git a/org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrPath.java b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrPath.java
index 8782be9ee..7318b7096 100644
--- a/org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrPath.java
+++ b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/JcrPath.java
@@ -5,7 +5,7 @@ import java.nio.file.Path;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.argeo.api.gcr.fs.AbstractFsPath;
+import org.argeo.api.acr.fs.AbstractFsPath;
 
 /** A {@link Path} which contains a reference to a JCR {@link Node}. */
 public class JcrPath extends AbstractFsPath<JcrFileSystem, WorkspaceFileStore> {
diff --git a/org.argeo.cms.jcr/src/org/argeo/jcr/fs/WorkspaceFileStore.java b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/WorkspaceFileStore.java
index e8f24c9de..ce4205a97 100644
--- a/org.argeo.cms.jcr/src/org/argeo/jcr/fs/WorkspaceFileStore.java
+++ b/org.argeo.cms.jcr/src/org/argeo/jcr/fs/WorkspaceFileStore.java
@@ -11,7 +11,7 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.Workspace;
 
-import org.argeo.api.gcr.fs.AbstractFsStore;
+import org.argeo.api.acr.fs.AbstractFsStore;
 import org.argeo.jcr.JcrUtils;
 
 /** A {@link FileStore} implementation based on JCR {@link Workspace}. */
diff --git a/org.argeo.cms.swt/src/org/argeo/cms/swt/gcr/GcrContentTreeView.java b/org.argeo.cms.swt/src/org/argeo/cms/swt/gcr/GcrContentTreeView.java
index ba6d7b477..4039f2baa 100644
--- a/org.argeo.cms.swt/src/org/argeo/cms/swt/gcr/GcrContentTreeView.java
+++ b/org.argeo.cms.swt/src/org/argeo/cms/swt/gcr/GcrContentTreeView.java
@@ -5,8 +5,8 @@ import java.nio.file.Paths;
 
 import javax.xml.namespace.QName;
 
-import org.argeo.api.gcr.Content;
-import org.argeo.cms.gcr.fs.FsContentProvider;
+import org.argeo.api.acr.Content;
+import org.argeo.cms.acr.fs.FsContentProvider;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
diff --git a/org.argeo.cms.swt/src/org/argeo/cms/swt/gcr/SwtUiProvider.java b/org.argeo.cms.swt/src/org/argeo/cms/swt/gcr/SwtUiProvider.java
index 63b29c963..8109c40ac 100644
--- a/org.argeo.cms.swt/src/org/argeo/cms/swt/gcr/SwtUiProvider.java
+++ b/org.argeo.cms.swt/src/org/argeo/cms/swt/gcr/SwtUiProvider.java
@@ -1,7 +1,7 @@
 package org.argeo.cms.swt.gcr;
 
+import org.argeo.api.acr.Content;
 import org.argeo.api.cms.MvcProvider;
-import org.argeo.api.gcr.Content;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
diff --git a/org.argeo.cms.tp/pom.xml b/org.argeo.cms.tp/pom.xml
index 2bc5b03d1..7a394495a 100644
--- a/org.argeo.cms.tp/pom.xml
+++ b/org.argeo.cms.tp/pom.xml
@@ -12,11 +12,11 @@
 	<artifactId>org.argeo.cms.tp</artifactId>
 	<packaging>jar</packaging>
 	<name>CMS Third Parties Adapters</name>
-	<description>Workarounds or trivial implementations from some third parties, typically logging</description>
+	<description>Workarounds or trivial implementations of some third parties, typically logging</description>
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.api</artifactId>
+			<artifactId>org.argeo.api.cms</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml
index 237af520b..38112fc3b 100644
--- a/org.argeo.cms/pom.xml
+++ b/org.argeo.cms/pom.xml
@@ -13,7 +13,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.api</artifactId>
+			<artifactId>org.argeo.api.cms</artifactId>
+			<version>2.3-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.api.acr</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
@@ -21,15 +26,5 @@
 			<artifactId>org.argeo.util</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.commons</groupId> -->
-<!-- 			<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> -->
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.cms/src/org/argeo/cms/gcr/CmsContentRepository.java b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentRepository.java
similarity index 92%
rename from org.argeo.cms/src/org/argeo/cms/gcr/CmsContentRepository.java
rename to org.argeo.cms/src/org/argeo/cms/acr/CmsContentRepository.java
index 69f2e94d4..9cd8bd22d 100644
--- a/org.argeo.cms/src/org/argeo/cms/gcr/CmsContentRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentRepository.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.gcr;
+package org.argeo.cms.acr;
 
 import java.security.AccessController;
 import java.util.Locale;
@@ -10,12 +10,12 @@ import java.util.stream.Collectors;
 
 import javax.security.auth.Subject;
 
-import org.argeo.api.gcr.Content;
-import org.argeo.api.gcr.ContentSession;
-import org.argeo.api.gcr.CrName;
-import org.argeo.api.gcr.spi.ContentProvider;
-import org.argeo.api.gcr.spi.ProvidedRepository;
-import org.argeo.api.gcr.spi.ProvidedSession;
+import org.argeo.api.acr.Content;
+import org.argeo.api.acr.ContentSession;
+import org.argeo.api.acr.CrName;
+import org.argeo.api.acr.spi.ContentProvider;
+import org.argeo.api.acr.spi.ProvidedRepository;
+import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
 
 public class CmsContentRepository implements ProvidedRepository {
diff --git a/org.argeo.cms/src/org/argeo/cms/gcr/fs/FsContent.java b/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContent.java
similarity index 94%
rename from org.argeo.cms/src/org/argeo/cms/gcr/fs/FsContent.java
rename to org.argeo.cms/src/org/argeo/cms/acr/fs/FsContent.java
index 0ba24093f..bfcd0118d 100644
--- a/org.argeo.cms/src/org/argeo/cms/gcr/fs/FsContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContent.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.gcr.fs;
+package org.argeo.cms.acr.fs;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -18,13 +18,13 @@ import java.util.Set;
 
 import javax.xml.namespace.QName;
 
-import org.argeo.api.gcr.Content;
-import org.argeo.api.gcr.ContentName;
-import org.argeo.api.gcr.ContentResourceException;
-import org.argeo.api.gcr.CrName;
-import org.argeo.api.gcr.spi.AbstractContent;
-import org.argeo.api.gcr.spi.ProvidedContent;
-import org.argeo.api.gcr.spi.ProvidedSession;
+import org.argeo.api.acr.Content;
+import org.argeo.api.acr.ContentName;
+import org.argeo.api.acr.ContentResourceException;
+import org.argeo.api.acr.CrName;
+import org.argeo.api.acr.spi.AbstractContent;
+import org.argeo.api.acr.spi.ProvidedContent;
+import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.util.FsUtils;
 
 public class FsContent extends AbstractContent implements ProvidedContent {
diff --git a/org.argeo.cms/src/org/argeo/cms/gcr/fs/FsContentProvider.java b/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContentProvider.java
similarity index 74%
rename from org.argeo.cms/src/org/argeo/cms/gcr/fs/FsContentProvider.java
rename to org.argeo.cms/src/org/argeo/cms/acr/fs/FsContentProvider.java
index e5732da1e..99ed3a8ca 100644
--- a/org.argeo.cms/src/org/argeo/cms/gcr/fs/FsContentProvider.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContentProvider.java
@@ -1,13 +1,13 @@
-package org.argeo.cms.gcr.fs;
+package org.argeo.cms.acr.fs;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import org.argeo.api.gcr.Content;
-import org.argeo.api.gcr.ContentResourceException;
-import org.argeo.api.gcr.spi.ContentProvider;
-import org.argeo.api.gcr.spi.ProvidedSession;
+import org.argeo.api.acr.Content;
+import org.argeo.api.acr.ContentResourceException;
+import org.argeo.api.acr.spi.ContentProvider;
+import org.argeo.api.acr.spi.ProvidedSession;
 
 public class FsContentProvider implements ContentProvider {
 	private final Path rootPath;
diff --git a/org.argeo.cms/src/org/argeo/cms/gcr/xml/DomContent.java b/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContent.java
similarity index 96%
rename from org.argeo.cms/src/org/argeo/cms/gcr/xml/DomContent.java
rename to org.argeo.cms/src/org/argeo/cms/acr/xml/DomContent.java
index 0b68a772c..626f582e5 100644
--- a/org.argeo.cms/src/org/argeo/cms/gcr/xml/DomContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContent.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.gcr.xml;
+package org.argeo.cms.acr.xml;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -9,11 +9,11 @@ import javax.xml.XMLConstants;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
 
-import org.argeo.api.gcr.Content;
-import org.argeo.api.gcr.ContentName;
-import org.argeo.api.gcr.spi.AbstractContent;
-import org.argeo.api.gcr.spi.ProvidedContent;
-import org.argeo.api.gcr.spi.ProvidedSession;
+import org.argeo.api.acr.Content;
+import org.argeo.api.acr.ContentName;
+import org.argeo.api.acr.spi.AbstractContent;
+import org.argeo.api.acr.spi.ProvidedContent;
+import org.argeo.api.acr.spi.ProvidedSession;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/org.argeo.cms/src/org/argeo/cms/gcr/xml/DomContentProvider.java b/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContentProvider.java
similarity index 93%
rename from org.argeo.cms/src/org/argeo/cms/gcr/xml/DomContentProvider.java
rename to org.argeo.cms/src/org/argeo/cms/acr/xml/DomContentProvider.java
index dc200bf3d..c5fde8d7c 100644
--- a/org.argeo.cms/src/org/argeo/cms/gcr/xml/DomContentProvider.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContentProvider.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.gcr.xml;
+package org.argeo.cms.acr.xml;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -11,10 +11,10 @@ import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
-import org.argeo.api.gcr.Content;
-import org.argeo.api.gcr.ContentNotFoundException;
-import org.argeo.api.gcr.spi.ContentProvider;
-import org.argeo.api.gcr.spi.ProvidedSession;
+import org.argeo.api.acr.Content;
+import org.argeo.api.acr.ContentNotFoundException;
+import org.argeo.api.acr.spi.ContentProvider;
+import org.argeo.api.acr.spi.ProvidedSession;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
diff --git a/org.argeo.cms/src/org/argeo/cms/gcr/xml/ElementIterator.java b/org.argeo.cms/src/org/argeo/cms/acr/xml/ElementIterator.java
similarity index 91%
rename from org.argeo.cms/src/org/argeo/cms/gcr/xml/ElementIterator.java
rename to org.argeo.cms/src/org/argeo/cms/acr/xml/ElementIterator.java
index db25b653d..3b07081e4 100644
--- a/org.argeo.cms/src/org/argeo/cms/gcr/xml/ElementIterator.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/xml/ElementIterator.java
@@ -1,10 +1,10 @@
-package org.argeo.cms.gcr.xml;
+package org.argeo.cms.acr.xml;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.argeo.api.gcr.Content;
-import org.argeo.api.gcr.spi.ProvidedSession;
+import org.argeo.api.acr.Content;
+import org.argeo.api.acr.spi.ProvidedSession;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/pom.xml b/pom.xml
index 41f257e50..c0edf6c4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,9 +22,10 @@
 		<!-- Base -->
 		<module>org.argeo.init</module>
 		<module>org.argeo.util</module>
-		<!-- Eclipse -->
+		<!-- API -->
+		<module>org.argeo.api.acr</module>
+		<module>org.argeo.api.cms</module>
 		<!-- CMS -->
-		<module>org.argeo.api</module>
 		<module>org.argeo.cms.tp</module>
 		<module>org.argeo.cms</module>
 		<module>org.argeo.cms.pgsql</module>
-- 
2.30.2