From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 27 Feb 2011 13:30:28 +0000 (+0000)
Subject: Improve Commons structure
X-Git-Tag: argeo-commons-2.1.30~1405
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=b46c1ca856b052eedfa8022726d64eaeb680673c;p=lgpl%2Fargeo-commons.git

Improve Commons structure

git-svn-id: https://svn.argeo.org/commons/trunk@4229 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/eclipse/pom.xml b/eclipse/pom.xml
index 286eb65c6..3d2291c39 100644
--- a/eclipse/pom.xml
+++ b/eclipse/pom.xml
@@ -13,7 +13,6 @@
 	<packaging>pom</packaging>
 	<modules>
 		<module>features</module>
-		<module>plugins</module>
 		<module>runtime</module>
 	</modules>
 </project>
\ No newline at end of file
diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/pom.xml b/gis/plugins/org.argeo.gis.ui.rap.openlayers/pom.xml
new file mode 100644
index 000000000..a388d4f20
--- /dev/null
+++ b/gis/plugins/org.argeo.gis.ui.rap.openlayers/pom.xml
@@ -0,0 +1,55 @@
+<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.gis</groupId>
+		<version>0.2.3-SNAPSHOT</version>
+		<artifactId>plugins</artifactId>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.gis.ui.rap.openlayers</artifactId>
+	<name>Commons GIS RAP OpenLayers</name>
+	<packaging>jar</packaging>
+	<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-jar-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<!-- Commons -->
+		<dependency>
+			<groupId>org.argeo.commons.basic</groupId>
+			<artifactId>org.argeo.basic.nodeps</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.gis</groupId>
+			<artifactId>org.argeo.gis.ui</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+		</dependency>
+
+		<!-- OpenLayers RAP widget -->
+		<dependency>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.polymap.openlayers.rap.widget</artifactId>
+		</dependency>
+
+		<!-- RCP only dependency, needed at compile time -->
+		<dependency>
+			<groupId>org.argeo.commons.eclipse</groupId>
+			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/gis/plugins/org.argeo.gis.ui/pom.xml b/gis/plugins/org.argeo.gis.ui/pom.xml
new file mode 100644
index 000000000..b2d9182dc
--- /dev/null
+++ b/gis/plugins/org.argeo.gis.ui/pom.xml
@@ -0,0 +1,63 @@
+<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.gis</groupId>
+		<version>0.2.3-SNAPSHOT</version>
+		<artifactId>plugins</artifactId>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.gis.ui</artifactId>
+	<name>Commons GIS UI</name>
+	<packaging>jar</packaging>
+	<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-jar-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.commons.gis</groupId>
+			<artifactId>org.argeo.gis.geotools</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+		</dependency>
+
+		<!-- Commons -->
+		<dependency>
+			<groupId>org.argeo.commons.basic</groupId>
+			<artifactId>org.argeo.basic.nodeps</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.eclipse</groupId>
+			<artifactId>org.argeo.eclipse.ui</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+		</dependency>
+
+		<!-- RCP only dependency, needed at compile time -->
+		<dependency>
+			<groupId>org.argeo.commons.eclipse</groupId>
+			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>com.springsource.slf4j.org.apache.commons.logging
+			</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/gis/plugins/pom.xml b/gis/plugins/pom.xml
index b8c4c7b95..92a10f5b8 100644
--- a/gis/plugins/pom.xml
+++ b/gis/plugins/pom.xml
@@ -13,6 +13,7 @@
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.argeo.gis.ui</module>
+		<module>org.argeo.gis.ui.rap.openlayers</module>
 	</modules>
 	<build>
 		<resources>
diff --git a/gis/pom.xml b/gis/pom.xml
index 15b200c7c..30ec9b11a 100644
--- a/gis/pom.xml
+++ b/gis/pom.xml
@@ -11,6 +11,7 @@
 	<name>Commons GIS</name>
 	<packaging>pom</packaging>
 	<modules>
+		<module>runtime</module>
 		<module>plugins</module>
 	</modules>
 </project>
\ No newline at end of file
diff --git a/gis/runtime/org.argeo.gis.geotools/.classpath b/gis/runtime/org.argeo.gis.geotools/.classpath
new file mode 100644
index 000000000..92f19d2ff
--- /dev/null
+++ b/gis/runtime/org.argeo.gis.geotools/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/gis/runtime/org.argeo.gis.geotools/.project b/gis/runtime/org.argeo.gis.geotools/.project
new file mode 100644
index 000000000..cda213272
--- /dev/null
+++ b/gis/runtime/org.argeo.gis.geotools/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.gis.geotools</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/gis/runtime/org.argeo.gis.geotools/.settings/org.eclipse.jdt.core.prefs b/gis/runtime/org.argeo.gis.geotools/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..eae900349
--- /dev/null
+++ b/gis/runtime/org.argeo.gis.geotools/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Sun Feb 27 13:54:27 CET 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/gis/runtime/org.argeo.gis.geotools/.settings/org.eclipse.pde.core.prefs b/gis/runtime/org.argeo.gis.geotools/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 000000000..e1d9a7827
--- /dev/null
+++ b/gis/runtime/org.argeo.gis.geotools/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Sun Feb 27 13:54:27 CET 2011
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/gis/runtime/org.argeo.gis.geotools/build.properties b/gis/runtime/org.argeo.gis.geotools/build.properties
new file mode 100644
index 000000000..5fc538bc8
--- /dev/null
+++ b/gis/runtime/org.argeo.gis.geotools/build.properties
@@ -0,0 +1,4 @@
+source.. = src/main/java/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .
diff --git a/gis/runtime/org.argeo.gis.geotools/pom.xml b/gis/runtime/org.argeo.gis.geotools/pom.xml
new file mode 100644
index 000000000..46168eb9d
--- /dev/null
+++ b/gis/runtime/org.argeo.gis.geotools/pom.xml
@@ -0,0 +1,134 @@
+<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.gis</groupId>
+		<artifactId>runtime</artifactId>
+		<version>0.2.3-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.gis.geotools</artifactId>
+	<name>Commons GIS Geotools</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-jar-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${version.maven-bundle-plugin}</version>
+				<configuration>
+					<instructions>
+						<Export-Package>org.argeo.geotools.*</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<version>${version.maven-argeo-osgi}</version>
+				<executions>
+					<execution>
+						<id>check-osgi</id>
+						<phase>test</phase>
+						<goals>
+							<goal>equinox</goal>
+						</goals>
+						<configuration>
+							<onlyCheck>true</onlyCheck>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<!-- Geotools -->
+		<dependency>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.geotools</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.jts</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.geoapi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jdom</groupId>
+			<artifactId>com.springsource.org.jdom</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jaxen</groupId>
+			<artifactId>com.springsource.org.jaxen</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.jsr275</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.java3d</artifactId>
+		</dependency>
+		<!-- Apache Commons -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.beanutils</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.lang</artifactId>
+		</dependency>
+		<!-- JAI -->
+		<dependency>
+			<groupId>javax.media.jai</groupId>
+			<artifactId>com.springsource.javax.media.jai.core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.media.jai</groupId>
+			<artifactId>com.springsource.javax.media.jai.codec</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.jai.imageio</artifactId>
+		</dependency>
+
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>com.springsource.slf4j.org.apache.commons.logging
+			</artifactId>
+		</dependency>
+
+		<!-- OSGi test -->
+		<dependency>
+			<groupId>org.argeo.commons.osgi</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>${version.argeo-commons}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.basic</groupId>
+			<artifactId>org.argeo.basic.dep.log4j</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/gis/runtime/pom.xml b/gis/runtime/pom.xml
new file mode 100644
index 000000000..3cd51e1be
--- /dev/null
+++ b/gis/runtime/pom.xml
@@ -0,0 +1,62 @@
+<?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">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.commons</groupId>
+		<version>0.2.3-SNAPSHOT</version>
+		<artifactId>gis</artifactId>
+		<relativePath>..</relativePath>
+	</parent>
+	<groupId>org.argeo.commons.gis</groupId>
+	<artifactId>runtime</artifactId>
+	<name>Commons GIS Runtime</name>
+	<packaging>pom</packaging>
+	<modules>
+		<module>org.argeo.gis.geotools</module>
+	</modules>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>META-INF/**</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>META-INF</directory>
+							<includes>
+								<include>MANIFEST.MF</include>
+							</includes>
+						</fileset>
+					</filesets>
+				</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.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/osgi/dep/org.argeo.osgi.dep.stdruntime/pom.xml b/osgi/dep/org.argeo.osgi.dep.stdruntime/pom.xml
index a54fbe40f..0ee4efc27 100644
--- a/osgi/dep/org.argeo.osgi.dep.stdruntime/pom.xml
+++ b/osgi/dep/org.argeo.osgi.dep.stdruntime/pom.xml
@@ -14,13 +14,13 @@
 		<dependency>
 			<groupId>org.argeo.commons.osgi</groupId>
 			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>${project.version}</version>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 		<!--  Logging -->
 		<dependency>
 			<groupId>org.argeo.commons.basic</groupId>
 			<artifactId>org.argeo.basic.dep.log4j</artifactId>
-			<version>${project.version}</version>
+			<version>${version.argeo-commons}</version>
 			<type>pom</type>
 		</dependency>
 		<!-- Spring OSGi -->
diff --git a/pom.xml b/pom.xml
index fa06f0529..2cf560d38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,8 +73,9 @@ limitations under the License.
 		<module>basic</module>
 		<module>osgi</module>
 		<module>server</module>
-		<module>security</module>
 		<module>eclipse</module>
+		<module>security</module>
+		<module>gis</module>
 		<module>sandbox</module>
 	</modules>
 	<build>
diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
new file mode 100644
index 000000000..fa40e2525
--- /dev/null
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -0,0 +1,129 @@
+<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.2.3-SNAPSHOT</version>
+		<artifactId>dep</artifactId>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.security.dep.node</artifactId>
+	<name>Commons Argeo Node Dependencies</name>
+	<packaging>pom</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<version>${version.maven-argeo-osgi}</version>
+				<executions>
+					<execution>
+						<id>check-osgi</id>
+						<phase>test</phase>
+						<goals>
+							<goal>equinox</goal>
+						</goals>
+						<configuration>
+							<onlyCheck>true</onlyCheck>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<!-- Base runtime -->
+		<dependency>
+			<groupId>org.argeo.commons.osgi</groupId>
+			<artifactId>org.argeo.osgi.dep.stdruntime</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.dep.javax</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xmlcommons</groupId>
+			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+		</dependency>
+		<!-- LDAP server and security services -->
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.dep.ads</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
+		</dependency>
+		<!-- Tomcat -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.dep.tomcat</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.web.extender</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.web</artifactId>
+		</dependency>
+		<!-- Active MQ -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.dep.activemq</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
+		</dependency>
+		<!-- Jackrabbit -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.jackrabbit</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.jcr.mvc</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.dep.jackrabbit.server</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.jackrabbit.webapp</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.node.repo.jackrabbit</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		<!-- Hibernate -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.dep.hibernate</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
+		</dependency>
+		<!-- DB drivers -->
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>com.springsource.org.h2</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.mysql.jdbc</groupId>
+			<artifactId>com.springsource.com.mysql.jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/security/dep/pom.xml b/security/dep/pom.xml
index f35a007f0..c60a6b2f1 100644
--- a/security/dep/pom.xml
+++ b/security/dep/pom.xml
@@ -14,5 +14,6 @@
 	<modules>
 		<module>org.argeo.security.dep.ldap</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/eclipse/pom.xml b/security/eclipse/pom.xml
deleted file mode 100644
index 31fb04523..000000000
--- a/security/eclipse/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.argeo.commons</groupId>
-		<version>0.2.3-SNAPSHOT</version>
-		<artifactId>security</artifactId>
-		<relativePath>..</relativePath>
-	</parent>
-	<groupId>org.argeo.commons.security</groupId>
-	<artifactId>eclipse</artifactId>
-	<name>Commons Security Eclipse</name>
-	<packaging>pom</packaging>
-	<modules>
-		<!-- <module>features</module> -->
-		<module>plugins</module>
-	</modules>
-</project>
\ No newline at end of file
diff --git a/security/plugins/org.argeo.security.ui.application/pom.xml b/security/plugins/org.argeo.security.ui.application/pom.xml
index e66484841..1f55666c1 100644
--- a/security/plugins/org.argeo.security.ui.application/pom.xml
+++ b/security/plugins/org.argeo.security.ui.application/pom.xml
@@ -77,19 +77,19 @@
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.ui</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.equinox</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 
 		<!-- Argeo Eclipse distribution (common dependencies for both RAP and RCP) -->
 		<dependency>
 			<groupId>org.argeo.commons.eclipse</groupId>
 			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
+			<version>${version.argeo-commons}</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -97,7 +97,7 @@
 		<dependency>
 			<groupId>org.argeo.commons.basic</groupId>
 			<artifactId>org.argeo.basic.nodeps</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 
 
@@ -106,12 +106,11 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
 		</dependency>
-
-		<!-- For testing and target platform generation -->
-		<!--  LDAP server and security services -->
+		
+		<!-- Target platform generation -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.ads</artifactId>
+			<artifactId>org.argeo.security.dep.node</artifactId>
 			<version>${version.argeo-commons}</version>
 			<type>pom</type>
 			<scope>test</scope>
diff --git a/security/plugins/org.argeo.security.ui.rap/pom.xml b/security/plugins/org.argeo.security.ui.rap/pom.xml
index 764c63f1c..067e16e15 100644
--- a/security/plugins/org.argeo.security.ui.rap/pom.xml
+++ b/security/plugins/org.argeo.security.ui.rap/pom.xml
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.ui.application</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
+			<version>${version.argeo-commons}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.argeo.commons.eclipse</groupId>
@@ -75,58 +75,16 @@
 		<dependency>
 			<groupId>org.argeo.commons.eclipse</groupId>
 			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
-		</dependency>
-
-
-		<!-- TODO: factorize with application.ui -->
-		<!-- For testing and target platform generation -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.ads.server</artifactId>
 			<version>${version.argeo-commons}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.services</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.ldap</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>test</scope>
 		</dependency>
+
+		<!-- Target platform generation -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.manager.ldap</artifactId>
+			<artifactId>org.argeo.security.dep.node</artifactId>
 			<version>${version.argeo-commons}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.ads</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.basic</groupId>
-			<artifactId>org.argeo.basic.dep.log4j</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
 			<type>pom</type>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>net.sourceforge.jdbm</groupId>
-			<artifactId>com.springsource.jdbm</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/security/plugins/pom.xml b/security/plugins/pom.xml
index ab837feb5..71a536b46 100644
--- a/security/plugins/pom.xml
+++ b/security/plugins/pom.xml
@@ -1,13 +1,15 @@
-<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.security</groupId>
+	<groupId>org.argeo.commons</groupId>
 		<version>0.2.3-SNAPSHOT</version>
-		<artifactId>eclipse</artifactId>
+		<artifactId>security</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
+	<groupId>org.argeo.commons.security</groupId>
 	<artifactId>plugins</artifactId>
-	<name>Commons Security Eclipse plugins</name>
+	<name>Commons Security Eclipse Plugins</name>
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.argeo.security.equinox</module>
diff --git a/security/pom.xml b/security/pom.xml
index c06486aee..bc3859e07 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -13,7 +13,7 @@
 	<modules>
 		<module>runtime</module>
 		<module>modules</module>
-		<module>eclipse</module>
+		<module>plugins</module>
 		<module>dep</module>
 		<module>demo</module>
 	</modules>
diff --git a/security/runtime/pom.xml b/security/runtime/pom.xml
index 23e8ddd4f..c04649e6f 100644
--- a/security/runtime/pom.xml
+++ b/security/runtime/pom.xml
@@ -46,11 +46,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>
@@ -65,24 +60,6 @@
 				<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>
diff --git a/server/plugins/org.argeo.jcr.ui.explorer/pom.xml b/server/plugins/org.argeo.jcr.ui.explorer/pom.xml
index d63fd3c9f..16aabfad7 100644
--- a/server/plugins/org.argeo.jcr.ui.explorer/pom.xml
+++ b/server/plugins/org.argeo.jcr.ui.explorer/pom.xml
@@ -2,7 +2,7 @@
 	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.eclipse</groupId>
+		<groupId>org.argeo.commons.server</groupId>
 		<version>0.2.3-SNAPSHOT</version>
 		<artifactId>plugins</artifactId>
 		<relativePath>..</relativePath>
@@ -61,102 +61,13 @@
 			<scope>provided</scope>
 		</dependency>
 
-
 		<!-- Testing and target platform -->
-		<dependency>
-			<groupId>org.argeo.commons.osgi</groupId>
-			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.javax</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xmlcommons</groupId>
-			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<!-- LDAP server and security services -->
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.ads</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.ui.application</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>test</scope>
-		</dependency>
-		<!-- Tomcat -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.tomcat</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web.extender</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web</artifactId>
-		</dependency>
-		<!-- Jackrabbit -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.jackrabbit</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.jcr.mvc</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.jackrabbit.server</artifactId>
+			<artifactId>org.argeo.server.dep.node</artifactId>
 			<version>${version.argeo-commons}</version>
 			<type>pom</type>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.jackrabbit.webapp</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.node.repo.jackrabbit</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>com.springsource.org.h2</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.mysql.jdbc</groupId>
-			<artifactId>com.springsource.com.mysql.jdbc</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.postgresql</groupId>
-			<artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml
index 3b7006a5d..4c0f91fd9 100644
--- a/server/plugins/pom.xml
+++ b/server/plugins/pom.xml
@@ -1,13 +1,15 @@
-<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.eclipse</groupId>
+		<groupId>org.argeo.commons</groupId>
 		<version>0.2.3-SNAPSHOT</version>
-		<artifactId>eclipse</artifactId>
+		<artifactId>server</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
+	<groupId>org.argeo.commons.server</groupId>
 	<artifactId>plugins</artifactId>
-	<name>Commons Eclipse plugins</name>
+	<name>Commons Server Eclipse Plugins</name>
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.argeo.jcr.ui.explorer</module>
diff --git a/server/runtime/org.argeo.server.jcr/pom.xml b/server/runtime/org.argeo.server.jcr/pom.xml
index 3137dfd6c..415c4fd05 100644
--- a/server/runtime/org.argeo.server.jcr/pom.xml
+++ b/server/runtime/org.argeo.server.jcr/pom.xml
@@ -29,10 +29,7 @@
 				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
 					<instructions>
-						<Export-Package>
-							org.argeo.jcr.*,
-							org.argeo.server.jcr.*
-						</Export-Package>
+						<Export-Package>org.argeo.jcr.*</Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>
diff --git a/server/runtime/pom.xml b/server/runtime/pom.xml
index 0a954944b..d37ce76d3 100644
--- a/server/runtime/pom.xml
+++ b/server/runtime/pom.xml
@@ -52,11 +52,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>
@@ -69,26 +64,7 @@
 			<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>