You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by jl...@apache.org on 2012/08/04 21:22:17 UTC
svn commit: r1369462 - in /incubator/easyant/plugins/trunk:
abstract-provisioning/src/main/resources/
abstract-provisioning/src/test/antunit/ deps-lib/src/main/resources/
deps-lib/src/test/antunit/ ivy-provisioning/src/main/resources/
ivy-provisioning/...
Author: jlboudart
Date: Sat Aug 4 21:22:17 2012
New Revision: 1369462
URL: http://svn.apache.org/viewvc?rev=1369462&view=rev
Log:
Move lib.*.fileset declaration in abstract-provisioning
Modified:
incubator/easyant/plugins/trunk/abstract-provisioning/src/main/resources/abstract-provisioning.ant
incubator/easyant/plugins/trunk/abstract-provisioning/src/test/antunit/abstract-provisioning-test.xml
incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant
incubator/easyant/plugins/trunk/deps-lib/src/test/antunit/deps-lib-test.xml
incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant
incubator/easyant/plugins/trunk/ivy-provisioning/src/test/antunit/ivy-provisioning-test.xml
Modified: incubator/easyant/plugins/trunk/abstract-provisioning/src/main/resources/abstract-provisioning.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-provisioning/src/main/resources/abstract-provisioning.ant?rev=1369462&r1=1369461&r2=1369462&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-provisioning/src/main/resources/abstract-provisioning.ant (original)
+++ incubator/easyant/plugins/trunk/abstract-provisioning/src/main/resources/abstract-provisioning.ant Sat Aug 4 21:22:17 2012
@@ -27,5 +27,10 @@
<ea:parameter property="lib.test" default="${basedir}/lib/test" description="directory where test libraries are picked up" />
<ea:parameter property="lib.provided" default="${basedir}/lib/provided" description="directory where provided libraries are picked up" />
+ <fileset id="lib.main.fileset" dir="${lib.main}" erroronmissingdir="false"/>
+ <fileset id="lib.test.fileset" dir="${lib.test}" erroronmissingdir="false"/>
+ <fileset id="lib.provided.fileset" dir="${lib.provided}" erroronmissingdir="false"/>
+
+
</project>
Modified: incubator/easyant/plugins/trunk/abstract-provisioning/src/test/antunit/abstract-provisioning-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-provisioning/src/test/antunit/abstract-provisioning-test.xml?rev=1369462&r1=1369461&r2=1369462&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-provisioning/src/test/antunit/abstract-provisioning-test.xml (original)
+++ incubator/easyant/plugins/trunk/abstract-provisioning/src/test/antunit/abstract-provisioning-test.xml Sat Aug 4 21:22:17 2012
@@ -41,6 +41,9 @@
<au:assertPropertyEquals name="lib.main" value="${basedir}/lib/main"/>
<au:assertPropertyEquals name="lib.test" value="${basedir}/lib/test"/>
<au:assertPropertyEquals name="lib.provided" value="${basedir}/lib/provided"/>
+ <au:assertReferenceSet refid="lib.main.fileset"/>
+ <au:assertReferenceSet refid="lib.test.fileset"/>
+ <au:assertReferenceSet refid="lib.provided.fileset"/>
</target>
</project>
Modified: incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant?rev=1369462&r1=1369461&r2=1369462&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant (original)
+++ incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant Sat Aug 4 21:22:17 2012
@@ -20,23 +20,14 @@
<ea:core-version requiredrevision="[0.9,+]" />
<ea:import mrid="org.apache.easyant.plugins#abstract-provisioning;0.9" />
- <target name="deps-lib:init" extensionOf="abstract-provisioning:provisioning-ready">
- <fileset id="lib.main.fileset" dir="${lib.main}">
- <include name="*.jar" />
- </fileset>
-
- <fileset id="lib.test.fileset" dir="${lib.test}">
- <include name="*.jar" />
- </fileset>
- </target>
-
- <target name="deps-lib:plugin" depends="deps-lib:init">
+ <target name="deps-lib:plugin">
<ea:parameter path="compile.main.classpath"
description="main compilation path" />
<ea:parameter path="compile.test.classpath"
description="test compilation path" />
<ea:path pathid="compile.main.classpath" overwrite="append">
<fileset refid="lib.main.fileset" />
+ <fileset refid="lib.provided.fileset" />
</ea:path>
<ea:path pathid="compile.test.classpath" overwrite="append">
<fileset refid="lib.test.fileset" />
Modified: incubator/easyant/plugins/trunk/deps-lib/src/test/antunit/deps-lib-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/deps-lib/src/test/antunit/deps-lib-test.xml?rev=1369462&r1=1369461&r2=1369462&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/deps-lib/src/test/antunit/deps-lib-test.xml (original)
+++ incubator/easyant/plugins/trunk/deps-lib/src/test/antunit/deps-lib-test.xml Sat Aug 4 21:22:17 2012
@@ -44,19 +44,6 @@
</target>
<target name="tearDown" depends="clean"/>
-
- <target name="test-deps-lib">
- <property name="main.classpath" refid="compile.main.classpath"/>
- <property name="test.classpath" refid="compile.test.classpath"/>
- <au:assertPropertyEquals name="main.classpath" value=""/>
- <au:assertPropertyEquals name="test.classpath" value=""/>
- </target>
-
- <target name="test-deps-lib:init" depends="deps-lib:init">
- <au:assertReferenceSet refid="lib.main.fileset"/>
- <au:assertReferenceSet refid="lib.test.fileset"/>
- </target>
-
<target name="test-deps-lib:plugin" depends="deps-lib:plugin">
<property name="main.classpath" refid="compile.main.classpath"/>
<property name="test.classpath" refid="compile.test.classpath"/>
Modified: incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant?rev=1369462&r1=1369461&r2=1369462&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant (original)
+++ incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant Sat Aug 4 21:22:17 2012
@@ -44,10 +44,6 @@
<isreference refid="${project.ivy.instance}"/>
</condition>
<fail unless="is.project.ivy.settings.configured" message="project ivy instance is not configured, at least one of the following property must be set : project.ivy.settings.file, project.ivy.settings.url"/>
- <!-- define empty *.lib.fileset that will be override by configuration classpath -->
- <fileset id="lib.main.fileset" dir="${lib.main}" erroronmissingdir="false"/>
- <fileset id="lib.test.fileset" dir="${lib.test}" erroronmissingdir="false"/>
- <fileset id="lib.provided.fileset" dir="${lib.provided}" erroronmissingdir="false"/>
<path id="project.lib.main.classpath"/>
<path id="project.lib.test.classpath"/>
Modified: incubator/easyant/plugins/trunk/ivy-provisioning/src/test/antunit/ivy-provisioning-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/ivy-provisioning/src/test/antunit/ivy-provisioning-test.xml?rev=1369462&r1=1369461&r2=1369462&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/ivy-provisioning/src/test/antunit/ivy-provisioning-test.xml (original)
+++ incubator/easyant/plugins/trunk/ivy-provisioning/src/test/antunit/ivy-provisioning-test.xml Sat Aug 4 21:22:17 2012
@@ -54,9 +54,6 @@
<au:assertPropertyEquals name="retrieve.pattern.lib.provided" value="${lib.provided}/[artifact]-[revision].[ext]"/>
<au:assertPropertyEquals name="sync.lib.dir" value="true"/>
<au:assertPropertyEquals name="is.project.ivy.settings.configured" value="true"/>
- <au:assertReferenceSet refid="lib.main.fileset"/>
- <au:assertReferenceSet refid="lib.test.fileset"/>
- <au:assertReferenceSet refid="lib.provided.fileset"/>
<au:assertReferenceSet refid="project.lib.main.classpath"/>
<au:assertReferenceSet refid="project.lib.test.classpath"/>
<au:assertReferenceSet refid="project.lib.provided.classpath"/>