From 45dcd17f9adcab2f2101f948466a1b70f39a81b6 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 30 Mar 2011 17:34:04 +0000
Subject: [PATCH] Working RCP

git-svn-id: https://svn.argeo.org/slc/trunk@4410 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.slc.archetype.basic/.project    | 11 ---
 .../archetype.properties                      |  1 -
 .../org.argeo.slc.archetype.basic/pom.xml     | 12 ---
 .../META-INF/maven/archetype-metadata.xml     | 23 ------
 .../resources/META-INF/maven/archetype.xml    | 13 ---
 .../resources/archetype-resources/pom.xml     | 56 -------------
 archetypes/pom.xml                            | 16 ----
 dep/org.argeo.slc.dep.backend/pom.xml         | 80 ++++++++++++-------
 dep/org.argeo.slc.dep.provided/pom.xml        | 27 -------
 dep/org.argeo.slc.dep.sdk.rap/pom.xml         | 12 ++-
 dep/org.argeo.slc.dep.server/pom.xml          | 75 +++--------------
 dep/pom.xml                                   |  1 -
 dist/org.argeo.slc.sdk/pom.xml                | 38 ++++-----
 .../META-INF/spring/osgi.xml                  |  8 +-
 .../plugins/org.argeo.slc.client.rcp/pom.xml  | 79 +++++++++++++++---
 .../META-INF/spring/jackrabbit-osgi.xml       |  4 +-
 .../META-INF/spring/repo-osgi.xml             |  3 +-
 pom.xml                                       |  4 +-
 18 files changed, 169 insertions(+), 294 deletions(-)
 delete mode 100644 archetypes/org.argeo.slc.archetype.basic/.project
 delete mode 100644 archetypes/org.argeo.slc.archetype.basic/archetype.properties
 delete mode 100644 archetypes/org.argeo.slc.archetype.basic/pom.xml
 delete mode 100644 archetypes/org.argeo.slc.archetype.basic/src/main/resources/META-INF/maven/archetype-metadata.xml
 delete mode 100644 archetypes/org.argeo.slc.archetype.basic/src/main/resources/META-INF/maven/archetype.xml
 delete mode 100644 archetypes/org.argeo.slc.archetype.basic/src/main/resources/archetype-resources/pom.xml
 delete mode 100644 archetypes/pom.xml
 delete mode 100644 dep/org.argeo.slc.dep.provided/pom.xml

diff --git a/archetypes/org.argeo.slc.archetype.basic/.project b/archetypes/org.argeo.slc.archetype.basic/.project
deleted file mode 100644
index 663f17321..000000000
--- a/archetypes/org.argeo.slc.archetype.basic/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.argeo.slc.archetype.basic</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/archetypes/org.argeo.slc.archetype.basic/archetype.properties b/archetypes/org.argeo.slc.archetype.basic/archetype.properties
deleted file mode 100644
index 00dcecbc1..000000000
--- a/archetypes/org.argeo.slc.archetype.basic/archetype.properties
+++ /dev/null
@@ -1 +0,0 @@
-slcArchetype.slc.version=0.11.2-SNAPSHOT
\ No newline at end of file
diff --git a/archetypes/org.argeo.slc.archetype.basic/pom.xml b/archetypes/org.argeo.slc.archetype.basic/pom.xml
deleted file mode 100644
index f6e4a7b51..000000000
--- a/archetypes/org.argeo.slc.archetype.basic/pom.xml
+++ /dev/null
@@ -1,12 +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>archetype</artifactId>
-		<version>0.12.1-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<groupId>org.argeo.slc.archetypes</groupId>
-	<artifactId>org.argeo.slc.archetype.basic</artifactId>
-	<name>SLC Basic Project Archetype</name>
-</project>
\ No newline at end of file
diff --git a/archetypes/org.argeo.slc.archetype.basic/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/org.argeo.slc.archetype.basic/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 343af3d6a..000000000
--- a/archetypes/org.argeo.slc.archetype.basic/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<archetype-descriptor name="org.argeo.slc.archetype.basic">
-	<requiredProperties>
-		<requiredProperty key="slcArchetype.slc.version">
-			<defaultValue>0.11.2-SNAPSHOT</defaultValue>
-		</requiredProperty>
-	</requiredProperties>
-	<fileSets>
-	<!-- 
-		<fileSet filtered="true">
-			<directory>src/slc</directory>
-			<includes>
-				<include>*/**</include>
-			</includes>
-		</fileSet>
-		 -->
-		<fileSet filtered="true">
-			<directory></directory>
-			<includes>
-				<include>pom.xml</include>
-			</includes>
-		</fileSet>
-	</fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/archetypes/org.argeo.slc.archetype.basic/src/main/resources/META-INF/maven/archetype.xml b/archetypes/org.argeo.slc.archetype.basic/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 648c707e4..000000000
--- a/archetypes/org.argeo.slc.archetype.basic/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<archetype>
-  <id>org.argeo.slc.archetype.basic</id>
-  <resources>
-  <!-- 
-    <resource>src/assembly/slcapp.xml</resource>
-    <resource>src/slc/conf/runtime/default.xml</resource>
-    <resource>src/slc/conf/applicationContext.xml</resource>
-    <resource>src/slc/conf/slc.properties</resource>
-    <resource>src/slc/root/slcRoot.properties</resource>
-    <resource>src/slc/work/log/slcApp.log</resource>
-     -->
-  </resources>
- </archetype>
diff --git a/archetypes/org.argeo.slc.archetype.basic/src/main/resources/archetype-resources/pom.xml b/archetypes/org.argeo.slc.archetype.basic/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 228f0e03e..000000000
--- a/archetypes/org.argeo.slc.archetype.basic/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,56 +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>
-	<groupId>${groupId}</groupId>
-	<artifactId>${artifactId}</artifactId>
-	<version>${version}</version>
-	<name>(Generated SLC Application Template)</name>
-	<properties>
-		<slc.version>${slcArchetype.slc.version}</slc.version>
-	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assembly/slcapp.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>assembly-slcapp</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.simple</artifactId>
-			<version>${slc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>${slc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.castor</artifactId>
-			<version>${slc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.launcher</artifactId>
-			<version>${slc.version}</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
deleted file mode 100644
index 24642c906..000000000
--- a/archetypes/pom.xml
+++ /dev/null
@@ -1,16 +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>argeo-slc</artifactId>
-		<version>0.12.1-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<groupId>org.argeo.slc</groupId>
-	<artifactId>archetype</artifactId>
-	<packaging>pom</packaging>
-	<name>SLC Maven Archetype</name>
-	<modules>
-		<module>org.argeo.slc.archetype.basic</module>
-	</modules>
-</project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index 6c65a738f..4608ce19c 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -29,44 +29,68 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.agent</artifactId>
-			<version>${version.slc}</version>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.dep.node</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.server</artifactId>
-			<version>${version.slc}</version>
+			<artifactId>org.argeo.slc.dep.agent</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
 			<artifactId>org.argeo.slc.dep.detached</artifactId>
-			<version>${version.slc}</version>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
+		<!-- Provided -->
 		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.gis</artifactId>
-			<version>${version.slc}</version>
+			<groupId>org.apache.xmlcommons</groupId>
+			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.provided</artifactId>
-			<version>${version.slc}</version>
+			<groupId>javax.xml.stream</groupId>
+			<artifactId>com.springsource.javax.xml.stream</artifactId>
 		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.slc.dep</groupId> -->
+		<!-- <artifactId>org.argeo.slc.dep.gis</artifactId> -->
+		<!-- <version>${version.slc}</version> -->
+		<!-- </dependency> -->
 
-		<!-- SLC non deps -->
+		<!-- SLC -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.unit</artifactId>
+			<artifactId>org.argeo.slc.server</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.hibernate</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.equinox</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.jcr</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.repo</artifactId>
 			<version>${version.slc}</version>
 		</dependency>
 
-		<!-- TO BE DELETED <dependency> <groupId>org.argeo.slc.dep</groupId> <artifactId>org.argeo.slc.dep.eclipse</artifactId> 
-			<version>${version.slc}</version> </dependency> -->
+		<!-- SLC non deps -->
 		<dependency>
-			<groupId>org.argeo.slc.server</groupId>
-			<artifactId>org.argeo.slc.ria</artifactId>
-			<version>${version.slc}</version>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.unit</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Modules (see profiles below) -->
@@ -75,20 +99,20 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.launcher</artifactId>
-			<version>${version.slc}</version>
+			<version>0.13.1-SNAPSHOT</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>
+		<!-- <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>
 </project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.provided/pom.xml b/dep/org.argeo.slc.dep.provided/pom.xml
deleted file mode 100644
index f9e3db257..000000000
--- a/dep/org.argeo.slc.dep.provided/pom.xml
+++ /dev/null
@@ -1,27 +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.provided</artifactId>
-	<name>SLC Dependencies Provided</name>
-	<description>Dependencies which may be provided by some OSGi runtimes</description>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.xmlcommons</groupId>
-			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.javax</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-		</dependency>
-	</dependencies>
-</project>
\ 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
index 5ac606ddf..080d58b24 100644
--- a/dep/org.argeo.slc.dep.sdk.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.sdk.rap/pom.xml
@@ -50,8 +50,18 @@
 		<!-- Back-end Dependencies -->
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.backend</artifactId>
+			<artifactId>org.argeo.slc.dep.server</artifactId>
 			<version>${version.slc}</version>
 		</dependency>
+
+		<!-- TEST and target platform generation -->
+		<!-- Apache Directory -->
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.dep.ads</artifactId>
+			<type>pom</type>
+			<version>${version.argeo-commons}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index 58d882c1f..7f55f58e2 100644
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -15,40 +15,14 @@
 		<!-- Other deps -->
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.agent</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.detached</artifactId>
-			<version>${version.slc}</version>
+			<artifactId>org.argeo.slc.dep.backend</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 
-		<!-- SLC -->
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.server</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.hibernate</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.jcr</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>${version.slc}</version>
+			<groupId>org.argeo.slc.server</groupId>
+			<artifactId>org.argeo.slc.ria</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Commons -->
@@ -58,30 +32,6 @@
 			<version>${version.argeo-commons}</version>
 			<type>pom</type>
 		</dependency>
-		<!-- TODO: select only what is really necessary -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.modules</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-			<exclusions>
-				<exclusion>
-					<groupId>org.argeo.commons.server</groupId>
-					<artifactId>org.argeo.server.osgi.webapp</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.modules</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.ldap</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
 
 		<!-- Security -->
 		<dependency>
@@ -127,23 +77,16 @@
 			<type>pom</type>
 		</dependency>
 
-		<!-- Apache Directory -->
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.ads</artifactId>
-			<type>pom</type>
-			<version>${version.argeo-commons}</version>
-		</dependency>
+
+		<!-- Jackrabbit -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.ads</artifactId>
+			<artifactId>org.argeo.server.jackrabbit</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
-
-		<!-- Jackrabbit -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.jackrabbit</artifactId>
+			<artifactId>org.argeo.server.json</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 
diff --git a/dep/pom.xml b/dep/pom.xml
index 421e5796c..753e369e2 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -15,7 +15,6 @@
 		<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.provided</module>
 		<module>org.argeo.slc.dep.backend</module>
 		<module>org.argeo.slc.dep.sdk.rcp</module>
 		<module>org.argeo.slc.dep.sdk.rap</module>
diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index 6fdf1a55e..2e33e26fb 100644
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -92,25 +92,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> 
diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml
index 773358254..6247a21f0 100644
--- a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml
+++ b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml
@@ -6,9 +6,7 @@
        http://www.springframework.org/schema/beans   
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<beans:description> Implements All RCP basic classes that are not SLC
-		dependent.
-	</beans:description>
+	<beans:description>Starts required bundles</beans:description>
 
 	<!-- BUNDLES TO START -->
 	<!-- Node repository -->
@@ -16,8 +14,6 @@
 		action="start" />
 	<bundle id="node.repofactory.jackrabbit" symbolic-name="org.argeo.node.repofactory.jackrabbit"
 		action="start" />
-	<bundle id="slc.node.jackrabbit" symbolic-name="org.argeo.slc.node.jackrabbit"
-		action="start" />
 	<bundle id="security.dao.jackrabbit" symbolic-name="org.argeo.security.dao.jackrabbit"
 		action="start" />
 
@@ -34,6 +30,8 @@
 		action="start" />
 
 	<!-- UI Components -->
+	<bundle id="slc.node.jackrabbit" symbolic-name="org.argeo.slc.node.jackrabbit"
+		action="start" />
 	<bundle id="slc.client.agent" symbolic-name="org.argeo.slc.client.agent"
 		action="start" />
 	<bundle id="slc.client.hibernate" symbolic-name="org.argeo.slc.client.hibernate"
diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml b/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml
index 2dd31af6b..c2daa2308 100644
--- a/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml
@@ -16,17 +16,84 @@
 		<dependency>
 			<groupId>org.argeo.slc.eclipse</groupId>
 			<artifactId>org.argeo.slc.client.ui</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
+		</dependency>
+
+		<!-- Bundles to start -->
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.dao.jackrabbit</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.node.repo.jackrabbit</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.argeo.slc.eclipse</groupId>
+			<artifactId>org.argeo.slc.client.agent</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.eclipse</groupId>
+			<artifactId>org.argeo.slc.client.hibernate</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.eclipse</groupId>
+			<artifactId>org.argeo.slc.client.oxm</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.eclipse</groupId>
+			<artifactId>org.argeo.slc.client.rcp</artifactId>
 			<version>${version.slc}</version>
 		</dependency>
 
-		<!-- Argeo common distribution for RCP projects -->
+		<dependency>
+			<groupId>org.argeo.slc.modules</groupId>
+			<artifactId>org.argeo.slc.node.jackrabbit</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.modules</groupId>
+			<artifactId>org.argeo.slc.agent</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.modules</groupId>
+			<artifactId>org.argeo.slc.server.castor</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.modules</groupId>
+			<artifactId>org.argeo.slc.server.h2</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.modules</groupId>
+			<artifactId>org.argeo.slc.server.hibernate</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.modules</groupId>
+			<artifactId>org.argeo.slc.server.services</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
+
+		<!-- Security UI -->
 		<dependency>
 			<groupId>org.argeo.commons.eclipse</groupId>
 			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
-
-		<!-- Argeo common distribution for Secured UI -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.ui.rcp</artifactId>
@@ -34,11 +101,5 @@
 		</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/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml
index c29e2dba7..233b00952 100644
--- a/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml
+++ b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml
@@ -12,9 +12,7 @@
 	<!-- REFERENCES -->
 	<reference id="systemExecutionService" interface="org.argeo.security.SystemExecutionService" />
 	<reference id="nodeRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=${argeo.node.repo.alias})"
-		cardinality="0..1">
-	</reference>
+		filter="(argeo.jcr.repository.alias=${argeo.node.repo.alias})" />
 
 	<!-- SERVICES -->
 	<service ref="jcrRepository" interface="javax.jcr.Repository">
diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml b/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
index aad718c86..bb39e61e2 100644
--- a/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
@@ -8,7 +8,8 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">
 
-	<reference id="jcrRepository" interface="javax.jcr.Repository" />
+	<reference id="jcrRepository" interface="javax.jcr.Repository"
+		filter="(argeo.jcr.repository.alias=slc)" />
 
 	<!-- Maven -->
 	<reference id="mavenRepositorySystem" interface="org.sonatype.aether.RepositorySystem"
diff --git a/pom.xml b/pom.xml
index b759c993b..a986fcee6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,8 +24,8 @@
 		<module>eclipse</module>
 		<module>demo</module>
 		<module>dep</module>
-		<module>integration-tests</module>
-		<!-- <module>archetypes</module> -->
+		<!-- FIXME: integration tests are currently failing -->
+		<!-- <module>integration-tests</module> -->
 		<module>dist</module>
 	</modules>
 	<url>${site.urlBase}/${developmentCycle.slc}</url>
-- 
2.39.2