From 6e4e2314ce0605519c6165a7e34fde9a3418217a Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 15 Feb 2010 19:27:53 +0000
Subject: [PATCH] Restructure SLC development environment Introduce JCR support

git-svn-id: https://svn.argeo.org/slc/trunk@3353 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/agent.properties                         |   5 +
 demo/server.properties                        |   6 +
 dep/org.argeo.slc.dep.agent/pom.xml           |   4 +
 .../OsgiBootEquinoxLaunchConfiguration.java   |   4 +-
 pom.xml                                       |   5 +
 runtime/org.argeo.slc.core/pom.xml            |  34 ------
 .../.classpath                                |   6 +-
 .../org.argeo.slc.detached.launcher/.project  |   9 +-
 .../build.properties                          |   2 +
 .../org.argeo.slc.detached.launcher/pom.xml   |  20 +---
 runtime/org.argeo.slc.detached/.classpath     |   6 +-
 runtime/org.argeo.slc.detached/.project       |   9 +-
 .../org.argeo.slc.detached/build.properties   |   2 +
 runtime/org.argeo.slc.detached/pom.xml        |  45 ++-----
 runtime/org.argeo.slc.launcher/.classpath     |   4 +-
 runtime/org.argeo.slc.launcher/.project       |   9 +-
 .../org.argeo.slc.launcher/build.properties   |   3 +
 runtime/org.argeo.slc.launcher/pom.xml        |  26 ++---
 runtime/org.argeo.slc.lib.detached/.classpath |   4 +-
 runtime/org.argeo.slc.lib.detached/.project   |   9 +-
 .../build.properties                          |   7 ++
 runtime/org.argeo.slc.lib.detached/pom.xml    |  17 ---
 runtime/org.argeo.slc.osgiboot/.classpath     |   4 +-
 runtime/org.argeo.slc.osgiboot/.project       |   9 +-
 .../org.argeo.slc.osgiboot/build.properties   |   3 +
 runtime/org.argeo.slc.osgiboot/pom.xml        |  58 +--------
 runtime/org.argeo.slc.server/.classpath       |   4 +-
 runtime/org.argeo.slc.server/.project         |   7 +-
 runtime/org.argeo.slc.server/pom.xml          |  47 ++------
 runtime/org.argeo.slc.specs/build.properties  |   2 +
 runtime/org.argeo.slc.specs/pom.xml           |  32 -----
 .../org.argeo.slc.support.activemq/.classpath |   6 +-
 .../org.argeo.slc.support.activemq/.project   |   9 +-
 .../build.properties                          |   2 +
 .../org.argeo.slc.support.activemq/pom.xml    |  22 ----
 runtime/org.argeo.slc.support.ant/.classpath  |   4 +-
 runtime/org.argeo.slc.support.ant/.project    |   9 +-
 .../build.properties                          |   4 +
 runtime/org.argeo.slc.support.ant/pom.xml     |  17 ---
 .../org.argeo.slc.support.castor/.classpath   |   4 +-
 runtime/org.argeo.slc.support.castor/.project |   9 +-
 .../build.properties                          |   6 +
 runtime/org.argeo.slc.support.castor/pom.xml  |  35 +++---
 .../org.argeo.slc.support.equinox/.classpath  |   4 +-
 .../org.argeo.slc.support.equinox/.project    |   9 +-
 .../build.properties                          |  10 ++
 runtime/org.argeo.slc.support.equinox/pom.xml |  10 --
 .../slc/equinox/ExecutionCommandProvider.java |   1 +
 .../.classpath                                |   4 +-
 .../org.argeo.slc.support.hibernate/.project  |   9 +-
 .../build.properties                          |   9 ++
 .../org.argeo.slc.support.hibernate/pom.xml   |  16 ---
 runtime/org.argeo.slc.support.jcr/.classpath  |   7 +-
 runtime/org.argeo.slc.support.jcr/.project    |  11 ++
 runtime/org.argeo.slc.support.jcr/pom.xml     |  42 +++++++
 .../slc/jcr/process/SlcExecutionDaoJcr.java   |   5 +
 .../org.argeo.slc.support.jemmy/.classpath    |   4 +-
 runtime/org.argeo.slc.support.jemmy/.project  |   9 +-
 .../build.properties                          |   4 +
 runtime/org.argeo.slc.support.jemmy/pom.xml   |  16 +--
 runtime/org.argeo.slc.support.maven/pom.xml   |  21 +---
 .../build.properties                          |   4 +
 runtime/org.argeo.slc.support.osgi/pom.xml    |  24 ----
 .../build.properties                          |   4 +
 runtime/org.argeo.slc.support.simple/pom.xml  |  33 ------
 .../org/argeo/slc/lib/svn/SvnKitDriver.java   |   4 +
 .../org.argeo.slc.support.ws.client/pom.xml   |  18 +--
 runtime/org.argeo.slc.unit/.classpath         |   4 +-
 runtime/org.argeo.slc.unit/.project           |   9 +-
 runtime/org.argeo.slc.unit/build.properties   |   4 +
 runtime/org.argeo.slc.unit/pom.xml            |  22 ----
 .../unit/AbstractOsgiRuntimeTestCase.java     |   1 +
 runtime/pom.xml                               | 110 +++++++++---------
 73 files changed, 375 insertions(+), 582 deletions(-)
 create mode 100644 demo/agent.properties
 create mode 100644 demo/server.properties
 create mode 100644 runtime/org.argeo.slc.detached.launcher/build.properties
 create mode 100644 runtime/org.argeo.slc.detached/build.properties
 create mode 100644 runtime/org.argeo.slc.launcher/build.properties
 create mode 100644 runtime/org.argeo.slc.lib.detached/build.properties
 create mode 100644 runtime/org.argeo.slc.osgiboot/build.properties
 create mode 100644 runtime/org.argeo.slc.specs/build.properties
 create mode 100644 runtime/org.argeo.slc.support.activemq/build.properties
 create mode 100644 runtime/org.argeo.slc.support.ant/build.properties
 create mode 100644 runtime/org.argeo.slc.support.castor/build.properties
 create mode 100644 runtime/org.argeo.slc.support.equinox/build.properties
 create mode 100644 runtime/org.argeo.slc.support.hibernate/build.properties
 create mode 100644 runtime/org.argeo.slc.support.jcr/pom.xml
 create mode 100644 runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/process/SlcExecutionDaoJcr.java
 create mode 100644 runtime/org.argeo.slc.support.jemmy/build.properties
 create mode 100644 runtime/org.argeo.slc.support.osgi/build.properties
 create mode 100644 runtime/org.argeo.slc.support.simple/build.properties
 create mode 100644 runtime/org.argeo.slc.unit/build.properties

diff --git a/demo/agent.properties b/demo/agent.properties
new file mode 100644
index 000000000..6df488a6e
--- /dev/null
+++ b/demo/agent.properties
@@ -0,0 +1,5 @@
+argeo.osgi.start=\
+org.springframework.osgi.extender,\
+org.argeo.slc.support.equinox,\
+org.argeo.slc.agent,\
+org.argeo.slc.agent.jms
diff --git a/demo/server.properties b/demo/server.properties
new file mode 100644
index 000000000..a05439d43
--- /dev/null
+++ b/demo/server.properties
@@ -0,0 +1,6 @@
+argeo.osgi.start=\
+org.springframework.osgi.extender,\
+org.argeo.server.ads.server,\
+org.argeo.slc.server.hsqldb,\
+org.argeo.slc.server.main,\
+org.argeo.slc.ria
diff --git a/dep/org.argeo.slc.dep.agent/pom.xml b/dep/org.argeo.slc.dep.agent/pom.xml
index 4cdcbff1b..576f39a96 100644
--- a/dep/org.argeo.slc.dep.agent/pom.xml
+++ b/dep/org.argeo.slc.dep.agent/pom.xml
@@ -42,6 +42,10 @@
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.ant</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.jcr</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.lib.detached</artifactId>
diff --git a/eclipse/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootEquinoxLaunchConfiguration.java b/eclipse/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootEquinoxLaunchConfiguration.java
index 6f2a93d3c..e619e44f1 100644
--- a/eclipse/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootEquinoxLaunchConfiguration.java
+++ b/eclipse/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootEquinoxLaunchConfiguration.java
@@ -34,8 +34,10 @@ public class OsgiBootEquinoxLaunchConfiguration extends
 		// refresh resources
 
 		IFile propertiesFile = (IFile) configuration.getMappedResources()[0];
-		propertiesFile.getProject().refreshLocal(IResource.DEPTH_INFINITE,
+		propertiesFile.getParent().refreshLocal(IResource.DEPTH_INFINITE,
 				monitor);
+//		propertiesFile.getProject().refreshLocal(IResource.DEPTH_INFINITE,
+//				monitor);
 	}
 
 	@Override
diff --git a/pom.xml b/pom.xml
index 115736d13..0b37769d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -262,6 +262,11 @@ limitations under the License.
 				<artifactId>org.argeo.slc.support.activemq</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.server</artifactId>
diff --git a/runtime/org.argeo.slc.core/pom.xml b/runtime/org.argeo.slc.core/pom.xml
index 982595c95..f4261b306 100644
--- a/runtime/org.argeo.slc.core/pom.xml
+++ b/runtime/org.argeo.slc.core/pom.xml
@@ -12,45 +12,12 @@
 	<description>Basic implementations of SLC Specifications</description>
 	<build>
 		<outputDirectory>bin</outputDirectory>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>META-INF/**</include>
-				</includes>
-			</resource>
-		</resources>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestFile>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>
 				<configuration>
-					<manifestLocation>META-INF</manifestLocation>
 					<instructions>
 						<Export-Package>
 							org.argeo.slc.*,org.argeo.slc.core.test.spring
@@ -67,7 +34,6 @@
 					</instructions>
 				</configuration>
 			</plugin>
-
 		</plugins>
 	</build>
 	<dependencies>
diff --git a/runtime/org.argeo.slc.detached.launcher/.classpath b/runtime/org.argeo.slc.detached.launcher/.classpath
index b606f1820..73ba12c2e 100644
--- a/runtime/org.argeo.slc.detached.launcher/.classpath
+++ b/runtime/org.argeo.slc.detached.launcher/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/runtime/org.argeo.slc.detached.launcher/.project b/runtime/org.argeo.slc.detached.launcher/.project
index 9c83d32f8..d8fefa252 100644
--- a/runtime/org.argeo.slc.detached.launcher/.project
+++ b/runtime/org.argeo.slc.detached.launcher/.project
@@ -11,13 +11,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.detached.launcher/build.properties b/runtime/org.argeo.slc.detached.launcher/build.properties
new file mode 100644
index 000000000..f0cc4f1b4
--- /dev/null
+++ b/runtime/org.argeo.slc.detached.launcher/build.properties
@@ -0,0 +1,2 @@
+source.. = src/main/java/,\
+           src/main/resources/
diff --git a/runtime/org.argeo.slc.detached.launcher/pom.xml b/runtime/org.argeo.slc.detached.launcher/pom.xml
index 0e5edbd1f..47d727d39 100644
--- a/runtime/org.argeo.slc.detached.launcher/pom.xml
+++ b/runtime/org.argeo.slc.detached.launcher/pom.xml
@@ -20,10 +20,6 @@
 					<target>1.4</target>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
@@ -43,20 +39,13 @@
 				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
 					<instructions>
+						<Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
 						<Export-Package>
 							org.argeo.slc.*
 						</Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>
-			<!--
-				<plugin> <groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId> <configuration>
-				<descriptors> <descriptor>src/assembly/dist.xml</descriptor>
-				</descriptors> </configuration> <executions> <execution>
-				<id>attach-assembly</id> <phase>package</phase> <goals>
-				<goal>single</goal> </goals> </execution> </executions> </plugin>
-			-->
 		</plugins>
 	</build>
 	<dependencies>
@@ -64,12 +53,5 @@
 			<groupId>org.eclipse.osgi</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
 		</dependency>
-
-		<!--
-			<dependency> <groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.extender</artifactId>
-			</dependency> <dependency> <groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.detached</artifactId> </dependency>
-		-->
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.detached/.classpath b/runtime/org.argeo.slc.detached/.classpath
index b606f1820..73ba12c2e 100644
--- a/runtime/org.argeo.slc.detached/.classpath
+++ b/runtime/org.argeo.slc.detached/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/runtime/org.argeo.slc.detached/.project b/runtime/org.argeo.slc.detached/.project
index 5757ba736..32df2c3eb 100644
--- a/runtime/org.argeo.slc.detached/.project
+++ b/runtime/org.argeo.slc.detached/.project
@@ -11,13 +11,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.detached/build.properties b/runtime/org.argeo.slc.detached/build.properties
new file mode 100644
index 000000000..f0cc4f1b4
--- /dev/null
+++ b/runtime/org.argeo.slc.detached/build.properties
@@ -0,0 +1,2 @@
+source.. = src/main/java/,\
+           src/main/resources/
diff --git a/runtime/org.argeo.slc.detached/pom.xml b/runtime/org.argeo.slc.detached/pom.xml
index 212b28219..27dce8ed0 100644
--- a/runtime/org.argeo.slc.detached/pom.xml
+++ b/runtime/org.argeo.slc.detached/pom.xml
@@ -13,7 +13,12 @@
 	<build>
 		<plugins>
 			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.4</source>
+					<target>1.4</target>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
@@ -21,6 +26,7 @@
 				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
 					<instructions>
+						<Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
 						<Export-Package>
 							org.argeo.slc.detached.*
 						</Export-Package>
@@ -30,32 +36,9 @@
 							org.springframework.core,
 							*
 						</Import-Package>
-						<!--
-							<Import-Package> org.w3c.dom;version="0.0.0",
-							javax.xml.*;version="0.0.0", org.apache.xerces.jaxp,
-							org.springframework.beans.factory;version="2.0",
-							org.springframework.beans.factory.support;version="2.0",
-							org.springframework.beans.factory.xml;version="2.0",
-							org.springframework.context;version="2.0",
-							org.springframework.context.support;version="2.0",
-							org.springframework.core.io;version="2.0", * </Import-Package>
-							<Spring-Context>*;create-asynchronously:=false</Spring-Context>
-						-->
 					</instructions>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.4</source>
-					<target>1.4</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
@@ -74,25 +57,11 @@
 			<groupId>edu.emory.mathcs.backport</groupId>
 			<artifactId>com.springsource.edu.emory.mathcs.backport</artifactId>
 		</dependency>
-
-
-		<!--
-			<dependency> <groupId>org.apache.xerces</groupId>
-			<artifactId>com.springsource.org.apache.xerces</artifactId>
-			</dependency>
-		-->
-
 		<dependency>
 			<groupId>org.apache.xmlcommons</groupId>
 			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<!--
-			<dependency> <groupId>xml-apis</groupId>
-			<artifactId>xml-apis</artifactId> <version>1.3.04</version>
-			<scope>provided</scope> </dependency>
-		-->
-
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>
diff --git a/runtime/org.argeo.slc.launcher/.classpath b/runtime/org.argeo.slc.launcher/.classpath
index 036412180..73ba12c2e 100644
--- a/runtime/org.argeo.slc.launcher/.classpath
+++ b/runtime/org.argeo.slc.launcher/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/runtime/org.argeo.slc.launcher/.project b/runtime/org.argeo.slc.launcher/.project
index 6aa81d06f..7254f6d9b 100644
--- a/runtime/org.argeo.slc.launcher/.project
+++ b/runtime/org.argeo.slc.launcher/.project
@@ -11,13 +11,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.launcher/build.properties b/runtime/org.argeo.slc.launcher/build.properties
new file mode 100644
index 000000000..7aa34daee
--- /dev/null
+++ b/runtime/org.argeo.slc.launcher/build.properties
@@ -0,0 +1,3 @@
+additional.bundles = org.springframework.xml
+source.. = src/main/java/,\
+           src/main/resources/
diff --git a/runtime/org.argeo.slc.launcher/pom.xml b/runtime/org.argeo.slc.launcher/pom.xml
index 0fca99b09..192710b8f 100644
--- a/runtime/org.argeo.slc.launcher/pom.xml
+++ b/runtime/org.argeo.slc.launcher/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>
@@ -12,22 +13,6 @@
 	<name>SLC Launcher</name>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -55,7 +40,12 @@
 						<Export-Package>
 							org.argeo.slc.*
 						</Export-Package>
-						<Import-Package>org.w3c.dom;version="0.0.0",javax.xml.*;version="0.0.0",*</Import-Package>
+						<Import-Package>
+							org.w3c.dom;version="0.0.0",
+							javax.xml.*;version="0.0.0",
+							org.argeo.slc.build,
+							*
+						 </Import-Package>
 						<Main-Class>org.argeo.slc.cli.SlcMain</Main-Class>
 					</instructions>
 				</configuration>
diff --git a/runtime/org.argeo.slc.lib.detached/.classpath b/runtime/org.argeo.slc.lib.detached/.classpath
index 9653ef0ac..110fd7f0b 100644
--- a/runtime/org.argeo.slc.lib.detached/.classpath
+++ b/runtime/org.argeo.slc.lib.detached/.classpath
@@ -5,6 +5,6 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/runtime/org.argeo.slc.lib.detached/.project b/runtime/org.argeo.slc.lib.detached/.project
index e7f6aa3dc..14fead302 100644
--- a/runtime/org.argeo.slc.lib.detached/.project
+++ b/runtime/org.argeo.slc.lib.detached/.project
@@ -11,13 +11,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.lib.detached/build.properties b/runtime/org.argeo.slc.lib.detached/build.properties
new file mode 100644
index 000000000..f7b1a68c3
--- /dev/null
+++ b/runtime/org.argeo.slc.lib.detached/build.properties
@@ -0,0 +1,7 @@
+additional.bundles = org.springframework.xml,\
+                     org.argeo.slc.unit,\
+                     com.springsource.junit
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
diff --git a/runtime/org.argeo.slc.lib.detached/pom.xml b/runtime/org.argeo.slc.lib.detached/pom.xml
index cb09fde2e..aa9b10d70 100644
--- a/runtime/org.argeo.slc.lib.detached/pom.xml
+++ b/runtime/org.argeo.slc.lib.detached/pom.xml
@@ -12,23 +12,6 @@
 	<name>SLC Lib Detached</name>
 	<build>
 		<plugins>
-			<!-- Look to parent pom for inheritances -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
diff --git a/runtime/org.argeo.slc.osgiboot/.classpath b/runtime/org.argeo.slc.osgiboot/.classpath
index 05a2e8f84..620713201 100644
--- a/runtime/org.argeo.slc.osgiboot/.classpath
+++ b/runtime/org.argeo.slc.osgiboot/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/runtime/org.argeo.slc.osgiboot/.project b/runtime/org.argeo.slc.osgiboot/.project
index 5a646e1b0..891fbe7a1 100644
--- a/runtime/org.argeo.slc.osgiboot/.project
+++ b/runtime/org.argeo.slc.osgiboot/.project
@@ -11,13 +11,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.osgiboot/build.properties b/runtime/org.argeo.slc.osgiboot/build.properties
new file mode 100644
index 000000000..c4970c82d
--- /dev/null
+++ b/runtime/org.argeo.slc.osgiboot/build.properties
@@ -0,0 +1,3 @@
+additional.bundles = com.springsource.junit
+source.. = src/main/java/,\
+           src/test/java/
diff --git a/runtime/org.argeo.slc.osgiboot/pom.xml b/runtime/org.argeo.slc.osgiboot/pom.xml
index c2dedb5d6..ab5e9374e 100644
--- a/runtime/org.argeo.slc.osgiboot/pom.xml
+++ b/runtime/org.argeo.slc.osgiboot/pom.xml
@@ -20,73 +20,17 @@
 					<target>1.4</target>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<!-- 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assembly/osgiboot.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>assembly-osgiboot</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			 -->
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
 				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
 					<instructions>
+						<Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
 						<Bundle-Activator>org.argeo.slc.osgiboot.Activator</Bundle-Activator>
 					</instructions>
 				</configuration>
 			</plugin>
-			<!-- 
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.1</version>
-				<executions>
-					<execution>
-						<id>attach-artifacts</id>
-						<phase>package</phase>
-						<goals>
-							<goal>attach-artifact</goal>
-						</goals>
-						<configuration>
-							<artifacts>
-								<artifact>
-									<file>src/main/ant/osgiboot.xml</file>
-									<type>xml</type>
-									<classifier>osgiboot</classifier>
-								</artifact>
-							</artifacts>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
- -->
 		</plugins>
 	</build>
 	<dependencies>
diff --git a/runtime/org.argeo.slc.server/.classpath b/runtime/org.argeo.slc.server/.classpath
index 9653ef0ac..110fd7f0b 100644
--- a/runtime/org.argeo.slc.server/.classpath
+++ b/runtime/org.argeo.slc.server/.classpath
@@ -5,6 +5,6 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/runtime/org.argeo.slc.server/.project b/runtime/org.argeo.slc.server/.project
index 663896211..278b92daa 100644
--- a/runtime/org.argeo.slc.server/.project
+++ b/runtime/org.argeo.slc.server/.project
@@ -11,19 +11,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index a083abb98..96897ff94 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>
@@ -12,23 +13,6 @@
 	<description>SLC Server</description>
 	<build>
 		<plugins>
-			<!-- Look to parent pom for inheritances -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<!--
-					<executions> <execution> <goals> <goal>test-jar</goal> </goals>
-					</execution> </executions>
-				-->
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -38,29 +22,16 @@
 						<Export-Package>
 							org.argeo.slc.*,org.argeo.slc.server,org.argeo.slc.server.spring
 						</Export-Package>
-						<Import-Package>org.w3c.dom;version="0.0.0",javax.xml.*;version="0.0.0",org.argeo.slc.activemq,org.argeo.slc.execution,*</Import-Package>
+						<Import-Package>org.w3c.dom;version="0.0.0",
+							javax.xml.*;version="0.0.0",
+							org.argeo.slc.activemq,
+							org.argeo.slc.execution,
+							org.springframework.context.support,
+							*
+						</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<configuration>
-					<webAppSourceDirectory>
-						../../org.argeo.slc.webapp/src/main/webapp
-					</webAppSourceDirectory>
-					<jettyConfig>
-						../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test-local.xml
-					</jettyConfig>
-					<webDefaultXml>../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml</webDefaultXml>
-					<systemProperties>
-						<systemProperty>
-							<name>activemq.base</name>
-							<value>${user.home}/share/apache-activemq-5.2.0</value>
-						</systemProperty>
-					</systemProperties>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
diff --git a/runtime/org.argeo.slc.specs/build.properties b/runtime/org.argeo.slc.specs/build.properties
new file mode 100644
index 000000000..f0c20ab36
--- /dev/null
+++ b/runtime/org.argeo.slc.specs/build.properties
@@ -0,0 +1,2 @@
+source.. = src/main/java/,\
+           src/main/resources/
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.specs/pom.xml b/runtime/org.argeo.slc.specs/pom.xml
index 1e7be8b6b..cb4b87118 100644
--- a/runtime/org.argeo.slc.specs/pom.xml
+++ b/runtime/org.argeo.slc.specs/pom.xml
@@ -10,41 +10,12 @@
 	<artifactId>org.argeo.slc.specs</artifactId>
 	<name>SLC Specifications</name>
 	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>META-INF/**</include>
-				</includes>
-			</resource>
-		</resources>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestFile>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>
 				<configuration>
-					<manifestLocation>META-INF</manifestLocation>
 					<instructions>
 						<Export-Package>
 							org.argeo.slc.*
@@ -56,9 +27,6 @@
 					</instructions>
 				</configuration>
 			</plugin>
-
 		</plugins>
 	</build>
-	<dependencies>
-	</dependencies>
 </project>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.activemq/.classpath b/runtime/org.argeo.slc.support.activemq/.classpath
index 30baf1326..73ba12c2e 100644
--- a/runtime/org.argeo.slc.support.activemq/.classpath
+++ b/runtime/org.argeo.slc.support.activemq/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/runtime/org.argeo.slc.support.activemq/.project b/runtime/org.argeo.slc.support.activemq/.project
index 42053e34a..c1292c0e6 100644
--- a/runtime/org.argeo.slc.support.activemq/.project
+++ b/runtime/org.argeo.slc.support.activemq/.project
@@ -11,13 +11,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.support.activemq/build.properties b/runtime/org.argeo.slc.support.activemq/build.properties
new file mode 100644
index 000000000..f0cc4f1b4
--- /dev/null
+++ b/runtime/org.argeo.slc.support.activemq/build.properties
@@ -0,0 +1,2 @@
+source.. = src/main/java/,\
+           src/main/resources/
diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index 0782ee9ec..a71a0611f 100644
--- a/runtime/org.argeo.slc.support.activemq/pom.xml
+++ b/runtime/org.argeo.slc.support.activemq/pom.xml
@@ -11,22 +11,6 @@
 	<name>SLC Support ActiveMQ</name>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -77,12 +61,6 @@
 			<groupId>org.argeo.dep.osgi</groupId>
 			<artifactId>org.argeo.dep.osgi.activemq.optional</artifactId>
 		</dependency>
-		<!-- 
-		<dependency>
-			<groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.activemq.xmpp</artifactId>
-		</dependency>
-		 -->
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>com.springsource.org.apache.activemq.pool</artifactId>
diff --git a/runtime/org.argeo.slc.support.ant/.classpath b/runtime/org.argeo.slc.support.ant/.classpath
index 9653ef0ac..110fd7f0b 100644
--- a/runtime/org.argeo.slc.support.ant/.classpath
+++ b/runtime/org.argeo.slc.support.ant/.classpath
@@ -5,6 +5,6 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/runtime/org.argeo.slc.support.ant/.project b/runtime/org.argeo.slc.support.ant/.project
index 75a122a3e..51538fef0 100644
--- a/runtime/org.argeo.slc.support.ant/.project
+++ b/runtime/org.argeo.slc.support.ant/.project
@@ -11,13 +11,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.support.ant/build.properties b/runtime/org.argeo.slc.support.ant/build.properties
new file mode 100644
index 000000000..7c51e9efe
--- /dev/null
+++ b/runtime/org.argeo.slc.support.ant/build.properties
@@ -0,0 +1,4 @@
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
diff --git a/runtime/org.argeo.slc.support.ant/pom.xml b/runtime/org.argeo.slc.support.ant/pom.xml
index b880a0cee..8bda690f0 100644
--- a/runtime/org.argeo.slc.support.ant/pom.xml
+++ b/runtime/org.argeo.slc.support.ant/pom.xml
@@ -12,23 +12,6 @@
 	<name>SLC Support Ant</name>
 	<build>
 		<plugins>
-			<!-- Look to parent pom for inheritances -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
diff --git a/runtime/org.argeo.slc.support.castor/.classpath b/runtime/org.argeo.slc.support.castor/.classpath
index 9653ef0ac..110fd7f0b 100644
--- a/runtime/org.argeo.slc.support.castor/.classpath
+++ b/runtime/org.argeo.slc.support.castor/.classpath
@@ -5,6 +5,6 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/runtime/org.argeo.slc.support.castor/.project b/runtime/org.argeo.slc.support.castor/.project
index 6cff3525a..c0bc103dd 100644
--- a/runtime/org.argeo.slc.support.castor/.project
+++ b/runtime/org.argeo.slc.support.castor/.project
@@ -11,13 +11,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.support.castor/build.properties b/runtime/org.argeo.slc.support.castor/build.properties
new file mode 100644
index 000000000..92bb45254
--- /dev/null
+++ b/runtime/org.argeo.slc.support.castor/build.properties
@@ -0,0 +1,6 @@
+additional.bundles = org.argeo.slc.unit,\
+                     com.springsource.junit
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
diff --git a/runtime/org.argeo.slc.support.castor/pom.xml b/runtime/org.argeo.slc.support.castor/pom.xml
index 9c07c52e6..acd6f4634 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>
@@ -12,22 +13,6 @@
 	<description>Implementations of SLC Specs using Castor</description>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -37,7 +22,9 @@
 						<Export-Package>
 							org.argeo.slc.*
 						</Export-Package>
-						<Import-Package>org.argeo.slc.*;resolution:=optional,
+						<Import-Package>
+							org.argeo.slc.*;resolution:=optional,
+							org.argeo.slc.deploy;resolution:=optional,
 							org.argeo.slc.build;resolution:=optional,
 							org.argeo.slc.execution;resolution:=optional,
 							org.argeo.slc.core.attachment;resolution:=optional,
@@ -56,13 +43,21 @@
 							org.apache.xml.serialize;resolution:=optional,
 							org.apache.xerces.jaxp;resolution:=optional,
 							javax.naming;resolution:=optional,
-							javax.naming.directory;resolution:=optional
+							javax.naming.directory;resolution:=optional,
+							javax.xml.transform;resolution:=optional,
+							javax.xml.transform.stream;resolution:=optional,
+							javax.xml.transform.dom;resolution:=optional,
+							org.springframework.xml.validation;resolution:=optional,
+							org.apache.commons.io,
+							org.springframework.oxm,
+							org.springframework.core,
+							org.springframework.xml.transform,
+							org.springframework.core.io
 						</Import-Package>
 						<Fragment-Host>com.springsource.org.castor</Fragment-Host>
 					</instructions>
 				</configuration>
 			</plugin>
-
 		</plugins>
 	</build>
 	<dependencies>
diff --git a/runtime/org.argeo.slc.support.equinox/.classpath b/runtime/org.argeo.slc.support.equinox/.classpath
index 438f0fe3b..3e6ecf767 100644
--- a/runtime/org.argeo.slc.support.equinox/.classpath
+++ b/runtime/org.argeo.slc.support.equinox/.classpath
@@ -5,6 +5,6 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/runtime/org.argeo.slc.support.equinox/.project b/runtime/org.argeo.slc.support.equinox/.project
index a2d12e512..19404bc7a 100644
--- a/runtime/org.argeo.slc.support.equinox/.project
+++ b/runtime/org.argeo.slc.support.equinox/.project
@@ -11,13 +11,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.support.equinox/build.properties b/runtime/org.argeo.slc.support.equinox/build.properties
new file mode 100644
index 000000000..da2d34268
--- /dev/null
+++ b/runtime/org.argeo.slc.support.equinox/build.properties
@@ -0,0 +1,10 @@
+additional.bundles = org.argeo.slc.core,\
+                     org.springframework.context,\
+                     org.argeo.slc.unit,\
+                     com.springsource.junit,\
+                     org.argeo.slc.osgiboot,\
+                     org.eclipse.osgi
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
diff --git a/runtime/org.argeo.slc.support.equinox/pom.xml b/runtime/org.argeo.slc.support.equinox/pom.xml
index 7a92c9691..9d507e3ce 100644
--- a/runtime/org.argeo.slc.support.equinox/pom.xml
+++ b/runtime/org.argeo.slc.support.equinox/pom.xml
@@ -13,16 +13,6 @@
 	<properties />
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<!--
-					<executions> <execution> <goals> <goal>test-jar</goal> </goals>
-					<configuration> <archive>
-					<manifestFile>src/test/resources/META-INF/MANIFEST.MF</manifestFile>
-					</archive> </configuration> </execution> </executions>
-				-->
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
diff --git a/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
index ab30014f9..9711c3c96 100644
--- a/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
+++ b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
@@ -9,6 +9,7 @@ import org.eclipse.core.runtime.adaptor.EclipseStarter;
 import org.eclipse.osgi.framework.console.CommandInterpreter;
 import org.eclipse.osgi.framework.console.CommandProvider;
 
+@SuppressWarnings("restriction")
 public class ExecutionCommandProvider implements CommandProvider {
 	private final static Log log = LogFactory
 			.getLog(ExecutionCommandProvider.class);
diff --git a/runtime/org.argeo.slc.support.hibernate/.classpath b/runtime/org.argeo.slc.support.hibernate/.classpath
index 9653ef0ac..110fd7f0b 100644
--- a/runtime/org.argeo.slc.support.hibernate/.classpath
+++ b/runtime/org.argeo.slc.support.hibernate/.classpath
@@ -5,6 +5,6 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/runtime/org.argeo.slc.support.hibernate/.project b/runtime/org.argeo.slc.support.hibernate/.project
index fac029545..080510172 100644
--- a/runtime/org.argeo.slc.support.hibernate/.project
+++ b/runtime/org.argeo.slc.support.hibernate/.project
@@ -11,13 +11,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.support.hibernate/build.properties b/runtime/org.argeo.slc.support.hibernate/build.properties
new file mode 100644
index 000000000..cdcb6d7db
--- /dev/null
+++ b/runtime/org.argeo.slc.support.hibernate/build.properties
@@ -0,0 +1,9 @@
+additional.bundles = org.springframework.transaction,\
+                     org.argeo.slc.unit,\
+                     com.springsource.junit,\
+                     org.springframework.oxm,\
+                     org.springframework.xml
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
diff --git a/runtime/org.argeo.slc.support.hibernate/pom.xml b/runtime/org.argeo.slc.support.hibernate/pom.xml
index 1c82a6b89..b700ae3b8 100644
--- a/runtime/org.argeo.slc.support.hibernate/pom.xml
+++ b/runtime/org.argeo.slc.support.hibernate/pom.xml
@@ -11,22 +11,6 @@
 	<name>SLC Support Hibernate</name>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
diff --git a/runtime/org.argeo.slc.support.jcr/.classpath b/runtime/org.argeo.slc.support.jcr/.classpath
index b4bee8726..fc460145a 100644
--- a/runtime/org.argeo.slc.support.jcr/.classpath
+++ b/runtime/org.argeo.slc.support.jcr/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/runtime/org.argeo.slc.support.jcr/.project b/runtime/org.argeo.slc.support.jcr/.project
index ad3c4fa38..e9c6312e8 100644
--- a/runtime/org.argeo.slc.support.jcr/.project
+++ b/runtime/org.argeo.slc.support.jcr/.project
@@ -10,8 +10,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.support.jcr/pom.xml b/runtime/org.argeo.slc.support.jcr/pom.xml
new file mode 100644
index 000000000..09a0e6075
--- /dev/null
+++ b/runtime/org.argeo.slc.support.jcr/pom.xml
@@ -0,0 +1,42 @@
+<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>runtime</artifactId>
+		<version>0.12.2-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<groupId>org.argeo.slc.runtime</groupId>
+	<artifactId>org.argeo.slc.support.jcr</artifactId>
+	<name>SLC Support JCR</name>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${version.maven-bundle-plugin}</version>
+				<configuration>
+					<instructions>
+						<Export-Package>
+							org.argeo.slc.jcr.*
+						</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.core</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.jackrabbit</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/process/SlcExecutionDaoJcr.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/process/SlcExecutionDaoJcr.java
new file mode 100644
index 000000000..b83b9fac5
--- /dev/null
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/process/SlcExecutionDaoJcr.java
@@ -0,0 +1,5 @@
+package org.argeo.slc.jcr.process;
+
+public class SlcExecutionDaoJcr {
+
+}
diff --git a/runtime/org.argeo.slc.support.jemmy/.classpath b/runtime/org.argeo.slc.support.jemmy/.classpath
index 350970264..90d9c1bfd 100644
--- a/runtime/org.argeo.slc.support.jemmy/.classpath
+++ b/runtime/org.argeo.slc.support.jemmy/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/runtime/org.argeo.slc.support.jemmy/.project b/runtime/org.argeo.slc.support.jemmy/.project
index 539f8268e..057f24f1d 100644
--- a/runtime/org.argeo.slc.support.jemmy/.project
+++ b/runtime/org.argeo.slc.support.jemmy/.project
@@ -11,13 +11,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.support.jemmy/build.properties b/runtime/org.argeo.slc.support.jemmy/build.properties
new file mode 100644
index 000000000..7c51e9efe
--- /dev/null
+++ b/runtime/org.argeo.slc.support.jemmy/build.properties
@@ -0,0 +1,4 @@
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
diff --git a/runtime/org.argeo.slc.support.jemmy/pom.xml b/runtime/org.argeo.slc.support.jemmy/pom.xml
index 10775fe2d..0f18a6902 100644
--- a/runtime/org.argeo.slc.support.jemmy/pom.xml
+++ b/runtime/org.argeo.slc.support.jemmy/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>
@@ -20,24 +21,13 @@
 					<target>1.4</target>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
 				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
 					<instructions>
+						<Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
 						<Export-Package>
 							org.argeo.slc.jemmy
 						</Export-Package>
diff --git a/runtime/org.argeo.slc.support.maven/pom.xml b/runtime/org.argeo.slc.support.maven/pom.xml
index d4fb72b92..c41846e27 100644
--- a/runtime/org.argeo.slc.support.maven/pom.xml
+++ b/runtime/org.argeo.slc.support.maven/pom.xml
@@ -12,23 +12,6 @@
 	<name>SLC Support Maven</name>
 	<build>
 		<plugins>
-			<!-- Look to parent pom for inheritances -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -38,8 +21,8 @@
 						<Export-Package>
 							org.argeo.slc.maven.*
 						</Export-Package>
-						<Import-Package>*,org.codehaus.plexus</Import-Package>
-						<Fragment-Host>org.argeo.dep.osgi.maven.embedder</Fragment-Host>
+						<Import-Package>*,org.codehaus.plexus;resolution:="optional"</Import-Package>
+						<!-- <Fragment-Host>org.argeo.dep.osgi.maven.embedder</Fragment-Host> -->
 					</instructions>
 				</configuration>
 			</plugin>
diff --git a/runtime/org.argeo.slc.support.osgi/build.properties b/runtime/org.argeo.slc.support.osgi/build.properties
new file mode 100644
index 000000000..7c51e9efe
--- /dev/null
+++ b/runtime/org.argeo.slc.support.osgi/build.properties
@@ -0,0 +1,4 @@
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
diff --git a/runtime/org.argeo.slc.support.osgi/pom.xml b/runtime/org.argeo.slc.support.osgi/pom.xml
index 3897000f2..ceff91f9a 100644
--- a/runtime/org.argeo.slc.support.osgi/pom.xml
+++ b/runtime/org.argeo.slc.support.osgi/pom.xml
@@ -12,34 +12,12 @@
 	<packaging>jar</packaging>
 	<properties />
 	<build>
-		<outputDirectory>bin</outputDirectory>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>META-INF/**</include>
-				</includes>
-			</resource>
-		</resources>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestFile>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>
 				<configuration>
-					<manifestLocation>META-INF</manifestLocation>
 					<instructions>
 						<Export-Package>
 							org.argeo.slc.*
@@ -50,8 +28,6 @@
 		</plugins>
 	</build>
 	<dependencies>
-
-
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
diff --git a/runtime/org.argeo.slc.support.simple/build.properties b/runtime/org.argeo.slc.support.simple/build.properties
new file mode 100644
index 000000000..7c51e9efe
--- /dev/null
+++ b/runtime/org.argeo.slc.support.simple/build.properties
@@ -0,0 +1,4 @@
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
diff --git a/runtime/org.argeo.slc.support.simple/pom.xml b/runtime/org.argeo.slc.support.simple/pom.xml
index 2971b030b..014a2a219 100644
--- a/runtime/org.argeo.slc.support.simple/pom.xml
+++ b/runtime/org.argeo.slc.support.simple/pom.xml
@@ -11,45 +11,12 @@
 	<name>SLC Support Simple</name>
 	<description>Basic implementations of SLC Specifications</description>
 	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>META-INF/**</include>
-				</includes>
-			</resource>
-		</resources>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestFile>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>
 				<configuration>
-					<manifestLocation>META-INF</manifestLocation>
 					<instructions>
 						<Export-Package>
 							org.argeo.slc.*,org.argeo.slc.core.test.spring
diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/svn/SvnKitDriver.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/svn/SvnKitDriver.java
index 6ad668dfd..365f7ba73 100644
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/svn/SvnKitDriver.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/svn/SvnKitDriver.java
@@ -26,6 +26,7 @@ public class SvnKitDriver implements VersioningDriver {
 		manager = SVNClientManager.newInstance();
 	}
 
+	@SuppressWarnings("deprecation")
 	public void updateToHead(File fileOrDir) {
 		try {
 			manager.getUpdateClient().doUpdate(fileOrDir, SVNRevision.HEAD,
@@ -35,6 +36,7 @@ public class SvnKitDriver implements VersioningDriver {
 		}
 	}
 
+	@SuppressWarnings("deprecation")
 	public void importFileOrDir(String repositoryUrl, File fileOrDir) {
 		try {
 			manager.getCommitClient().doImport(fileOrDir,
@@ -46,6 +48,7 @@ public class SvnKitDriver implements VersioningDriver {
 		}
 	}
 
+	@SuppressWarnings("deprecation")
 	public void checkout(String repositoryUrl, File destDir, Boolean recursive) {
 		try {
 			manager.getUpdateClient().doCheckout(
@@ -119,6 +122,7 @@ public class SvnKitDriver implements VersioningDriver {
 		}
 	}
 
+	@SuppressWarnings("deprecation")
 	public void commit(File fileOrDir, String commitMessage) {
 		try {
 			manager.getCommitClient().doCommit(new File[] { fileOrDir }, true,
diff --git a/runtime/org.argeo.slc.support.ws.client/pom.xml b/runtime/org.argeo.slc.support.ws.client/pom.xml
index 3c0259234..85971d3ef 100644
--- a/runtime/org.argeo.slc.support.ws.client/pom.xml
+++ b/runtime/org.argeo.slc.support.ws.client/pom.xml
@@ -12,23 +12,6 @@
 	<name>SLC Support Web Services Client (deprecated)</name>
 	<build>
 		<plugins>
-			<!-- Look to parent pom for inheritances -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -41,6 +24,7 @@
 						<Import-Package>org.w3c.dom;version="0.0.0",
 							javax.xml.*;version="0.0.0",
 							org.xml.*;version="0.0.0",
+							org.springframework.ws.*;resolution:="optional",
 							*
 						</Import-Package>
 					</instructions>
diff --git a/runtime/org.argeo.slc.unit/.classpath b/runtime/org.argeo.slc.unit/.classpath
index 9653ef0ac..110fd7f0b 100644
--- a/runtime/org.argeo.slc.unit/.classpath
+++ b/runtime/org.argeo.slc.unit/.classpath
@@ -5,6 +5,6 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/runtime/org.argeo.slc.unit/.project b/runtime/org.argeo.slc.unit/.project
index 2c3e0f5af..d4d0be86f 100644
--- a/runtime/org.argeo.slc.unit/.project
+++ b/runtime/org.argeo.slc.unit/.project
@@ -11,13 +11,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.unit/build.properties b/runtime/org.argeo.slc.unit/build.properties
new file mode 100644
index 000000000..7c51e9efe
--- /dev/null
+++ b/runtime/org.argeo.slc.unit/build.properties
@@ -0,0 +1,4 @@
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
diff --git a/runtime/org.argeo.slc.unit/pom.xml b/runtime/org.argeo.slc.unit/pom.xml
index 11c6859ca..79245efcf 100644
--- a/runtime/org.argeo.slc.unit/pom.xml
+++ b/runtime/org.argeo.slc.unit/pom.xml
@@ -11,28 +11,6 @@
 	<name>SLC Unit Tests Helpers</name>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<!--
-					<executions> <execution> <goals> <goal>test-jar</goal> </goals>
-					<configuration> <archive>
-					<manifestFile>target/test-classes/META-INF/MANIFEST.MF</manifestFile>
-					</archive> </configuration> </execution> </executions>
-				-->
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
diff --git a/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java b/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java
index 98892190c..f1f4926b2 100644
--- a/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java
+++ b/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java
@@ -19,6 +19,7 @@ import org.osgi.framework.ServiceReference;
 import org.springframework.context.ApplicationContext;
 import org.springframework.osgi.util.OsgiStringUtils;
 
+@SuppressWarnings("restriction")
 public abstract class AbstractOsgiRuntimeTestCase extends TestCase {
 	private final static Log log = LogFactory
 			.getLog(AbstractOsgiRuntimeTestCase.class);
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 0f4658e6e..0d6c3ec16 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -25,6 +25,7 @@
 		<module>org.argeo.slc.support.ant</module>
 		<module>org.argeo.slc.support.maven</module>
 		<module>org.argeo.slc.support.jemmy</module>
+		<module>org.argeo.slc.support.jcr</module>
 		<module>org.argeo.slc.server</module>
 		<module>org.argeo.slc.detached</module>
 		<module>org.argeo.slc.detached.launcher</module>
@@ -33,62 +34,61 @@
 		<module>org.argeo.slc.support.ws.client</module>
 	</modules>
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<artifactId>maven-jar-plugin</artifactId>
-					<configuration>
-						<archive>
-							<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
-						</archive>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-source-plugin</artifactId>
-				</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>${pom.artifactId}</Bundle-SymbolicName>
-							<_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>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>META-INF/**</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${version.maven-bundle-plugin}</version>
+				<extensions>true</extensions>
+				<configuration>
+					<manifestLocation>META-INF</manifestLocation>
+					<instructions>
+						<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+						<Bundle-SymbolicName>${pom.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>
 	</build>
-	<!--
-		<profiles> <profile> <id>release</id> <build> <plugins> <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>${pom.artifactId}</Bundle-SymbolicName>
-		<_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> </build> </profile>
-		</profiles>
-	-->
 	<!--
 		<reporting> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId>
 		<artifactId>cobertura-maven-plugin</artifactId> </plugin> </plugins>
-- 
2.39.2