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 2011/06/28 07:12:19 UTC
svn commit: r1140456 - in /incubator/easyant/plugins/trunk:
abstract-test/src/main/resources/ clean-std/
compile-java/src/main/resources/ compile-test-java/src/main/resources/
deps-lib/src/main/resources/ ivy-provisioning/src/main/resources/
Author: jlboudart
Date: Tue Jun 28 07:12:19 2011
New Revision: 1140456
URL: http://svn.apache.org/viewvc?rev=1140456&view=rev
Log:
Add abstract provisionning plugin
Modified:
incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant
incubator/easyant/plugins/trunk/clean-std/module.ivy
incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant
incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant
incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant
incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant
Modified: incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant?rev=1140456&r1=1140455&r2=1140456&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant (original)
+++ incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant Tue Jun 28 07:12:19 2011
@@ -24,14 +24,14 @@
<extension-point name="abstract-test:test-run" />
- <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.2" />
+ <ea:import mrid="org.apache.easyant.plugins#abstract-provisioning;0.1" />
<target name="/skip-tests" description="skip tests">
<property name="skip.test" value="true" />
<property name="skip.test.integration" value="true" />
</target>
- <target name="abstract-test:init" depends="ivy-provisioning:resolve-test-libs">
+ <target name="abstract-test:init" depends="abstract-provisioning:provisioning-finished">
<ea:parameter property="src.test.java" required="true"
description="directory with unit test source files" />
<ea:parameter property="src.test.integration.java" default="${basedir}/src/integration-test/java"
Modified: incubator/easyant/plugins/trunk/clean-std/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/clean-std/module.ivy?rev=1140456&r1=1140455&r2=1140456&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/clean-std/module.ivy (original)
+++ incubator/easyant/plugins/trunk/clean-std/module.ivy Tue Jun 28 07:12:19 2011
@@ -15,7 +15,7 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="clean-std" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="clean-std" revision="0.2">
<description>This module provides project cleaning feature.</description>
<ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
Modified: incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant?rev=1140456&r1=1140455&r2=1140456&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant (original)
+++ incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant Tue Jun 28 07:12:19 2011
@@ -19,7 +19,7 @@
<ea:core-version requiredrevision="[0.9,+]" />
- <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.2" />
+ <ea:import mrid="org.apache.easyant.plugins#abstract-provisioning;0.1" />
<!-- We expect at this point to have every source available, even the ones which are generated -->
<extension-point name="compile-java:compile-ready" />
@@ -47,7 +47,7 @@
<ea:path pathid="compile.main.classpath" overwrite="false" />
</target>
- <target name="compile-java:compile" depends="compile-java:init,ivy-provisioning:resolve-main-confs,compile-java:compile-ready" if="has.src.main.java">
+ <target name="compile-java:compile" depends="compile-java:init,abstract-provisioning:provisioning-finished,compile-java:compile-ready" if="has.src.main.java">
<mkdir dir="${target.main.classes}" />
<javac srcdir="${src.main.java}"
destdir="${target.main.classes}"
Modified: incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant?rev=1140456&r1=1140455&r2=1140456&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant (original)
+++ incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant Tue Jun 28 07:12:19 2011
@@ -19,7 +19,7 @@
<ea:core-version requiredrevision="[0.9,+]" />
- <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.2" />
+ <ea:import mrid="org.apache.easyant.plugins#abstract-provisioning;0.1" />
<macrodef name="compile-java-tests">
<attribute name="prefix"/>
@@ -38,7 +38,7 @@
</sequential>
</macrodef>
- <target name="compile-test-java:compile" depends="ivy-provisioning:resolve-test-confs" if="has.src.test.java">
+ <target name="compile-test-java:compile" depends="abstract-provisioning:provisioning-finished" if="has.src.test.java">
<ea:parameter property="test.compile.java.target.version" default="${ant.java.version}"
description="Specify a VM version for Generated class files (e.g., 1.1 or 1.2)." />
<ea:parameter property="test.compile.java.source.version" default="${ant.java.version}"
@@ -46,7 +46,7 @@
<compile-java-tests prefix="test"/>
</target>
- <target name="compile-test-java:compile-integration" depends="ivy-provisioning:resolve-test-confs" if="has.src.test.integration.java">
+ <target name="compile-test-java:compile-integration" depends="abstract-provisioning:provisioning-finished" if="has.src.test.integration.java">
<ea:parameter property="test.integration.compile.java.target.version" default="${ant.java.version}"
description="Specify a VM version for Generated class files (e.g., 1.1 or 1.2)." />
<ea:parameter property="test.integration.compile.java.source.version" default="${ant.java.version}"
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=1140456&r1=1140455&r2=1140456&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 Tue Jun 28 07:12:19 2011
@@ -17,36 +17,29 @@
<project name="org.apache.easyant.plugins#deps-lib"
xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
+ <ea:core-version requiredrevision="[0.9,+]" />
+ <ea:import mrid="org.apache.easyant.plugins#abstract-provisioning;0.1" />
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="provision" />
-
- <ea:parameter property="lib.main" required="true"
- description="directory where main libraries are picked up" />
- <ea:parameter property="lib.test" required="true"
- description="directory where test libraries are picked up" />
-
+ <target name="deps-lib:init" extensionOf="abstract-provisioning:provisioning-ready">
<fileset id="lib.main.fileset" dir="${lib.main}">
- <include name="*.jar" />
- </fileset>
+ <include name="*.jar" />
+ </fileset>
- <fileset id="lib.test.fileset" dir="${lib.test}">
- <include name="*.jar" />
- </fileset>
+ <fileset id="lib.test.fileset" dir="${lib.test}">
+ <include name="*.jar" />
+ </fileset>
</target>
- <target name=":plugin" phase="provision">
+ <target name="deps-lib:plugin" extensionOf="abstract-provisioning:provisioning-finished">
<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" />
- </ea:path>
+ <fileset refid="lib.main.fileset" />
+ </ea:path>
<ea:path pathid="compile.test.classpath" overwrite="append">
- <fileset refid="lib.test.fileset" />
- </ea:path>
+ <fileset refid="lib.test.fileset" />
+ </ea:path>
</target>
</project>
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=1140456&r1=1140455&r2=1140456&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 Tue Jun 28 07:12:19 2011
@@ -20,8 +20,9 @@
xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.9,+]" />
+ <ea:import mrid="org.apache.easyant.plugins#abstract-provisioning;0.1" />
- <target name="-ivy-provisioning:init">
+ <target name="-ivy-provisioning:init" extensionOf="abstract-provisioning:provisioning-ready">
<ea:parameter property="lib.main" default="${basedir}/lib/main" description="directory where main libraries are picked up" />
<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" />
@@ -59,7 +60,7 @@
<!-- =================================
target: resolve
================================= -->
- <target name="-ivy-provisioning:resolve" depends="-ivy-provisioning:init">
+ <target name="-ivy-provisioning:resolve" depends="abstract-provisioning:provisioning-ready">
<ivy:resolve file="${project.ivy.file}" settingsRef="${project.ivy.instance}" />
<condition property="project.contains.main.confs">
<matches string="${ivy.configurations}" pattern="${main.confs}"/>