From 04a76562928ee268ba4df5c4cb59600d198b6b4f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 1 Nov 2009 17:02:08 +0000
Subject: [PATCH] Updated ivy settings so that org.jboss.util is downloaded to
 the local repository; updated Eclipse classpath regarding latest version of
 org.jboss.util; added classpath entry for org.jboss.classloading.spi so that
 JBoss5ClassLoader compiles in Eclipse.

---
 org.springframework.context/.classpath | 3 ++-
 org.springframework.context/ivy.xml    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/org.springframework.context/.classpath b/org.springframework.context/.classpath
index 26698a55407..e084c31e497 100644
--- a/org.springframework.context/.classpath
+++ b/org.springframework.context/.classpath
@@ -39,6 +39,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.6.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.inject/com.springsource.org.atinject.tck/1.0.0/com.springsource.org.atinject.tck-1.0.0.jar" sourcepath="/IVY_CACHE/javax.inject/com.springsource.org.atinject.tck/1.0.0/com.springsource.org.atinject.tck-sources-1.0.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.jboss.cl/com.springsource.org.jboss.classloader/2.0.5.GA/com.springsource.org.jboss.classloader-2.0.5.GA.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.jboss.util/com.springsource.org.jboss.util/2.2.9.GA/com.springsource.org.jboss.util-2.2.9.GA.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.jboss.integration/com.springsource.org.jboss.classloading.spi/5.0.3.GA/com.springsource.org.jboss.classloading.spi-5.0.3.GA.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.jboss.util/com.springsource.org.jboss.util/2.2.13.GA/com.springsource.org.jboss.util-2.2.13.GA.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.context/ivy.xml b/org.springframework.context/ivy.xml
index e6e58d9690c..61072c26999 100644
--- a/org.springframework.context/ivy.xml
+++ b/org.springframework.context/ivy.xml
@@ -47,7 +47,7 @@
 		<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.6.3" conf="optional, groovy->compile"/>
 		<dependency org="org.jboss.cl" name="com.springsource.org.jboss.classloader" rev="2.0.5.GA" conf="provided->compile"/>
-		<dependency org="org.jboss.util" name="com.springsource.org.jboss.util" rev="2.2.13.GA" conf="provided->compile"/>
+		<dependency org="org.jboss.util" name="com.springsource.org.jboss.util" rev="2.2.13.GA" conf="provided, runtime->compile"/>
 		<dependency org="org.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="optional->compile"/>	
 		<dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.2.0" conf="optional, jruby->compile"/>
 		<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>