[Ant-contrib-developers] SF.net SVN: ant-contrib:[177] ant-contrib/trunk

[<mat...@us...>]

Revision: 177
          http://ant-contrib.svn.sourceforge.net/ant-contrib/?rev=177&view=rev
Author:   mattinger
Date:     2009-03-20 04:27:52 +0000 (Fri, 20 Mar 2009)

Log Message:
-----------
Using ivy 2.0 for building now

Modified Paths:
--------------
    ant-contrib/trunk/build.xml

Added Paths:
-----------
    ant-contrib/trunk/ivysettings.xml

Removed Paths:
-------------
    ant-contrib/trunk/ivy-conf.xml

Modified: ant-contrib/trunk/build.xml
===================================================================
--- ant-contrib/trunk/build.xml	2009-01-30 19:13:35 UTC (rev 176)
+++ ant-contrib/trunk/build.xml	2009-03-20 04:27:52 UTC (rev 177)
@@ -19,7 +19,7 @@
 	name="ant-contrib"
 	default="dist"
 	basedir="."
-	xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+	xmlns:ivy="antlib:org.apache.ivy.ant">
 
 	<property file="build.properties" />
 	
@@ -53,7 +53,7 @@
 	
 	<target name="init" unless="no-ivy">
         <path id="ivy.lib.path">
-            <fileset dir="lib/ivy/jars" includes="ivy-1.3.1.jar"/>
+            <fileset dir="lib/ivy/jars" includes="ivy-2.0.0.jar"/>
             <fileset dir="lib/commons-cli/jars" includes="commons-cli-1.0.jar"/>
             <fileset dir="lib/commons-codec/jars" includes="commons-codec-1.3.jar"/>
             <fileset dir="lib/commons-httpclient/jars" includes="commons-httpclient-3.0.1.jar"/>
@@ -61,13 +61,13 @@
             <fileset dir="lib/oro/jars" includes="oro-2.0.8.jar"/>
         </path>
 	    
-        <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
-                 uri="antlib:fr.jayasoft.ivy.ant"
+        <taskdef resource="org/apache/ivy/ant/antlib.xml"
+                 uri="antlib:org.apache.ivy.ant"
        	         classpathref="ivy.lib.path"/>
 	</target>
 	
 	<target name="configure" depends="init" unless="no-ivy">
-		<ivy:configure file="ivy-conf.xml" />
+		<ivy:configure file="ivysettings.xml" />
     </target>
 		
 	<target name="resolve" depends="configure" unless="no-ivy">
@@ -75,9 +75,9 @@
     </target>
     
 	<target name="classpath-ivy" depends="resolve" unless="no-ivy">
-		<ivy:cachepath id="compile.classpath" type="jar" conf="provided" />
-		<ivy:cachepath id="runtime.classpath" type="jar" conf="default" />
-		<ivy:cachepath id="test.classpath" type="jar" conf="test" />
+		<ivy:cachepath pathid="compile.classpath" type="jar" conf="provided" />
+		<ivy:cachepath pathid="runtime.classpath" type="jar" conf="default" />
+		<ivy:cachepath pathid="test.classpath" type="jar" conf="test" />
 		<ivy:cachefileset setid="compile.fileset" type="jar" conf="provided" />
 		<ivy:cachefileset setid="runtime.fileset" type="jar" conf="default" />
 		<ivy:cachefileset setid="test.fileset" type="jar" conf="test" />
@@ -156,6 +156,8 @@
 	</target>
 		
 	<target name="clean">
+                <mkdir dir="${target.dir}" />
+                <mkdir dir="${dist.dir}" />
 		<delete includeemptydirs="true">
 			<fileset dir="${target.dir}" includes="**/*" />
 			<fileset dir="${dist.dir}" includes="**/*" />

Deleted: ant-contrib/trunk/ivy-conf.xml
===================================================================
--- ant-contrib/trunk/ivy-conf.xml	2009-01-30 19:13:35 UTC (rev 176)
+++ ant-contrib/trunk/ivy-conf.xml	2009-03-20 04:27:52 UTC (rev 177)
@@ -1,19 +0,0 @@
-<ivy-conf>
-  <properties file="${ivy.conf.dir}/build.properties" />
-  
-  <conf defaultResolver="default-resolver" checkUpToDate="true" />
-  
-  <resolvers>
-      <filesystem name="local">
-          <ivy pattern="${ivy.conf.dir}/lib/[module]/ivy-[revision].xml" />
-          <artifact pattern="${ivy.conf.dir}/lib/[module]/[ext]s/[artifact]-[revision].[ext]" />
-      </filesystem>
-          
-      <ivyrep name="ivyrep" />
-
-      <chain name="default-resolver">
-          <resolver ref="local" />
-      </chain>
-  </resolvers>
-  
-</ivy-conf>

Copied: ant-contrib/trunk/ivysettings.xml (from rev 176, ant-contrib/trunk/ivy-conf.xml)
===================================================================
--- ant-contrib/trunk/ivysettings.xml	                        (rev 0)
+++ ant-contrib/trunk/ivysettings.xml	2009-03-20 04:27:52 UTC (rev 177)
@@ -0,0 +1,20 @@
+<settings>
+  <properties file="${ivy.settings.dir}/build.properties" />
+  
+  <settings defaultResolver="default-resolver" />
+  
+  <resolvers>
+      <filesystem name="local">
+          <ivy pattern="${ivy.conf.dir}/lib/[module]/ivy-[revision].xml" />
+          <artifact pattern="${ivy.conf.dir}/lib/[module]/[ext]s/[artifact]-[revision].[ext]" />
+      </filesystem>
+          
+
+      <ibiblio m2compatible="true" name="maven2" />
+
+      <chain name="default-resolver">
+          <resolver ref="local" />
+      </chain>
+  </resolvers>
+  
+</settings>


Property changes on: ant-contrib/trunk/ivysettings.xml
___________________________________________________________________
Added: svn:mergeinfo
   + 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.