From 59cf55b9e72ded7dd9ff2d3dc5cf04bf28763775 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 9 Dec 2011 13:56:40 +0000
Subject: [PATCH] Improve Maven dependency structure

git-svn-id: https://svn.argeo.org/commons/trunk@4917 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 basic/runtime/org.argeo.basic.nodeps/pom.xml  |   1 -
 basic/runtime/pom.xml                         |  25 ---
 .../org.argeo.eclipse.dep.rap/pom.xml         |  91 +++++++++-
 eclipse/features/pom.xml                      |   9 -
 .../dep/org.argeo.security.dep.ads/pom.xml    |  54 ------
 security/dep/pom.xml                          |   2 +-
 .../META-INF/MANIFEST.MF                      |  13 ++
 .../p2.inf                                    |   2 +
 .../pom.xml                                   | 126 ++++++++++++++
 .../org.argeo.security.dep.node.rap/pom.xml   | 155 +++---------------
 .../org.argeo.security.dep.node.rcp/pom.xml   |  80 +++------
 .../org.argeo.security.dep.node/p2.inf        |   2 +
 .../org.argeo.security.dep.node/pom.xml       |  32 +++-
 security/features/pom.xml                     |  88 ++++------
 security/modules/pom.xml                      |  11 --
 security/pom.xml                              |   2 +-
 security/runtime/pom.xml                      |   1 -
 .../dep/org.argeo.server.dep.tomcat/pom.xml   |   4 -
 18 files changed, 335 insertions(+), 363 deletions(-)
 delete mode 100644 security/dep/org.argeo.security.dep.ads/pom.xml
 create mode 100644 security/features/org.argeo.security.dep.node.eclipse/META-INF/MANIFEST.MF
 create mode 100644 security/features/org.argeo.security.dep.node.eclipse/p2.inf
 create mode 100644 security/features/org.argeo.security.dep.node.eclipse/pom.xml
 create mode 100644 security/features/org.argeo.security.dep.node/p2.inf
 rename security/{dep => features}/org.argeo.security.dep.node/pom.xml (92%)

diff --git a/basic/runtime/org.argeo.basic.nodeps/pom.xml b/basic/runtime/org.argeo.basic.nodeps/pom.xml
index e7ca2bdac..00d4ef552 100644
--- a/basic/runtime/org.argeo.basic.nodeps/pom.xml
+++ b/basic/runtime/org.argeo.basic.nodeps/pom.xml
@@ -13,7 +13,6 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/basic/runtime/pom.xml b/basic/runtime/pom.xml
index f4159c3fd..287947b38 100644
--- a/basic/runtime/pom.xml
+++ b/basic/runtime/pom.xml
@@ -44,11 +44,6 @@
 			<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>
@@ -61,26 +56,6 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-
-				<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>
diff --git a/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml b/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
index fcd6a56a3..41ef4a0bc 100644
--- a/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
+++ b/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
@@ -9,6 +9,9 @@
 	</parent>
 	<artifactId>org.argeo.eclipse.dep.rap</artifactId>
 	<name>Commons Eclipse RAP Dependencies</name>
+	<properties>
+		<version.rap>1.3.2</version.rap>
+	</properties>
 	<build>
 		<plugins>
 			<plugin>
@@ -38,10 +41,6 @@
 		</dependency>
 
 		<!-- RAP Specific Dependencies -->
-		<dependency>
-			<groupId>org.eclipse.rap</groupId>
-			<artifactId>org.eclipse.rap.ui</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>com.springsource.javax.servlet</artifactId>
@@ -56,7 +55,11 @@
 		</dependency>
 
 		<!-- RAP -->
-		<!-- Order is important -->
+		<!-- order IS important -->
+		<dependency>
+			<groupId>org.eclipse.rap</groupId>
+			<artifactId>org.eclipse.rap.ui</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.eclipse.rap</groupId>
 			<artifactId>org.eclipse.rap.rwt</artifactId>
@@ -89,10 +92,6 @@
 			<groupId>org.eclipse.rap</groupId>
 			<artifactId>org.eclipse.rap.ui.workbench</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.rap</groupId>
-			<artifactId>org.eclipse.rap.ui</artifactId>
-		</dependency>
 
 		<!-- Jetty (TO BE REMOVED and replaced by Tomcat
 		<dependency>
@@ -119,4 +118,78 @@
 			<artifactId>org.eclipse.core.databinding.beans</artifactId>
 		</dependency>
 	</dependencies>
+	<profiles>
+		<profile>
+			<id>rpmbuild-tp</id>
+			<build>
+				<plugins>
+<!-- 					<plugin> -->
+<!-- 						<groupId>org.apache.maven.plugins</groupId> -->
+<!-- 						<artifactId>maven-dependency-plugin</artifactId> -->
+<!-- 						<executions> -->
+<!-- 							<execution> -->
+<!-- 								<id>copy-rap</id> -->
+<!-- 								<phase>package</phase> -->
+<!-- 								<goals> -->
+<!-- 									<goal>copy-dependencies</goal> -->
+<!-- 								</goals> -->
+<!-- 								<configuration> -->
+<!-- 									<includeTypes>jar</includeTypes> -->
+<!-- 									<includeGroupIds>org.eclipse.core,org.eclipse.equinox,org.eclipse.rap,org.eclipse.help,org.argeo.dep.rap,org.eclipse.osgi,com.ibm.icu</includeGroupIds> -->
+<!-- 									<outputDirectory>${project.build.directory}/eclipse-rap</outputDirectory> -->
+<!-- 								</configuration> -->
+<!-- 							</execution> -->
+<!-- 						</executions> -->
+<!-- 					</plugin> -->
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-rap</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>eclipse-rap</name>
+									<projversion>${version.rap}</projversion>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/eclipse-rap</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<dependency/>
+										</mapping>
+									</mappings>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>install</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<copy todir="${rpm.stagingRepository}" verbose="true">
+											<fileset dir="${project.build.directory}/rpm"
+												includes="*/RPMS/**/*.rpm" />
+											<flattenmapper />
+										</copy>
+									</target>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
diff --git a/eclipse/features/pom.xml b/eclipse/features/pom.xml
index 9f0046170..cfacd0827 100644
--- a/eclipse/features/pom.xml
+++ b/eclipse/features/pom.xml
@@ -34,19 +34,10 @@
 			</plugin>
 			<plugin>
 				<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>
-
-				<configuration>
-					<manifestLocation>META-INF</manifestLocation>
-				</configuration>
 			</plugin>
 		</plugins>
 		<pluginManagement>
diff --git a/security/dep/org.argeo.security.dep.ads/pom.xml b/security/dep/org.argeo.security.dep.ads/pom.xml
deleted file mode 100644
index c2691c115..000000000
--- a/security/dep/org.argeo.security.dep.ads/pom.xml
+++ /dev/null
@@ -1,54 +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.commons.security</groupId>
-		<version>0.3.4-SNAPSHOT</version>
-		<artifactId>dep</artifactId>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>org.argeo.security.dep.ads</artifactId>
-	<packaging>pom</packaging>
-	<name>Commons Security ADS Dependencies</name>
-	<dependencies>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.ads</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-			<type>pom</type>
-		</dependency>
-
-
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.ads.server</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.ads</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.basic</groupId>
-			<artifactId>org.argeo.basic.dep.log4j</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>net.sourceforge.jdbm</groupId>
-			<artifactId>com.springsource.jdbm</artifactId>
-		</dependency>
-
-		<!-- TODO remove it? -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.json</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-		</dependency>
-
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/security/dep/pom.xml b/security/dep/pom.xml
index 38a71bbfc..5445ebfc3 100644
--- a/security/dep/pom.xml
+++ b/security/dep/pom.xml
@@ -12,7 +12,7 @@
 	<name>Commons Security Dependencies</name>
 	<packaging>pom</packaging>
 	<modules>
-		<module>org.argeo.security.dep.ads</module>
+<!-- 		<module>org.argeo.security.dep.ads</module> -->
 		<module>org.argeo.security.dep.node</module>
 	</modules>
 </project>
\ No newline at end of file
diff --git a/security/features/org.argeo.security.dep.node.eclipse/META-INF/MANIFEST.MF b/security/features/org.argeo.security.dep.node.eclipse/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..d33f27ccc
--- /dev/null
+++ b/security/features/org.argeo.security.dep.node.eclipse/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Private-Package: .
+Tool: Bnd-1.15.0
+Bundle-Name: Node Eclipse Perspectives
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: Argeo
+Bundle-Version: 0.3.4.SNAPSHOT-r20111209_145052
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-SymbolicName: org.argeo.security.dep.node.eclipse
+Bundle-DocURL: http://www.argeo.org
+
diff --git a/security/features/org.argeo.security.dep.node.eclipse/p2.inf b/security/features/org.argeo.security.dep.node.eclipse/p2.inf
new file mode 100644
index 000000000..0423aa509
--- /dev/null
+++ b/security/features/org.argeo.security.dep.node.eclipse/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file
diff --git a/security/features/org.argeo.security.dep.node.eclipse/pom.xml b/security/features/org.argeo.security.dep.node.eclipse/pom.xml
new file mode 100644
index 000000000..3a1c6c36f
--- /dev/null
+++ b/security/features/org.argeo.security.dep.node.eclipse/pom.xml
@@ -0,0 +1,126 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.commons.security</groupId>
+		<version>0.3.4-SNAPSHOT</version>
+		<artifactId>features</artifactId>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.security.dep.node.eclipse</artifactId>
+	<name>Node Eclipse Perspectives</name>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>maven-argeo-osgi-plugin</artifactId>
+					<executions>
+						<execution>
+							<id>generate-descriptors</id>
+							<goals>
+								<goal>descriptors</goal>
+							</goals>
+							<phase>generate-resources</phase>
+						</execution>
+					</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<!-- Applications -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.jcr.ui.explorer</artifactId>
+			<version>0.3.4-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.osgi</groupId>
+			<artifactId>org.argeo.osgi.ui.explorer</artifactId>
+			<version>0.3.4-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.ui.admin</artifactId>
+			<version>0.3.4-SNAPSHOT</version>
+		</dependency>
+
+		<!-- Basis -->
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.dep.node</artifactId>
+			<version>0.3.4-SNAPSHOT</version>
+			<type>pom</type>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-direct</id>
+								<phase>package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<includeTypes>jar</includeTypes>
+									<excludeTransitive>true</excludeTransitive>
+									<outputDirectory>${project.build.directory}/argeo-node-eclipse</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-node-eclipse</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>argeo-node-eclipse</name>
+									<copyright>2011 Argeo</copyright>
+									<classifier>rpm-eclipse</classifier>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi/eclipse</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<dependency>
+												<includes>
+													<include>org.argeo.commons.eclipse:org.argeo.eclipse.ui</include>
+													<include>org.argeo.commons.eclipse:org.argeo.eclipse.ui.jcr</include>
+													<include>org.argeo.commons.security:org.argeo.security.equinox</include>
+													<include>org.argeo.commons.security:org.argeo.security.ui</include>
+													<include>org.argeo.commons.security:org.argeo.security.ui.admin</include>
+												</includes>
+											</dependency>
+											<sources>
+												<source>
+													<location>${project.build.directory}/argeo-node-eclipse</location>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+									<requires>
+										<require>argeo-node</require>
+									</requires>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
diff --git a/security/features/org.argeo.security.dep.node.rap/pom.xml b/security/features/org.argeo.security.dep.node.rap/pom.xml
index 8e93697bf..6fac5a061 100644
--- a/security/features/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rap/pom.xml
@@ -8,16 +8,38 @@
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.security.dep.node.rap</artifactId>
-	<name>Commons Node RAP Dependencies</name>
-	<packaging>jar</packaging>
-	<properties>
-		<version.rap>1.3.2</version.rap>
-	</properties>
+	<name>Node Eclipse RAP</name>
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-descriptors</id>
+						<goals>
+							<goal>descriptors</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
+					<execution>
+						<id>resolve-pde-sources</id>
+						<goals>
+							<goal>pde-sources</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
+					<execution>
+						<id>check-osgi</id>
+						<phase>test</phase>
+						<goals>
+							<goal>equinox</goal>
+						</goals>
+						<configuration>
+							<onlyCheck>true</onlyCheck>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
@@ -64,38 +86,6 @@
 			<id>rpmbuild</id>
 			<build>
 				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>copy-argeo-eclipse</id>
-								<phase>package</phase>
-								<goals>
-									<goal>copy-dependencies</goal>
-								</goals>
-								<configuration>
-									<includeTypes>jar</includeTypes>
-									<includeGroupIds>org.argeo.commons.eclipse</includeGroupIds>
-									<excludeArtifactIds>org.argeo.eclipse.ui.rap</excludeArtifactIds>
-									<outputDirectory>${project.build.directory}/argeo-node-eclipse</outputDirectory>
-								</configuration>
-							</execution>
-							<execution>
-								<id>copy-direct</id>
-								<phase>package</phase>
-								<goals>
-									<goal>copy-dependencies</goal>
-								</goals>
-								<configuration>
-									<includeTypes>jar</includeTypes>
-									<excludeTransitive>true</excludeTransitive>
-									<excludeArtifactIds>org.argeo.security.ui.rap,org.argeo.server.rap.webapp</excludeArtifactIds>
-									<outputDirectory>${project.build.directory}/argeo-node-eclipse</outputDirectory>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -132,41 +122,6 @@
 									</requires>
 								</configuration>
 							</execution>
-							<execution>
-								<id>rpm-node-eclipse</id>
-								<phase>package</phase>
-								<goals>
-									<goal>rpm</goal>
-								</goals>
-								<configuration>
-									<name>argeo-node-eclipse</name>
-									<copyright>2011 Argeo</copyright>
-									<classifier>rpm-eclipse</classifier>
-									<mappings>
-										<mapping>
-											<directory>/usr/share/osgi/eclipse</directory>
-											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<dependency>
-												<includes>
-													<include>org.argeo.commons.eclipse:org.argeo.eclipse.ui</include>
-													<include>org.argeo.commons.eclipse:org.argeo.eclipse.ui.jcr</include>
-													<include>org.argeo.commons.security:org.argeo.security.equinox</include>
-													<include>org.argeo.commons.security:org.argeo.security.ui</include>
-													<include>org.argeo.commons.security:org.argeo.security.ui.admin</include>
-												</includes>
-											</dependency>
-											<sources>
-												<source>
-													<location>${project.build.directory}/argeo-node-eclipse</location>
-												</source>
-											</sources>
-										</mapping>
-									</mappings>
-								</configuration>
-							</execution>
 						</executions>
 					</plugin>
 					<plugin>
@@ -192,61 +147,5 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>rpmbuild-tp</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>copy-rap</id>
-								<phase>package</phase>
-								<goals>
-									<goal>copy-dependencies</goal>
-								</goals>
-								<configuration>
-									<includeTypes>jar</includeTypes>
-									<includeGroupIds>org.eclipse.core,org.eclipse.equinox,org.eclipse.rap,org.eclipse.help,org.argeo.dep.rap,org.eclipse.osgi,com.ibm.icu</includeGroupIds>
-									<outputDirectory>${project.build.directory}/eclipse-rap</outputDirectory>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>rpm-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>rpm-rap</id>
-								<phase>package</phase>
-								<goals>
-									<goal>rpm</goal>
-								</goals>
-								<configuration>
-									<name>eclipse-rap</name>
-									<projversion>${version.rap}</projversion>
-									<mappings>
-										<mapping>
-											<directory>/usr/share/eclipse-rap</directory>
-											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<location>${project.build.directory}/eclipse-rap</location>
-												</source>
-											</sources>
-										</mapping>
-									</mappings>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 </project>
diff --git a/security/features/org.argeo.security.dep.node.rcp/pom.xml b/security/features/org.argeo.security.dep.node.rcp/pom.xml
index 281755cb8..d4bcf9bfd 100644
--- a/security/features/org.argeo.security.dep.node.rcp/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rcp/pom.xml
@@ -8,38 +8,38 @@
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.security.dep.node.rcp</artifactId>
-	<name>Commons Node RCP Dependencies</name>
-	<packaging>jar</packaging>
+	<name>Node Eclipse RCP</name>
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-descriptors</id>
+						<goals>
+							<goal>descriptors</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
+					<execution>
+						<id>check-osgi</id>
+						<phase>test</phase>
+						<goals>
+							<goal>equinox</goal>
+						</goals>
+						<configuration>
+							<onlyCheck>true</onlyCheck>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
-		<!-- Applications -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.jcr.ui.explorer</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.osgi</groupId>
-			<artifactId>org.argeo.osgi.ui.explorer</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.ui.admin</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-		</dependency>
-
-		<!-- Basis -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.node</artifactId>
+			<artifactId>org.argeo.security.dep.node.eclipse</artifactId>
 			<version>0.3.4-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
@@ -92,44 +92,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<copy todir="${rpm.stagingRepository}" verbose="true">
-											<fileset dir="${project.build.directory}/rpm"
-												includes="*/RPMS/**/*.rpm" />
-											<flattenmapper />
-										</copy>
-									</target>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-<!-- 					<plugin> -->
-<!-- 						<groupId>org.codehaus.mojo</groupId> -->
-<!-- 						<artifactId>exec-maven-plugin</artifactId> -->
-<!-- 						<executions> -->
-<!-- 							<execution> -->
-<!-- 								<phase>install</phase> -->
-<!-- 								<goals> -->
-<!-- 									<goal>exec</goal> -->
-<!-- 								</goals> -->
-<!-- 								<configuration> -->
-<!-- 									<executable>createrepo</executable> -->
-<!-- 									<arguments> -->
-<!-- 										<argument>${rpm.stagingRepository}</argument> -->
-<!-- 									</arguments> -->
-<!-- 								</configuration> -->
-<!-- 							</execution> -->
-<!-- 						</executions> -->
-<!-- 					</plugin> -->
 				</plugins>
 			</build>
 		</profile>
diff --git a/security/features/org.argeo.security.dep.node/p2.inf b/security/features/org.argeo.security.dep.node/p2.inf
new file mode 100644
index 000000000..0423aa509
--- /dev/null
+++ b/security/features/org.argeo.security.dep.node/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file
diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/features/org.argeo.security.dep.node/pom.xml
similarity index 92%
rename from security/dep/org.argeo.security.dep.node/pom.xml
rename to security/features/org.argeo.security.dep.node/pom.xml
index 0c44338c6..8e976cb3d 100644
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/features/org.argeo.security.dep.node/pom.xml
@@ -4,19 +4,24 @@
 	<parent>
 		<groupId>org.argeo.commons.security</groupId>
 		<version>0.3.4-SNAPSHOT</version>
-		<artifactId>dep</artifactId>
+		<artifactId>features</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.security.dep.node</artifactId>
-	<name>Commons Node Dependencies</name>
-	<packaging>pom</packaging>
+	<name>Node Backend</name>
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<version>${version.maven-argeo-osgi}</version>
 				<executions>
+					<execution>
+						<id>generate-descriptors</id>
+						<goals>
+							<goal>descriptors</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
 					<execution>
 						<id>check-osgi</id>
 						<phase>test</phase>
@@ -206,11 +211,26 @@
 
 		<!-- LDAP server -->
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.ads</artifactId>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.dep.ads</artifactId>
 			<version>0.3.4-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.ads.server</artifactId>
+			<version>0.3.4-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.ads</artifactId>
+			<version>0.3.4-SNAPSHOT</version>
+		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.commons.server</groupId> -->
+		<!-- <artifactId>org.argeo.server.json</artifactId> -->
+		<!-- <version>0.3.4-SNAPSHOT</version> -->
+		<!-- </dependency> -->
 
 		<!-- Hibernate -->
 		<dependency>
diff --git a/security/features/pom.xml b/security/features/pom.xml
index d393a6fcc..b535fb1c7 100644
--- a/security/features/pom.xml
+++ b/security/features/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.commons</groupId>
@@ -12,6 +13,8 @@
 	<name>Commons Security Features</name>
 	<packaging>pom</packaging>
 	<modules>
+		<module>org.argeo.security.dep.node</module>
+		<module>org.argeo.security.dep.node.eclipse</module>
 		<module>org.argeo.security.dep.node.rap</module>
 		<module>org.argeo.security.dep.node.rcp</module>
 	</modules>
@@ -25,66 +28,43 @@
 			</resource>
 		</resources>
 		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<configuration>
-					<useLastCommittedRevision>false</useLastCommittedRevision>
-				</configuration>
-			</plugin>
 			<plugin>
 				<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>
-				<configuration>
-					<manifestLocation>META-INF</manifestLocation>
-				</configuration>
 			</plugin>
 		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.argeo.maven.plugins</groupId>
-					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<executions>
-						<execution>
-							<id>resolve-pde-sources</id>
-							<goals>
-								<goal>pde-sources</goal>
-							</goals>
-							<phase>generate-resources</phase>
-						</execution>
-						<execution>
-							<id>generate-descriptors</id>
-							<goals>
-								<goal>descriptors</goal>
-							</goals>
-							<phase>generate-resources</phase>
-						</execution>
-						<execution>
-							<id>check-osgi</id>
-							<phase>test</phase>
-							<goals>
-								<goal>equinox</goal>
-							</goals>
-							<configuration>
-								<onlyCheck>true</onlyCheck>
-								<argsToAppend>
-									<arg>-clean</arg>
-								</argsToAppend>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		
 	</build>
+	<profiles>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>install</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<copy todir="${rpm.stagingRepository}" verbose="true"
+											failonerror="false">
+											<fileset dir="${project.build.directory}/rpm"
+												includes="*/RPMS/**/*.rpm" />
+											<flattenmapper />
+										</copy>
+									</target>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file
diff --git a/security/modules/pom.xml b/security/modules/pom.xml
index 7a05b23dc..def38344d 100644
--- a/security/modules/pom.xml
+++ b/security/modules/pom.xml
@@ -48,21 +48,10 @@
 			<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>
-				<configuration>
-					<manifestLocation>META-INF</manifestLocation>
-					<instructions>
-						<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-					</instructions>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/security/pom.xml b/security/pom.xml
index 9f7925a76..8ec7baeee 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -15,7 +15,7 @@
 		<module>runtime</module>
 		<module>modules</module>
 		<module>plugins</module>
-		<module>dep</module>
+<!-- 		<module>dep</module> -->
 		<module>features</module>
 	</modules>
 </project>
\ No newline at end of file
diff --git a/security/runtime/pom.xml b/security/runtime/pom.xml
index fbe66b119..c232d5b19 100644
--- a/security/runtime/pom.xml
+++ b/security/runtime/pom.xml
@@ -59,7 +59,6 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
index ff70e10ae..65b810d45 100644
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -55,10 +55,6 @@
 			<groupId>javax.xml.rpc</groupId>
 			<artifactId>com.springsource.javax.xml.rpc</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet.jsp</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
-- 
2.30.2