svn commit: r1401179 - in /incubator/easyant/plugins/trunk/offline/src: main/resources/offline.ant test/antunit/offline-test.xml

[jl...@apache.org]

Author: jlboudart
Date: Tue Oct 23 07:00:29 2012
New Revision: 1401179

URL: http://svn.apache.org/viewvc?rev=1401179&view=rev
Log:
Deffer initialization of project.ivy.instance property to go-offline target
Otherwise the property is loaded with default value as this plugin is loaded as a system plugin

Modified:
    incubator/easyant/plugins/trunk/offline/src/main/resources/offline.ant
    incubator/easyant/plugins/trunk/offline/src/test/antunit/offline-test.xml

Modified: incubator/easyant/plugins/trunk/offline/src/main/resources/offline.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/offline/src/main/resources/offline.ant?rev=1401179&r1=1401178&r2=1401179&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/offline/src/main/resources/offline.ant (original)
+++ incubator/easyant/plugins/trunk/offline/src/main/resources/offline.ant Tue Oct 23 07:00:29 2012
@@ -19,7 +19,6 @@
 
     <ea:core-version requiredrevision="[0.9,+]" />
 
-    <ea:parameter property="project.ivy.instance" default="project.ivy.instance" description="the ivy instance name for your project" />
     <ea:parameter property="project.buildscope.resolver" default="project.buildscope.repository"
         description="name of project build scope repository" />
     <ea:parameter property="easyant.buildscope.resolver" default="easyant.buildscope.repository"
@@ -29,6 +28,7 @@
 
     <target name="offline:go-offline">
         <fail if="${easyant.offline}" message="can't run offline:go-offline when you are already offline" />
+        <ea:parameter property="project.ivy.instance" default="project.ivy.instance" description="the ivy instance name for your project" />
         <ea:go-offline projectResolverName="${project.buildscope.resolver}" easyantResolverName="${easyant.buildscope.resolver}" />
     </target>
 </project>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/offline/src/test/antunit/offline-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/offline/src/test/antunit/offline-test.xml?rev=1401179&r1=1401178&r2=1401179&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/offline/src/test/antunit/offline-test.xml (original)
+++ incubator/easyant/plugins/trunk/offline/src/test/antunit/offline-test.xml Tue Oct 23 07:00:29 2012
@@ -42,7 +42,6 @@
     <target name="tearDown" depends="clean" />
 
     <target name="test-offline:init">
-        <au:assertPropertyEquals name="project.ivy.instance" value="project.ivy.instance" />
         <au:assertPropertyEquals name="project.buildscope.resolver" value="project.buildscope.repository" />
         <au:assertPropertyEquals name="easyant.buildscope.resolver" value="easyant.buildscope.repository" />
         <au:assertPropertyEquals name="easyant.offline" value="false" />
@@ -51,6 +50,8 @@
 
 
     <target name="test-offline:offline:go-offline" depends="offline:go-offline">
+        <au:assertPropertyEquals name="project.ivy.instance" value="project.ivy.instance" />
+
         <au:assertLogContains text=":: installing junit#junit;4.4 ::" />
         <au:assertLogContains text=":: installing in project.buildscope.repository ::" />
         <au:assertLogContains text=":: installing in easyant.buildscope.repository ::" />