From d6889bc95bf28f5ed1a0afda43cceb75949f4495 Mon Sep 17 00:00:00 2001
From: Brian Rosenberger <bru@brutex.de>
Date: Tue, 26 Nov 2013 17:49:53 +0000
Subject: [PATCH] Update IVY dependency management to make use of ivy
 configurations

git-svn-id: https://brutex.net/svn/xservices/trunk@142 e7e49efb-446e-492e-b9ec-fcafc1997a86
---
 ivy.xml                  | 60 ++++++++++++++++++++++++++++------------
 ivysettings.xml          | 34 +++++++++++++++--------
 web/META-INF/MANIFEST.MF |  3 ++
 3 files changed, 68 insertions(+), 29 deletions(-)
 create mode 100644 web/META-INF/MANIFEST.MF

diff --git a/ivy.xml b/ivy.xml
index 7fb33ed..bfbb87f 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -15,13 +15,27 @@
 	<info organisation="Brutex Network" module="XServices" status="integration">
 	</info>
 
-	<dependencies>
+	<configurations>
+		<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
+		<conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
+		<conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths." extends="master"/>
+		<conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
+		<conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
+		<conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." extends="runtime"/>
+		<conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/>
+		<conf name="sources" visibility="public" description="this configuration contains the source artifact of this module, if any."/>
+		<conf name="javadoc" visibility="public" description="this configuration contains the javadoc artifact of this module, if any."/>
+		<conf name="optional" visibility="public" description="contains all optional dependencies"/>
+	</configurations>
+	
+
+	<dependencies defaultconf="*->#(master),master(*)">
 
 		<dependency org="com.sun.xml.bind" name="jaxb-impl" rev="2.2.7"/>    
             
 		<dependency org="org.apache.commons" name="commons-lang3" rev="3.1"/>
-		<dependency org="commons-configuration" name="commons-configuration" rev="1.9"/>
-		<dependency org="commons-net" name="commons-net" rev="3.2" />
+		<dependency org="commons-configuration" name="commons-configuration" rev="1.10"/>
+		<dependency org="commons-net" name="commons-net" rev="3.2"/>
 		
 		<dependency org="org.apache.ant" name="ant" rev="1.8.4"/>
 		<dependency org="org.apache.ant" name="ant-nodeps" rev="1.8.1"/>
@@ -29,42 +43,52 @@
 		<!--<dependency org="ant-contrib" name="ant-contrib" rev="20020829"/>-->
 		<dependency org="org.apache.ant" name="ant-commons-net" rev="1.8.4"/>
             
-		
-		<dependency org="jcs" name="jcs" rev="1.3"/>
+		<!-- JCS does not define scopes in its pom.xml, thus map any configuration to default -->
+		<dependency org="jcs" name="jcs" rev="1.3" transitive="false" conf="*->default"/>
             
-        <dependency org="org.quartz-scheduler" name="quartz" rev="2.2.0" transitive="false"/>
+        <dependency org="org.quartz-scheduler" name="quartz" rev="2.2.0"/>
             
-        <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false"/>
+        <dependency org="log4j" name="log4j" rev="1.2.17"/>
 
         <dependency org="org.apache.ws.commons.axiom" name="axiom-api" rev="1.2.14"/>
-        <dependency org="org.apache.ws.commons.axiom" name="axiom-impl" rev="1.2.14" transitive="false"/>
+        <dependency org="org.apache.ws.commons.axiom" name="axiom-impl" rev="1.2.14"/>
+        
+        <dependency org="jaxen" name="jaxen" rev="1.1.4"/>
+        
         
         <dependency org="org.apache.cxf" name="cxf-rt-core" rev="2.7.0"/>
         <dependency org="org.apache.cxf" name="cxf-rt-transports-http" rev="2.7.0"/>
+        <dependency org="org.apache.cxf" name="cxf-rt-databinding-aegis" rev="2.7.0"/>
+        <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxrs" rev="2.7.0"/>
+                 
+   		<dependency org="rhino" name="js" rev="1.7R2"/>
             
-        <!-- <dependency org="org.apache.cxf" name="cxf-api" rev="2.7.0"/> -->
+
+        <!--
+        <dependency org="org.apache.cxf" name="cxf-bundle" rev="2.7.0"/>
+        <dependency org="org.apache.cxf" name="cxf-api" rev="2.7.0"/>
         <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxws" rev="2.7.0"/>
         <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxrs" rev="2.7.0"/>
         <dependency org="org.apache.cxf" name="cxf-rt-bindings-soap" rev="2.7.0"/>
-        <dependency org="org.apache.cxf" name="cxf-bundle" rev="2.7.0"/>
         <dependency org="org.apache.cxf" name="cxf-rt-databinding-jaxb" rev="2.7.0"/>
+        -->
             
-        <dependency org="org.springframework" name="spring-web" rev="3.0.7.RELEASE" conf="default"/>
+        <dependency org="org.springframework" name="spring-web" rev="3.0.7.RELEASE"/>
             
+		 <!-- 
+		<dependency org="javax.transaction" name="jta" rev="1.0.1B" />
+		<dependency org="javax.sql" name="jdbc-stdext" rev="2.0" />		
+		-->
 
-
-		<dependency org="lib" name="java-unrar" rev="0.3">
+		<dependency org="lib" name="java-unrar" rev="0.3" conf="*->*">
 			<artifact name="java-unrar" type="jar" />
 		</dependency>
-		<dependency org="lib" name="lib.cvsclient" rev="20131001">
+		<dependency org="lib" name="lib.cvsclient" rev="20131001" conf="*->*">
 			<artifact name="lib.cvsclient" type="jar" />
 		</dependency>
-		<dependency org="lib" name="lib.xservices-scmtypes" rev="20131001">
+		<dependency org="lib" name="lib.xservices-scmtypes" rev="20131001" conf="*">
 			<artifact name="lib.xservices-scmtypes" type="jar" />
 		</dependency>
 
-
-		<!-- There is also a dependency on lib.cvsclient from Netbeans Project 
-			which is not included here -->
 	</dependencies>
 </ivy-module>
diff --git a/ivysettings.xml b/ivysettings.xml
index 737188f..4e9f586 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -1,16 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivysettings>
-	<settings defaultResolver="default-chain"/>
+	<settings defaultResolver="defaultchain" />
 	<resolvers>
-		<chain name="default-chain">
-			<ibiblio name="apache-maven" m2compatible="true" root="http://repo.maven.apache.org/maven2/"/>
+		<ibiblio name="apache-maven" m2compatible="true" usepoms="true"	root="http://repo.maven.apache.org/maven2/" />
+		<!-- <ibiblio name="java2" m2compatible="true" usepoms="true" root="https://maven.java.net/content/repositories/public/" /> -->
 
-		 <filesystem name="local-filesystem">
-		    <!--  <ivy pattern="${ivy.settings.dir}/1/[organisation]/[module]/ivys/ivy-[revision].xml"/>-->
-		    
-		    <artifact pattern="${ivy.settings.dir}/lib/[artifact]-[revision].[ext]"/>
-		  
-  </filesystem>
-    		</chain>
+		<ibiblio name="java" m2compatible="true" usepoms="true" root="http://download.java.net/maven/2/" />
+
+		<filesystem name="local-filesystem">
+			<!-- <ivy pattern="${ivy.settings.dir}/1/[organisation]/[module]/ivys/ivy-[revision].xml"/> -->
+			<artifact pattern="${ivy.settings.dir}/lib/[artifact]-[revision].[ext]" />
+		</filesystem>
+
+		<chain name="defaultchain">
+			<resolver ref="local-filesystem" />
+			<resolver ref="apache-maven" />
+			<resolver ref="java" />
+
+		</chain>
 	</resolvers>
-</ivysettings>
\ No newline at end of file
+
+	<modules>
+		<module organisation="javax.transaction" resolver="java" />
+		<module organisation="javax.sql" resolver="java" />
+	</modules>
+</ivysettings>
+
diff --git a/web/META-INF/MANIFEST.MF b/web/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5e94951
--- /dev/null
+++ b/web/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+