[Smartfrog-checkins] SF.net SVN: smartfrog:[7184] trunk/core

[<st...@us...>]

Revision: 7184
          http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7184&view=rev
Author:   steve_l
Date:     2008-11-26 16:48:29 +0000 (Wed, 26 Nov 2008)

Log Message:
-----------
SFOS-1034 	 Move to Ivy 2.0.0rc2

Modified Paths:
--------------
    trunk/core/antbuild/xml/ivy-mixin.xml
    trunk/core/build.xml
    trunk/core/common.xml

Modified: trunk/core/antbuild/xml/ivy-mixin.xml
===================================================================
--- trunk/core/antbuild/xml/ivy-mixin.xml	2008-11-26 16:48:04 UTC (rev 7183)
+++ trunk/core/antbuild/xml/ivy-mixin.xml	2008-11-26 16:48:29 UTC (rev 7184)
@@ -44,7 +44,9 @@
   <target name="ivy-init" depends="ivy-init-antlib" >
     <!--copy ivy artifacts -->
     <property name="ivy.lib.dir" location="${build.dir}/ivy/lib" />
-    <ivy:settings file="${ivy.dir}/ivyconf.xml" override="false"/>
+    <property name="ivysettings.xml" location="${ivy.dir}/ivysettings.xml"/>
+    <ivy:configure file="${ivysettings.xml}" override="false"/>
+
     <property name="ivy.artifact.retrieve.pattern"
         value="[conf]/[artifact]-[revision].[ext]"/>
     <property name="ivy.publish.pattern"

Modified: trunk/core/build.xml
===================================================================
--- trunk/core/build.xml	2008-11-26 16:48:04 UTC (rev 7183)
+++ trunk/core/build.xml	2008-11-26 16:48:29 UTC (rev 7184)
@@ -466,7 +466,9 @@
     </typedef>
     <!--create the external dir if it is missing-->
     <mkdir dir="external" />
-    <ivy:settings file="antbuild/ivy/ivyconf.xml" override="true"/>
+    <property name="ivysettings.xml" location="antbuild/ivy/ivysettings.xml" />
+    <property name="root.dir" location="." />
+    <ivy:configure file="${ivysettings.xml}" override="true"/>
   </target>
 
   <!-- =================================================================== -->
@@ -478,7 +480,7 @@
   <target name="ivy-init" depends="ivy-init-antlib"
           xmlns:ivy="antlib:org.apache.ivy.ant">
     <presetdef name="ivy-projects">
-      <ivy:buildlist skipbuildwithoutivy="true">
+      <ivy:buildlist onMissingDescriptor="skip">
         <fileset file="smartfrog/build.xml" />
         <fileset file="testharness/build.xml" />
         <fileset file="antbuild/build.xml" />

Modified: trunk/core/common.xml
===================================================================
--- trunk/core/common.xml	2008-11-26 16:48:04 UTC (rev 7183)
+++ trunk/core/common.xml	2008-11-26 16:48:29 UTC (rev 7184)
@@ -1977,8 +1977,8 @@
     <mkdir dir="${ivy.cache.smartfrog.dir}" />
     <mkdir dir="${ivy.cache.project.dir}" />
 
+    <property name="ivysettings.xml" location="${core.dir}/antbuild/ivy/ivysettings.xml" />
 
-
     <!--first check for ivy being loaded-->
     <condition property="ivy.tasks.loaded">
       <typefound name="retrieve" uri="antlib:org.apache.ivy.ant"/>
@@ -2030,7 +2030,7 @@
   <target name="maybe-ivy-init"
           depends="declare-ivy"
           if="ivy.enabled" >
-    <ivy:settings file="${core.dir}/antbuild/ivy/ivyconf.xml" override="false"/>
+    <ivy:configure file="${ivysettings.xml}" override="false"/>
   </target>
 
   <target name="maybe-ivy-resolve" depends="maybe-ivy-init"
@@ -2087,7 +2087,7 @@
   <target name="ivy-init"
           depends="maybe-ivy-init"
       unless="ivy.enabled">
-    <ivy:settings file="${core.dir}/antbuild/ivy/ivyconf.xml" override="false"/>
+    <ivy:configure file="${ivysettings.xml}" override="false"/>
   </target>
 
   <target name="ivy-resolve" depends="maybe-ivy-resolve,ivy-init"


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