From a80cd4f2a698abcb81c5034359618c91dd698d30 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 13 Oct 2011 11:21:06 +0000
Subject: [PATCH] Factorize more features in node

git-svn-id: https://svn.argeo.org/commons/trunk@4822 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../dep/org.argeo.security.dep.node/pom.xml   | 52 ++++++++++++++-----
 .../org.argeo.security.dep.node.rap/pom.xml   | 34 ------------
 .../org.argeo.security.dep.node.rcp/pom.xml   | 36 -------------
 security/plugins/pom.xml                      | 11 ++--
 4 files changed, 43 insertions(+), 90 deletions(-)

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index c73ccc453..1c0217cc9 100644
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/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.commons.security</groupId>
@@ -39,16 +40,6 @@
 			<type>pom</type>
 		</dependency>
 
-		<!-- Javax -->
-		<dependency>
-			<groupId>javax.xml.soap</groupId>
-			<artifactId>com.springsource.javax.xml.soap</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>com.springsource.javax.activation</artifactId>
-		</dependency>
-
 		<!-- Argeo Security -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
@@ -118,6 +109,14 @@
 		</dependency>
 
 		<!-- Javax -->
+		<dependency>
+			<groupId>javax.xml.soap</groupId>
+			<artifactId>com.springsource.javax.xml.soap</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>com.springsource.javax.activation</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>com.springsource.javax.annotation</artifactId>
@@ -131,7 +130,7 @@
 			<artifactId>com.springsource.javax.xml.bind</artifactId>
 		</dependency>
 
-		<!-- Security -->
+		<!-- Security (LDAP) -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.dao.ldap</artifactId>
@@ -148,6 +147,13 @@
 			<version>${version.argeo-commons}</version>
 		</dependency>
 
+		<!-- Security (Jackrabbit) -->
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.dao.jackrabbit</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+
 		<!-- Web -->
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
@@ -179,6 +185,21 @@
 			<version>${version.argeo-commons}</version>
 		</dependency>
 
+		<!-- Default Tomcat conf -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.tomcat</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+
+		<!-- LDAP server -->
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.dep.ads</artifactId>
+			<version>0.3.4-SNAPSHOT</version>
+			<type>pom</type>
+		</dependency>
+
 		<!-- Hibernate -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
@@ -200,5 +221,12 @@
 			<groupId>org.postgresql</groupId>
 			<artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
 		</dependency>
+
+		<!-- Software development -->
+		<dependency>
+			<groupId>org.argeo.commons.basic</groupId>
+			<artifactId>org.argeo.support.junit</artifactId>
+			<version>0.3.4-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
 </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 c51c4894c..20503e9d3 100644
--- a/security/features/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rap/pom.xml
@@ -16,24 +16,6 @@
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
 			</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>
@@ -74,21 +56,5 @@
 			<version>${version.argeo-commons}</version>
 		</dependency>
 
-		<!-- Default Tomcat conf (for development) -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.tomcat</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- LDAP server (target platform generation only) -->
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.ads</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-			<type>pom</type>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </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 64bc129f7..e9e488b59 100644
--- a/security/features/org.argeo.security.dep.node.rcp/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rcp/pom.xml
@@ -16,26 +16,6 @@
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
 			</plugin>
-			<!-- <plugin> -->
-			<!-- <groupId>org.apache.maven.plugins</groupId> -->
-			<!-- <artifactId>maven-assembly-plugin</artifactId> -->
-			<!-- <configuration> -->
-			<!-- <descriptors> -->
-			<!-- <descriptor>src/assembly/win32.x86.xml</descriptor> -->
-			<!-- <descriptor>src/assembly/linux.x86.xml</descriptor> -->
-			<!-- <descriptor>src/assembly/linux.x86_64.xml</descriptor> -->
-			<!-- </descriptors> -->
-			<!-- </configuration> -->
-			<!-- <executions> -->
-			<!-- <execution> -->
-			<!-- <id>attach-assembly</id> -->
-			<!-- <phase>package</phase> -->
-			<!-- <goals> -->
-			<!-- <goal>single</goal> -->
-			<!-- </goals> -->
-			<!-- </execution> -->
-			<!-- </executions> -->
-			<!-- </plugin> -->
 		</plugins>
 	</build>
 	<dependencies>
@@ -56,13 +36,6 @@
 			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Security -->
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dao.jackrabbit</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-
 		<!-- Basis -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
@@ -75,14 +48,5 @@
 			<artifactId>org.argeo.security.ui.rcp</artifactId>
 			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
-
-		<!-- SDK -->
-		<dependency>
-			<groupId>org.argeo.commons.basic</groupId>
-			<artifactId>org.argeo.support.junit</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-
 	</dependencies>
 </project>
diff --git a/security/plugins/pom.xml b/security/plugins/pom.xml
index 77555ab7f..4becfbdf8 100644
--- a/security/plugins/pom.xml
+++ b/security/plugins/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.commons</groupId>
@@ -50,11 +51,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>
@@ -75,9 +71,8 @@
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
 				<configuration>
-					<manifestLocation>META-INF</manifestLocation>
 					<instructions>
-						<Bundle-SymbolicName>${pom.artifactId};singleton:=true</Bundle-SymbolicName>
+						<Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
 					</instructions>
 				</configuration>
 			</plugin>
-- 
2.39.2