From 638bb5094dfea13c1aa9955afefc89bdaf6a002b Mon Sep 17 00:00:00 2001
From: Ben Hale <bhale@vmware.com>
Date: Mon, 20 Aug 2007 23:11:49 +0000
Subject: [PATCH] Updated ivy configuration to remove deprecation warnings
 (SWF-395)

---
 build-spring-webflow/build.xml                | 2 +-
 common-build/common-targets.xml               | 2 +-
 common-build/{ivyconf.xml => ivysettings.xml} | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename common-build/{ivyconf.xml => ivysettings.xml} (98%)

diff --git a/build-spring-webflow/build.xml b/build-spring-webflow/build.xml
index dc6077d9..06e55ab0 100644
--- a/build-spring-webflow/build.xml
+++ b/build-spring-webflow/build.xml
@@ -84,7 +84,7 @@ to see a list of all relevant targets.
 
 		<property name="ivy.conf.dir" value="${common.build.dir}" />
 
-		<ivy:configure file="${ivy.conf.dir}/ivyconf.xml" />
+		<ivy:settings id="ivy.instance" file="${ivy.conf.dir}/ivysettings.xml" />
 
 		<ivy:buildlist reference="modules">
 			<fileset dir="..">
diff --git a/common-build/common-targets.xml b/common-build/common-targets.xml
index 371ebb29..ef956fc9 100644
--- a/common-build/common-targets.xml
+++ b/common-build/common-targets.xml
@@ -309,7 +309,7 @@
 
   <target name="ivy.configure" depends="init">
     <echo>reading ivy config</echo>
-    <ivy:configure file="${ivy.conf.dir}/ivyconf.xml" />
+    <ivy:settings id="ivy.instance" file="${ivy.conf.dir}/ivysettings.xml" />
   </target>
 
   <presetdef name="resolve.conf">
diff --git a/common-build/ivyconf.xml b/common-build/ivysettings.xml
similarity index 98%
rename from common-build/ivyconf.xml
rename to common-build/ivysettings.xml
index bd11d5d8..d4b54270 100644
--- a/common-build/ivyconf.xml
+++ b/common-build/ivysettings.xml
@@ -1,7 +1,8 @@
-<ivyconf>
+<?xml version="1.0" encoding="UTF-8"?>
+<ivysettings>
 	<properties file="${ivy.conf.dir}/ivyconf.properties"/>
-	<conf defaultResolver="maven2"/>
-	<resolvers>
+	<settings defaultResolver="maven2"/>
+		<resolvers>
 		<chain name="spring-projects" returnFirst="true">
 			<!-- try developer's local integration repository first -->
 			<filesystem name="integration-repo">
@@ -94,4 +95,4 @@
 		<module organisation="org.springframework" name="spring-ldap" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="various" resolver="spring-projects"/>
 	</modules>
-</ivyconf>
+</ivysettings>