From e512acf089b0c39ae1408c8a92df11536dbfe0d2 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 27 Jun 2011 16:41:40 +0000
Subject: [PATCH] Improve dependency tree

git-svn-id: https://svn.argeo.org/slc/trunk@4629 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 dep/org.argeo.slc.dep.agent/pom.xml           | 106 +++++++++---------
 dep/org.argeo.slc.dep.backend/pom.xml         |   8 +-
 dep/org.argeo.slc.dep.server/pom.xml          |  20 ++++
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../META-INF/MANIFEST.MF                      |   6 +-
 runtime/org.argeo.slc.unit/pom.xml            |  16 ++-
 6 files changed, 93 insertions(+), 65 deletions(-)

diff --git a/dep/org.argeo.slc.dep.agent/pom.xml b/dep/org.argeo.slc.dep.agent/pom.xml
index 1fc280639..1046a9cd0 100644
--- a/dep/org.argeo.slc.dep.agent/pom.xml
+++ b/dep/org.argeo.slc.dep.agent/pom.xml
@@ -11,6 +11,14 @@
 	<artifactId>org.argeo.slc.dep.agent</artifactId>
 	<packaging>jar</packaging>
 	<name>SLC Agent Dependencies</name>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>maven-argeo-osgi-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 	<dependencies>
 		<!-- Commons -->
 		<dependency>
@@ -18,11 +26,11 @@
 			<artifactId>org.argeo.osgi.boot</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>org.argeo.commons.server</groupId>-->
-<!--			<artifactId>org.argeo.server.modeshape</artifactId>-->
-<!--			<version>${version.argeo-commons}</version>-->
-<!--		</dependency>-->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.commons.server</groupId> -->
+		<!-- <artifactId>org.argeo.server.modeshape</artifactId> -->
+		<!-- <version>${version.argeo-commons}</version> -->
+		<!-- </dependency> -->
 
 		<!-- SLC -->
 		<dependency>
@@ -45,11 +53,6 @@
 			<artifactId>org.argeo.slc.support.activemq</artifactId>
 			<version>${version.slc}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.castor</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.ant</artifactId>
@@ -60,42 +63,53 @@
 			<artifactId>org.argeo.slc.support.jcr</artifactId>
 			<version>${version.slc}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.lib.detached</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.launcher</artifactId>
 			<version>${version.slc}</version>
 		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.slc.runtime</groupId> -->
+		<!-- <artifactId>org.argeo.slc.support.maven</artifactId> -->
+		<!-- <version>${version.slc}</version> -->
+		<!-- </dependency> -->
+
+		<!-- Active MQ -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.maven</artifactId>
-			<version>${version.slc}</version>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.dep.activemq</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
 		</dependency>
-
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.activemq</artifactId>
 			<version>${version.argeo-commons}</version>
 			<type>pom</type>
 		</dependency>
-		
-		<!-- JCR -->
 
-		<!-- Spring -->
+		<!-- Javax (JDK 1.5) -->
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.jdbc</artifactId>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.dep.javax</artifactId>
+			<version>0.3.3-SNAPSHOT</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xmlcommons</groupId>
+			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xalan</groupId>
+			<artifactId>com.springsource.org.apache.xalan</artifactId>
 		</dependency>
 
 		<!-- Various third parties -->
 		<dependency>
-			<groupId>org.custommonkey.xmlunit</groupId>
-			<artifactId>com.springsource.org.custommonkey.xmlunit</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.jdbc</artifactId>
 		</dependency>
+		
 		<dependency>
 			<groupId>org.apache.bsf</groupId>
 			<artifactId>com.springsource.org.apache.bsf</artifactId>
@@ -104,25 +118,13 @@
 			<groupId>org.beanshell</groupId>
 			<artifactId>com.springsource.bsh</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>net.sourceforge.jexcelapi</groupId>
-			<artifactId>com.springsource.jxl</artifactId>
-		</dependency>
 
 		<!-- DB Drivers -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.jdbc</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.jdbc</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>com.springsource.org.hsqldb</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>com.springsource.org.h2</artifactId>
@@ -140,29 +142,25 @@
 			<artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
 		</dependency>
 		<!-- Required by the Oracle JDBC driver -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>javax.resource</groupId> -->
-<!-- 			<artifactId>com.springsource.javax.resource</artifactId> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>javax.resource</groupId> -->
+		<!-- <artifactId>com.springsource.javax.resource</artifactId> -->
+		<!-- </dependency> -->
 
 		<!-- Jacob (will be removed soon) -->
-		<dependency>
-			<groupId>org.argeo.dep.jacob</groupId>
-			<artifactId>org.argeo.dep.jacob</artifactId>
-		</dependency>
 		<!-- <dependency> <groupId>org.argeo.dep.jacob</groupId> <artifactId>org.argeo.dep.jacob.win32.x86</artifactId> 
 			</dependency> -->
 		<!-- Languages <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>com.springsource.org.codehaus.groovy</artifactId> 
 			</dependency> -->
 		<!-- ASM -->
-		<dependency>
-			<groupId>org.objectweb.asm</groupId>
-			<artifactId>com.springsource.org.objectweb.asm</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.objectweb.asm</groupId>
-			<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.objectweb.asm</groupId> -->
+		<!-- <artifactId>com.springsource.org.objectweb.asm</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.objectweb.asm</groupId> -->
+		<!-- <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId> -->
+		<!-- </dependency> -->
 
 	</dependencies>
 	<profiles>
diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index 20bec609d..2891b599a 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -10,7 +10,8 @@
 
 	<groupId>org.argeo.slc.dep</groupId>
 	<artifactId>org.argeo.slc.dep.backend</artifactId>
-	<name>SLC BACKEND Dependencies</name>
+	<name>SLC Backend Dependencies</name>
+	<description>Shared by RAP and pure server</description>
 	<build>
 		<plugins>
 			<plugin>
@@ -49,6 +50,11 @@
 			<artifactId>org.argeo.slc.support.jcr</artifactId>
 			<version>${version.slc}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.activemq</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
 
 		<!-- SLC Agent Modules -->
 		<dependency>
diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index c59c89cc8..918441472 100644
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -11,6 +11,14 @@
 	<artifactId>org.argeo.slc.dep.server</artifactId>
 	<packaging>jar</packaging>
 	<name>SLC Server Dependencies</name>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>maven-argeo-osgi-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 	<dependencies>
 		<!-- Other deps -->
 		<dependency>
@@ -24,6 +32,11 @@
 			<artifactId>org.argeo.slc.support.hibernate</artifactId>
 			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.castor</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
+		</dependency>
 
 		<!-- SLC non deps -->
 		<dependency>
@@ -101,6 +114,13 @@
 			<type>pom</type>
 		</dependency>
 
+		<!-- Javax (JDK 1.5) -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.dep.javax</artifactId>
+			<version>0.3.3-SNAPSHOT</version>
+			<type>pom</type>
+		</dependency>
 
 		<!-- Jackrabbit -->
 		<dependency>
diff --git a/modules/agent/org.argeo.slc.agent.jms/META-INF/MANIFEST.MF b/modules/agent/org.argeo.slc.agent.jms/META-INF/MANIFEST.MF
index 9c2c9724f..6fa6ee60c 100644
--- a/modules/agent/org.argeo.slc.agent.jms/META-INF/MANIFEST.MF
+++ b/modules/agent/org.argeo.slc.agent.jms/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Require-Bundle: org.argeo.slc.specs,
  org.argeo.slc.core,
  org.argeo.slc.support.activemq,
- com.springsource.org.castor
+ com.springsource.org.castor;resolution:=optional
 Bundle-Version: 0.13.1.SNAPSHOT
 Bundle-Name: SLC Agent JMS
 Bundle-SymbolicName: org.argeo.slc.agent.jms
diff --git a/modules/agent/org.argeo.slc.ext.activemq/META-INF/MANIFEST.MF b/modules/agent/org.argeo.slc.ext.activemq/META-INF/MANIFEST.MF
index 55163b330..1df9886ab 100644
--- a/modules/agent/org.argeo.slc.ext.activemq/META-INF/MANIFEST.MF
+++ b/modules/agent/org.argeo.slc.ext.activemq/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Import-Package: org.argeo.slc.runtime,
  org.argeo.slc.process,
  org.argeo.slc.runtime,
  org.argeo.slc.test,
- org.argeo.slc.xml.process,
- org.argeo.slc.xml.test.tree,
- org.hibernate.collection
+ org.argeo.slc.xml.process;resolution:=optional,
+ org.argeo.slc.xml.test.tree;resolution:=optional,
+ org.hibernate.collection;resolution:=optional
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/runtime/org.argeo.slc.unit/pom.xml b/runtime/org.argeo.slc.unit/pom.xml
index 5e49cb667..8e609a0fd 100644
--- a/runtime/org.argeo.slc.unit/pom.xml
+++ b/runtime/org.argeo.slc.unit/pom.xml
@@ -21,12 +21,12 @@
 						<Export-Package>
 							org.argeo.slc.*,org.argeo.slc.core.test.spring
 						</Export-Package>
-						<Import-Package>*,org.apache.commons.logging;version="1.1",
-							org.dbunit;resolution:="optional",
-							org.dbunit.database;resolution:="optional",
-							org.dbunit.dataset;resolution:="optional",
-							org.dbunit.dataset.xml;resolution:="optional",
-							org.dbunit.operation;resolution:="optional"
+						<Import-Package>org.apache.commons.logging;version="1.1",
+							org.dbunit.*;resolution:="optional",
+							org.hibernate.*;resolution:="optional",
+							org.springframework.xml.*;resolution:="optional",
+							org.springframework.orm.*;resolution:="optional",
+							*
 						</Import-Package>
 					</instructions>
 				</configuration>
@@ -54,20 +54,24 @@
 		<dependency>
 			<groupId>org.dbunit</groupId>
 			<artifactId>com.springsource.org.dbunit</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>com.springsource.org.apache.commons.collections</artifactId>
+			<optional>true</optional>
 		</dependency>
 
 		<!-- Hibernate -->
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>com.springsource.org.hibernate</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.orm</artifactId>
+			<optional>true</optional>
 		</dependency>
 
 		<!-- OSGi -->
-- 
2.39.2