Author: maartenc
Date: Thu Feb 15 12:57:48 2007
New Revision: 508145
URL: http://svn.apache.org/viewvc?view=rev&rev=508145
Log:
No need to set the classpath for the ivy taskdef.
The ivy classes are already on the classpath because Ant is invoked from within
an Ivy class.
This will hopefully fix the failing trigger tests in gump.
Modified:
incubator/ivy/core/trunk/test/triggers/ant-build/A/build.xml
incubator/ivy/core/trunk/test/triggers/ant-call/A/build.xml
Modified: incubator/ivy/core/trunk/test/triggers/ant-build/A/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/triggers/ant-build/A/build.xml?view=diff&rev=508145&r1=508144&r2=508145
==============================================================================
--- incubator/ivy/core/trunk/test/triggers/ant-build/A/build.xml (original)
+++ incubator/ivy/core/trunk/test/triggers/ant-build/A/build.xml Thu Feb 15
12:57:48 2007
@@ -1,33 +1,15 @@
<project xmlns:ivy="antlib:org.apache.ivy.ant">
- <property environment="env"/>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" />
- <!-- =================================================================
- IVY AUTO INSTALL
- works if Ivy is already installed either in ivy home or in ant
lib
- ================================================================= -->
- <condition property="ivy.home" value="${env.IVY_HOME}">
- <isset property="env.IVY_HOME" />
- </condition>
- <property name="ivy.home" value="${user.home}/.ivy" />
- <property name="ivy.jar.dir" value="${ivy.home}/jars" />
-
- <!-- try to load ivy from ivy home dir, in case the user has not
already dropped
- it into ant's lib dir (note that the latter copy will always take
precedence).
- We will not fail as long as local lib dir exists (it may be
empty) and
- ivy is in at least one of ant's lib dir or the local lib dir. -->
- <path id="ivy.lib.path">
- <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
- </path>
- <taskdef resource="org/apache/ivy/ant/antlib.xml"
- uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
-
- <target name="publish">
- <tstamp><format property="tstamp"
pattern="yyyyMMDDHHmmss"/></tstamp>
- <mkdir dir="${basedir}/build"/>
- <echo message="${tstamp}" file="${basedir}/build/A.jar"/>
- <ivy:configure file="${basedir}/../ivyconf.xml"/>
- <ivy:resolve file="${basedir}/ivy.xml" />
- <ivy:publish resolver="local"
artifactspattern="${basedir}/build/[artifact].[ext]" pubrevision="${tstamp}" />
- <delete dir="build" />
- </target>
+ <target name="publish">
+ <tstamp><format property="tstamp" pattern="yyyyMMDDHHmmss"/></tstamp>
+ <mkdir dir="${basedir}/build"/>
+ <echo message="${tstamp}" file="${basedir}/build/A.jar"/>
+ <ivy:configure file="${basedir}/../ivyconf.xml"/>
+ <ivy:resolve file="${basedir}/ivy.xml" />
+ <ivy:publish resolver="local"
artifactspattern="${basedir}/build/[artifact].[ext]" pubrevision="${tstamp}" />
+ <delete dir="build" />
+
+ </target>
</project>
Modified: incubator/ivy/core/trunk/test/triggers/ant-call/A/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/triggers/ant-call/A/build.xml?view=diff&rev=508145&r1=508144&r2=508145
==============================================================================
--- incubator/ivy/core/trunk/test/triggers/ant-call/A/build.xml (original)
+++ incubator/ivy/core/trunk/test/triggers/ant-call/A/build.xml Thu Feb 15
12:57:48 2007
@@ -1,23 +1,6 @@
<project xmlns:ivy="antlib:org.apache.ivy.ant">
- <!-- =================================================================
- IVY AUTO INSTALL
- works if Ivy is already installed either in ivy home or in ant
lib
- ================================================================= -->
- <condition property="ivy.home" value="${env.IVY_HOME}">
- <isset property="env.IVY_HOME" />
- </condition>
- <property name="ivy.home" value="${user.home}/.ivy" />
- <property name="ivy.jar.dir" value="${ivy.home}/jars" />
-
- <!-- try to load ivy from ivy home dir, in case the user has not
already dropped
- it into ant's lib dir (note that the latter copy will always take
precedence).
- We will not fail as long as local lib dir exists (it may be
empty) and
- ivy is in at least one of ant's lib dir or the local lib dir. -->
- <path id="ivy.lib.path">
- <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
- </path>
<taskdef resource="org/apache/ivy/ant/antlib.xml"
- uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+ uri="antlib:org.apache.ivy.ant" />
<target name="resolve">
<ivy:configure file="../ivyconf.xml"/>
