From c81dc41c157107a601024ab1e1bef1f78fd952f1 Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Fri, 11 Feb 2011 19:10:26 +0000
Subject: [PATCH] introduction of new architecture for target platforms with
 sdk.rap and sdk.rcp distinct distributions.

git-svn-id: https://svn.argeo.org/slc/trunk@4132 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/slc_demo_rap.properties                  |  40 +++
 dep/org.argeo.slc.dep.agent.extras/pom.xml    |   4 +-
 dep/org.argeo.slc.dep.agent/pom.xml           |  32 +-
 .../p2.inf                                    |   0
 dep/org.argeo.slc.dep.backend/pom.xml         | 144 +++++++++
 dep/org.argeo.slc.dep.detached/pom.xml        |   5 +-
 dep/org.argeo.slc.dep.sdk.rap/p2.inf          |   2 +
 dep/org.argeo.slc.dep.sdk.rap/pom.xml         |  44 +++
 dep/org.argeo.slc.dep.sdk.rcp/p2.inf          |   2 +
 dep/org.argeo.slc.dep.sdk.rcp/pom.xml         |  38 +++
 .../slc-client-rcp.product                    |  33 ++-
 dep/org.argeo.slc.dep.sdk.sources/pom.xml     |  52 ----
 dep/org.argeo.slc.dep.sdk/pom.xml             |   1 +
 dep/org.argeo.slc.dep.server/pom.xml          |  11 +-
 dep/pom.xml                                   |  89 ++++--
 dist/org.argeo.slc.sdk/pom.xml                |  48 ++-
 .../org.argeo.slc.client.rap.launch           |  42 ---
 .../org.argeo.slc.client.rap/rap.properties   |  21 --
 .../slc-client-rap.product                    | 275 ------------------
 .../org.argeo.slc.client.rap/.classpath       |   0
 .../org.argeo.slc.client.rap/.project         |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../org.argeo.slc.client.rap/build.properties |   0
 .../icons/slc_execution_perspective.gif       | Bin
 .../org.argeo.slc.client.rap/plugin.xml       |  37 +--
 .../runtime/org.argeo.slc.client.rap/pom.xml  |  36 +++
 .../rap/ApplicationActionBarAdvisor.java      |   0
 .../rap/ApplicationWorkbenchAdvisor.java      |   0
 .../ApplicationWorkbenchWindowAdvisor.java    |   0
 .../org/argeo/slc/client/rap/Perspective.java |   0
 .../client/rap/SlcClientRapApplication.java   |   0
 .../slc/client/rap/SlcClientRapPlugin.java    |   0
 .../runtime/org.argeo.slc.client.rcp/pom.xml  |  17 +-
 .../runtime/org.argeo.slc.client.ui/pom.xml   |  52 ++--
 eclipse/plugins/runtime/pom.xml               |   4 +-
 .../org.argeo.slc.it.webapp/pom.xml           |  43 ++-
 pom.xml                                       | 142 ++++++++-
 runtime/org.argeo.slc.core/pom.xml            |   4 +-
 runtime/org.argeo.slc.launcher/pom.xml        |   2 +
 runtime/org.argeo.slc.lib.detached/pom.xml    |   8 +-
 runtime/org.argeo.slc.server/pom.xml          |  12 +-
 .../org.argeo.slc.support.activemq/pom.xml    |   6 +-
 runtime/org.argeo.slc.support.ant/pom.xml     |   6 +-
 runtime/org.argeo.slc.support.castor/pom.xml  |   5 +-
 runtime/org.argeo.slc.support.equinox/pom.xml |   6 +-
 runtime/org.argeo.slc.support.gis/pom.xml     |   4 +-
 .../org.argeo.slc.support.hibernate/pom.xml   |   6 +-
 runtime/org.argeo.slc.support.jcr/pom.xml     |   6 +-
 runtime/org.argeo.slc.support.maven/pom.xml   |   4 +-
 runtime/org.argeo.slc.support.osgi/pom.xml    |   1 +
 runtime/org.argeo.slc.support.simple/pom.xml  |   1 +
 .../org.argeo.slc.support.ws.client/pom.xml   |   5 +-
 runtime/org.argeo.slc.unit/pom.xml            |   6 +-
 server/org.argeo.slc.ria/pom.xml              |  14 +-
 55 files changed, 728 insertions(+), 582 deletions(-)
 create mode 100644 demo/slc_demo_rap.properties
 rename dep/{org.argeo.slc.dep.sdk.sources => org.argeo.slc.dep.backend}/p2.inf (100%)
 create mode 100644 dep/org.argeo.slc.dep.backend/pom.xml
 create mode 100644 dep/org.argeo.slc.dep.sdk.rap/p2.inf
 create mode 100644 dep/org.argeo.slc.dep.sdk.rap/pom.xml
 create mode 100644 dep/org.argeo.slc.dep.sdk.rcp/p2.inf
 create mode 100644 dep/org.argeo.slc.dep.sdk.rcp/pom.xml
 rename {eclipse/plugins/runtime/org.argeo.slc.client.rcp => dep/org.argeo.slc.dep.sdk.rcp}/slc-client-rcp.product (92%)
 delete mode 100644 dep/org.argeo.slc.dep.sdk.sources/pom.xml
 delete mode 100644 eclipse/plugins/org.argeo.slc.client.rap/org.argeo.slc.client.rap.launch
 delete mode 100644 eclipse/plugins/org.argeo.slc.client.rap/rap.properties
 delete mode 100644 eclipse/plugins/org.argeo.slc.client.rap/slc-client-rap.product
 rename eclipse/plugins/{ => runtime}/org.argeo.slc.client.rap/.classpath (100%)
 rename eclipse/plugins/{ => runtime}/org.argeo.slc.client.rap/.project (100%)
 rename eclipse/plugins/{ => runtime}/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs (100%)
 rename eclipse/plugins/{ => runtime}/org.argeo.slc.client.rap/META-INF/MANIFEST.MF (100%)
 rename eclipse/plugins/{ => runtime}/org.argeo.slc.client.rap/build.properties (100%)
 rename eclipse/plugins/{ => runtime}/org.argeo.slc.client.rap/icons/slc_execution_perspective.gif (100%)
 rename eclipse/plugins/{ => runtime}/org.argeo.slc.client.rap/plugin.xml (90%)
 create mode 100644 eclipse/plugins/runtime/org.argeo.slc.client.rap/pom.xml
 rename eclipse/plugins/{ => runtime}/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java (100%)
 rename eclipse/plugins/{ => runtime}/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java (100%)
 rename eclipse/plugins/{ => runtime}/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchWindowAdvisor.java (100%)
 rename eclipse/plugins/{ => runtime}/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java (100%)
 rename eclipse/plugins/{ => runtime}/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapApplication.java (100%)
 rename eclipse/plugins/{ => runtime}/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java (100%)

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
new file mode 100644
index 000000000..f128e259e
--- /dev/null
+++ b/demo/slc_demo_rap.properties
@@ -0,0 +1,40 @@
+argeo.osgi.start=\
+com.springsource.javax.servlet,\
+org.eclipse.core.runtime,\
+org.eclipse.equinox.common,\
+org.eclipse.equinox.http.jetty,\
+org.eclipse.equinox.http.registry,\
+org.eclipse.equinox.launcher,\
+org.mortbay.jetty.server,\
+org.springframework.osgi.extender,\
+org.argeo.slc.agent,\
+org.argeo.slc.client.agent,\
+org.argeo.slc.client.hibernate,\
+org.argeo.slc.client.oxm,\
+org.argeo.slc.demo.ant,\
+org.argeo.slc.demo.basic,\
+org.argeo.slc.server.castor,\
+org.argeo.slc.server.h2,\
+org.argeo.slc.server.hibernate,\
+org.argeo.slc.server.services,\
+
+#org.argeo.server.ads.server,\
+#org.argeo.security.manager.ldap,\
+#org.argeo.security.services,\
+#org.argeo.security.manager.ldap,\
+
+#org.argeo.security.ui.initialPerspective=com.agfa.sebi.client.ui.consultEbiPerspective
+
+# LDAP
+#argeo.ldap.rootdn=dc=slc,dc=argeo,dc=net
+#argeo.ads.init.ldif=osgibundle:init-slc.ldif
+
+eclipse.ignoreApp=true
+osgi.noShutdown=true
+
+log4j.configuration=file:../../log4j.properties
+
+org.eclipse.equinox.http.jetty.log.stderr.threshold=debug
+org.osgi.service.http.port=9090
+
+# java -Dlog4j.configuration=file:/home/mbaudier/dev/src/agfa-sebi/demo/log4j.properties -Dosgi.framework=lib/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -jar lib/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -console -configuration configuration
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.agent.extras/pom.xml b/dep/org.argeo.slc.dep.agent.extras/pom.xml
index 1fabd4352..c89d132df 100644
--- a/dep/org.argeo.slc.dep.agent.extras/pom.xml
+++ b/dep/org.argeo.slc.dep.agent.extras/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -14,6 +15,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.maven</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.agent/pom.xml b/dep/org.argeo.slc.dep.agent/pom.xml
index 362ce164d..264460f5a 100644
--- a/dep/org.argeo.slc.dep.agent/pom.xml
+++ b/dep/org.argeo.slc.dep.agent/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -11,51 +12,61 @@
 	<packaging>jar</packaging>
 	<name>SLC Agent Dependencies</name>
 	<dependencies>
-		<!--  Commons -->
+		<!-- Commons -->
 		<dependency>
 			<groupId>org.argeo.commons.osgi</groupId>
 			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 
 		<!-- SLC -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.simple</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.equinox</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.activemq</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.castor</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.ant</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.jcr</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.lib.detached</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.launcher</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
-		<!--  Spring -->
+		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.jdbc</artifactId>
@@ -100,7 +111,7 @@
 			<groupId>org.postgresql</groupId>
 			<artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
 		</dependency>
-		<!--  Required by the Oracle JDBC driver -->
+		<!-- Required by the Oracle JDBC driver -->
 		<dependency>
 			<groupId>javax.resource</groupId>
 			<artifactId>com.springsource.javax.resource</artifactId>
@@ -111,15 +122,10 @@
 			<groupId>org.argeo.dep.jacob</groupId>
 			<artifactId>org.argeo.dep.jacob</artifactId>
 		</dependency>
-		<!--
-			<dependency> <groupId>org.argeo.dep.jacob</groupId>
-			<artifactId>org.argeo.dep.jacob.win32.x86</artifactId> </dependency>
-		-->
-		<!--
-			Languages <dependency> <groupId>org.codehaus.groovy</groupId>
-			<artifactId>com.springsource.org.codehaus.groovy</artifactId>
-			</dependency>
-		-->
+		<!-- <dependency> <groupId>org.argeo.dep.jacob</groupId> <artifactId>org.argeo.dep.jacob.win32.x86</artifactId> 
+			</dependency> -->
+		<!-- Languages <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>com.springsource.org.codehaus.groovy</artifactId> 
+			</dependency> -->
 		<!-- ASM -->
 		<dependency>
 			<groupId>org.objectweb.asm</groupId>
diff --git a/dep/org.argeo.slc.dep.sdk.sources/p2.inf b/dep/org.argeo.slc.dep.backend/p2.inf
similarity index 100%
rename from dep/org.argeo.slc.dep.sdk.sources/p2.inf
rename to dep/org.argeo.slc.dep.backend/p2.inf
diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
new file mode 100644
index 000000000..674a825a9
--- /dev/null
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -0,0 +1,144 @@
+<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>dep</artifactId>
+		<version>0.13.1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<groupId>org.argeo.slc.dep</groupId>
+	<artifactId>org.argeo.slc.backend</artifactId>
+	<name>SLC BACKEND Dependencies</name>
+
+	<dependencies>
+		<!-- HACK because of dependencies pb with Maven: version 2.4.0 is required 
+			by Spring-LDAP while Apache Directory takes 2.1.0 -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.lang</artifactId>
+			<version>2.4.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.agent</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.agent.extras</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.server</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.detached</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.gis</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<!-- SLC non deps -->
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.unit</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<!-- TO BE DELETED <dependency> <groupId>org.argeo.slc.dep</groupId> <artifactId>org.argeo.slc.dep.eclipse</artifactId> 
+			<version>${project.version}</version> </dependency> -->
+		<dependency>
+			<groupId>org.argeo.slc.server</groupId>
+			<artifactId>org.argeo.slc.ria</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<!-- Modules (see profiles below) -->
+
+		<!-- Launcher -->
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.launcher</artifactId>
+			<version>${project.version}</version>
+			<type>tar.gz</type>
+			<classifier>base</classifier>
+		</dependency>
+
+		<!-- Felix -->
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.osgi.service.obr</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.bundlerepository</artifactId>
+		</dependency>
+
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>sdkWithModules</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.argeo.slc.modules</groupId>
+					<artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
+					<version>${project.version}</version>
+					<type>pom</type>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc.modules</groupId>
+					<artifactId>org.argeo.slc.modules.server.bundles</artifactId>
+					<version>${project.version}</version>
+					<type>pom</type>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc.eclipse</groupId>
+					<artifactId>org.argeo.slc.eclipse.plugins.modules.bundles</artifactId>
+					<version>${project.version}</version>
+					<type>pom</type>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>sdkWithoutModules</id>
+		</profile>
+		<profile>
+			<id>release</id>
+			<properties>
+				<argeo.p2.repository>/srv/projects/slc/www/sdk</argeo.p2.repository>
+			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>org.argeo.slc.modules</groupId>
+					<artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
+					<version>${project.version}</version>
+					<type>pom</type>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc.modules</groupId>
+					<artifactId>org.argeo.slc.modules.server.bundles</artifactId>
+					<version>${project.version}</version>
+					<type>pom</type>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc.eclipse</groupId>
+					<artifactId>org.argeo.slc.eclipse.plugins.modules.bundles</artifactId>
+					<version>${project.version}</version>
+					<type>pom</type>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+</project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.detached/pom.xml b/dep/org.argeo.slc.dep.detached/pom.xml
index e05f416a3..667508449 100644
--- a/dep/org.argeo.slc.dep.detached/pom.xml
+++ b/dep/org.argeo.slc.dep.detached/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -15,10 +16,12 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.detached</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.jemmy</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<!-- For JDK 1.4 -->
 		<dependency>
diff --git a/dep/org.argeo.slc.dep.sdk.rap/p2.inf b/dep/org.argeo.slc.dep.sdk.rap/p2.inf
new file mode 100644
index 000000000..0423aa509
--- /dev/null
+++ b/dep/org.argeo.slc.dep.sdk.rap/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.sdk.rap/pom.xml b/dep/org.argeo.slc.dep.sdk.rap/pom.xml
new file mode 100644
index 000000000..4f6ca4d4d
--- /dev/null
+++ b/dep/org.argeo.slc.dep.sdk.rap/pom.xml
@@ -0,0 +1,44 @@
+<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>dep</artifactId>
+		<version>0.13.1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<groupId>org.argeo.slc.dep</groupId>
+	<artifactId>org.argeo.slc.dep.sdk.rap</artifactId>
+	<name>SLC Eclipse RAP Dependencies</name>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>maven-argeo-osgi-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.slc.eclipse</groupId>
+			<artifactId>org.argeo.slc.client.rap</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<!-- Back-end Dependencies -->
+		<dependency>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.backend</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<!-- <dependency> <groupId>org.argeo.slc.eclipse</groupId> <artifactId>org.argeo.slc.client.ui</artifactId> 
+			<version>${project.version}</version> </dependency> -->
+
+		<!-- Commons RAP -->
+		<!-- TO BE DELETED <dependency> <groupId>org.argeo.commons.eclipse</groupId> 
+			<artifactId>org.argeo.eclipse.dep.rap</artifactId> <version>${version.argeo-commons}</version> 
+			</dependency> -->
+
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.sdk.rcp/p2.inf b/dep/org.argeo.slc.dep.sdk.rcp/p2.inf
new file mode 100644
index 000000000..0423aa509
--- /dev/null
+++ b/dep/org.argeo.slc.dep.sdk.rcp/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.sdk.rcp/pom.xml b/dep/org.argeo.slc.dep.sdk.rcp/pom.xml
new file mode 100644
index 000000000..29baea42b
--- /dev/null
+++ b/dep/org.argeo.slc.dep.sdk.rcp/pom.xml
@@ -0,0 +1,38 @@
+<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>dep</artifactId>
+		<version>0.13.1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<groupId>org.argeo.slc.dep</groupId>
+	<artifactId>org.argeo.slc.dep.sdk.rcp</artifactId>
+	<name>SLC Eclipse RCP Dependencies</name>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>maven-argeo-osgi-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.slc.eclipse</groupId>
+			<artifactId>org.argeo.slc.client.rcp</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<!-- TO BE DELETED <dependency> <groupId>org.argeo.slc.eclipse</groupId> 
+			<artifactId>org.argeo.slc.client.ui</artifactId> <version>${project.version}</version> 
+			</dependency> -->
+
+		<!-- Back-end Dependencies -->
+		<dependency>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.backend</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rcp/slc-client-rcp.product b/dep/org.argeo.slc.dep.sdk.rcp/slc-client-rcp.product
similarity index 92%
rename from eclipse/plugins/runtime/org.argeo.slc.client.rcp/slc-client-rcp.product
rename to dep/org.argeo.slc.dep.sdk.rcp/slc-client-rcp.product
index ef7a3a3c2..118c23242 100644
--- a/eclipse/plugins/runtime/org.argeo.slc.client.rcp/slc-client-rcp.product
+++ b/dep/org.argeo.slc.dep.sdk.rcp/slc-client-rcp.product
@@ -3,7 +3,6 @@
 
 <product name="SLC" uid="org.argeo.slc.client.rcp.product" id="org.argeo.slc.client.rcp.product" application="org.argeo.slc.client.rcp.application" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
 
-
    <configIni use="default">
    </configIni>
 
@@ -14,7 +13,6 @@
 
    <windowImages i16="icons/argeo-icon-256.png"/>
 
-
    <launcher>
       <solaris/>
       <win useIco="false">
@@ -22,11 +20,9 @@
       </win>
    </launcher>
 
-
    <vm>
    </vm>
 
-
    <plugins>
       <plugin id="com.ibm.icu"/>
       <plugin id="com.springsource.antlr"/>
@@ -34,6 +30,7 @@
       <plugin id="com.springsource.com.jcraft.jsch"/>
       <plugin id="com.springsource.com.lowagie.text"/>
       <plugin id="com.springsource.com.mysql.jdbc"/>
+      <plugin id="com.springsource.com.sun.syndication"/>
       <plugin id="com.springsource.com.thoughtworks.xstream"/>
       <plugin id="com.springsource.edu.emory.mathcs.backport"/>
       <plugin id="com.springsource.edu.oswego.cs.dl.util.concurrent"/>
@@ -66,13 +63,14 @@
       <plugin id="com.springsource.net.sf.cglib"/>
       <plugin id="com.springsource.net.sf.ehcache"/>
       <plugin id="com.springsource.net.sourceforge.jtds"/>
-      <plugin id="com.springsource.oracle.jdbc"/>
+      <plugin id="com.springsource.oracle.jdbc" fragment=""/>
       <plugin id="com.springsource.org.antlr"/>
       <plugin id="com.springsource.org.aopalliance"/>
       <plugin id="com.springsource.org.apache.bsf"/>
       <plugin id="com.springsource.org.apache.commons.beanutils"/>
       <plugin id="com.springsource.org.apache.commons.codec"/>
       <plugin id="com.springsource.org.apache.commons.collections"/>
+      <plugin id="com.springsource.org.apache.commons.compress"/>
       <plugin id="com.springsource.org.apache.commons.dbcp"/>
       <plugin id="com.springsource.org.apache.commons.fileupload"/>
       <plugin id="com.springsource.org.apache.commons.httpclient"/>
@@ -113,6 +111,7 @@
       <plugin id="com.springsource.org.castor"/>
       <plugin id="com.springsource.org.codehaus.jackson"/>
       <plugin id="com.springsource.org.codehaus.jackson.mapper"/>
+      <plugin id="com.springsource.org.cyberneko.html"/>
       <plugin id="com.springsource.org.dbunit"/>
       <plugin id="com.springsource.org.dom4j"/>
       <plugin id="com.springsource.org.h2"/>
@@ -135,25 +134,37 @@
       <plugin id="org.argeo.dep.org.freecompany.redline"/>
       <plugin id="org.argeo.dep.osgi.activemq"/>
       <plugin id="org.argeo.dep.osgi.activemq.optional" fragment="true"/>
+      <plugin id="org.argeo.dep.osgi.aether"/>
+      <plugin id="org.argeo.dep.osgi.boilerpipe"/>
+      <plugin id="org.argeo.dep.osgi.bouncycastle.jdk15"/>
       <plugin id="org.argeo.dep.osgi.commons.cli"/>
       <plugin id="org.argeo.dep.osgi.commons.exec"/>
       <plugin id="org.argeo.dep.osgi.directory.shared.asn.codec" fragment="true"/>
+      <plugin id="org.argeo.dep.osgi.drewnoakes.metadata_extractor"/>
       <plugin id="org.argeo.dep.osgi.geoapi"/>
       <plugin id="org.argeo.dep.osgi.geotools"/>
+      <plugin id="org.argeo.dep.osgi.jackrabbit"/>
       <plugin id="org.argeo.dep.osgi.jai.imageio"/>
       <plugin id="org.argeo.dep.osgi.java3d"/>
+      <plugin id="org.argeo.dep.osgi.jcr"/>
       <plugin id="org.argeo.dep.osgi.jsr275"/>
       <plugin id="org.argeo.dep.osgi.jts"/>
       <plugin id="org.argeo.dep.osgi.mina.filter.ssl" fragment="true"/>
+      <plugin id="org.argeo.dep.osgi.netcdf"/>
+      <plugin id="org.argeo.dep.osgi.pdfbox"/>
       <plugin id="org.argeo.dep.osgi.poi"/>
       <plugin id="org.argeo.dep.osgi.springframework.ldap"/>
+      <plugin id="org.argeo.dep.osgi.tagsoup"/>
+      <plugin id="org.argeo.dep.osgi.tika"/>
       <plugin id="org.argeo.eclipse.ui"/>
       <plugin id="org.argeo.security.core"/>
       <plugin id="org.argeo.security.manager.ldap"/>
       <plugin id="org.argeo.security.services"/>
       <plugin id="org.argeo.server.core"/>
+      <plugin id="org.argeo.server.ext.jackrabbit" fragment="true"/>
       <plugin id="org.argeo.server.jdbc" fragment="true"/>
       <plugin id="org.argeo.server.json"/>
+      <plugin id="org.argeo.server.tika.jackrabbit" fragment="true"/>
       <plugin id="org.argeo.slc.agent"/>
       <plugin id="org.argeo.slc.agent.ext.bsf" fragment="true"/>
       <plugin id="org.argeo.slc.agent.ext.jdbc" fragment="true"/>
@@ -161,22 +172,17 @@
       <plugin id="org.argeo.slc.client.agent"/>
       <plugin id="org.argeo.slc.client.commons"/>
       <plugin id="org.argeo.slc.client.core"/>
-      <plugin id="org.argeo.slc.client.gis"/>
       <plugin id="org.argeo.slc.client.hibernate"/>
       <plugin id="org.argeo.slc.client.oxm"/>
       <plugin id="org.argeo.slc.client.rcp"/>
       <plugin id="org.argeo.slc.client.ui"/>
-      <plugin id="org.argeo.slc.client.ui.dist"/>
       <plugin id="org.argeo.slc.core"/>
       <plugin id="org.argeo.slc.demo.agent" fragment="true"/>
-      <plugin id="org.argeo.slc.demo.ant"/>
+      <plugin id="org.argeo.slc.demo.ant" fragment=""/>
       <plugin id="org.argeo.slc.demo.basic"/>
       <plugin id="org.argeo.slc.demo.log4j" fragment="true"/>
       <plugin id="org.argeo.slc.detached"/>
       <plugin id="org.argeo.slc.ext.activemq" fragment="true"/>
-      <plugin id="org.argeo.slc.gis.ext.dbcp" fragment="true"/>
-      <plugin id="org.argeo.slc.gis.position.backend"/>
-      <plugin id="org.argeo.slc.gis.position.gpsbabel"/>
       <plugin id="org.argeo.slc.server"/>
       <plugin id="org.argeo.slc.server.castor"/>
       <plugin id="org.argeo.slc.server.h2"/>
@@ -238,18 +244,15 @@
       <plugin id="org.argeo.security.services" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.agent" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.client.agent" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.client.gis" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.client.hibernate" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.client.oxm" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.client.ui" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.demo.ant" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.demo.basic" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.gis.position.backend" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.gis.position.gpsbabel" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.server.castor" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.server.h2" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.server.hibernate" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.server.services" autoStart="true" startLevel="0" />
+      <plugin id="org.springframework.osgi.extender" autoStart="true" startLevel="0" />
    </configurations>
 
 </product>
diff --git a/dep/org.argeo.slc.dep.sdk.sources/pom.xml b/dep/org.argeo.slc.dep.sdk.sources/pom.xml
deleted file mode 100644
index 8674dd747..000000000
--- a/dep/org.argeo.slc.dep.sdk.sources/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<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>dep</artifactId>
-		<version>0.13.1-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<groupId>org.argeo.slc.dep</groupId>
-	<artifactId>org.argeo.slc.dep.sdk.sources</artifactId>
-	<packaging>jar</packaging>
-	<name>SLC SDK Sources</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<version>${version.maven-argeo-osgi}</version>
-				<executions>
-					<execution>
-						<id>pde-source</id>
-						<phase>initialize</phase>
-						<goals>
-							<goal>pde-sources</goal>
-						</goals>
-						<configuration>
-							<!--
-								<outputDirectory>${project.build.directory}</outputDirectory>
-							-->
-						</configuration>
-					</execution>
-					<execution>
-						<goals>
-							<goal>descriptors</goal>
-						</goals>
-						<phase>generate-resources</phase>
-						<configuration>
-							<jarDirectory>${project.build.directory}/libsrc</jarDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.sdk</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.sdk/pom.xml b/dep/org.argeo.slc.dep.sdk/pom.xml
index 96caf9415..d589964d6 100644
--- a/dep/org.argeo.slc.dep.sdk/pom.xml
+++ b/dep/org.argeo.slc.dep.sdk/pom.xml
@@ -59,6 +59,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.server</groupId>
 			<artifactId>org.argeo.slc.ria</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<!-- Modules (see profiles below) -->
diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index e8dd1f23b..590784f71 100644
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -27,18 +28,22 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.server</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.hibernate</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.equinox</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.jcr</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
@@ -119,10 +124,12 @@
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.dep.ads</artifactId>
 			<type>pom</type>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.ads</artifactId>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 
 		<!-- Jackrabbit -->
@@ -130,10 +137,12 @@
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.dep.jackrabbit.server</artifactId>
 			<type>pom</type>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.jackrabbit</artifactId>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 
 		<!-- Required in JDK 1.5 -->
diff --git a/dep/pom.xml b/dep/pom.xml
index 92183d7c8..102886779 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -7,19 +7,18 @@
 		<version>0.13.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
-	<groupId>org.argeo.slc</groupId>
 	<artifactId>dep</artifactId>
-	<packaging>pom</packaging>
 	<name>SLC Dependencies</name>
+	<packaging>pom</packaging>
 	<modules>
 		<module>org.argeo.slc.dep.agent</module>
 		<module>org.argeo.slc.dep.agent.extras</module>
 		<module>org.argeo.slc.dep.server</module>
 		<module>org.argeo.slc.dep.detached</module>
 		<module>org.argeo.slc.dep.gis</module>
-		<module>org.argeo.slc.dep.eclipse</module>
-		<module>org.argeo.slc.dep.sdk</module>
-		<module>org.argeo.slc.dep.sdk.sources</module>
+		<module>org.argeo.slc.dep.backend</module>
+		<module>org.argeo.slc.dep.sdk.rcp</module>
+		<module>org.argeo.slc.dep.sdk.rap</module>
 	</modules>
 	<build>
 		<resources>
@@ -67,33 +66,59 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>resolve-pde-sources</id>
-						<goals>
-							<goal>pde-sources</goal>
-						</goals>
-						<phase>generate-resources</phase>
-						<configuration>
-							<copyArtifacts>true</copyArtifacts>
-						</configuration>
-					</execution>
-					<execution>
-						<goals>
-							<goal>descriptors</goal>
-						</goals>
-						<phase>generate-resources</phase>
-					</execution>
-				</executions>
-			</plugin><!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> 
-				<executions> <execution> <id>attach-artifacts</id> <phase>package</phase> 
-				<goals> <goal>attach-artifact</goal> </goals> <configuration> <artifacts> 
-				<artifact> <file>target/classes/modularDistribution.csv</file> <type>csv</type> 
-				<classifier>modularDistribution</classifier> </artifact> </artifacts> </configuration> 
-				</execution> </executions> </plugin> -->
 		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.argeo.maven.plugins</groupId>
+					<artifactId>maven-argeo-osgi-plugin</artifactId>
+					<executions>
+						<execution>
+							<id>resolve-pde-sources</id>
+							<goals>
+								<goal>pde-sources</goal>
+							</goals>
+							<phase>generate-resources</phase>
+							<configuration>
+								<copyArtifacts>false</copyArtifacts>
+							</configuration>
+						</execution>
+						<execution>
+							<id>generate-descriptors</id>
+							<goals>
+								<goal>descriptors</goal>
+							</goals>
+							<phase>generate-resources</phase>
+						</execution>
+						<execution>
+							<id>check-osgi</id>
+							<phase>test</phase>
+							<goals>
+								<goal>equinox</goal>
+							</goals>
+							<configuration>
+								<onlyCheck>true</onlyCheck>
+								<argsToAppend>
+									<arg>-clean</arg>
+								</argsToAppend>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<!-- TO BE DELETED <plugin> <groupId>org.argeo.maven.plugins</groupId> 
+			<artifactId>maven-argeo-osgi-plugin</artifactId> <executions> <execution> 
+			<id>resolve-pde-sources</id> <goals> <goal>pde-sources</goal> </goals> <phase>generate-resources</phase> 
+			<configuration> <copyArtifacts>true</copyArtifacts> </configuration> </execution> 
+			<execution> <goals> <goal>descriptors</goal> </goals> <phase>generate-resources</phase> 
+			</execution> </executions> </plugin> -->
+		<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> 
+			<executions> <execution> <id>attach-artifacts</id> <phase>package</phase> 
+			<goals> <goal>attach-artifact</goal> </goals> <configuration> <artifacts> 
+			<artifact> <file>target/classes/modularDistribution.csv</file> <type>csv</type> 
+			<classifier>modularDistribution</classifier> </artifact> </artifacts> </configuration> 
+			</execution> </executions> </plugin> -->
+		<!-- </plugins> -->
 	</build>
 </project>
\ No newline at end of file
diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index 879b206b8..5b9ab2849 100644
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -91,25 +91,25 @@
 					</execution>
 				</executions>
 			</plugin>
-<!--			<plugin>-->
-<!--				<groupId>org.apache.maven.plugins</groupId>-->
-<!--				<artifactId>maven-assembly-plugin</artifactId>-->
-<!--				<configuration>-->
-<!--					<descriptors>-->
-<!--						<descriptor>src/assembly/dist.xml</descriptor>-->
-<!--						<descriptor>src/assembly/devel.xml</descriptor>-->
-<!--					</descriptors>-->
-<!--				</configuration>-->
-<!--				<executions>-->
-<!--					<execution>-->
-<!--						<id>attach-assembly</id>-->
-<!--						<phase>package</phase>-->
-<!--						<goals>-->
-<!--							<goal>single</goal>-->
-<!--						</goals>-->
-<!--					</execution>-->
-<!--				</executions>-->
-<!--			</plugin>-->
+			<!-- <plugin> -->
+			<!-- <groupId>org.apache.maven.plugins</groupId> -->
+			<!-- <artifactId>maven-assembly-plugin</artifactId> -->
+			<!-- <configuration> -->
+			<!-- <descriptors> -->
+			<!-- <descriptor>src/assembly/dist.xml</descriptor> -->
+			<!-- <descriptor>src/assembly/devel.xml</descriptor> -->
+			<!-- </descriptors> -->
+			<!-- </configuration> -->
+			<!-- <executions> -->
+			<!-- <execution> -->
+			<!-- <id>attach-assembly</id> -->
+			<!-- <phase>package</phase> -->
+			<!-- <goals> -->
+			<!-- <goal>single</goal> -->
+			<!-- </goals> -->
+			<!-- </execution> -->
+			<!-- </executions> -->
+			<!-- </plugin> -->
 			<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> 
 				<version>1.1</version> <executions> <execution> <id>create-repository</id> 
 				<phase>deploy</phase> <goals> <goal>exec</goal> </goals> </execution> </executions> 
@@ -140,14 +140,11 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.sdk</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.sdk.sources</artifactId>
+			<artifactId>org.argeo.slc.dep.sdk.rcp</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<!-- TO BE DELETED <dependency> <groupId>org.argeo.slc.dep</groupId> <artifactId>org.argeo.slc.dep.sdk.sources</artifactId> 
+			<version>${project.version}</version> </dependency> -->
 	</dependencies>
 	<profiles>
 		<profile>
@@ -344,6 +341,7 @@
 									</mappings>
 									<requires>
 										<require>org.argeo.slc.sdk</require>
+										<!-- <require> org.argeo.slc.dep.sdk.rcp</require> -->
 									</requires>
 								</configuration>
 							</execution>
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/org.argeo.slc.client.rap.launch b/eclipse/plugins/org.argeo.slc.client.rap/org.argeo.slc.client.rap.launch
deleted file mode 100644
index 73320966d..000000000
--- a/eclipse/plugins/org.argeo.slc.client.rap/org.argeo.slc.client.rap.launch
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.rap.ui.launch.RAPLauncher">
-<setAttribute key="additional_plugins"/>
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/org.argeo.slc.client.rap"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="default_auto_start" value="false"/>
-<intAttribute key="default_start_level" value="4"/>
-<stringAttribute key="featureDefaultLocation" value="workspace"/>
-<stringAttribute key="featurePluginResolution" value="workspace"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.eclipse.rwt.compression=true -Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info -Dargeo.osgi.data.dir=C:/Tmp"/>
-<stringAttribute key="org.eclipse.rap.launch.browserMode" value="EXTERNAL"/>
-<stringAttribute key="org.eclipse.rap.launch.entryPoint" value="home"/>
-<stringAttribute key="org.eclipse.rap.launch.libraryVariant" value="STANDARD"/>
-<stringAttribute key="org.eclipse.rap.launch.logLevel" value="OFF"/>
-<booleanAttribute key="org.eclipse.rap.launch.openBrowser" value="true"/>
-<intAttribute key="org.eclipse.rap.launch.port" value="1081"/>
-<stringAttribute key="org.eclipse.rap.launch.servletName" value="rap"/>
-<intAttribute key="org.eclipse.rap.launch.sessionTimeout" value="0"/>
-<booleanAttribute key="org.eclipse.rap.launch.terminatePrevious" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useManualPort" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<setAttribute key="selected_features">
-<setEntry value="org.eclipse.rap.runtime.sdk:default"/>
-</setAttribute>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="org.springframework.jdbc@default:default,com.springsource.org.objectweb.asm@default:default,org.argeo.dep.osgi.postgis.jdbc@default:default,org.argeo.server.core@default:default,org.argeo.slc.client.core@default:true,org.eclipse.rap.jface@default:true,com.springsource.org.objectweb.asm.attrs@default:default,org.eclipse.rap.junit@default:default,org.eclipse.jface.databinding@default:default,org.springframework.osgi.web.extender@default:default,org.springframework.transaction@default:default,com.springsource.javax.annotation@default:default,org.argeo.server.jdbc@default:false,com.springsource.org.apache.commons.dbcp@default:default,org.argeo.dep.osgi.catalina.start@default:default,com.springsource.net.sourceforge.jtds@default:default,com.springsource.mx4j@default:default,org.argeo.dep.osgi.commons.cli@default:default,com.springsource.org.apache.derby@default:default,org.argeo.dep.osgi.java3d@default:default,com.springsource.edu.emory.mathcs.backport@default:default,com.springsource.org.apache.lucene@default:default,com.springsource.org.xmlpull@default:default,org.eclipse.rap.ui.views@default:true,org.argeo.slc.agent@default:true,org.springframework.beans@default:default,com.springsource.com.thoughtworks.xstream@default:default,org.argeo.security.core@default:default,com.ibm.icu@default:default,com.springsource.org.apache.directory.server.protocol.shared@default:default,org.eclipse.rap.demo.databinding@default:default,com.springsource.org.h2@default:default,com.springsource.org.aspectj.runtime@default:default,org.eclipse.swt.gtk.linux.x86@default:false,org.argeo.slc.client.agent@default:true,com.springsource.javax.resource@default:default,org.argeo.server.ext.jackrabbit@default:false,org.argeo.slc.dep.detached@default:default,org.springframework.web.servlet@default:default,org.argeo.slc.server.castor@default:true,org.argeo.dep.osgi.springframework.ldap@default:default,org.argeo.server.ads.server@default:default,com.springsource.javax.persistence@default:default,com.springsource.org.apache.directory.server.ldap@default:default,org.eclipse.rap.rwt.q07@default:false,org.argeo.slc.support.equinox@default:default,com.springsource.org.apache.directory.server.core@default:false,org.eclipse.equinox.launcher.gtk.linux.x86@default:false,com.springsource.org.jgroups@default:default,com.springsource.org.apache.commons.vfs@default:default,com.springsource.org.mortbay.util@default:default,org.eclipse.equinox.http.registry@default:true,org.argeo.server.activemq.broker@default:default,com.springsource.org.apache.bcel@default:default,com.springsource.net.sf.cglib@default:default,org.argeo.slc.dep.agent@default:default,com.springsource.org.apache.ws.commons.schema@default:default,com.springsource.org.dom4j@default:default,org.argeo.server.hsqldb@default:default,com.springsource.javax.xml.stream@default:default,com.springsource.javax.xml.bind@default:default,com.springsource.jxl@default:default,org.argeo.dep.osgi.geotools@default:default,com.springsource.javax.xml.ws@default:default,org.argeo.dep.jemmy.nb61@default:default,com.springsource.org.apache.commons.fileupload@default:default,com.springsource.javassist@default:default,com.springsource.javax.jms@default:default,org.eclipse.equinox.http.servlet@default:default,org.argeo.slc.server.services@default:true,com.springsource.javax.xml.rpc@default:default,org.springframework.context@default:default,com.springsource.org.apache.commons.collections@default:default,org.argeo.slc.lib.detached@default:default,com.springsource.javax.ejb@default:default,org.junit@default:default,org.argeo.slc.agent.jmx@default:default,com.springsource.oracle.jdbc@default:default,com.springsource.org.jaxen@default:default,org.argeo.slc.client.oxm@default:true,com.springsource.org.apache.jasper@default:false,org.argeo.slc.ria@default:default,org.argeo.slc.support.activemq@default:default,com.springsource.org.hibernate@default:default,org.eclipse.rap.ui.cheatsheets@default:true,org.argeo.slc.server.jms@default:default,org.springframework.oxm@default:default,org.argeo.slc.support.simple@default:default,org.argeo.slc.agent.ext.jdbc@default:false,org.argeo.dep.osgi.jsr275@default:default,org.springframework.context.support@default:default,org.argeo.slc.agent.ext.bsf@default:false,org.eclipse.equinox.registry@default:default,com.springsource.org.apache.coyote@default:false,org.argeo.dep.osgi.jai.imageio@default:default,org.eclipse.rap.ui.forms@default:true,com.springsource.org.apache.oro@default:default,org.argeo.slc.support.castor@default:false,org.argeo.security.services@default:true,org.eclipse.equinox.preferences@default:default,org.argeo.slc.support.gis@default:default,org.argeo.slc.unit@default:default,com.springsource.org.apache.commons.beanutils@default:default,com.springsource.org.apache.log4j@default:default,org.argeo.slc.server.jcr@default:default,com.springsource.javax.media.jai.core@default:default,org.eclipse.osgi@-1:true,org.argeo.server.tomcat@default:false,com.springsource.org.apache.juli.extras@default:default,com.ibm.icu.base@default:true,org.argeo.slc.support.hibernate@default:false,org.argeo.server.jackrabbit.repo@default:default,com.springsource.org.apache.directory.server.changepw@default:default,org.argeo.server.mysql@default:default,org.argeo.dep.osgi.activemq@default:default,com.springsource.org.apache.jasper.org.eclipse.jdt@default:default,com.springsource.org.apache.directory.shared.asn1@default:default,com.springsource.slf4j.api@default:default,com.springsource.com.sun.xml.messaging.saaj@default:default,com.springsource.javax.xml.soap@default:default,org.argeo.slc.agent.ext.xalan@default:false,com.springsource.javax.servlet.jsp@default:default,com.springsource.org.apache.commons.lang@default:default,com.springsource.org.codehaus.jackson.mapper@default:default,org.argeo.dep.osgi.geoapi@default:default,org.argeo.dep.osgi.directory.shared.asn.codec@default:false,org.eclipse.jface@default:default,org.springframework.security.core@default:default,org.argeo.slc.server.jackrabbit.derby@default:default,org.argeo.slc.support.jcr@default:default,com.springsource.org.apache.commons.pool@default:default,org.argeo.server.catalina@default:false,com.springsource.org.codehaus.jackson@default:default,com.springsource.org.aopalliance@default:default,com.springsource.org.apache.directory.server.kerberos.shared@default:default,com.springsource.org.apache.activemq.pool@default:default,com.springsource.org.apache.commons.httpclient@default:default,org.argeo.server.json@default:default,org.argeo.dep.osgi.mina.filter.ssl@default:false,com.springsource.com.mysql.jdbc@default:default,com.springsource.org.apache.xalan@default:default,com.springsource.org.hsqldb@default:default,org.argeo.slc.server.h2@default:true,org.springframework.osgi.io@default:default,com.springsource.org.antlr@default:default,org.argeo.slc.dep.agent.extras@default:default,com.springsource.net.sf.ehcache@default:default,com.springsource.jcifs@default:default,com.springsource.org.apache.xerces@default:false,com.springsource.org.apache.xmlbeans@default:default,org.argeo.dep.osgi.jcr@default:default,com.springsource.javax.servlet.jsp.jstl@default:default,com.springsource.junit@default:default,com.springsource.slf4j.org.apache.commons.logging@default:default,org.springframework.orm@default:default,com.springsource.org.apache.el@default:default,org.argeo.slc.dep.gis@default:default,org.mortbay.jetty.util@default:true,org.springframework.aop@default:default,org.eclipse.rap.jface.databinding@default:true,com.springsource.org.dbunit@default:default,org.argeo.slc.ext.activemq@default:false,org.springframework.osgi.web@default:default,org.eclipse.rap.junit.runtime@default:default,com.springsource.org.apache.taglibs.standard@default:default,org.argeo.osgi.boot@default:default,org.argeo.slc.server.agentproxy@default:default,com.springsource.org.castor@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,com.springsource.org.apache.commons.net@default:default,com.springsource.org.apache.regexp@default:default,org.springframework.jms@default:default,org.argeo.security.webapp@default:default,org.argeo.slc.server.main.rap@default:false,org.eclipse.rap.design.example@default:default,com.springsource.jdbm@default:default,org.eclipse.core.jobs@default:default,org.argeo.server.jcr@default:default,org.eclipse.equinox.app@default:default,com.springsource.org.apache.tools.ant@default:default,com.springsource.org.apache.catalina@default:default,com.springsource.org.apache.directory.server.kerberos@default:default,com.springsource.org.apache.directory.server.core.shared@default:default,org.argeo.dep.osgi.commons.exec@default:default,org.mortbay.jetty.server@default:true,org.argeo.slc.support.osgi@default:default,org.argeo.slc.support.ant@default:default,org.argeo.slc.server.activemq@default:default,org.argeo.slc.webapp@default:default,org.argeo.slc.support.maven@default:false,org.springframework.security.acls@default:false,org.eclipse.osgi.services@default:true,com.springsource.com.lowagie.text@default:default,org.argeo.slc.core@default:default,com.springsource.org.mortbay.jetty.server@default:default,org.argeo.slc.specs@default:default,org.argeo.slc.dep.eclipse@default:default,org.argeo.dep.osgi.activemq.optional@default:false,org.springframework.web@default:default,com.springsource.antlr@default:default,com.springsource.javax.el@default:default,org.eclipse.swt@default:default,com.springsource.org.apache.bsf@default:default,com.springsource.slf4j.log4j@default:false,org.argeo.server.ads@default:default,org.argeo.slc.dep.sdk@default:default,org.eclipse.core.databinding.beans@default:true,org.argeo.slc.server.mysql@default:default,com.springsource.javax.management.j2ee@default:default,org.argeo.slc.client.hibernate@default:true,org.argeo.slc.client.ui@default:true,org.argeo.dep.osgi.hibernatespatial@default:default,org.argeo.server.jackrabbit@default:false,com.springsource.org.apache.directory.shared.ldap@default:default,org.eclipse.rap.ui.workbench@default:true,org.eclipse.rap.rwt@default:true,org.eclipse.core.expressions@default:default,org.eclipse.rap.demo@default:false,org.argeo.dep.osgi.jackrabbit@default:default,org.eclipse.core.databinding.observable@default:default,org.springframework.osgi.core@default:default,org.eclipse.equinox.launcher@default:default,com.springsource.javax.activation@default:default,com.springsource.org.apache.tools.ant.launch@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,com.springsource.com.jcraft.jsch@default:default,com.springsource.org.aspectj.weaver@default:default,org.argeo.server.jackrabbit.webdav@default:default,org.argeo.dep.org.freecompany.redline@default:default,com.springsource.org.quartz@default:default,com.springsource.javax.media.jai.codec@default:default,org.eclipse.rap.ui@default:true,org.eclipse.core.commands@default:true,org.springframework.core@default:default,org.argeo.dep.osgi.jts@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.help@default:default,org.argeo.slc.client.commons@default:true,com.springsource.javax.servlet@default:true,com.springsource.org.tmatesoft.svn@default:default,org.eclipse.core.databinding@default:default,com.springsource.org.apache.directory.server.ntp@default:default,com.springsource.javax.mail@default:default,org.argeo.slc.agent.jms@default:default,com.springsource.org.jdom@default:default,org.eclipse.core.databinding.property@default:default,org.springframework.security.taglibs@default:default,org.eclipse.equinox.http.jetty@default:true,org.argeo.server.webextender@default:false,javax.servlet@default:default,com.springsource.org.apache.mina@default:default,com.springsource.org.apache.xml.serializer@default:default,org.springframework.osgi.extender@default:true,org.springframework.xml@default:default,com.springsource.javax.jcr@default:default,com.springsource.edu.oswego.cs.dl.util.concurrent@default:default,com.springsource.org.custommonkey.xmlunit@default:default,org.eclipse.core.runtime@default:true,org.argeo.slc.support.jemmy@default:default,com.springsource.org.apache.xmlcommons@default:default,org.argeo.dep.jacob@default:default,com.springsource.json@default:default,org.argeo.security.mvc@default:default,org.eclipse.swt.win32.win32.x86@default:false,com.springsource.javax.transaction@default:default,org.argeo.eclipse.ui@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.argeo.security.manager.ldap@default:true,org.eclipse.core.contenttype@default:default,com.springsource.org.apache.commons.io@default:default,com.springsource.org.apache.commons.codec@default:default,org.argeo.slc.server@default:default,com.springsource.bsh@default:default,com.springsource.org.apache.directory.server.jndi@default:default,com.springsource.org.postgresql.jdbc3@default:default,org.argeo.slc.server.hibernate@default:true,org.argeo.slc.detached@default:default,org.argeo.slc.dep.server@default:default,org.argeo.basic.nodeps@default:default,org.argeo.slc.launcher@default:default,org.eclipse.equinox.common@2:true,org.argeo.slc.server.hsqldb@default:default,com.springsource.org.apache.xml.resolver@default:default,org.argeo.slc.dep.sdk.sources@default:default"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.argeo.slc.server.main.rap@default:false,org.argeo.slc.demo.log4j@default:false,org.argeo.slc.demo.basic@default:true,org.argeo.slc.demo.minimal@default:true,org.argeo.slc.client.rap@default:true,org.argeo.slc.demo.agent@default:false"/>
-</launchConfiguration>
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/rap.properties b/eclipse/plugins/org.argeo.slc.client.rap/rap.properties
deleted file mode 100644
index e8e3e4292..000000000
--- a/eclipse/plugins/org.argeo.slc.client.rap/rap.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Question : which are the bundles that must be listed here,
-# Which are the bundles that are started because of dependency, what is the rule ?
-argeo.osgi.start=\
-org.springframework.osgi.extender,\
-org.argeo.server.ads.server,\
-org.argeo.slc.server.h2,\
-org.argeo.slc.server.hibernate,\
-org.argeo.slc.server.main.rap,\
-org.argeo.slc.client.rap,\
-org.argeo.slc.client.ui,\
-org.argeo.slc.client.commons,\
-org.argeo.slc.client.core,\
-org.argeo.slc.client.hibernate,\
-org.argeo.slc.client.oxm,\
-org.eclipse.equinox.http.jetty
-# incoming port for the server
-org.osgi.service.http.port=1068
-# do not run an eclipse application
-eclipse.ignoreApp=true 
-# don t shutdown osgi after exiting (or not running) the application 
-#osgi.noShutdown=true
\ No newline at end of file
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/slc-client-rap.product b/eclipse/plugins/org.argeo.slc.client.rap/slc-client-rap.product
deleted file mode 100644
index 7b0d9a2cf..000000000
--- a/eclipse/plugins/org.argeo.slc.client.rap/slc-client-rap.product
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="SLC Rap UI" uid="org.argeo.slc.client.rap" id="org.argeo.slc.client.rap.product" application="org.eclipse.ui.ide.workbench" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
-
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console</programArgs>
-      <vmArgs>-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dargeo.osgi.data.dir=C:/Tmp</vmArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-   </launcherArgs>
-
-   <windowImages i16="icons/argeo-icon-256.png"/>
-
-
-   <launcher>
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-
-   <vm>
-   </vm>
-
-
-   <plugins>
-      <plugin id="com.ibm.icu"/>
-      <plugin id="com.springsource.antlr"/>
-      <plugin id="com.springsource.bsh"/>
-      <plugin id="com.springsource.com.jcraft.jsch"/>
-      <plugin id="com.springsource.com.lowagie.text"/>
-      <plugin id="com.springsource.com.mysql.jdbc"/>
-      <plugin id="com.springsource.com.thoughtworks.xstream"/>
-      <plugin id="com.springsource.edu.emory.mathcs.backport"/>
-      <plugin id="com.springsource.edu.oswego.cs.dl.util.concurrent"/>
-      <plugin id="com.springsource.javassist"/>
-      <plugin id="com.springsource.javax.activation"/>
-      <plugin id="com.springsource.javax.annotation"/>
-      <plugin id="com.springsource.javax.ejb"/>
-      <plugin id="com.springsource.javax.el"/>
-      <plugin id="com.springsource.javax.jms"/>
-      <plugin id="com.springsource.javax.management.j2ee"/>
-      <plugin id="com.springsource.javax.persistence"/>
-      <plugin id="com.springsource.javax.resource"/>
-      <plugin id="com.springsource.javax.servlet"/>
-      <plugin id="com.springsource.javax.servlet.jsp"/>
-      <plugin id="com.springsource.javax.servlet.jsp.jstl"/>
-      <plugin id="com.springsource.javax.transaction"/>
-      <plugin id="com.springsource.javax.xml.bind"/>
-      <plugin id="com.springsource.javax.xml.rpc"/>
-      <plugin id="com.springsource.javax.xml.stream"/>
-      <plugin id="com.springsource.javax.xml.ws"/>
-      <plugin id="com.springsource.jcifs"/>
-      <plugin id="com.springsource.jdbm"/>
-      <plugin id="com.springsource.json"/>
-      <plugin id="com.springsource.junit"/>
-      <plugin id="com.springsource.jxl"/>
-      <plugin id="com.springsource.net.sf.cglib"/>
-      <plugin id="com.springsource.net.sf.ehcache"/>
-      <plugin id="com.springsource.net.sourceforge.jtds"/>
-      <plugin id="com.springsource.org.antlr"/>
-      <plugin id="com.springsource.org.aopalliance"/>
-      <plugin id="com.springsource.org.apache.activemq.pool"/>
-      <plugin id="com.springsource.org.apache.bsf"/>
-      <plugin id="com.springsource.org.apache.catalina"/>
-      <plugin id="com.springsource.org.apache.commons.beanutils"/>
-      <plugin id="com.springsource.org.apache.commons.cli"/>
-      <plugin id="com.springsource.org.apache.commons.codec"/>
-      <plugin id="com.springsource.org.apache.commons.collections"/>
-      <plugin id="com.springsource.org.apache.commons.dbcp"/>
-      <plugin id="com.springsource.org.apache.commons.fileupload"/>
-      <plugin id="com.springsource.org.apache.commons.httpclient"/>
-      <plugin id="com.springsource.org.apache.commons.io"/>
-      <plugin id="com.springsource.org.apache.commons.lang"/>
-      <plugin id="com.springsource.org.apache.commons.net"/>
-      <plugin id="com.springsource.org.apache.commons.pool"/>
-      <plugin id="com.springsource.org.apache.commons.vfs"/>
-      <plugin id="com.springsource.org.apache.coyote" fragment="true"/>
-      <plugin id="com.springsource.org.apache.derby"/>
-      <plugin id="com.springsource.org.apache.directory.server.changepw"/>
-      <plugin id="com.springsource.org.apache.directory.server.core" fragment="true"/>
-      <plugin id="com.springsource.org.apache.directory.server.core.shared"/>
-      <plugin id="com.springsource.org.apache.directory.server.jndi"/>
-      <plugin id="com.springsource.org.apache.directory.server.kerberos"/>
-      <plugin id="com.springsource.org.apache.directory.server.kerberos.shared"/>
-      <plugin id="com.springsource.org.apache.directory.server.ldap"/>
-      <plugin id="com.springsource.org.apache.directory.server.ntp"/>
-      <plugin id="com.springsource.org.apache.directory.server.protocol.shared"/>
-      <plugin id="com.springsource.org.apache.directory.shared.asn1"/>
-      <plugin id="com.springsource.org.apache.directory.shared.ldap"/>
-      <plugin id="com.springsource.org.apache.log4j"/>
-      <plugin id="com.springsource.org.apache.lucene"/>
-      <plugin id="com.springsource.org.apache.mina"/>
-      <plugin id="com.springsource.org.apache.oro"/>
-      <plugin id="com.springsource.org.apache.regexp"/>
-      <plugin id="com.springsource.org.apache.taglibs.standard"/>
-      <plugin id="com.springsource.org.apache.tools.ant"/>
-      <plugin id="com.springsource.org.apache.tools.ant.launch"/>
-      <plugin id="com.springsource.org.apache.ws.commons.schema"/>
-      <plugin id="com.springsource.org.apache.xalan"/>
-      <plugin id="com.springsource.org.apache.xerces" fragment="true"/>
-      <plugin id="com.springsource.org.apache.xml.resolver"/>
-      <plugin id="com.springsource.org.apache.xml.serializer"/>
-      <plugin id="com.springsource.org.apache.xmlbeans"/>
-      <plugin id="com.springsource.org.apache.xmlcommons"/>
-      <plugin id="com.springsource.org.aspectj.runtime"/>
-      <plugin id="com.springsource.org.aspectj.weaver"/>
-      <plugin id="com.springsource.org.castor"/>
-      <plugin id="com.springsource.org.codehaus.jackson"/>
-      <plugin id="com.springsource.org.codehaus.jackson.mapper"/>
-      <plugin id="com.springsource.org.dbunit"/>
-      <plugin id="com.springsource.org.dom4j"/>
-      <plugin id="com.springsource.org.h2"/>
-      <plugin id="com.springsource.org.hibernate"/>
-      <plugin id="com.springsource.org.hsqldb"/>
-      <plugin id="com.springsource.org.jgroups"/>
-      <plugin id="com.springsource.org.mortbay.jetty.server"/>
-      <plugin id="com.springsource.org.mortbay.util"/>
-      <plugin id="com.springsource.org.postgresql.jdbc3"/>
-      <plugin id="com.springsource.org.quartz"/>
-      <plugin id="com.springsource.org.tmatesoft.svn"/>
-      <plugin id="com.springsource.org.xmlpull"/>
-      <plugin id="com.springsource.slf4j.api"/>
-      <plugin id="com.springsource.slf4j.log4j" fragment="true"/>
-      <plugin id="com.springsource.slf4j.org.apache.commons.logging"/>
-      <plugin id="org.argeo.basic.nodeps"/>
-      <plugin id="org.argeo.dep.osgi.activemq"/>
-      <plugin id="org.argeo.dep.osgi.activemq.optional" fragment="true"/>
-      <plugin id="org.argeo.dep.osgi.commons.cli"/>
-      <plugin id="org.argeo.dep.osgi.commons.exec"/>
-      <plugin id="org.argeo.osgi.boot"/>
-      <plugin id="org.argeo.security.core"/>
-      <plugin id="org.argeo.security.manager.ldap"/>
-      <plugin id="org.argeo.security.mvc"/>
-      <plugin id="org.argeo.security.services"/>
-      <plugin id="org.argeo.security.webapp"/>
-      <plugin id="org.argeo.server.activemq.broker"/>
-      <plugin id="org.argeo.server.ads"/>
-      <plugin id="org.argeo.server.ads.server"/>
-      <plugin id="org.argeo.server.catalina" fragment="true"/>
-      <plugin id="org.argeo.server.core"/>
-      <plugin id="org.argeo.server.jdbc" fragment="true"/>
-      <plugin id="org.argeo.server.json"/>
-      <plugin id="org.argeo.server.tomcat" fragment="true"/>
-      <plugin id="org.argeo.server.webextender" fragment="true"/>
-      <plugin id="org.argeo.slc.agent"/>
-      <plugin id="org.argeo.slc.agent.ext.bsf" fragment="true"/>
-      <plugin id="org.argeo.slc.agent.ext.jdbc" fragment="true"/>
-      <plugin id="org.argeo.slc.agent.ext.xalan" fragment="true"/>
-      <plugin id="org.argeo.slc.agent.jms"/>
-      <plugin id="org.argeo.slc.client.agent"/>
-      <plugin id="org.argeo.slc.client.commons"/>
-      <plugin id="org.argeo.slc.client.core"/>
-      <plugin id="org.argeo.slc.client.hibernate"/>
-      <plugin id="org.argeo.slc.client.oxm"/>
-      <plugin id="org.argeo.slc.client.rap"/>
-      <plugin id="org.argeo.slc.client.ui"/>
-      <plugin id="org.argeo.slc.core"/>
-      <plugin id="org.argeo.slc.demo.agent" fragment="true"/>
-      <plugin id="org.argeo.slc.demo.ant"/>
-      <plugin id="org.argeo.slc.demo.basic"/>
-      <plugin id="org.argeo.slc.demo.log4j" fragment="true"/>
-      <plugin id="org.argeo.slc.ext.activemq" fragment="true"/>
-      <plugin id="org.argeo.slc.server"/>
-      <plugin id="org.argeo.slc.server.activemq"/>
-      <plugin id="org.argeo.slc.server.castor"/>
-      <plugin id="org.argeo.slc.server.h2"/>
-      <plugin id="org.argeo.slc.server.hibernate"/>
-      <plugin id="org.argeo.slc.server.main.rap"/>
-      <plugin id="org.argeo.slc.server.services"/>
-      <plugin id="org.argeo.slc.specs"/>
-      <plugin id="org.argeo.slc.support.activemq"/>
-      <plugin id="org.argeo.slc.support.ant"/>
-      <plugin id="org.argeo.slc.support.castor" fragment="true"/>
-      <plugin id="org.argeo.slc.support.equinox"/>
-      <plugin id="org.argeo.slc.support.hibernate" fragment="true"/>
-      <plugin id="org.argeo.slc.support.maven" fragment="true"/>
-      <plugin id="org.argeo.slc.support.osgi"/>
-      <plugin id="org.argeo.slc.support.simple"/>
-      <plugin id="org.eclipse.core.commands"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.databinding"/>
-      <plugin id="org.eclipse.core.databinding.beans"/>
-      <plugin id="org.eclipse.core.databinding.observable"/>
-      <plugin id="org.eclipse.core.databinding.property"/>
-      <plugin id="org.eclipse.core.databinding.source"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.http.jetty"/>
-      <plugin id="org.eclipse.equinox.http.registry"/>
-      <plugin id="org.eclipse.equinox.http.servlet"/>
-      <plugin id="org.eclipse.equinox.launcher"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.source"/>
-      <plugin id="org.eclipse.equinox.launcher.win32.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.help"/>
-      <plugin id="org.eclipse.jdt.junit.runtime"/>
-      <plugin id="org.eclipse.jface"/>
-      <plugin id="org.eclipse.jface.databinding"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.eclipse.rap.demo"/>
-      <plugin id="org.eclipse.rap.demo.databinding"/>
-      <plugin id="org.eclipse.rap.jface"/>
-      <plugin id="org.eclipse.rap.jface.databinding"/>
-      <plugin id="org.eclipse.rap.junit"/>
-      <plugin id="org.eclipse.rap.junit.runtime"/>
-      <plugin id="org.eclipse.rap.rwt"/>
-      <plugin id="org.eclipse.rap.rwt.q07" fragment="true"/>
-      <plugin id="org.eclipse.rap.ui"/>
-      <plugin id="org.eclipse.rap.ui.cheatsheets"/>
-      <plugin id="org.eclipse.rap.ui.forms"/>
-      <plugin id="org.eclipse.rap.ui.views"/>
-      <plugin id="org.eclipse.rap.ui.workbench"/>
-      <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.ui"/>
-      <plugin id="org.eclipse.ui.workbench"/>
-      <plugin id="org.junit"/>
-      <plugin id="org.mortbay.jetty.server"/>
-      <plugin id="org.mortbay.jetty.util"/>
-      <plugin id="org.springframework.aop"/>
-      <plugin id="org.springframework.beans"/>
-      <plugin id="org.springframework.context"/>
-      <plugin id="org.springframework.context.support"/>
-      <plugin id="org.springframework.core"/>
-      <plugin id="org.springframework.jdbc"/>
-      <plugin id="org.springframework.jms"/>
-      <plugin id="org.springframework.jms.source"/>
-      <plugin id="org.springframework.orm"/>
-      <plugin id="org.springframework.osgi.core"/>
-      <plugin id="org.springframework.osgi.extender"/>
-      <plugin id="org.springframework.osgi.io"/>
-      <plugin id="org.springframework.osgi.web"/>
-      <plugin id="org.springframework.osgi.web.extender"/>
-      <plugin id="org.springframework.oxm"/>
-      <plugin id="org.springframework.security.acls" fragment="true"/>
-      <plugin id="org.springframework.security.core"/>
-      <plugin id="org.springframework.security.taglibs"/>
-      <plugin id="org.springframework.transaction"/>
-      <plugin id="org.springframework.web"/>
-      <plugin id="org.springframework.web.servlet"/>
-      <plugin id="org.springframework.xml"/>
-   </plugins>
-
-   <configurations>
-      <plugin id="org.argeo.security.manager.ldap" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.security.services" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.agent" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.client.agent" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.client.hibernate" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.client.oxm" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.client.ui" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.demo.basic" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.server.castor" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.server.h2" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.server.hibernate" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.server.services" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.support.osgi" autoStart="true" startLevel="0" />
-   </configurations>
-
-</product>
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/.classpath b/eclipse/plugins/runtime/org.argeo.slc.client.rap/.classpath
similarity index 100%
rename from eclipse/plugins/org.argeo.slc.client.rap/.classpath
rename to eclipse/plugins/runtime/org.argeo.slc.client.rap/.classpath
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/.project b/eclipse/plugins/runtime/org.argeo.slc.client.rap/.project
similarity index 100%
rename from eclipse/plugins/org.argeo.slc.client.rap/.project
rename to eclipse/plugins/runtime/org.argeo.slc.client.rap/.project
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/runtime/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from eclipse/plugins/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs
rename to eclipse/plugins/runtime/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF b/eclipse/plugins/runtime/org.argeo.slc.client.rap/META-INF/MANIFEST.MF
similarity index 100%
rename from eclipse/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF
rename to eclipse/plugins/runtime/org.argeo.slc.client.rap/META-INF/MANIFEST.MF
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/build.properties b/eclipse/plugins/runtime/org.argeo.slc.client.rap/build.properties
similarity index 100%
rename from eclipse/plugins/org.argeo.slc.client.rap/build.properties
rename to eclipse/plugins/runtime/org.argeo.slc.client.rap/build.properties
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/icons/slc_execution_perspective.gif b/eclipse/plugins/runtime/org.argeo.slc.client.rap/icons/slc_execution_perspective.gif
similarity index 100%
rename from eclipse/plugins/org.argeo.slc.client.rap/icons/slc_execution_perspective.gif
rename to eclipse/plugins/runtime/org.argeo.slc.client.rap/icons/slc_execution_perspective.gif
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/plugin.xml b/eclipse/plugins/runtime/org.argeo.slc.client.rap/plugin.xml
similarity index 90%
rename from eclipse/plugins/org.argeo.slc.client.rap/plugin.xml
rename to eclipse/plugins/runtime/org.argeo.slc.client.rap/plugin.xml
index 436597fbd..3658bee27 100644
--- a/eclipse/plugins/org.argeo.slc.client.rap/plugin.xml
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.rap/plugin.xml
@@ -2,11 +2,29 @@
 <?eclipse version="3.4"?>
 <plugin>
 
+ <extension
+         id="SlcRapProduct"
+         point="org.eclipse.core.runtime.products">
+      <product
+            name="ArgeoSlcProduct"
+            application="org.eclipse.ui.ide.workbench"
+            >
+         <property
+               name="windowImages"
+               value="icons/argeo-icon-256.png">
+         </property>
+         <property
+               name="appName"
+               value="SLC">
+         </property>
+      </product>
+   </extension>
+
    <extension
          point="org.eclipse.rap.ui.entrypoint">
       <entrypoint
             class="org.argeo.slc.client.rap.SlcClientRapApplication"
-            parameter="home"
+            parameter="slc"
             id="org.argeo.slc.client.rap.SlcClientRapApplication">
       </entrypoint>
    </extension>
@@ -45,20 +63,5 @@
             name="Exit">
       </command> 
    </extension> -->
-   <extension
-         id="product"
-         point="org.eclipse.core.runtime.products">
-      <product
-            application="org.eclipse.ui.ide.workbench"
-            name="SLC">
-         <property
-               name="windowImages"
-               value="icons/argeo-icon-256.png">
-         </property>
-         <property
-               name="appName"
-               value="SLC">
-         </property>
-      </product>
-   </extension>
+  
 </plugin>
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rap/pom.xml b/eclipse/plugins/runtime/org.argeo.slc.client.rap/pom.xml
new file mode 100644
index 000000000..a17b171cf
--- /dev/null
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.rap/pom.xml
@@ -0,0 +1,36 @@
+<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.eclipse</groupId>
+		<artifactId>runtime</artifactId>
+		<version>0.13.1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.slc.client.rap</artifactId>
+	<name>SLC Client RAP</name>
+	<packaging>jar</packaging>
+	<dependencies>
+
+		<!-- SLC -->
+		<dependency>
+			<groupId>org.argeo.slc.eclipse</groupId>
+			<artifactId>org.argeo.slc.client.ui</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<!-- Argeo common distribution for RAP projects -->
+		<dependency>
+			<groupId>org.argeo.commons.eclipse</groupId>
+			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+
+		<!-- Eclipse -->
+		<!-- <dependency> <groupId>org.eclipse.ui</groupId> <artifactId>org.eclipse.ui</artifactId> 
+			</dependency> <dependency> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.runtime</artifactId> 
+			</dependency> <dependency> <groupId>org.eclipse.swt</groupId> <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId> 
+			</dependency> <dependency> <groupId>org.eclipse.swt</groupId> <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId> 
+			</dependency> -->
+	</dependencies>
+</project>
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java b/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java
similarity index 100%
rename from eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java
rename to eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java b/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java
similarity index 100%
rename from eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java
rename to eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchWindowAdvisor.java b/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchWindowAdvisor.java
similarity index 100%
rename from eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchWindowAdvisor.java
rename to eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchWindowAdvisor.java
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java b/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java
similarity index 100%
rename from eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java
rename to eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapApplication.java b/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapApplication.java
similarity index 100%
rename from eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapApplication.java
rename to eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapApplication.java
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java b/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java
similarity index 100%
rename from eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java
rename to eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rcp/pom.xml b/eclipse/plugins/runtime/org.argeo.slc.client.rcp/pom.xml
index 03f7f1f22..27e2b1241 100644
--- a/eclipse/plugins/runtime/org.argeo.slc.client.rcp/pom.xml
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.rcp/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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.eclipse</groupId>
@@ -10,14 +11,23 @@
 	<name>SLC Client RCP</name>
 	<packaging>jar</packaging>
 	<dependencies>
+		
 		<!-- SLC -->
 		<dependency>
 			<groupId>org.argeo.slc.eclipse</groupId>
 			<artifactId>org.argeo.slc.client.ui</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<!-- Eclipse -->
+		
+		<!-- Argeo common distribution for RCP projects -->
 		<dependency>
+			<groupId>org.argeo.commons.eclipse</groupId>
+			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		
+		<!-- Eclipse -->
+		<!--   <dependency>
 			<groupId>org.eclipse.ui</groupId>
 			<artifactId>org.eclipse.ui</artifactId>
 		</dependency>
@@ -32,7 +42,6 @@
 		<dependency>
 			<groupId>org.eclipse.swt</groupId>
 			<artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
-		</dependency>
-
+		</dependency> -->
 	</dependencies>
 </project>
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/pom.xml b/eclipse/plugins/runtime/org.argeo.slc.client.ui/pom.xml
index dca923225..a83c9986c 100644
--- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/pom.xml
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/pom.xml
@@ -10,13 +10,10 @@
 	<artifactId>org.argeo.slc.client.ui</artifactId>
 	<name>SLC Client UI</name>
 	<packaging>jar</packaging>
+
+
 	<dependencies>
 		<!-- SLC Client UI -->
-		<dependency>
-			<groupId>org.argeo.slc.eclipse</groupId>
-			<artifactId>org.argeo.slc.client.commons</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.eclipse</groupId>
 			<artifactId>org.argeo.slc.client.oxm</artifactId>
@@ -40,29 +37,38 @@
 			<artifactId>org.argeo.slc.server</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<!-- Commons -->
-		<dependency>
-			<groupId>org.argeo.commons.eclipse</groupId>
-			<artifactId>org.argeo.eclipse.ui</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
+
 		<!-- Spring -->
-		<dependency>
+	<!-- <dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.context</artifactId>
 		</dependency>
-		<!-- Eclipse -->
+ -->	
+		<!-- Commons (with all dependencies that are commons for both RCP and RAP) -->
 		<dependency>
-			<groupId>org.eclipse.ui</groupId>
-			<artifactId>org.eclipse.ui</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.core</groupId>
-			<artifactId>org.eclipse.core.runtime</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.swt</groupId>
-			<artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
+			<groupId>org.argeo.commons.eclipse</groupId>
+			<artifactId>org.argeo.eclipse.ui</artifactId>
+			<version>${version.argeo-commons}</version>
 		</dependency>
+
+
+		<!-- Eclipse - Only used at compile time. so that it is compatible with 
+			RCP runtime -->
+		<!-- TO BE DELETED <dependency> <groupId>org.argeo.slc.eclipse</groupId> 
+			<artifactId>org.argeo.slc.client.rap</artifactId> <version>${project.version}</version> 
+			<scope>provided</scope> </dependency> -->
+
+		<!-- Commons -->
+		<!-- TO BE DELETED <dependency> <groupId>org.argeo.slc.eclipse</groupId> 
+			<artifactId>org.argeo.slc.client.commons</artifactId> <version>${project.version}</version> 
+			</dependency> <dependency> <groupId>org.argeo.commons.eclipse</groupId> <artifactId>org.argeo.eclipse.ui</artifactId> 
+			<version>${version.argeo-commons}</version> </dependency> -->
+		<!-- Eclipse -->
+		<!-- TO BE DELETED <dependency> <groupId>org.eclipse.ui</groupId> <artifactId>org.eclipse.ui</artifactId> 
+			</dependency> <dependency> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.runtime</artifactId> 
+			</dependency> <dependency> <groupId>org.eclipse.swt</groupId> <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId> 
+			</dependency> -->
+
+
 	</dependencies>
 </project>
diff --git a/eclipse/plugins/runtime/pom.xml b/eclipse/plugins/runtime/pom.xml
index ecc6ff299..0b1816b75 100644
--- a/eclipse/plugins/runtime/pom.xml
+++ b/eclipse/plugins/runtime/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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.eclipse</groupId>
@@ -16,5 +17,6 @@
 		<module>org.argeo.slc.client.core</module>
 		<module>org.argeo.slc.client.ui</module>
 		<module>org.argeo.slc.client.rcp</module>
+		<module>org.argeo.slc.client.rap</module>
 	</modules>
 </project>
diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index 18f192bc6..b3ba0ffb3 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -25,13 +26,9 @@
 							${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml;ex=.*,
 							${project.build.directory}/lib;in=*.jar,
 						</argeo.osgi.bundles>
-						<!--
-							<argeo.osgi.bundles>
-							${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml;ex=.*,
-							${basedir}/../../modules/server;in=*;ex=target;ex=pom.xml;ex=.*,
-							${basedir}/../../modules/agent;in=*;ex=target;ex=pom.xml;ex=.*
-							</argeo.osgi.bundles>
-						-->
+						<!-- <argeo.osgi.bundles> ${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml;ex=.*, 
+							${basedir}/../../modules/server;in=*;ex=target;ex=pom.xml;ex=.*, ${basedir}/../../modules/agent;in=*;ex=target;ex=pom.xml;ex=.* 
+							</argeo.osgi.bundles> -->
 
 						<argeo.osgi.start>
 							org.springframework.osgi.extender,
@@ -46,15 +43,10 @@
 							org.argeo.slc.demo.ant						
 						</argeo.osgi.start>
 						<argeo.server.port.http>7080</argeo.server.port.http>
-						<!--
-							<argeo.osgi.start> org.springframework.osgi.extender,
-							org.argeo.server.ads.server,
-							org.argeo.slc.server.jackrabbit.derby, org.argeo.slc.server.jcr,
-							org.argeo.slc.server.main, org.argeo.slc.ria,
-							org.argeo.slc.agent, org.argeo.slc.agent.jms,
-							org.argeo.slc.demo.minimal, org.argeo.slc.demo.basic,
-							org.argeo.slc.demo.ant </argeo.osgi.start>
-						-->
+						<!-- <argeo.osgi.start> org.springframework.osgi.extender, org.argeo.server.ads.server, 
+							org.argeo.slc.server.jackrabbit.derby, org.argeo.slc.server.jcr, org.argeo.slc.server.main, 
+							org.argeo.slc.ria, org.argeo.slc.agent, org.argeo.slc.agent.jms, org.argeo.slc.demo.minimal, 
+							org.argeo.slc.demo.basic, org.argeo.slc.demo.ant </argeo.osgi.start> -->
 					</systemProperties>
 				</configuration>
 				<executions>
@@ -113,14 +105,14 @@
 					</execution>
 				</executions>
 			</plugin>
-				<plugin>
-					<artifactId>maven-jar-plugin</artifactId>
-					<configuration>
-						<archive>
-							<manifestFile>META-INF/MANIFEST.MF</manifestFile>
-						</archive>
-					</configuration>
-				</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
@@ -134,6 +126,7 @@
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.unit</artifactId>
 			<scope>test</scope>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5bba9fa74..0675de054 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,7 @@
 		<developmentCycle>0.13</developmentCycle>
 		<site.repoBase>file:///srv/projects/www/slc/site</site.repoBase>
 		<site.urlBase>http://projects.argeo.org/slc/site</site.urlBase>
+		<version.argeo-slc>0.13.1-SNAPSHOT</version.argeo-slc>
 	</properties>
 	<modules>
 		<module>runtime</module>
@@ -91,6 +92,17 @@ limitations under the License.
 				<role>developer</role>
 			</roles>
 		</developer>
+		<developer>
+			<id>bsinou</id>
+			<name>Bruno Sinou</name>
+			<email><![CDATA[http://www.google.com/recaptcha/mailhide/d?k=01SZoYvDnJzcw0KOR7M7u6Qg==&c=SVgEjXA_Uu9ZrNzLES92w1ght6puLFiVpoNUddCfSU8=]]></email>
+			<organization>Argeo</organization>
+			<organizationUrl>http://www.argeo.org</organizationUrl>
+			<roles>
+				<role>developer</role>
+				<role>QA</role>
+			</roles>
+		</developer>
 	</developers>
 	<contributors>
 		<contributor>
@@ -104,8 +116,133 @@ limitations under the License.
 			</roles>
 		</contributor>
 	</contributors>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-scm-plugin</artifactId>
+					<version>1.4</version>
+					<configuration>
+						<connectionType>connection</connectionType>
+					</configuration>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.maven.scm</groupId>
+							<artifactId>maven-scm-provider-gitexe</artifactId>
+							<version>1.2</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.argeo.maven.plugins</groupId>
+					<artifactId>maven-argeo-osgi-plugin</artifactId>
+					<version>${version.maven-argeo-osgi}</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>buildnumber-maven-plugin</artifactId>
+				<version>1.0-beta-4</version>
+				<executions>
+					<execution>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<doCheck>false</doCheck>
+					<doUpdate>false</doUpdate>
+					<format>{0,date,yyyyMMdd_HHmmss}</format>
+					<items>
+						<item>timestamp</item>
+					</items>
+					<revisionOnScmFailure>git</revisionOnScmFailure>
+					<providerImplementations>
+						<git>svn</git>
+					</providerImplementations>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.4.3</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-release-plugin</artifactId>
+				<version>2.1</version>
+				<configuration>
+					<autoVersionSubmodules>true</autoVersionSubmodules>
+					<preparationGoals>clean install</preparationGoals>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+
+	<!-- TO BE DELETED : done differently now to handle automatic generation 
+		of target platform. <build> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> 
+		<artifactId>maven-compiler-plugin</artifactId> <version>2.3.2</version> <configuration> 
+		<source>1.5</source> <target>1.5</target> </configuration> </plugin> <plugin> 
+		<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> 
+		<version>2.1.2</version> <executions> <execution> <id>attach-sources</id> 
+		<phase>package</phase> <goals> <goal>jar</goal> </goals> </execution> </executions> 
+		</plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> 
+		<version>2.4.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 
+		<artifactId>maven-surefire-plugin</artifactId> <version>2.7.1</version> </plugin> 
+		<plugin> <groupId>org.argeo.maven.plugins</groupId> <artifactId>maven-argeo-osgi-plugin</artifactId> 
+		<version>${version.maven-argeo-osgi}</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId> 
+		<version>2.3.1</version> <configuration> <archive> <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile> 
+		</archive> </configuration> </plugin> <plugin> <groupId>org.apache.felix</groupId> 
+		<artifactId>maven-bundle-plugin</artifactId> <version>${version.maven-bundle-plugin}</version> 
+		<extensions>true</extensions> <configuration> <manifestLocation>target/classes/META-INF</manifestLocation> 
+		<instructions> <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version> 
+		<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> 
+		<_removeheaders>Bnd-LastModified</_removeheaders> </instructions> </configuration> 
+		<executions> <execution> <id>bundle-manifest</id> <phase>process-classes</phase> 
+		<goals> <goal>manifest</goal> </goals> </execution> </executions> </plugin> 
+		</plugins> </pluginManagement> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> 
+		<artifactId>buildnumber-maven-plugin</artifactId> <version>1.0-beta-4</version> 
+		<executions> <execution> <phase>generate-resources</phase> <goals> <goal>create</goal> 
+		</goals> </execution> </executions> <configuration> <doCheck>false</doCheck> 
+		<doUpdate>false</doUpdate> <format>{0,date,yyyyMMdd_HHmmss}</format> <items> 
+		<item>timestamp</item> </items> <revisionOnScmFailure>git</revisionOnScmFailure> 
+		<providerImplementations> <git>svn</git> </providerImplementations> </configuration> 
+		</plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> 
+		<version>2.4.3</version> <configuration> <encoding>UTF-8</encoding> </configuration> 
+		</plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> 
+		<version>2.1.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 
+		<artifactId>maven-release-plugin</artifactId> <version>2.1</version> <configuration> 
+		<autoVersionSubmodules>true</autoVersionSubmodules> <releaseProfiles>release</releaseProfiles> 
+		<preparationGoals>clean install</preparationGoals> </configuration> </plugin> 
+		<plugin> <groupId>com.mycila.maven-license-plugin</groupId> <artifactId>maven-license-plugin</artifactId> 
+		<version>1.8.0</version> <configuration> <header>license-apache2-header.txt</header> 
+		<failIfMissing>true</failIfMissing> <aggregate>true</aggregate> <includes> 
+		<include>src/**/*.java</include> <include>src/**/*.xml</include> </includes> 
+		<excludes> <exclude>**/springutil/**</exclude> <exclude>**/qooxdoo-sdk/**</exclude> 
+		</excludes> <useDefaultExcludes>true</useDefaultExcludes> <mapping> <java>SLASHSTAR_STYLE</java> 
+		<xml>XML_STYLE</xml> </mapping> </configuration> </plugin> </plugins> </build> -->
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.argeo.dep</groupId>
+				<artifactId>versions-all</artifactId>
+				<version>${version.argeo-distribution}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<!-- </dependencies> </dependencyManagement> -->
+
+			<!-- TO BE DELETED, it is in DEP now. <dependencyManagement> <dependencies> -->
+
 			<!-- SLC (itself) -->
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
@@ -197,7 +334,6 @@ limitations under the License.
 				<artifactId>org.argeo.slc.ria</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-
 			<dependency>
 				<groupId>org.argeo.ria</groupId>
 				<artifactId>org.argeo.ria.core</artifactId>
@@ -209,7 +345,6 @@ limitations under the License.
 				<version>${project.version}</version>
 				<type>pom</type>
 			</dependency>
-
 			<!-- SLC dubious -->
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
@@ -218,7 +353,6 @@ limitations under the License.
 				<type>tar.gz</type>
 				<classifier>dist</classifier>
 			</dependency>
-
 			<!-- Argeo Commons -->
 			<dependency>
 				<groupId>org.argeo.commons.security</groupId>
@@ -247,9 +381,9 @@ limitations under the License.
 				<artifactId>org.argeo.server.jackrabbit</artifactId>
 				<version>${version.argeo-commons}</version>
 			</dependency>
-
 		</dependencies>
 	</dependencyManagement>
+	<!-- -->
 	<repositories>
 		<repository>
 			<id>argeo</id>
diff --git a/runtime/org.argeo.slc.core/pom.xml b/runtime/org.argeo.slc.core/pom.xml
index e1d71d58b..4cf39434b 100644
--- a/runtime/org.argeo.slc.core/pom.xml
+++ b/runtime/org.argeo.slc.core/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -40,6 +41,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.specs</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/runtime/org.argeo.slc.launcher/pom.xml b/runtime/org.argeo.slc.launcher/pom.xml
index adf9aa118..469923cc2 100644
--- a/runtime/org.argeo.slc.launcher/pom.xml
+++ b/runtime/org.argeo.slc.launcher/pom.xml
@@ -75,10 +75,12 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.osgi</groupId>
 			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 
 		<dependency>
diff --git a/runtime/org.argeo.slc.lib.detached/pom.xml b/runtime/org.argeo.slc.lib.detached/pom.xml
index c43d6615e..178673a4c 100644
--- a/runtime/org.argeo.slc.lib.detached/pom.xml
+++ b/runtime/org.argeo.slc.lib.detached/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -8,7 +9,6 @@
 	</parent>
 	<groupId>org.argeo.slc.runtime</groupId>
 	<artifactId>org.argeo.slc.lib.detached</artifactId>
-	<packaging>jar</packaging>
 	<name>SLC Lib Detached</name>
 	<build>
 		<plugins>
@@ -31,20 +31,24 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.simple</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.detached</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.castor</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<!-- Unit Tests -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.unit</artifactId>
+			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index 1c94914c9..c826dd569 100644
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -46,6 +47,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<!-- Spring -->
@@ -109,11 +111,7 @@
 			<optional>true</optional>
 		</dependency>
 
-		<!--  Commons VFS
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.vfs</artifactId>
-		</dependency> -->
-
+		<!-- Commons VFS <dependency> <groupId>org.apache.commons</groupId> <artifactId>com.springsource.org.apache.commons.vfs</artifactId> 
+			</dependency> -->
 	</dependencies>
 </project>
diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index 69fec90a8..ff10dd3a9 100644
--- a/runtime/org.argeo.slc.support.activemq/pom.xml
+++ b/runtime/org.argeo.slc.support.activemq/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -30,6 +31,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<!-- Spring -->
@@ -76,7 +78,7 @@
 			<artifactId>com.springsource.org.apache.commons.pool</artifactId>
 		</dependency>
 
-		<!-- JEE required by ActiveMQ Core-->
+		<!-- JEE required by ActiveMQ Core -->
 		<dependency>
 			<groupId>javax.activation</groupId>
 			<artifactId>com.springsource.javax.activation</artifactId>
diff --git a/runtime/org.argeo.slc.support.ant/pom.xml b/runtime/org.argeo.slc.support.ant/pom.xml
index 8638cf25c..010451e7f 100644
--- a/runtime/org.argeo.slc.support.ant/pom.xml
+++ b/runtime/org.argeo.slc.support.ant/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -30,6 +31,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
@@ -40,7 +42,7 @@
 			<groupId>org.apache.ant</groupId>
 			<artifactId>com.springsource.org.apache.tools.ant.launch</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>com.springsource.org.apache.commons.net</artifactId>
diff --git a/runtime/org.argeo.slc.support.castor/pom.xml b/runtime/org.argeo.slc.support.castor/pom.xml
index 9ae9d2e09..ae112ec25 100644
--- a/runtime/org.argeo.slc.support.castor/pom.xml
+++ b/runtime/org.argeo.slc.support.castor/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -62,6 +63,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
@@ -94,6 +96,7 @@
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.unit</artifactId>
 			<scope>test</scope>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.equinox/pom.xml b/runtime/org.argeo.slc.support.equinox/pom.xml
index 44379485c..44f0410ab 100644
--- a/runtime/org.argeo.slc.support.equinox/pom.xml
+++ b/runtime/org.argeo.slc.support.equinox/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -43,6 +44,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.osgi</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
@@ -55,7 +57,7 @@
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.unit</artifactId>
 			<scope>test</scope>
+			<version>${project.version}</version>
 		</dependency>
-
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.gis/pom.xml b/runtime/org.argeo.slc.support.gis/pom.xml
index 9be399424..250645068 100644
--- a/runtime/org.argeo.slc.support.gis/pom.xml
+++ b/runtime/org.argeo.slc.support.gis/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -34,6 +35,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/runtime/org.argeo.slc.support.hibernate/pom.xml b/runtime/org.argeo.slc.support.hibernate/pom.xml
index e4992964c..5d1705a1c 100644
--- a/runtime/org.argeo.slc.support.hibernate/pom.xml
+++ b/runtime/org.argeo.slc.support.hibernate/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -28,6 +29,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
@@ -71,12 +73,14 @@
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.unit</artifactId>
 			<scope>test</scope>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.castor</artifactId>
 			<scope>test</scope>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/runtime/org.argeo.slc.support.jcr/pom.xml b/runtime/org.argeo.slc.support.jcr/pom.xml
index 4ce2961b2..2513d1192 100644
--- a/runtime/org.argeo.slc.support.jcr/pom.xml
+++ b/runtime/org.argeo.slc.support.jcr/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -30,6 +31,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
@@ -50,7 +52,7 @@
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.unit</artifactId>
 			<scope>test</scope>
+			<version>${project.version}</version>
 		</dependency>
-
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.maven/pom.xml b/runtime/org.argeo.slc.support.maven/pom.xml
index 87cca0a13..35fc70682 100644
--- a/runtime/org.argeo.slc.support.maven/pom.xml
+++ b/runtime/org.argeo.slc.support.maven/pom.xml
@@ -67,7 +67,9 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.specs</artifactId>
-		</dependency><!-- <dependency> <groupId>org.argeo.dep.osgi</groupId> <artifactId>org.argeo.dep.osgi.maven.embedder</artifactId> 
+			<version>${project.version}</version>
+		</dependency>
+		<!-- <dependency> <groupId>org.argeo.dep.osgi</groupId> <artifactId>org.argeo.dep.osgi.maven.embedder</artifactId> 
 			</dependency> -->
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/runtime/org.argeo.slc.support.osgi/pom.xml b/runtime/org.argeo.slc.support.osgi/pom.xml
index e60a79dc4..ff34db74c 100644
--- a/runtime/org.argeo.slc.support.osgi/pom.xml
+++ b/runtime/org.argeo.slc.support.osgi/pom.xml
@@ -32,6 +32,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/runtime/org.argeo.slc.support.simple/pom.xml b/runtime/org.argeo.slc.support.simple/pom.xml
index cbeac8cf2..158dc3aff 100644
--- a/runtime/org.argeo.slc.support.simple/pom.xml
+++ b/runtime/org.argeo.slc.support.simple/pom.xml
@@ -42,6 +42,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<!-- SSH -->
diff --git a/runtime/org.argeo.slc.support.ws.client/pom.xml b/runtime/org.argeo.slc.support.ws.client/pom.xml
index 2f537d0c7..5123f883f 100644
--- a/runtime/org.argeo.slc.support.ws.client/pom.xml
+++ b/runtime/org.argeo.slc.support.ws.client/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -37,10 +38,12 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.simple</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.castor</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/runtime/org.argeo.slc.unit/pom.xml b/runtime/org.argeo.slc.unit/pom.xml
index c02243c14..2c45f9707 100644
--- a/runtime/org.argeo.slc.unit/pom.xml
+++ b/runtime/org.argeo.slc.unit/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -37,10 +38,12 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.simple</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.junit</groupId>
@@ -82,6 +85,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.launcher</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<!-- OXM -->
diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index 08fbc0497..7876f2234 100644
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -119,6 +120,7 @@
 								<artifactItem>
 									<groupId>org.argeo.ria</groupId>
 									<artifactId>org.argeo.ria.core</artifactId>
+									<version>${version.argeo-ria}</version>
 									<classifier>ria</classifier>
 									<type>zip</type>
 									<outputDirectory>src/argeo-ria-src</outputDirectory>
@@ -129,8 +131,8 @@
 									<classifier>ria-security</classifier>
 									<type>zip</type>
 									<outputDirectory>src/argeo-ria-lib/security</outputDirectory>
-								</artifactItem>								
-							</artifactItems>							
+								</artifactItem>
+							</artifactItems>
 							<overWriteReleases>true</overWriteReleases>
 							<overWriteSnapshots>true</overWriteSnapshots>
 						</configuration>
@@ -164,7 +166,7 @@
 								<descriptor>assembly/ria-slc-web.xml</descriptor>
 							</descriptors>
 						</configuration>
-					</execution>				
+					</execution>
 					<execution>
 						<id>assembly-ria-jcr</id>
 						<phase>package</phase>
@@ -176,7 +178,7 @@
 								<descriptor>assembly/ria-jcr.xml</descriptor>
 							</descriptors>
 						</configuration>
-					</execution>				
+					</execution>
 				</executions>
 			</plugin>
 		</plugins>
@@ -189,5 +191,5 @@
 				<version>${version.argeo-commons}</version>
 			</dependency>
 		</dependencies>
-	</dependencyManagement>	
+	</dependencyManagement>
 </project>
\ No newline at end of file
-- 
2.39.2