From c7602e29dc1ddf30ee351db42b44d125a3a7422e Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 30 Mar 2011 17:33:18 +0000
Subject: [PATCH] Improve dependencies

git-svn-id: https://svn.argeo.org/commons/trunk@4409 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../dep/org.argeo.security.dep.node/pom.xml   | 92 ++++++-------------
 .../org.argeo.security.dep.node.rap/pom.xml   | 62 +++++++++++++
 .../org.argeo.security.dep.node.rcp/pom.xml   | 50 +++++-----
 3 files changed, 121 insertions(+), 83 deletions(-)

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index 11e3a584b..a02086a7f 100644
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -39,38 +39,28 @@
 			<version>0.3.2-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
+
+		<!-- Javax -->
 		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.javax</artifactId>
-			<version>0.3.2-SNAPSHOT</version>
-			<type>pom</type>
+			<groupId>javax.xml.soap</groupId>
+			<artifactId>com.springsource.javax.xml.soap</artifactId>
 		</dependency>
-		<!-- Argeo Security -->
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.core</artifactId>
-			<version>0.3.2-SNAPSHOT</version>
+			<groupId>javax.activation</groupId>
+			<artifactId>com.springsource.javax.activation</artifactId>
 		</dependency>
+
+		<!-- Argeo Security -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.ldap</artifactId>
+			<artifactId>org.argeo.security.core</artifactId>
 			<version>0.3.2-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.services</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.mvc</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dao.ldap</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
 
 		<!-- Xerces and Xalan -->
 		<dependency>
@@ -84,38 +74,14 @@
 
 		<!-- Spring -->
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web.extender</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.jdbc</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web</artifactId>
+			<artifactId>org.springframework.osgi.extender</artifactId>
 		</dependency>
 
-		<!-- Tomcat -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.tomcat</artifactId>
-			<version>0.3.2-SNAPSHOT</version>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.webextender</artifactId>
-			<version>0.3.2-SNAPSHOT</version>
-		</dependency>
-		<!-- Active MQ -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.activemq</artifactId>
-			<version>0.3.2-SNAPSHOT</version>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.activemq</artifactId>
-			<version>0.3.2-SNAPSHOT</version>
-		</dependency>
 		<!-- Jackrabbit -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
@@ -129,24 +95,28 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.jcr.mvc</artifactId>
-			<version>0.3.2-SNAPSHOT</version>
+			<artifactId>org.argeo.node.repo.jackrabbit</artifactId>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.jackrabbit.webapp</artifactId>
+			<artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
+
+		<!-- Active MQ -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.node.repo.jackrabbit</artifactId>
-			<version>${version.argeo-commons}</version>
+			<artifactId>org.argeo.server.dep.activemq</artifactId>
+			<version>0.3.2-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
-			<version>${version.argeo-commons}</version>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.activemq</artifactId>
+			<version>0.3.2-SNAPSHOT</version>
 		</dependency>
+
 		<!-- Hibernate -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
@@ -154,7 +124,13 @@
 			<version>0.3.2-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
+
 		<!-- DB drivers -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.jdbc</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>com.springsource.org.h2</artifactId>
@@ -167,13 +143,5 @@
 			<groupId>org.postgresql</groupId>
 			<artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
 		</dependency>
-		<!-- LDAP server (target platform generation only) -->
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.ads</artifactId>
-			<version>0.3.2-SNAPSHOT</version>
-			<type>pom</type>
-			<scope>test</scope>
-		</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 f2eea5f2f..624995809 100644
--- a/security/features/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rap/pom.xml
@@ -60,6 +60,68 @@
 			<artifactId>org.argeo.security.ui.rap</artifactId>
 			<version>0.3.2-SNAPSHOT</version>
 		</dependency>
+		
+		<!-- Javax -->
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>com.springsource.javax.annotation</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.ws</groupId>
+			<artifactId>com.springsource.javax.xml.ws</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>com.springsource.javax.xml.bind</artifactId>
+		</dependency>
+		
+		<!-- Security -->
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.dao.ldap</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.ldap</artifactId>
+			<version>0.3.2-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.services</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		
+		<!-- Web -->
+		<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>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.dep.tomcat</artifactId>
+			<version>0.3.2-SNAPSHOT</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.webextender</artifactId>
+			<version>0.3.2-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.jcr.mvc</artifactId>
+			<version>0.3.2-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.jackrabbit.webapp</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
 
 		<!-- For Tomcat deployment -->
 		<dependency>
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 16d44d48b..572ca56c1 100644
--- a/security/features/org.argeo.security.dep.node.rcp/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rcp/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>
@@ -15,26 +16,26 @@
 				<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>-->
+			<!-- <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>
@@ -50,6 +51,13 @@
 			<version>0.3.2-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>
-- 
2.30.2