From 43505a6ce76db021436cb030144bcafa02236e8e Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Mon, 27 Oct 2008 13:41:44 +0000
Subject: [PATCH] Upgraded ivy files to correspond to those in 2.5.5

---
 org.springframework.aop/ivy.xml             | 25 ++++-----
 org.springframework.beans/ivy.xml           | 14 +++--
 org.springframework.context.support/ivy.xml | 42 +++++++++------
 org.springframework.context/ivy.xml         | 53 +++++++++++--------
 org.springframework.core/ivy.xml            | 15 +++---
 org.springframework.jdbc/ivy.xml            | 24 ++++-----
 org.springframework.orm/ivy.xml             | 57 ++++++++++++---------
 org.springframework.transaction/ivy.xml     | 28 +++++-----
 org.springframework.web.servlet/ivy.xml     | 57 +++++++++++----------
 org.springframework.web/ivy.xml             | 49 ++++++++++--------
 10 files changed, 203 insertions(+), 161 deletions(-)

diff --git a/org.springframework.aop/ivy.xml b/org.springframework.aop/ivy.xml
index 3252b1bd7c..ed4f490baf 100644
--- a/org.springframework.aop/ivy.xml
+++ b/org.springframework.aop/ivy.xml
@@ -11,6 +11,10 @@
 
 	<configurations>
 		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+		<conf name="aspectj" extends="runtime" description="JARs needed to run with AspectJ"/>
+		<conf name="bytecode-proxy" extends="runtime" description="JARs needed to run with CGLIB bytecode proxies"/>
+		<conf name="jamon" extends="runtime" description="JARs needed to run with JamonAPI"/>
+		<conf name="pooling" extends="runtime" description="JARs needed to run the pooling target source"/>
 	</configurations>
 
 	<publications>
@@ -19,20 +23,17 @@
 	</publications>
 
 	<dependencies>
-		<!-- compile dependencies -->
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime" />
-		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile" />
-		<!-- optional dependencies -->
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.4.0" conf="optional->compile" />
-		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.2.RELEASE" conf="optional->compile" />
-		<dependency org="com.jamonapi" name="com.springsource.com.jamonapi" rev="2.4.0" conf="optional->compile" />
-		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="optional->compile" />
+		<dependency org="com.jamonapi" name="com.springsource.com.jamonapi" rev="2.4.0" conf="optional, jamon->compile"/>
+		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="optional, bytecode-proxy->compile"/>
+		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.3.0" conf="optional, pooling->compile"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.5.4" conf="optional, aspectj->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
 		<!-- test dependencies -->
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
-				
 	</dependencies>
 
-</ivy-module>
\ No newline at end of file
+</ivy-module>
diff --git a/org.springframework.beans/ivy.xml b/org.springframework.beans/ivy.xml
index 2d06b0be3c..c321d3619f 100644
--- a/org.springframework.beans/ivy.xml
+++ b/org.springframework.beans/ivy.xml
@@ -11,6 +11,7 @@
 
 	<configurations>
 		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+		<conf name="bytecode-proxy" extends="runtime" description="JARs needed to run with CGLIB bytecode proxies"/>
 	</configurations>
 
 	<publications>
@@ -19,16 +20,13 @@
 	</publications>
 
 	<dependencies>
-		<!-- compile dependencies -->
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime" />
-		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile" />
-		<!-- optional dependencies -->
-		<dependency org="javax.el" name="com.springsource.javax.el" rev="2.1.0" conf="optional->compile" />
-		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="optional->compile" />
+		<dependency org="javax.el" name="com.springsource.javax.el" rev="2.1.0" conf="provided->compile"/>
+		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="optional, bytecode-proxy->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
 		<!-- test dependencies -->
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
-				
 	</dependencies>
 
-</ivy-module>
\ No newline at end of file
+</ivy-module>
diff --git a/org.springframework.context.support/ivy.xml b/org.springframework.context.support/ivy.xml
index cd3edd5fe4..52fae3312d 100644
--- a/org.springframework.context.support/ivy.xml
+++ b/org.springframework.context.support/ivy.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
 <ivy-module
@@ -12,6 +11,15 @@
 
 	<configurations>
 		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+		<conf name="commonj" extends="runtime" description="JARs to compile against CommonJ"/>
+		<conf name="commons-collections" extends="runtime" description="JARs needed to run with Commons Collections"/>
+		<conf name="ehcache" extends="runtime" description="JARs needed to run with EHCache"/>
+		<conf name="freemarker" extends="runtime" description="JARs needed to create beans for Freemarker"/>
+		<conf name="jasper-reports" extends="runtime" description="JARs needed to create beans for Jasper Reports"/>
+		<conf name="jdbc" extends="runtime" description="JARs needed to run against JDBC"/>
+		<conf name="mail" extends="runtime" description="JARs needed to create beans for Java Mail"/>
+		<conf name="quartz" extends="runtime" description="JARs needed to create beans for Quartz"/>
+		<conf name="velocity" extends="runtime" description="JARs needed to create beans for Velocity"/>
 	</configurations>
 
 	<publications>
@@ -20,24 +28,24 @@
 	</publications>
 
 	<dependencies>
-		<!-- compile dependencies -->
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime" />
-		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile" />
-		<!-- optional dependencies -->
-		<dependency org="org.springframework" name="org.springframework.jdbc" rev="latest.integration" conf="optional->compile" />
-		<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="optional->compile" />
-		<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.1" conf="optional->compile" />
-		<dependency org="org.apache.velocity" name="com.springsource.org.apache.velocity" rev="1.5.0" conf="optional->compile" />
-		<dependency org="org.freemarker" name="com.springsource.freemarker" rev="2.3.12" conf="optional->compile" />
-		<dependency org="net.sourceforge.jasperreports" name="com.springsource.net.sf.jasperreports" rev="2.0.5" conf="optional->compile" />
-		<dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="1.6.0" conf="optional->compile" />
-		<dependency org="com.bea.commonj" name="com.springsource.commonj" rev="1.1.0" conf="optional->compile" />
-		<dependency org="net.sourceforge.ehcache" name="com.springsource.net.sf.ehcache" rev="1.4.1" conf="optional->compile" />
+		<dependency org="com.bea.commonj" name="com.springsource.commonj" rev="1.1.0" conf="optional, commonj->compile"/>
+		<dependency org="org.freemarker" name="com.springsource.freemarker" rev="2.3.12" conf="optional, freemarker->compile"/>
+		<dependency org="javax.activation" name="com.springsource.javax.activation" rev="1.1.0" conf="provided->compile"/>
+		<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="optional, mail->compile"/>
+		<dependency org="net.sourceforge.ehcache" name="com.springsource.net.sf.ehcache" rev="1.3.0" conf="optional, ehcache->compile"/>
+		<dependency org="net.sourceforge.jasperreports" name="com.springsource.net.sf.jasperreports" rev="2.0.5" conf="optional, jasper-reports->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.collections" rev="3.2.0" conf="optional, commons-collections->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
+		<dependency org="org.apache.velocity" name="com.springsource.org.apache.velocity" rev="1.5.0" conf="optional, velocity->compile"/>
+		<dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="1.6.0" conf="optional, quartz->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.jdbc" rev="latest.integration" conf="optional, jdbc->compile"/>
+		<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="optional, jdbc->compile"/>
 		<!-- test dependencies -->
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
-				
 	</dependencies>
 
-</ivy-module>
\ No newline at end of file
+</ivy-module>
diff --git a/org.springframework.context/ivy.xml b/org.springframework.context/ivy.xml
index c203a04631..e25725d784 100644
--- a/org.springframework.context/ivy.xml
+++ b/org.springframework.context/ivy.xml
@@ -11,6 +11,17 @@
 
 	<configurations>
 		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+		<conf name="aspectj" extends="runtime" description="JARs need to run with AspectJ"/>
+		<conf name="backport-util-concurrent" extends="runtime" description="JARs needed to run with Backport Util Concurrent"/>
+		<conf name="beanshell" extends="runtime" description="JARs needed to develop BeanShell beans"/>
+		<conf name="bytecode-proxy" extends="runtime" description="JARs needed to run with CGLIB bytecode proxies"/>
+		<conf name="ejb" extends="runtime" description="JARs needed to develop EJB3 beans"/>
+		<conf name="jms" extends="runtime" description="JARs needed to develop JMS beans"/>
+		<conf name="groovy" extends="runtime" description="JARs needed to develop Groovy beans"/>
+		<conf name="instrumentation" extends="runtime" description="JARs needed to develop with Spring VM Instrumentation"/>
+		<conf name="jpa" extends="runtime" description="JARs needed to develop JPA beans"/>
+		<conf name="jruby" extends="runtime" description="JARs needed to develop Groovy beans"/>
+		<conf name="ws" extends="runtime" description="JARs needed to develop web service beans"/>
 	</configurations>
 
 	<publications>
@@ -19,28 +30,28 @@
 	</publications>
 
 	<dependencies>
-		<!-- compile dependencies -->
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime" />
-		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.agent" rev="latest.integration" conf="compile->compile" />
-		<!-- optional dependencies -->
-		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="optional->compile" />
-		<dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.1.0" conf="optional->compile" />
-		<dependency org="org.codehaus.groovy" name="com.springsource.org.codehaus.groovy" rev="1.5.1" conf="optional->compile" />
-		<dependency org="org.beanshell" name="com.springsource.bsh" rev="2.0.0.b4" conf="optional->compile" />
-		<dependency org="edu.emory.mathcs.backport" name="com.springsource.edu.emory.mathcs.backport" rev="3.1.0" conf="optional->compile" />
-		<dependency org="com.sun.enterprise" name="com.springsource.com.sun.enterprise.loader" rev="1.0.0" conf="optional->compile" />
-		<dependency org="com.oracle.oc4j" name="com.springsource.oracle.classloader" rev="10.1.3.1" conf="optional->compile" />
-		<dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="3.0.0" conf="optional->compile" />
-		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.2.RELEASE" conf="optional->compile" />
-		<dependency org="javax.jms" name="com.springsource.javax.jms" rev="1.1.0" conf="optional->compile" />
-		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional->compile" />
+		<dependency org="com.oracle.oc4j" name="com.springsource.oracle.classloader" rev="10.1.3.1" conf="provided->compile"/>
+		<dependency org="com.sun.enterprise" name="com.springsource.com.sun.enterprise.loader" rev="1.0.0" conf="provided->compile"/>
+		<dependency org="edu.emory.mathcs.backport" name="com.springsource.edu.emory.mathcs.backport" rev="3.0.0" conf="optional, backport-util-concurrent->compile"/>
+		<dependency org="javax.annotation" name="com.springsource.javax.annotation" rev="1.0.0" conf="provided, ejb->compile"/>
+		<dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="3.0.0" conf="provided, ejb->compile"/>
+		<dependency org="javax.jms" name="com.springsource.javax.jms" rev="1.1.0" conf="provided, jms->compile"/>
+		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, jpa->compile"/>
+		<dependency org="javax.xml.ws" name="com.springsource.javax.xml.ws" rev="2.1.1" conf="provided, ws->compile"/>
+		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="optional, bytecode-proxy->compile"/>
+		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.5.4" conf="optional, aspectj->compile"/>
+		<dependency org="org.beanshell" name="com.springsource.bsh" rev="2.0.0.b4" conf="optional, beanshell->compile"/>
+		<dependency org="org.codehaus.groovy" name="com.springsource.org.codehaus.groovy" rev="1.5.1" conf="optional, groovy->compile"/>
+		<dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.1.0" conf="optional, jruby->compile"/>
+		<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.instrument" rev="latest.integration" conf="optional, instrumentation->compile"/>
 		<!-- test dependencies -->
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
-				
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />		
 	</dependencies>
 
-</ivy-module>
\ No newline at end of file
+</ivy-module>
diff --git a/org.springframework.core/ivy.xml b/org.springframework.core/ivy.xml
index 95b26bd8ec..65beb0bc97 100644
--- a/org.springframework.core/ivy.xml
+++ b/org.springframework.core/ivy.xml
@@ -11,6 +11,9 @@
 
 	<configurations>
 		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+		<conf name="aspectj" extends="runtime" description="JARs needed to run with AspectJ"/>
+		<conf name="commons-collections" extends="runtime" description="JARs needed to run with Commons Collections"/>
+		<conf name="log4j" extends="runtime" description="JARs needed to use Log4J"/>
 	</configurations>
 
 	<publications>
@@ -19,18 +22,16 @@
 	</publications>
 
 	<dependencies>
-		<!-- compile dependencies -->
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime" />
-		<!-- optional dependencies -->
-		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional->runtime" />
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.collections" rev="3.2.0" conf="optional->compile" />
-		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.2.RELEASE" conf="optional->compile" />
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.collections" rev="3.2.0" conf="optional, commons-collections->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
+		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional, log4j->compile"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.5.4" conf="optional, aspectj->compile"/>
 		<!-- These should be replaced with the internal repackaging of ASM -->
 		<dependency org="org.objectweb.asm" name="com.springsource.org.objectweb.asm" rev="2.2.3" conf="optional->compile" />
 		<dependency org="org.objectweb.asm" name="com.springsource.org.objectweb.asm.commons" rev="2.2.3" conf="optional->compile" />
 		<!-- test dependencies -->
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
-				
+
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.jdbc/ivy.xml b/org.springframework.jdbc/ivy.xml
index 2aceb75ad3..d0fe02252c 100644
--- a/org.springframework.jdbc/ivy.xml
+++ b/org.springframework.jdbc/ivy.xml
@@ -11,6 +11,10 @@
 
 	<configurations>
 		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+		<conf name="c3p0" extends="runtime" description="JARs needed to run with c3p0"/>
+		<conf name="jndi" extends="runtime" description="JARs needed to use JNDI"/>
+		<conf name="pooling" extends="runtime" description="JARs needed to run with an XA pool"/>
+		<conf name="rowset" extends="runtime" description="JARs needed to use JDBC rowsets"/>
 	</configurations>
 
 	<publications>
@@ -19,20 +23,16 @@
 	</publications>
 
 	<dependencies>
-		<!-- compile dependencies -->
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime" />
-		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="compile->compile" />
-		<!-- optional dependencies -->
-		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional->compile" />
-		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="optional->compile" />
-		<dependency org="com.mchange.c3p0" name="com.springsource.com.mchange.v2.c3p0" rev="0.9.1.2" conf="optional->compile" />
-		<dependency org="com.experlog.xapool" name="com.springsource.org.enhydra.jdbc" rev="1.5.0" conf="optional->compile" />
+		<dependency org="com.mchange.c3p0" name="com.springsource.com.mchange.v2.c3p0" rev="0.9.1.2" conf="optional, c3p0->compile"/>
+		<dependency org="com.experlog.xapool" name="com.springsource.org.enhydra.jdbc" rev="1.5.0" conf="optional, pooling->compile"/>
+		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional, jndi->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="compile->compile"/>
 		<!-- test dependencies -->
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
-				
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.orm/ivy.xml b/org.springframework.orm/ivy.xml
index bd163c8185..00fd4bcf2d 100644
--- a/org.springframework.orm/ivy.xml
+++ b/org.springframework.orm/ivy.xml
@@ -11,6 +11,18 @@
 
 	<configurations>
 		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+		<conf name="aop" extends="runtime" description="JARs needed to use AOP"/>
+		<conf name="eclipselink" extends="jpa" description="JARs needed to use EclipseLink JPA"/>
+		<conf name="hibernate" extends="runtime" description="JARs needed to use Hibernate"/>
+		<conf name="hibernate-jpa" extends="hibernate, jpa" description="JARs needed to use Hibernate JPA"/>
+		<conf name="ibatis" extends="runtime" description="JARs needed to use Ibatis"/>
+		<conf name="jdo" extends="runtime" description="JARs needed to use JDO"/>
+		<conf name="jndi" extends="runtime" description="JARs needed to use JNDI"/>
+		<conf name="jpa" extends="runtime" description="JARs needed to develop JPA beans"/>
+		<conf name="openjpa" extends="jpa" description="JARs needed to use OpenJPA JPA"/>
+		<conf name="toplink-essentials" extends="jpa" description="JARs needed to use TopLink Essentials JPA"/>
+		<conf name="toplink" extends="runtime" description="JARs needed to use TopLink"/>
+		<conf name="web" extends="runtime" description="JARs needed to develop for the web"/>
 	</configurations>
 
 	<publications>
@@ -19,31 +31,30 @@
 	</publications>
 
 	<dependencies>
-		<!-- compile dependencies -->
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime" />
-		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.jdbc" rev="latest.integration" conf="compile->compile" />
-		<!-- optional dependencies -->
-		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional->compile" />
-		<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="optional->compile" />
-		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.2.6.ga" conf="optional->compile" />
-		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations.common" rev="3.3.0.ga" conf="optional->compile" />
-		<dependency org="com.oracle.toplink" name="com.springsource.oracle.toplink" rev="10.1.3" conf="optional->compile" />
-		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional->compile" />
-		<dependency org="com.oracle.toplink.essentials" name="com.springsource.oracle.toplink.essentials" rev="2.0.0.b41-beta2" conf="optional->compile" />
-		<dependency org="org.apache.openjpa" name="com.springsource.org.apache.openjpa.persistence" rev="1.0.2" conf="optional->compile" />
-		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.2.GA" conf="optional->compile" />
-		<dependency org="org.eclipse.persistence" name="com.springsource.org.eclipse.persistence.jpa" rev="1.0.1" conf="optional->compile" />
-		<dependency org="javax.jdo" name="com.springsource.javax.jdo" rev="2.1.0" conf="optional->compile" />
-		<dependency org="org.apache.ibatis" name="com.springsource.com.ibatis" rev="2.3.0.677" conf="optional->compile" />
-		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="optional->compile" />
-		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="optional->compile" />
+		<dependency org="com.oracle.toplink.essentials" name="com.springsource.oracle.toplink.essentials" rev="2.0.0.b41-beta2" conf="optional, toplink-essentials->compile"/>
+		<dependency org="com.oracle.toplink" name="com.springsource.oracle.toplink" rev="10.1.3" conf="optional, toplink->compile"/>
+		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="optional, aop->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
+		<dependency org="org.apache.ibatis" name="com.springsource.com.ibatis" rev="2.3.4.726" conf="optional, ibatis->compile"/>
+		<dependency org="org.apache.openjpa" name="com.springsource.org.apache.openjpa.persistence" rev="1.0.2" conf="optional, openjpa->compile"/>
+		<dependency org="org.eclipse.persistence" name="com.springsource.org.eclipse.persistence.jpa" rev="1.0.1" conf="optional, eclipselink-> compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.2.6.ga" conf="optional, hibernate->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations" rev="3.3.0.ga" conf="optional, hibernate-jpa->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.1.ga" conf="optional, hibernate-jpa->compile"/>
+		<dependency org="javax.jdo" name="com.springsource.javax.jdo" rev="2.0.0" conf="provided, jdo->compile"/>
+		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, jpa->compile"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided, web->compile"/>
+		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="optional, aop->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional, jndi->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.instrument.classloading" rev="latest.integration" conf="optional, jpa->compile"/>
+		<dependency org="org.springframework" name="org.springframework.jdbc" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="optional, web->compile"/>
 		<!-- test dependencies -->
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
-				
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.transaction/ivy.xml b/org.springframework.transaction/ivy.xml
index 49dd821b24..386171bddd 100644
--- a/org.springframework.transaction/ivy.xml
+++ b/org.springframework.transaction/ivy.xml
@@ -11,6 +11,10 @@
 
 	<configurations>
 		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+		<conf name="ejb" extends="runtime" description="JARs needed to develop EJB3 beans"/>
+		<conf name="jca" extends="runtime" description="JARs needed to develop JCA beans"/>
+		<conf name="jotm" extends="runtime" description="JARs needed to use JOTM"/>
+		<conf name="websphere" extends="runtime" description="JARs needed to develop against websphere"/>
 	</configurations>
 
 	<publications>
@@ -19,21 +23,19 @@
 	</publications>
 
 	<dependencies>
-		<!-- compile dependencies -->
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime" />
-		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile" />
-		<!-- optional dependencies -->
-		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional->compile" />
-		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="optional->compile" />
-		<dependency org="com.ibm.websphere" name="com.springsource.com.ibm.websphere.uow" rev="6.0.2.17" conf="optional->compile" />
-		<dependency org="org.objectweb.jotm" name="com.springsource.org.objectweb.jotm" rev="2.0.10" conf="optional->compile" />
-		<dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="3.0.0" conf="optional->compile" />
-		<dependency org="javax.resource" name="com.springsource.javax.resource" rev="1.5.0" conf="optional->compile" />
+		<dependency org="com.ibm.websphere" name="com.springsource.com.ibm.websphere.uow" rev="6.0.2.17" conf="provided, websphere->compile"/>
+		<dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="3.0.0" conf="provided, ejb->compile"/>
+		<dependency org="javax.resource" name="com.springsource.javax.resource" rev="1.5.0" conf="provided, jca->compile"/>
+		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->compile"/>
+		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
+		<dependency org="org.objectweb.jotm" name="com.springsource.org.objectweb.jotm" rev="2.0.10" conf="optional, jotm->compile"/>
+		<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
 		<!-- test dependencies -->
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
-				
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.web.servlet/ivy.xml b/org.springframework.web.servlet/ivy.xml
index c6ee9b41da..cb3249bdfc 100644
--- a/org.springframework.web.servlet/ivy.xml
+++ b/org.springframework.web.servlet/ivy.xml
@@ -11,6 +11,15 @@
 
 	<configurations>
 		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+		<conf name="commons-attributes" extends="runtime" description="JARs needed to run with Commons Attributes"/>
+		<conf name="commons-fileupload" extends="runtime" description="JARs needed to run with Commons Fileupload"/>
+		<conf name="freemarker" extends="runtime" description="JARs needed to create beans for Freemarker"/>
+		<conf name="itext" extends="runtime" description="JARs needed to create beans for iText"/>
+		<conf name="jasper-reports" extends="runtime" description="JARs needed to create beans for Jasper Reports"/>
+		<conf name="jexcelapi" extends="runtime" description="JARs needed to create beans for JExcelApi"/>
+		<conf name="poi" extends="runtime" description="JARs needed to create beans for Poi"/>
+		<conf name="tiles" extends="runtime" description="JARs neeeded to create beans for Tiles"/>
+		<conf name="velocity" extends="runtime" description="JARs needed to create beans for Velocity"/>
 	</configurations>
 
 	<publications>
@@ -19,35 +28,29 @@
 	</publications>
 
 	<dependencies>
-		<!-- compile dependencies -->
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime" />
-		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="compile->compile" />
-		<!-- optional dependencies -->
-		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="optional->compile" />
-		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2" />
-		<dependency org="org.freemarker" name="com.springsource.freemarker" rev="2.3.12" conf="optional->compile" />
-		<dependency org="org.apache.velocity" name="com.springsource.org.apache.velocity" rev="1.5.0" conf="optional->compile" />
-		<dependency org="org.apache.velocity" name="com.springsource.org.apache.velocity.tools.view" rev="1.4.0" conf="optional->compile" />
-		<dependency org="org.apache.tiles" name="org.apache.tiles-library" rev="2.0.5.osgi" conf="optional->compile" />
-		<dependency org="net.sourceforge.jasperreports" name="com.springsource.net.sf.jasperreports" rev="2.0.5" conf="optional->compile" />
-		<dependency org="net.sourceforge.jexcelapi" name="com.springsource.jxl" rev="2.6.6" conf="optional->compile" />
-		<dependency org="org.apache.poi" name="com.springsource.org.apache.poi" rev="3.0.2.FINAL" conf="optional->compile" />
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="1.2.0" conf="optional->compile" />
-		<!--
-			<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp" rev="2.1.0" conf="optional->compile" />
-		<dependency org="javax.el" name="com.springsource.javax.el" rev="2.1.0" conf="optional->compile" />
-		<dependency org="org.apache.myfaces" name="com.springsource.org.apache.myfaces.javax.faces" rev="1.2.2" conf="optional->compile" />
-		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional->runtime" />
-		<dependency org="javax.xml.rpc" name="com.springsource.javax.xml.rpc" rev="1.1.0" conf="optional->runtime" />
-		<dependency org="org.apache.axis" name="com.springsource.org.apache.axis" rev="1.4.0" conf="optional->runtime" />
-		<dependency org="com.caucho" name="com.springsource.com.caucho" rev="3.1.5" conf="optional->runtime" />
-	-->
+		<dependency org="com.lowagie.text" name="com.springsource.com.lowagie.text" rev="2.0.8" conf="optional, itext->compile"/>
+		<dependency org="org.freemarker" name="com.springsource.freemarker" rev="2.3.12" conf="optional, freemarker->compile"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp" rev="2.1.0" conf="provided->compile"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2" conf="provided->compile"/>
+		<dependency org="net.sourceforge.jexcelapi" name="com.springsource.jxl" rev="2.6.6" conf="optional, jexcelapi->compile"/>
+		<dependency org="net.sourceforge.jasperreports" name="com.springsource.net.sf.jasperreports" rev="2.0.5" conf="optional, jasper-reports->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.attributes" rev="2.2.0" conf="optional, commons-attributes->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="1.2.0" conf="optional, commons-fileupload->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
+		<dependency org="org.apache.poi" name="com.springsource.org.apache.poi" rev="3.0.2.FINAL" conf="optional, poi->compile"/>
+		<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles" rev="2.0.5" conf="optional, tiles->compile"/>
+		<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.core" rev="2.0.5.osgi" conf="optional, tiles->compile"/>
+		<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.jsp" rev="2.0.5" conf="optional, tiles->compile"/>
+		<dependency org="org.apache.velocity" name="com.springsource.org.apache.velocity" rev="1.5.0" conf="optional, velocity->compile"/>
+		<dependency org="org.apache.velocity" name="com.springsource.org.apache.velocity.tools.view" rev="1.4.0" conf="optional, velocity->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="optional, velocity, freemarker, jasper-reports->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="compile->compile"/>
 		<!-- test dependencies -->
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
-				
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.web/ivy.xml b/org.springframework.web/ivy.xml
index 3242c99383..5b59cd56a7 100644
--- a/org.springframework.web/ivy.xml
+++ b/org.springframework.web/ivy.xml
@@ -11,6 +11,16 @@
 
 	<configurations>
 		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+		<conf name="axis" extends="runtime" description="JARs needed to use Axis"/>
+		<conf name="burlap" extends="runtime" description="JARs needed to use Burlap"/>
+		<conf name="el" extends="runtime" description="JARs needed to use EL"/>
+		<conf name="faces" extends="runtime" description="JARs neeeded to use JSF"/>
+		<conf name="hessian" extends="runtime" description="JARs needed to use Hessian"/>
+		<conf name="httpclient" extends="runtime" description="JARs needed to use HTTPClient"/>
+		<conf name="jaxrpc" extends="runtime" description="JARs needed to use JAXRPC"/>
+		<conf name="jsp" extends="runtime" description="JARs needed to use JSP"/>
+		<conf name="log4j" extends="runtime" description="JARs needed to use Log4J"/>
+		<conf name="ws" extends="runtime" description="JARs needed to develop web service beans"/>
 	</configurations>
 
 	<publications>
@@ -19,29 +29,26 @@
 	</publications>
 
 	<dependencies>
-		<!-- compile dependencies -->
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime" />
-		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional->compile" />
-<!--
-		<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="compile->compile" />
-		<dependency org="org.springframework" name="org.springframework.jdbc" rev="latest.integration" conf="compile->compile" />
-	-->
-		<!-- optional dependencies -->
-		<dependency org="javax.el" name="com.springsource.javax.el" rev="2.1.0" conf="optional->compile" />
-		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="optional->compile" />
-		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp" rev="2.1.0" conf="optional->compile" />
-		<dependency org="org.apache.myfaces" name="com.springsource.org.apache.myfaces.javax.faces" rev="1.2.2" conf="optional->compile" />
-		<dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2" conf="optional->compile" />
-		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional->runtime" />
-		<dependency org="javax.xml.rpc" name="com.springsource.javax.xml.rpc" rev="1.1.0" conf="optional->runtime" />
-		<dependency org="org.apache.axis" name="com.springsource.org.apache.axis" rev="1.4.0" conf="optional->runtime" />
-		<dependency org="com.caucho" name="com.springsource.com.caucho" rev="3.1.5" conf="optional->runtime" />
+		<dependency org="com.caucho" name="com.springsource.com.caucho" rev="3.1.5" conf="optional, hessian, burlap->compile"/>
+		<dependency org="javax.el" name="com.springsource.javax.el" rev="2.1.0" conf="provided, el->compile"/>
+		<dependency org="javax.faces" name="com.springsource.javax.faces" rev="1.2.0.08" conf="provided, faces->compile"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp" rev="2.1.0" conf="provided, jsp->compile"/>
+		<dependency org="javax.xml.rpc" name="com.springsource.javax.xml.rpc" rev="1.1.0" conf="provided, jaxrpc->compile"/>
+		<dependency org="javax.xml.soap" name="com.springsource.javax.xml.soap" rev="1.3.0" conf="provided, ws->compile"/>
+		<dependency org="javax.xml.ws" name="com.springsource.javax.xml.ws" rev="2.1.1" conf="provided, ws->compile"/>
+		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
+		<dependency org="org.apache.axis" name="com.springsource.org.apache.axis" rev="1.4.0" conf="optional, axis->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.httpclient" rev="3.1.0" conf="optional, httpclient->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
+		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional, log4j->compile"/>
+		<dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2" conf="optional, jsp->compile"/>
+		<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
 		<!-- test dependencies -->
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
-				
 	</dependencies>
 
 </ivy-module>