From f8a9ca2e0faabe1e0cdcd3537da34e02a0e55f57 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 15 Feb 2020 10:55:52 +0100
Subject: [PATCH] Start SLC 2 refactoring.

---
 dep/org.argeo.slc.dep.backend/pom.xml         |   9 -
 dep/org.argeo.slc.dep.e4.rap/pom.xml          |  49 +++---
 dep/org.argeo.slc.dep.minimal/pom.xml         |   5 -
 dep/org.argeo.slc.dep.spring/pom.xml          |  21 ++-
 .../dep/org.argeo.dep.cms.platform/pom.xml    | 157 ++++++++----------
 .../org/argeo/slc}/attachment/Attachment.java |   2 +-
 .../slc}/attachment/AttachmentsEnabled.java   |   2 +-
 .../slc}/attachment/AttachmentsStorage.java   |   2 +-
 .../execution/AbstractExecutionValue.java     |   2 +-
 .../slc}/execution/AbstractSpecAttribute.java |   4 +-
 .../slc}/execution/RefSpecAttribute.java      |   2 +-
 .../org/argeo/slc}/execution/RefValue.java    |   2 +-
 .../argeo/slc}/execution/RefValueChoice.java  |   2 +-
 .../slc/primitive}/PrimitiveAccessor.java     |   2 +-
 .../primitive}/PrimitiveSpecAttribute.java    |   3 +-
 .../argeo/slc/primitive}/PrimitiveUtils.java  |   2 +-
 .../argeo/slc/primitive}/PrimitiveValue.java  |   4 +-
 org.argeo.slc.client.ui/pom.xml               |   2 +-
 .../client/ui/editors/ProcessBuilderPage.java |   4 +-
 org.argeo.slc.e4/pom.xml                      |   2 +-
 org.argeo.slc.jcr/.classpath                  |   7 +
 org.argeo.slc.jcr/.gitignore                  |   2 +
 org.argeo.slc.jcr/.project                    |  28 ++++
 org.argeo.slc.jcr/META-INF/.gitignore         |   1 +
 org.argeo.slc.jcr/bnd.bnd                     |   2 +
 org.argeo.slc.jcr/build.properties            |   4 +
 org.argeo.slc.jcr/pom.xml                     |  59 +++++++
 .../org/argeo/slc/jcr/JcrMetadataWriter.java  |   0
 .../src/org/argeo/slc/jcr/JcrTestResult.java  |   4 +-
 .../org/argeo/slc/jcr/SlcJcrConstants.java    |   0
 .../org/argeo/slc/jcr/SlcJcrResultUtils.java  |   0
 .../src/org/argeo/slc/jcr/SlcJcrUtils.java    |   4 +-
 org.argeo.slc.repo/pom.xml                    |   6 +-
 org.argeo.slc.spring/bnd.bnd                  |   1 +
 org.argeo.slc.spring/pom.xml                  |  14 +-
 .../core/attachment/AttachmentUploader.java   |   1 +
 .../attachment/FileAttachmentsStorage.java    |   2 +
 .../slc/core/attachment/SimpleAttachment.java |   2 +
 ...faultExecutionFlowDescriptorConverter.java |   5 +
 .../core/execution/DefaultExecutionSpec.java  |   2 +
 .../core/execution/InstantiationManager.java  |   3 +
 .../execution/tasks/UploadAttachments.java    |   4 +-
 .../xml/SpecBeanDefinitionParser.java         |   6 +-
 .../jcr/execution/JcrAttachmentUploader.java  |   2 +-
 .../JcrExecutionModulesListener.java          |   8 +-
 .../slc/jcr/execution/JcrRealizedFlow.java    |   6 +-
 .../unit}/AbstractExecutionFlowTestcase.java  |   3 +-
 .../unit/AbstractOsgiRuntimeTestCase.java     |   6 +-
 .../spring}/unit/AbstractSpringTestCase.java  |   6 +-
 .../ExecutionFlowDescriptorTestUtils.java     |  14 +-
 .../org/argeo/slc/spring}/unit/UnitUtils.java |   2 +-
 org.argeo.slc.support/pom.xml                 |   2 +-
 org.argeo.slc.unit/pom.xml                    |  12 +-
 pom.xml                                       |   2 +-
 54 files changed, 316 insertions(+), 182 deletions(-)
 rename {org.argeo.slc.spring/src/org/argeo/slc/core => org.argeo.slc.api/src/org/argeo/slc}/attachment/Attachment.java (95%)
 rename {org.argeo.slc.spring/src/org/argeo/slc/core => org.argeo.slc.api/src/org/argeo/slc}/attachment/AttachmentsEnabled.java (94%)
 rename {org.argeo.slc.spring/src/org/argeo/slc/core => org.argeo.slc.api/src/org/argeo/slc}/attachment/AttachmentsStorage.java (95%)
 rename {org.argeo.slc.spring/src/org/argeo/slc/core => org.argeo.slc.api/src/org/argeo/slc}/execution/AbstractExecutionValue.java (95%)
 rename {org.argeo.slc.spring/src/org/argeo/slc/core => org.argeo.slc.api/src/org/argeo/slc}/execution/AbstractSpecAttribute.java (96%)
 rename {org.argeo.slc.spring/src/org/argeo/slc/core => org.argeo.slc.api/src/org/argeo/slc}/execution/RefSpecAttribute.java (98%)
 rename {org.argeo.slc.spring/src/org/argeo/slc/core => org.argeo.slc.api/src/org/argeo/slc}/execution/RefValue.java (96%)
 rename {org.argeo.slc.spring/src/org/argeo/slc/core => org.argeo.slc.api/src/org/argeo/slc}/execution/RefValueChoice.java (97%)
 rename {org.argeo.slc.spring/src/org/argeo/slc/core/execution => org.argeo.slc.api/src/org/argeo/slc/primitive}/PrimitiveAccessor.java (97%)
 rename {org.argeo.slc.spring/src/org/argeo/slc/core/execution => org.argeo.slc.api/src/org/argeo/slc/primitive}/PrimitiveSpecAttribute.java (94%)
 rename {org.argeo.slc.spring/src/org/argeo/slc/core/execution => org.argeo.slc.api/src/org/argeo/slc/primitive}/PrimitiveUtils.java (99%)
 rename {org.argeo.slc.spring/src/org/argeo/slc/core/execution => org.argeo.slc.api/src/org/argeo/slc/primitive}/PrimitiveValue.java (93%)
 create mode 100644 org.argeo.slc.jcr/.classpath
 create mode 100644 org.argeo.slc.jcr/.gitignore
 create mode 100644 org.argeo.slc.jcr/.project
 create mode 100644 org.argeo.slc.jcr/META-INF/.gitignore
 create mode 100644 org.argeo.slc.jcr/bnd.bnd
 create mode 100644 org.argeo.slc.jcr/build.properties
 create mode 100644 org.argeo.slc.jcr/pom.xml
 rename {org.argeo.slc.spring => org.argeo.slc.jcr}/src/org/argeo/slc/jcr/JcrMetadataWriter.java (100%)
 rename {org.argeo.slc.spring => org.argeo.slc.jcr}/src/org/argeo/slc/jcr/JcrTestResult.java (98%)
 rename {org.argeo.slc.spring => org.argeo.slc.jcr}/src/org/argeo/slc/jcr/SlcJcrConstants.java (100%)
 rename {org.argeo.slc.spring => org.argeo.slc.jcr}/src/org/argeo/slc/jcr/SlcJcrResultUtils.java (100%)
 rename {org.argeo.slc.spring => org.argeo.slc.jcr}/src/org/argeo/slc/jcr/SlcJcrUtils.java (98%)
 rename {org.argeo.slc.unit/src/org/argeo/slc/unit/execution => org.argeo.slc.spring/src/org/argeo/slc/spring/unit}/AbstractExecutionFlowTestcase.java (91%)
 rename {org.argeo.slc.unit/src/org/argeo/slc/equinox => org.argeo.slc.spring/src/org/argeo/slc/spring}/unit/AbstractOsgiRuntimeTestCase.java (99%)
 rename {org.argeo.slc.unit/src/org/argeo/slc => org.argeo.slc.spring/src/org/argeo/slc/spring}/unit/AbstractSpringTestCase.java (95%)
 rename {org.argeo.slc.unit/src/org/argeo/slc/unit/execution => org.argeo.slc.spring/src/org/argeo/slc/spring/unit}/ExecutionFlowDescriptorTestUtils.java (87%)
 rename {org.argeo.slc.unit/src/org/argeo/slc => org.argeo.slc.spring/src/org/argeo/slc/spring}/unit/UnitUtils.java (95%)

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index e0210c753..4bbe5394d 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -105,15 +105,6 @@
 			<groupId>org.argeo.tp.misc</groupId>
 			<artifactId>org.eclipse.jgit</artifactId>
 		</dependency>
-
-
-		<!-- For target platform generation -->
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.unit</artifactId>
-			<version>2.1.17-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
diff --git a/dep/org.argeo.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml
index 30bd59c9e..63cfd3403 100644
--- a/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@ -32,6 +32,15 @@
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 
+		<!-- OSGi Boot for platform generation only, as it could be used by regular 
+			Java applications to launch an OSGi runtime. -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>2.1.86-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+
 		<!-- ALM Third Parties -->
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.tp.apache.ant</groupId> -->
@@ -42,26 +51,26 @@
 		<!-- <artifactId>org.apache.ant.launch</artifactId> -->
 		<!-- </dependency> -->
 
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.sdk</groupId> -->
-<!-- 			<artifactId>biz.aQute.bndlib</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.sdk</groupId> -->
-<!-- 			<artifactId>org.junit</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.sdk</groupId> -->
-<!-- 			<artifactId>org.redline-rpm</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
-<!-- 			<artifactId>com.googlecode.javaewah.JavaEWAH</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
-<!-- 			<artifactId>org.eclipse.jgit</artifactId> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.sdk</groupId> -->
+		<!-- <artifactId>biz.aQute.bndlib</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.sdk</groupId> -->
+		<!-- <artifactId>org.junit</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.sdk</groupId> -->
+		<!-- <artifactId>org.redline-rpm</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>com.googlecode.javaewah.JavaEWAH</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.eclipse.jgit</artifactId> -->
+		<!-- </dependency> -->
 	</dependencies>
 	<profiles>
 		<profile>
diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index e32a59a82..e51826248 100644
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -25,11 +25,6 @@
 			<artifactId>org.argeo.slc.api</artifactId>
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.support</artifactId>
-			<version>2.1.17-SNAPSHOT</version>
-		</dependency>
 
 		<!-- CLI Agent -->
 		<!-- <dependency> -->
diff --git a/dep/org.argeo.slc.dep.spring/pom.xml b/dep/org.argeo.slc.dep.spring/pom.xml
index faada3bb6..835345eea 100644
--- a/dep/org.argeo.slc.dep.spring/pom.xml
+++ b/dep/org.argeo.slc.dep.spring/pom.xml
@@ -22,7 +22,12 @@
 		<!-- Spring-based Agent -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.core</artifactId>
+			<artifactId>org.argeo.slc.spring</artifactId>
+			<version>2.1.17-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.support</artifactId>
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 		<dependency>
@@ -44,6 +49,20 @@
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 
+		<!-- Not strictly Spring dependencies but used by the old approach -->
+		<dependency>
+			<groupId>org.argeo.tp.apache.ant</groupId>
+			<artifactId>org.apache.ant</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache.ant</groupId>
+			<artifactId>org.apache.ant.launch</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.mail</artifactId>
+		</dependency>
+
 		<!-- Base Spring dependency -->
 		<dependency>
 			<groupId>org.argeo.tp.spring</groupId>
diff --git a/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml b/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
index 047a269fb..f2edc68c3 100644
--- a/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
@@ -87,22 +87,14 @@
 		<!-- <groupId>org.argeo.tp.apache</groupId> -->
 		<!-- <artifactId>org.apache.tika.parser</artifactId> -->
 		<!-- </dependency> -->
-		<dependency>
-			<groupId>org.argeo.tp.bouncycastle</groupId>
-			<artifactId>bcmail</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.bouncycastle</groupId>
-			<artifactId>bcpg</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache.ant</groupId>
-			<artifactId>org.apache.ant</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache.ant</groupId>
-			<artifactId>org.apache.ant.launch</artifactId>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.bouncycastle</groupId> -->
+		<!-- <artifactId>bcmail</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.bouncycastle</groupId> -->
+		<!-- <artifactId>bcpg</artifactId> -->
+		<!-- </dependency> -->
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.tp.misc</groupId> -->
 		<!-- <artifactId>org.quartz-scheduler.quartz</artifactId> -->
@@ -111,78 +103,75 @@
 		<!-- <groupId>org.argeo.tp.misc</groupId> -->
 		<!-- <artifactId>org.quartz-scheduler.quartz.jobs</artifactId> -->
 		<!-- </dependency> -->
-		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.mail</artifactId>
-		</dependency>
 
 		<!-- Base Spring dependency -->
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.beans</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.el</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.extender</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.io</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.aspectj.weaver</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.aopalliance</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.aop</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.context</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.expression</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.instrument</artifactId>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.beans</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.core</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.javax</groupId> -->
+		<!-- <artifactId>javax.el</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.gemini</groupId> -->
+		<!-- <artifactId>org.eclipse.gemini.blueprint.core</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.gemini</groupId> -->
+		<!-- <artifactId>org.eclipse.gemini.blueprint.extender</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.gemini</groupId> -->
+		<!-- <artifactId>org.eclipse.gemini.blueprint.io</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.aspectj.weaver</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.aopalliance</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.aop</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.context</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.expression</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.instrument</artifactId> -->
+		<!-- </dependency> -->
 
 		<!-- Spring -->
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.aspects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.context.support</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.tx</artifactId>
-		</dependency>
+
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.aspects</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.context.support</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.jdbc</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.tx</artifactId> -->
+		<!-- </dependency> -->
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.tp.spring</groupId> -->
 		<!-- <artifactId>org.springframework.web</artifactId> -->
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/Attachment.java b/org.argeo.slc.api/src/org/argeo/slc/attachment/Attachment.java
similarity index 95%
rename from org.argeo.slc.spring/src/org/argeo/slc/core/attachment/Attachment.java
rename to org.argeo.slc.api/src/org/argeo/slc/attachment/Attachment.java
index ecde0b936..9ad961355 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/Attachment.java
+++ b/org.argeo.slc.api/src/org/argeo/slc/attachment/Attachment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.core.attachment;
+package org.argeo.slc.attachment;
 
 public interface Attachment {
 	public String getUuid();
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/AttachmentsEnabled.java b/org.argeo.slc.api/src/org/argeo/slc/attachment/AttachmentsEnabled.java
similarity index 94%
rename from org.argeo.slc.spring/src/org/argeo/slc/core/attachment/AttachmentsEnabled.java
rename to org.argeo.slc.api/src/org/argeo/slc/attachment/AttachmentsEnabled.java
index 780a6a483..53c8cdf4b 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/AttachmentsEnabled.java
+++ b/org.argeo.slc.api/src/org/argeo/slc/attachment/AttachmentsEnabled.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.core.attachment;
+package org.argeo.slc.attachment;
 
 public interface AttachmentsEnabled {
 	public void addAttachment(Attachment attachment);
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/AttachmentsStorage.java b/org.argeo.slc.api/src/org/argeo/slc/attachment/AttachmentsStorage.java
similarity index 95%
rename from org.argeo.slc.spring/src/org/argeo/slc/core/attachment/AttachmentsStorage.java
rename to org.argeo.slc.api/src/org/argeo/slc/attachment/AttachmentsStorage.java
index 2214afabf..94a845c7b 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/AttachmentsStorage.java
+++ b/org.argeo.slc.api/src/org/argeo/slc/attachment/AttachmentsStorage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.core.attachment;
+package org.argeo.slc.attachment;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/AbstractExecutionValue.java b/org.argeo.slc.api/src/org/argeo/slc/execution/AbstractExecutionValue.java
similarity index 95%
rename from org.argeo.slc.spring/src/org/argeo/slc/core/execution/AbstractExecutionValue.java
rename to org.argeo.slc.api/src/org/argeo/slc/execution/AbstractExecutionValue.java
index 131ffec75..23ab55ebe 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/AbstractExecutionValue.java
+++ b/org.argeo.slc.api/src/org/argeo/slc/execution/AbstractExecutionValue.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.core.execution;
+package org.argeo.slc.execution;
 
 import java.io.Serializable;
 
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/AbstractSpecAttribute.java b/org.argeo.slc.api/src/org/argeo/slc/execution/AbstractSpecAttribute.java
similarity index 96%
rename from org.argeo.slc.spring/src/org/argeo/slc/core/execution/AbstractSpecAttribute.java
rename to org.argeo.slc.api/src/org/argeo/slc/execution/AbstractSpecAttribute.java
index 109c0335e..5b1438ad2 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/AbstractSpecAttribute.java
+++ b/org.argeo.slc.api/src/org/argeo/slc/execution/AbstractSpecAttribute.java
@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.core.execution;
+package org.argeo.slc.execution;
 
 import java.io.Serializable;
 
-import org.argeo.slc.execution.ExecutionSpecAttribute;
-
 /** Canonical implementation of the execution spec attribute booleans. */
 public abstract class AbstractSpecAttribute implements ExecutionSpecAttribute,
 		Serializable {
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/RefSpecAttribute.java b/org.argeo.slc.api/src/org/argeo/slc/execution/RefSpecAttribute.java
similarity index 98%
rename from org.argeo.slc.spring/src/org/argeo/slc/core/execution/RefSpecAttribute.java
rename to org.argeo.slc.api/src/org/argeo/slc/execution/RefSpecAttribute.java
index 8e4f617c8..ccfebaf03 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/RefSpecAttribute.java
+++ b/org.argeo.slc.api/src/org/argeo/slc/execution/RefSpecAttribute.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.core.execution;
+package org.argeo.slc.execution;
 
 import java.util.List;
 
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/RefValue.java b/org.argeo.slc.api/src/org/argeo/slc/execution/RefValue.java
similarity index 96%
rename from org.argeo.slc.spring/src/org/argeo/slc/core/execution/RefValue.java
rename to org.argeo.slc.api/src/org/argeo/slc/execution/RefValue.java
index 0a24bc4b4..b66f2c474 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/RefValue.java
+++ b/org.argeo.slc.api/src/org/argeo/slc/execution/RefValue.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.core.execution;
+package org.argeo.slc.execution;
 
 /** Reference value to be used by an execution */
 public class RefValue extends AbstractExecutionValue {
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/RefValueChoice.java b/org.argeo.slc.api/src/org/argeo/slc/execution/RefValueChoice.java
similarity index 97%
rename from org.argeo.slc.spring/src/org/argeo/slc/core/execution/RefValueChoice.java
rename to org.argeo.slc.api/src/org/argeo/slc/execution/RefValueChoice.java
index 5e1f9c2ab..83c880a8e 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/RefValueChoice.java
+++ b/org.argeo.slc.api/src/org/argeo/slc/execution/RefValueChoice.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.core.execution;
+package org.argeo.slc.execution;
 
 import java.io.Serializable;
 
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/PrimitiveAccessor.java b/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveAccessor.java
similarity index 97%
rename from org.argeo.slc.spring/src/org/argeo/slc/core/execution/PrimitiveAccessor.java
rename to org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveAccessor.java
index 18d1b9894..ce71429d7 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/PrimitiveAccessor.java
+++ b/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveAccessor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.core.execution;
+package org.argeo.slc.primitive;
 
 /** Abstraction of access to primitive values */
 public interface PrimitiveAccessor {
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/PrimitiveSpecAttribute.java b/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveSpecAttribute.java
similarity index 94%
rename from org.argeo.slc.spring/src/org/argeo/slc/core/execution/PrimitiveSpecAttribute.java
rename to org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveSpecAttribute.java
index fe8412c81..eb9ff2ad8 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/PrimitiveSpecAttribute.java
+++ b/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveSpecAttribute.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.core.execution;
+package org.argeo.slc.primitive;
 
 import org.argeo.slc.SlcException;
+import org.argeo.slc.execution.AbstractSpecAttribute;
 
 /**
  * A spec attribute wrapping a primitive value.
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/PrimitiveUtils.java b/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveUtils.java
similarity index 99%
rename from org.argeo.slc.spring/src/org/argeo/slc/core/execution/PrimitiveUtils.java
rename to org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveUtils.java
index 4268b8b03..d7284cf8d 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/PrimitiveUtils.java
+++ b/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.core.execution;
+package org.argeo.slc.primitive;
 
 /** Converts to and from primitive types. */
 public class PrimitiveUtils {
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/PrimitiveValue.java b/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveValue.java
similarity index 93%
rename from org.argeo.slc.spring/src/org/argeo/slc/core/execution/PrimitiveValue.java
rename to org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveValue.java
index 3dedb9c22..b3ade50d9 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/PrimitiveValue.java
+++ b/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveValue.java
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.core.execution;
+package org.argeo.slc.primitive;
+
+import org.argeo.slc.execution.AbstractExecutionValue;
 
 /** Primitive value to be used by an execution. */
 public class PrimitiveValue extends AbstractExecutionValue implements
diff --git a/org.argeo.slc.client.ui/pom.xml b/org.argeo.slc.client.ui/pom.xml
index c2ff564df..f4571db4c 100644
--- a/org.argeo.slc.client.ui/pom.xml
+++ b/org.argeo.slc.client.ui/pom.xml
@@ -15,7 +15,7 @@
 		<!-- SLC -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.core</artifactId>
+			<artifactId>org.argeo.slc.spring</artifactId>
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 
diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
index 758d761c6..638d3a2d2 100644
--- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
+++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
@@ -38,8 +38,8 @@ import org.argeo.slc.SlcException;
 import org.argeo.slc.SlcNames;
 import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.SlcImages;
-import org.argeo.slc.core.execution.PrimitiveAccessor;
-import org.argeo.slc.core.execution.PrimitiveUtils;
+import org.argeo.slc.primitive.PrimitiveAccessor;
+import org.argeo.slc.primitive.PrimitiveUtils;
 import org.argeo.slc.execution.ExecutionProcess;
 import org.argeo.slc.jcr.SlcJcrUtils;
 import org.eclipse.jface.viewers.CellEditor;
diff --git a/org.argeo.slc.e4/pom.xml b/org.argeo.slc.e4/pom.xml
index e638a99b5..8585843b7 100644
--- a/org.argeo.slc.e4/pom.xml
+++ b/org.argeo.slc.e4/pom.xml
@@ -13,7 +13,7 @@
 		<!-- SLC -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.core</artifactId>
+			<artifactId>org.argeo.slc.jcr</artifactId>
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 
diff --git a/org.argeo.slc.jcr/.classpath b/org.argeo.slc.jcr/.classpath
new file mode 100644
index 000000000..e801ebfb4
--- /dev/null
+++ b/org.argeo.slc.jcr/.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.slc.jcr/.gitignore b/org.argeo.slc.jcr/.gitignore
new file mode 100644
index 000000000..09e3bc9b2
--- /dev/null
+++ b/org.argeo.slc.jcr/.gitignore
@@ -0,0 +1,2 @@
+/bin/
+/target/
diff --git a/org.argeo.slc.jcr/.project b/org.argeo.slc.jcr/.project
new file mode 100644
index 000000000..a4cd8740b
--- /dev/null
+++ b/org.argeo.slc.jcr/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.slc.jcr</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.argeo.slc.jcr/META-INF/.gitignore b/org.argeo.slc.jcr/META-INF/.gitignore
new file mode 100644
index 000000000..4854a41b9
--- /dev/null
+++ b/org.argeo.slc.jcr/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF
diff --git a/org.argeo.slc.jcr/bnd.bnd b/org.argeo.slc.jcr/bnd.bnd
new file mode 100644
index 000000000..b632c5a46
--- /dev/null
+++ b/org.argeo.slc.jcr/bnd.bnd
@@ -0,0 +1,2 @@
+Import-Package: javax.jcr.nodetype,\
+*
\ No newline at end of file
diff --git a/org.argeo.slc.jcr/build.properties b/org.argeo.slc.jcr/build.properties
new file mode 100644
index 000000000..34d2e4d2d
--- /dev/null
+++ b/org.argeo.slc.jcr/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/org.argeo.slc.jcr/pom.xml b/org.argeo.slc.jcr/pom.xml
new file mode 100644
index 000000000..8f34b615b
--- /dev/null
+++ b/org.argeo.slc.jcr/pom.xml
@@ -0,0 +1,59 @@
+<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.slc</groupId>
+		<artifactId>argeo-slc</artifactId>
+		<version>2.1.17-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.slc.jcr</artifactId>
+	<name>SLC JCR implementations</name>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<!-- Commons -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.enterprise</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.node.api</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.cms</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.jcr</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.util</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+
+		<!-- SLC -->
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.api</artifactId>
+			<version>2.1.17-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/jcr/JcrMetadataWriter.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/JcrMetadataWriter.java
similarity index 100%
rename from org.argeo.slc.spring/src/org/argeo/slc/jcr/JcrMetadataWriter.java
rename to org.argeo.slc.jcr/src/org/argeo/slc/jcr/JcrMetadataWriter.java
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/jcr/JcrTestResult.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/JcrTestResult.java
similarity index 98%
rename from org.argeo.slc.spring/src/org/argeo/slc/jcr/JcrTestResult.java
rename to org.argeo.slc.jcr/src/org/argeo/slc/jcr/JcrTestResult.java
index c9ec874ea..3f94b8bcd 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/jcr/JcrTestResult.java
+++ b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/JcrTestResult.java
@@ -36,8 +36,8 @@ import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.SlcNames;
 import org.argeo.slc.SlcTypes;
-import org.argeo.slc.core.attachment.Attachment;
-import org.argeo.slc.core.attachment.AttachmentsEnabled;
+import org.argeo.slc.attachment.Attachment;
+import org.argeo.slc.attachment.AttachmentsEnabled;
 import org.argeo.slc.test.TestResult;
 import org.argeo.slc.test.TestResultPart;
 import org.argeo.slc.test.TestRun;
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/jcr/SlcJcrConstants.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrConstants.java
similarity index 100%
rename from org.argeo.slc.spring/src/org/argeo/slc/jcr/SlcJcrConstants.java
rename to org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrConstants.java
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/jcr/SlcJcrResultUtils.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java
similarity index 100%
rename from org.argeo.slc.spring/src/org/argeo/slc/jcr/SlcJcrResultUtils.java
rename to org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/jcr/SlcJcrUtils.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrUtils.java
similarity index 98%
rename from org.argeo.slc.spring/src/org/argeo/slc/jcr/SlcJcrUtils.java
rename to org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrUtils.java
index 137e298be..fcf2e7159 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/jcr/SlcJcrUtils.java
+++ b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrUtils.java
@@ -33,9 +33,9 @@ import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.SlcNames;
 import org.argeo.slc.SlcTypes;
-import org.argeo.slc.core.execution.PrimitiveAccessor;
-import org.argeo.slc.core.execution.PrimitiveUtils;
 import org.argeo.slc.deploy.ModuleDescriptor;
+import org.argeo.slc.primitive.PrimitiveAccessor;
+import org.argeo.slc.primitive.PrimitiveUtils;
 import org.argeo.slc.test.TestStatus;
 
 /**
diff --git a/org.argeo.slc.repo/pom.xml b/org.argeo.slc.repo/pom.xml
index ab207def9..759c61189 100644
--- a/org.argeo.slc.repo/pom.xml
+++ b/org.argeo.slc.repo/pom.xml
@@ -11,15 +11,15 @@
 	<artifactId>org.argeo.slc.repo</artifactId>
 	<name>SLC Repo</name>
 	<dependencies>
-		<!-- SLC Runtime -->
+		<!-- SLC API -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.support</artifactId>
+			<artifactId>org.argeo.slc.api</artifactId>
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.core</artifactId>
+			<artifactId>org.argeo.slc.spring</artifactId>
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 
diff --git a/org.argeo.slc.spring/bnd.bnd b/org.argeo.slc.spring/bnd.bnd
index fb76254e2..2b27e378d 100644
--- a/org.argeo.slc.spring/bnd.bnd
+++ b/org.argeo.slc.spring/bnd.bnd
@@ -1,5 +1,6 @@
 Import-Package: javax.jcr.nodetype,\
 javax.jcr.security,\
+org.argeo.node,\
 org.apache.tools.ant.*;resolution:="optional",\
 junit.framework;resolution:="optional",\
 org.osgi.*;version=0.0.0,\
diff --git a/org.argeo.slc.spring/pom.xml b/org.argeo.slc.spring/pom.xml
index 29ba3cf97..5462d5446 100644
--- a/org.argeo.slc.spring/pom.xml
+++ b/org.argeo.slc.spring/pom.xml
@@ -49,12 +49,25 @@
 			<version>${version.argeo-commons}</version>
 		</dependency>
 
+		<!-- Commons -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>${version.argeo-commons}</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<!-- SLC -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.api</artifactId>
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.jcr</artifactId>
+			<version>2.1.17-SNAPSHOT</version>
+		</dependency>
 
 		<!-- Spring -->
 		<dependency>
@@ -87,6 +100,5 @@
 			<groupId>org.argeo.tp.apache.ant</groupId>
 			<artifactId>org.apache.ant</artifactId>
 		</dependency>
-
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/AttachmentUploader.java b/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/AttachmentUploader.java
index eb484c92c..9b91207b3 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/AttachmentUploader.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/AttachmentUploader.java
@@ -15,6 +15,7 @@
  */
 package org.argeo.slc.core.attachment;
 
+import org.argeo.slc.attachment.Attachment;
 import org.springframework.core.io.Resource;
 
 public interface AttachmentUploader {
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/FileAttachmentsStorage.java b/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/FileAttachmentsStorage.java
index 3b7e62dac..e6bd8e776 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/FileAttachmentsStorage.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/FileAttachmentsStorage.java
@@ -30,6 +30,8 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.attachment.Attachment;
+import org.argeo.slc.attachment.AttachmentsStorage;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.Resource;
 
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/SimpleAttachment.java b/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/SimpleAttachment.java
index 6248dd71e..e9a44c959 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/SimpleAttachment.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/SimpleAttachment.java
@@ -18,6 +18,8 @@ package org.argeo.slc.core.attachment;
 import java.io.Serializable;
 import java.util.UUID;
 
+import org.argeo.slc.attachment.Attachment;
+
 public class SimpleAttachment implements Attachment, Serializable {
 	private static final long serialVersionUID = 6615155908800610606L;
 	private String uuid = UUID.randomUUID().toString();
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java b/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
index beac9175a..41a2f27e9 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
@@ -30,6 +30,11 @@ import org.argeo.slc.execution.ExecutionFlowDescriptorConverter;
 import org.argeo.slc.execution.ExecutionModuleDescriptor;
 import org.argeo.slc.execution.ExecutionSpec;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
+import org.argeo.slc.execution.RefSpecAttribute;
+import org.argeo.slc.execution.RefValue;
+import org.argeo.slc.primitive.PrimitiveSpecAttribute;
+import org.argeo.slc.primitive.PrimitiveUtils;
+import org.argeo.slc.primitive.PrimitiveValue;
 import org.springframework.aop.scope.ScopedObject;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionSpec.java b/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionSpec.java
index 2bce12577..f36a71f73 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionSpec.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionSpec.java
@@ -25,6 +25,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.execution.ExecutionSpec;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
+import org.argeo.slc.execution.RefSpecAttribute;
+import org.argeo.slc.execution.RefValueChoice;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/InstantiationManager.java b/org.argeo.slc.spring/src/org/argeo/slc/core/execution/InstantiationManager.java
index 60e93ec15..211fc4cf9 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/InstantiationManager.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/core/execution/InstantiationManager.java
@@ -22,6 +22,9 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.execution.ExecutionFlow;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
+import org.argeo.slc.execution.RefSpecAttribute;
+import org.argeo.slc.primitive.PrimitiveSpecAttribute;
+import org.argeo.slc.primitive.PrimitiveUtils;
 
 /** Manage parameters that need to be set during the instantiation of a flow */
 public class InstantiationManager {
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/tasks/UploadAttachments.java b/org.argeo.slc.spring/src/org/argeo/slc/core/execution/tasks/UploadAttachments.java
index 13cc51918..93f27b281 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/tasks/UploadAttachments.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/core/execution/tasks/UploadAttachments.java
@@ -22,9 +22,9 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.argeo.slc.SlcException;
-import org.argeo.slc.core.attachment.Attachment;
+import org.argeo.slc.attachment.Attachment;
+import org.argeo.slc.attachment.AttachmentsEnabled;
 import org.argeo.slc.core.attachment.AttachmentUploader;
-import org.argeo.slc.core.attachment.AttachmentsEnabled;
 import org.springframework.core.io.Resource;
 
 public class UploadAttachments implements Runnable {
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/SpecBeanDefinitionParser.java b/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/SpecBeanDefinitionParser.java
index 761e26dd1..bb2d24516 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/SpecBeanDefinitionParser.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/SpecBeanDefinitionParser.java
@@ -20,9 +20,9 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.core.execution.DefaultExecutionSpec;
-import org.argeo.slc.core.execution.PrimitiveSpecAttribute;
-import org.argeo.slc.core.execution.RefSpecAttribute;
-import org.argeo.slc.core.execution.RefValueChoice;
+import org.argeo.slc.execution.RefSpecAttribute;
+import org.argeo.slc.execution.RefValueChoice;
+import org.argeo.slc.primitive.PrimitiveSpecAttribute;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.ManagedList;
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/jcr/execution/JcrAttachmentUploader.java b/org.argeo.slc.spring/src/org/argeo/slc/jcr/execution/JcrAttachmentUploader.java
index 105d549cd..52ea2801a 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/jcr/execution/JcrAttachmentUploader.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/jcr/execution/JcrAttachmentUploader.java
@@ -17,7 +17,7 @@ package org.argeo.slc.jcr.execution;
 
 import javax.jcr.Session;
 
-import org.argeo.slc.core.attachment.Attachment;
+import org.argeo.slc.attachment.Attachment;
 import org.argeo.slc.core.attachment.AttachmentUploader;
 import org.springframework.core.io.Resource;
 
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java b/org.argeo.slc.spring/src/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java
index 1a2576e06..022dd8721 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java
@@ -33,10 +33,6 @@ import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.SlcNames;
 import org.argeo.slc.SlcTypes;
-import org.argeo.slc.core.execution.PrimitiveSpecAttribute;
-import org.argeo.slc.core.execution.PrimitiveValue;
-import org.argeo.slc.core.execution.RefSpecAttribute;
-import org.argeo.slc.core.execution.RefValueChoice;
 import org.argeo.slc.deploy.ModuleDescriptor;
 import org.argeo.slc.execution.ExecutionFlowDescriptor;
 import org.argeo.slc.execution.ExecutionModuleDescriptor;
@@ -44,7 +40,11 @@ import org.argeo.slc.execution.ExecutionModulesListener;
 import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.execution.ExecutionSpec;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
+import org.argeo.slc.execution.RefSpecAttribute;
+import org.argeo.slc.execution.RefValueChoice;
 import org.argeo.slc.jcr.SlcJcrUtils;
+import org.argeo.slc.primitive.PrimitiveSpecAttribute;
+import org.argeo.slc.primitive.PrimitiveValue;
 
 /**
  * Synchronizes the local execution runtime with a JCR repository. For the time
diff --git a/org.argeo.slc.spring/src/org/argeo/slc/jcr/execution/JcrRealizedFlow.java b/org.argeo.slc.spring/src/org/argeo/slc/jcr/execution/JcrRealizedFlow.java
index c371b1114..5c8738b3f 100644
--- a/org.argeo.slc.spring/src/org/argeo/slc/jcr/execution/JcrRealizedFlow.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/jcr/execution/JcrRealizedFlow.java
@@ -12,13 +12,13 @@ import org.argeo.slc.SlcException;
 import org.argeo.slc.SlcNames;
 import org.argeo.slc.SlcTypes;
 import org.argeo.slc.core.execution.DefaultExecutionSpec;
-import org.argeo.slc.core.execution.PrimitiveSpecAttribute;
-import org.argeo.slc.core.execution.PrimitiveUtils;
-import org.argeo.slc.core.execution.RefSpecAttribute;
 import org.argeo.slc.execution.ExecutionFlowDescriptor;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.argeo.slc.execution.RealizedFlow;
+import org.argeo.slc.execution.RefSpecAttribute;
 import org.argeo.slc.jcr.SlcJcrUtils;
+import org.argeo.slc.primitive.PrimitiveSpecAttribute;
+import org.argeo.slc.primitive.PrimitiveUtils;
 
 public class JcrRealizedFlow extends RealizedFlow implements SlcNames {
 	private static final long serialVersionUID = -3709453850260712001L;
diff --git a/org.argeo.slc.unit/src/org/argeo/slc/unit/execution/AbstractExecutionFlowTestcase.java b/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractExecutionFlowTestcase.java
similarity index 91%
rename from org.argeo.slc.unit/src/org/argeo/slc/unit/execution/AbstractExecutionFlowTestcase.java
rename to org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractExecutionFlowTestcase.java
index 774ce257d..301846333 100644
--- a/org.argeo.slc.unit/src/org/argeo/slc/unit/execution/AbstractExecutionFlowTestcase.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractExecutionFlowTestcase.java
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.unit.execution;
+package org.argeo.slc.spring.unit;
 
 import org.argeo.slc.execution.ExecutionFlow;
-import org.argeo.slc.unit.AbstractSpringTestCase;
 
 public class AbstractExecutionFlowTestcase extends AbstractSpringTestCase {
 	@SuppressWarnings(value = { "unchecked" })
diff --git a/org.argeo.slc.unit/src/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java b/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractOsgiRuntimeTestCase.java
similarity index 99%
rename from org.argeo.slc.unit/src/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java
rename to org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractOsgiRuntimeTestCase.java
index 2bcf96029..7cd14736e 100644
--- a/org.argeo.slc.unit/src/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractOsgiRuntimeTestCase.java
@@ -13,15 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.equinox.unit;
+package org.argeo.slc.spring.unit;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.osgi.boot.OsgiBoot;
@@ -34,6 +32,8 @@ import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.springframework.context.ApplicationContext;
 
+import junit.framework.TestCase;
+
 @SuppressWarnings("restriction")
 public abstract class AbstractOsgiRuntimeTestCase extends TestCase {
 	private final static Log log = LogFactory
diff --git a/org.argeo.slc.unit/src/org/argeo/slc/unit/AbstractSpringTestCase.java b/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractSpringTestCase.java
similarity index 95%
rename from org.argeo.slc.unit/src/org/argeo/slc/unit/AbstractSpringTestCase.java
rename to org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractSpringTestCase.java
index 76b7fb660..b6e48fed4 100644
--- a/org.argeo.slc.unit/src/org/argeo/slc/unit/AbstractSpringTestCase.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractSpringTestCase.java
@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.unit;
+package org.argeo.slc.spring.unit;
 
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
@@ -27,6 +25,8 @@ import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
+import junit.framework.TestCase;
+
 /** Helper for tests using a Spring application co,text. */
 public abstract class AbstractSpringTestCase extends TestCase {
 	protected final Log log = LogFactory.getLog(getClass());
diff --git a/org.argeo.slc.unit/src/org/argeo/slc/unit/execution/ExecutionFlowDescriptorTestUtils.java b/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/ExecutionFlowDescriptorTestUtils.java
similarity index 87%
rename from org.argeo.slc.unit/src/org/argeo/slc/unit/execution/ExecutionFlowDescriptorTestUtils.java
rename to org.argeo.slc.spring/src/org/argeo/slc/spring/unit/ExecutionFlowDescriptorTestUtils.java
index b8619f4c9..a78662f97 100644
--- a/org.argeo.slc.unit/src/org/argeo/slc/unit/execution/ExecutionFlowDescriptorTestUtils.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/ExecutionFlowDescriptorTestUtils.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.unit.execution;
+package org.argeo.slc.spring.unit;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.argeo.slc.core.execution.DefaultExecutionSpec;
-import org.argeo.slc.core.execution.PrimitiveAccessor;
-import org.argeo.slc.core.execution.PrimitiveSpecAttribute;
-import org.argeo.slc.core.execution.PrimitiveValue;
-import org.argeo.slc.core.execution.RefSpecAttribute;
-import org.argeo.slc.core.execution.RefValue;
-import org.argeo.slc.core.execution.RefValueChoice;
 import org.argeo.slc.core.test.BasicTestData;
 import org.argeo.slc.execution.ExecutionFlowDescriptor;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
+import org.argeo.slc.execution.RefSpecAttribute;
+import org.argeo.slc.execution.RefValue;
+import org.argeo.slc.execution.RefValueChoice;
+import org.argeo.slc.primitive.PrimitiveAccessor;
+import org.argeo.slc.primitive.PrimitiveSpecAttribute;
+import org.argeo.slc.primitive.PrimitiveValue;
 
 public class ExecutionFlowDescriptorTestUtils {
 	public static ExecutionFlowDescriptor createSimpleExecutionFlowDescriptor() {
diff --git a/org.argeo.slc.unit/src/org/argeo/slc/unit/UnitUtils.java b/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/UnitUtils.java
similarity index 95%
rename from org.argeo.slc.unit/src/org/argeo/slc/unit/UnitUtils.java
rename to org.argeo.slc.spring/src/org/argeo/slc/spring/unit/UnitUtils.java
index 75cc578e5..1eeca0561 100644
--- a/org.argeo.slc.unit/src/org/argeo/slc/unit/UnitUtils.java
+++ b/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/UnitUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.slc.unit;
+package org.argeo.slc.spring.unit;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
diff --git a/org.argeo.slc.support/pom.xml b/org.argeo.slc.support/pom.xml
index b4d091d3f..d9082295d 100644
--- a/org.argeo.slc.support/pom.xml
+++ b/org.argeo.slc.support/pom.xml
@@ -12,7 +12,7 @@
 		<!-- SLC Runtime -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.core</artifactId>
+			<artifactId>org.argeo.slc.spring</artifactId>
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
diff --git a/org.argeo.slc.unit/pom.xml b/org.argeo.slc.unit/pom.xml
index ef9c0e4bc..76563e3d1 100644
--- a/org.argeo.slc.unit/pom.xml
+++ b/org.argeo.slc.unit/pom.xml
@@ -19,13 +19,13 @@
 		<!-- SLC -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.core</artifactId>
-			<version>2.1.17-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.support</artifactId>
+			<artifactId>org.argeo.slc.api</artifactId>
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.slc</groupId> -->
+<!-- 			<artifactId>org.argeo.slc.support</artifactId> -->
+<!-- 			<version>2.1.17-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6cee4d3e1..98a5e915e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,10 +23,10 @@
 	</properties>
 	<modules>
 		<module>org.argeo.slc.api</module>
+		<module>org.argeo.slc.jcr</module>
 
 		<!-- Runtime -->
 		<module>org.argeo.slc.spring</module>
-		<module>org.argeo.slc.unit</module>
 		<module>org.argeo.slc.support</module>
 		<module>org.argeo.slc.repo</module>
 		<module>org.argeo.slc.factory</module>
-- 
2.39.2