incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1091226 [1/3] - in /incubator/easyant/plugins/trunk: abstract-coverage/ abstract-coverage/src/main/resources/ abstract-test/ abstract-test/src/main/resources/ antcontrib-activator/ antcontrib-activator/src/main/resources/ antunit/ antunit/...
Date Mon, 11 Apr 2011 21:51:55 GMT
Author: hibou
Date: Mon Apr 11 21:51:53 2011
New Revision: 1091226

URL: http://svn.apache.org/viewvc?rev=1091226&view=rev
Log:
EASYANT-27 : get rid of phases for the plugins (not sure they actually works, to be tested and thus possibily fixed)

Modified:
    incubator/easyant/plugins/trunk/abstract-coverage/module.ivy
    incubator/easyant/plugins/trunk/abstract-coverage/src/main/resources/abstract-coverage.ant
    incubator/easyant/plugins/trunk/abstract-test/module.ivy
    incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant
    incubator/easyant/plugins/trunk/antcontrib-activator/module.ivy
    incubator/easyant/plugins/trunk/antcontrib-activator/src/main/resources/antcontrib-activator.ant
    incubator/easyant/plugins/trunk/antunit/module.ivy
    incubator/easyant/plugins/trunk/antunit/src/main/resources/antunit.ant
    incubator/easyant/plugins/trunk/build-tools/module.ivy
    incubator/easyant/plugins/trunk/build-tools/src/main/resources/build-tools.ant
    incubator/easyant/plugins/trunk/checkstyle/module.ivy
    incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.ant
    incubator/easyant/plugins/trunk/clean-std/src/main/resources/clean-std.ant
    incubator/easyant/plugins/trunk/compile-groovy/module.ivy
    incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant
    incubator/easyant/plugins/trunk/compile-java/module.ivy
    incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant
    incubator/easyant/plugins/trunk/compile-scala/module.ivy
    incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant
    incubator/easyant/plugins/trunk/compile-test-groovy/module.ivy
    incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant
    incubator/easyant/plugins/trunk/compile-test-java/module.ivy
    incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant
    incubator/easyant/plugins/trunk/compile-test-scala/module.ivy
    incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant
    incubator/easyant/plugins/trunk/coverage-cobertura/module.ivy
    incubator/easyant/plugins/trunk/coverage-cobertura/src/main/resources/coverage-cobertura.ant
    incubator/easyant/plugins/trunk/default-version-strategy/module.ivy
    incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant
    incubator/easyant/plugins/trunk/deps-lib/module.ivy
    incubator/easyant/plugins/trunk/distribution/module.ivy
    incubator/easyant/plugins/trunk/distribution/src/main/resources/distribution.ant
    incubator/easyant/plugins/trunk/docbook/module.ivy
    incubator/easyant/plugins/trunk/documentation/module.ivy
    incubator/easyant/plugins/trunk/documentation/src/main/resources/documentation.ant
    incubator/easyant/plugins/trunk/eadoc/module.ivy
    incubator/easyant/plugins/trunk/eadoc/src/main/resources/eadoc.ant
    incubator/easyant/plugins/trunk/easyant-plugin-publication/module.ivy
    incubator/easyant/plugins/trunk/easyant-plugin-publication/src/main/resources/easyant-plugin-publication.ant
    incubator/easyant/plugins/trunk/emma/module.ivy
    incubator/easyant/plugins/trunk/emma/src/main/resources/emma.ant
    incubator/easyant/plugins/trunk/ivy-provisioning/module.ivy
    incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant
    incubator/easyant/plugins/trunk/ivy-publication/module.ivy
    incubator/easyant/plugins/trunk/ivy-publication/src/main/resources/ivy-publication.ant
    incubator/easyant/plugins/trunk/ivy-repo-management/module.ivy
    incubator/easyant/plugins/trunk/ivy-repo-management/src/main/resources/ivy-repo-management.ant
    incubator/easyant/plugins/trunk/ivy-utils/module.ivy
    incubator/easyant/plugins/trunk/ivy-utils/src/main/resources/ivy-utils.ant
    incubator/easyant/plugins/trunk/javadoc/module.ivy
    incubator/easyant/plugins/trunk/jetty-deploy/module.ivy
    incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant
    incubator/easyant/plugins/trunk/manifest/module.ivy
    incubator/easyant/plugins/trunk/manifest/src/main/resources/manifest.ant
    incubator/easyant/plugins/trunk/maven-publication/module.ivy
    incubator/easyant/plugins/trunk/maven-version-strategy/module.ivy
    incubator/easyant/plugins/trunk/osgi-bundle/module.ivy
    incubator/easyant/plugins/trunk/osgi-bundle/src/main/resources/osgi-bundle.ant
    incubator/easyant/plugins/trunk/package-jar/module.ivy
    incubator/easyant/plugins/trunk/package-jar/src/main/resources/package-jar.ant
    incubator/easyant/plugins/trunk/package-test-jar/module.ivy
    incubator/easyant/plugins/trunk/package-war/module.ivy
    incubator/easyant/plugins/trunk/package-war/src/main/resources/package-war.ant
    incubator/easyant/plugins/trunk/rat/module.ivy
    incubator/easyant/plugins/trunk/rat/src/main/resources/rat.ant
    incubator/easyant/plugins/trunk/rat/src/test/antunit/rat-test.xml
    incubator/easyant/plugins/trunk/resources-std/module.ivy
    incubator/easyant/plugins/trunk/resources-std/src/main/resources/resources-std.ant
    incubator/easyant/plugins/trunk/run-java/module.ivy
    incubator/easyant/plugins/trunk/run-java/src/main/resources/run-java.ant
    incubator/easyant/plugins/trunk/scaladoc/module.ivy
    incubator/easyant/plugins/trunk/scaladoc/src/main/resources/scaladoc.ant
    incubator/easyant/plugins/trunk/scm-svn/module.ivy
    incubator/easyant/plugins/trunk/scm-svn/src/main/resources/scm-svn.ant
    incubator/easyant/plugins/trunk/skeleton/src/main/resources/skeleton.ant
    incubator/easyant/plugins/trunk/source-jar/module.ivy
    incubator/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant
    incubator/easyant/plugins/trunk/test-junit/module.ivy
    incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant
    incubator/easyant/plugins/trunk/test-testng/module.ivy
    incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant
    incubator/easyant/plugins/trunk/webstart/module.ivy
    incubator/easyant/plugins/trunk/webstart/src/main/resources/webstart.ant
    incubator/easyant/plugins/trunk/webstart/src/test/antunit/common/test-utils.ant
    incubator/easyant/plugins/trunk/webstart/src/test/antunit/webstart-test.xml
    incubator/easyant/plugins/trunk/xooki/module.ivy
    incubator/easyant/plugins/trunk/xooki/src/main/resources/xooki.ant

Modified: incubator/easyant/plugins/trunk/abstract-coverage/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-coverage/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-coverage/module.ivy (original)
+++ incubator/easyant/plugins/trunk/abstract-coverage/module.ivy Mon Apr 11 21:51:53 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="abstract-coverage" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="abstract-coverage" revision="0.2">
            <description>Abstract base plugin, that any modules providing
            test code coverage features should include.  abstract-coverage
            defines common configuration properties governing code coverage

Modified: incubator/easyant/plugins/trunk/abstract-coverage/src/main/resources/abstract-coverage.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-coverage/src/main/resources/abstract-coverage.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-coverage/src/main/resources/abstract-coverage.ant (original)
+++ incubator/easyant/plugins/trunk/abstract-coverage/src/main/resources/abstract-coverage.ant Mon Apr 11 21:51:53 2011
@@ -14,32 +14,25 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins#abstract-coverage"
-    xmlns:ea="antlib:org.apache.easyant">
+<project name="org.apache.easyant.plugins#abstract-coverage" xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
-    <target name=":init" phase="validate" description="defines a common set of configuration parameters used by code coverage tools">
-        <ea:parameter phase="validate" />
-        <ea:parameter phase="process-classes" />
-        <ea:parameter phase="report" />
-
-        <ea:parameter property="target.main.classes" required="true" description="destination directory for compiled test classes" />
-        <ea:parameter property="target.test.classes" required="true" description="destination directory for compiled coverage test classes" />
-        
-        <ea:parameter property="target" default="target" description="the target directory" />
-        <ea:parameter property="target.report" default="${target}/report" description="the target report directory" />
-    
-        <ea:parameter property="coverage.exclude.filter" default="" description="a list of pattern that coverage framework will ignore during instrumentation phase" />
-        <ea:parameter property="coverage.verbosity" default="info" description="coverage verbosity" />
-        <ea:parameter property="coverage.report.name" default="coverage" description="the name of the generated report (without file type)" />
-
-        <ea:parameter property="target.coverage.classes" default="${target}/coverage/classes" description="directory where coverage classes will be generated" />
-        <ea:parameter property="target.coverage.report" default="${target.report}/coverage" description="directory where coverage report will be generated" />
-        
-        <ea:parameter path="compile.test.classpath" required="true" description="test compilation path" />
-        
-        <available file="${src.test.java}" property="has.src.test.java" />
-    </target>
+    <ea:core-version requiredrevision="[0.9,+]" />
+
+    <ea:parameter property="target.main.classes" required="true" description="destination directory for compiled test classes" />
+    <ea:parameter property="target.test.classes" required="true" description="destination directory for compiled coverage test classes" />
+
+    <ea:parameter property="target" default="target" description="the target directory" />
+    <ea:parameter property="target.report" default="${target}/report" description="the target report directory" />
+
+    <ea:parameter property="coverage.exclude.filter" default="" description="a list of pattern that coverage framework will ignore during instrumentation phase" />
+    <ea:parameter property="coverage.verbosity" default="info" description="coverage verbosity" />
+    <ea:parameter property="coverage.report.name" default="coverage" description="the name of the generated report (without file type)" />
+
+    <ea:parameter property="target.coverage.classes" default="${target}/coverage/classes" description="directory where coverage classes will be generated" />
+    <ea:parameter property="target.coverage.report" default="${target.report}/coverage" description="directory where coverage report will be generated" />
+
+    <ea:parameter path="compile.test.classpath" required="true" description="test compilation path" />
+
+    <available file="${src.test.java}" property="has.src.test.java" />
 
 </project>

Modified: incubator/easyant/plugins/trunk/abstract-test/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-test/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-test/module.ivy (original)
+++ incubator/easyant/plugins/trunk/abstract-test/module.ivy Mon Apr 11 21:51:53 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="abstract-test" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="abstract-test" revision="0.2">
            <description>This module provides tests compilation feature.<br/>
 This module initialize compile.test.classpath and run.test.classpath.<br/>
 Tests can be skipped using skip.test property.</description>

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=1091226&r1=1091225&r2=1091226&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 Mon Apr 11 21:51:53 2011
@@ -18,14 +18,20 @@
     xmlns:ac="antlib:net.sf.antcontrib"
     xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
-    <target name=":init" phase="validate">
-        <ea:parameter phase="validate" />
-        <ea:parameter phase="compile" />
-        <ea:parameter phase="test-compile" />
-        <ea:parameter phase="test" />
+    <ea:core-version requiredrevision="[0.9,+]" />
 
+    <extension-point name="abstract-test:test-ready" />
+
+    <extension-point name="abstract-test:test-run" />
+
+    <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.2" />
+
+    <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">
         <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" 
@@ -43,12 +49,11 @@
         <ea:parameter property="target.test.integration.classes" default="${basedir}/target/integration-test/classes" 
                 description="destination directory for compiled integration test classes" />
 
-        
         <ea:parameter property="target.test.xml" required="true" 
             description="destination directory for xml test report" />
         <ea:parameter property="target.test.html" required="true" 
             description="destination directory for html test report" />
-        
+
         <ea:parameter property="test.mode" default="run"
             description="mode to use to execute tests: 'run' to only run tests, 'report' to generate html report" />
         <ea:parameter property="javac.debug.mode" default="true" 
@@ -61,14 +66,13 @@
             description="Pattern describing files included in integration test compilation process" />
         <ea:parameter property="test.integration.compile.excludes.pattern" default="" 
             description="Pattern describing files excluded in integration test compilation process" />
-        
+
         <ea:parameter property="test.run.failonerror" default="true"
             description="specify if the build should be stopped when tests are failed. Typically this property should be set to false in continuous environmnent systems"/>
-                
-        
+
         <ea:parameter path="compile.main.classpath" required="true" 
             description="path used to compile main sources" />
-        
+
         <path id="compile.test.classpath">
                 <pathelement location="${target.main.classes}" />
                 <path refid="compile.main.classpath" />
@@ -76,11 +80,11 @@
 
         <available file="${src.test.java}" property="has.src.test.java" />
         <available file="${src.test.integration.java}" property="has.src.test.integration.java"/>
-        
+
         <condition property="test.mode.run">
             <equals arg1="${test.mode}" arg2="run" />
         </condition>
-        
+
         <condition property="test.mode.report">
             <equals arg1="${test.mode}" arg2="report" />
         </condition>
@@ -92,7 +96,7 @@
             classpathref="org.apache.easyant.plugins#abstract-test.classpath" />
 
     </target>
-    
+
     <macrodef name="check-test-result" description="check test results">
         <attribute name="propertytocheck"/>
         <attribute name="message" />
@@ -112,9 +116,7 @@
                     </ac:if>
                 </ac:else>
             </ac:if>
-        </sequential>       
-        
+        </sequential>
     </macrodef>
 
-
 </project>

Modified: incubator/easyant/plugins/trunk/antcontrib-activator/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/antcontrib-activator/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/antcontrib-activator/module.ivy (original)
+++ incubator/easyant/plugins/trunk/antcontrib-activator/module.ivy Mon Apr 11 21:51:53 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="antcontrib-activator" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="antcontrib-activator" revision="0.2">
         <description>
             This module is in charge to load antcontrib taksdefs.
         </description>

Modified: incubator/easyant/plugins/trunk/antcontrib-activator/src/main/resources/antcontrib-activator.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/antcontrib-activator/src/main/resources/antcontrib-activator.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/antcontrib-activator/src/main/resources/antcontrib-activator.ant (original)
+++ incubator/easyant/plugins/trunk/antcontrib-activator/src/main/resources/antcontrib-activator.ant Mon Apr 11 21:51:53 2011
@@ -14,19 +14,11 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins#antcontrib-activator" 
-    xmlns:ea="antlib:org.apache.easyant">
+<project name="org.apache.easyant.plugins#antcontrib-activator" xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
+    <ea:core-version requiredrevision="[0.9,+]" />
 
-    <target name=":init" phase="validate">
-        <ea:parameter phase="validate"/>
+    <echo level="verbose" message="loading antcontrib" />
+    <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="org.apache.easyant.plugins#antcontrib-activator.classpath" />
 
-        <echo level="verbose" message="loading antcontrib"/>
-        
-        <taskdef resource="net/sf/antcontrib/antlib.xml" 
-            classpathref="org.apache.easyant.plugins#antcontrib-activator.classpath"/>
-    </target>
-    
-    <target name="doit" depends=":init" />
 </project>

Modified: incubator/easyant/plugins/trunk/antunit/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/antunit/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/antunit/module.ivy (original)
+++ incubator/easyant/plugins/trunk/antunit/module.ivy Mon Apr 11 21:51:53 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="antunit" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="antunit" revision="0.2">
            <description>This module provides antunit test features.</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
         </info>

Modified: incubator/easyant/plugins/trunk/antunit/src/main/resources/antunit.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/antunit/src/main/resources/antunit.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/antunit/src/main/resources/antunit.ant (original)
+++ incubator/easyant/plugins/trunk/antunit/src/main/resources/antunit.ant Mon Apr 11 21:51:53 2011
@@ -19,27 +19,23 @@
     xmlns:ea="antlib:org.apache.easyant" 
     xmlns:au="antlib:org.apache.ant.antunit">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
-    <dirname property="antunit.plugin.dir" file="${org.apache.easyant.plugins#antunit.junit-frames.xsl.file}"/>
+    <ea:core-version requiredrevision="[0.9,+]" />
 
-    <target name=":init" phase="validate" description="load parameters, antunit tasks, and create report directories">
+    <dirname property="antunit.plugin.dir" file="${org.apache.easyant.plugins#antunit.junit-frames.xsl.file}"/>
 
-        <ea:parameter phase="validate" />
-        <ea:parameter phase="test" />
-        
+    <target name="antunit:init" description="load parameters, antunit tasks, and create report directories">
         <ea:parameter property="target.antunit.xml" default="${target}/antunit/xml" description="destination directory for xml test report" />
         <ea:parameter property="target.antunit.html" default="${target}/antunit/html" description="destination directory for html test report" />
-        
+
         <!-- Create the default antunit stylesheet dir -->
         <property name="default.antunit.stylesheet.dir" value="${java.io.tmpdir}/antunit-stylesheet"/>
         <echo message="Copying default stylesheet in default.antunit.stylesheet.dir"/>
         <mkdir dir="${default.antunit.stylesheet.dir}" />
         <copy tofile="${default.antunit.stylesheet.dir}/junit-frames.xsl" file="${org.apache.easyant.plugins#antunit.junit-frames.xsl.file}" verbose="false"/>
         <copy tofile="${default.antunit.stylesheet.dir}/junit-noframes.xsl" file="${org.apache.easyant.plugins#antunit.junit-noframes.xsl.file}" verbose="false"/>
-        
+
         <ea:parameter property="target.antunit.xsl.dir" default="${default.antunit.stylesheet.dir}" description="Location of directory containing XSL transforms for test reports"/>
-        
+
         <ea:parameter property="src.test.antunit" default="src/test/antunit" description="directory where antunit test scripts are stored" />
         <ea:parameter property="antunit.testcase" description="specify a list of testcase that you want to run, if no one is specified includes pattern will be used" />
         <ea:parameter property="test.antunit.log.level" default="error" description="Verbosity level of messages from the antunit test:  none, info, warn, error, debug, verbose" />
@@ -50,11 +46,10 @@
             description="directory where antunit integration tests are stored.  Integration tests are run after packaging, in the integration-test phase."/>
         <ea:parameter property="test.integration.antunit.includes.pattern" description="Pattern describing files included in antunit integration test process"/>
         <ea:parameter property="test.integration.antunit.excludes.pattern" default="" description="Pattern describing files excluded in antunit integration test process" />
-        
+
         <ea:parameter property="test.run.failonerror" default="true"
                     description="specify if the build should be stopped when tests are failed. Typically this property should be set to false in continuous environmnent systems"/>
-                
-        
+
         <condition property="test.antunit.includes.pattern" value="${antunit.testcase}" else="**/test.xml,**/*-test.xml">
             <isset property="antunit.testcase" />
         </condition>
@@ -70,20 +65,20 @@
 
         <mkdir dir="${target.antunit.xml}"/>
         <mkdir dir="${target.antunit.html}"/>
-        
+
         <available file="${src.test.antunit}" property="has.src.test.antunit" />
         <available file="${src.test.integration.antunit}" property="has.src.test.integration.antunit"/>
-        
+
         <condition property="skip.antunit.test">
             <not><isset property="has.src.test.antunit"/></not>
         </condition>
-        
+
         <condition property="skip.antunit.integration">
             <not><isset property="has.src.test.integration.antunit"/></not>
         </condition>
 
     </target>
-    
+
     <macrodef name="antunit-test">
         <attribute name="prefix"/>
         <sequential>
@@ -106,14 +101,14 @@
         </sequential>
     </macrodef>
 
-    <target name="-test" depends="validate" unless="skip.antunit.test">
+    <target name="-antunit:test" depends="antunit:init" unless="skip.antunit.test">
         <antunit-test prefix="test"/>
     </target>
-    
-    <target name="-integration-test" depends="validate" unless="skip.antunit.integration">
+
+    <target name="-antunit:integration-test" depends="antunit:init" unless="skip.antunit.integration">
         <antunit-test prefix="test.integration"/>
     </target>
-    
+
     <macrodef name="check-test-result" description="check test results">
         <attribute name="propertytocheck"/>
         <attribute name="message" />
@@ -136,23 +131,19 @@
         </sequential>       
     </macrodef>
 
-    
-    <target name=":run" depends="-test" if="test.mode.run" unless="skip.antunit.test" 
-        phase="test" description="run all antunit tests">
+    <target name="antunit:run" depends="-antunit:test" if="test.mode.run" unless="skip.antunit.test" description="run all antunit tests">
         <check-test-result propertytocheck="test.failed"
             message="At least one test has failed. See logs in ${target.test.xml} for details or use the report target to run the test with a report" />
-
     </target>
-    
-    <target name=":run-integration" depends="-integration-test" 
-        if="test.mode.run" unless="skip.antunit.integration" 
-        phase="integration-test" description="run antunit integration tests">
+
+    <target name="antunit:run-integration" depends="-antunit:integration-test" 
+        if="test.mode.run" unless="skip.antunit.integration" description="run antunit integration tests">
         <check-test-result propertytocheck="test.integration.failed"
             message="At least one integration test has failed. See logs in ${target.test.xml} for details or use the report target to run the test with a report" />
     </target>
 
-       <target name=":report" if="test.mode.report" unless="skip.antunit.test" depends="-test,-integration-test"
-             phase="report" description="generate junit report">
+       <target name="antunit:report" if="test.mode.report" unless="skip.antunit.test" depends="-antunit:test,-antunit:integration-test"
+             description="generate junit report">
             <junitreport todir="${target.test.xml}">
                 <fileset dir="${target.test.xml}">
                     <include name="TEST-*.xml" />
@@ -165,7 +156,4 @@
                   message="At least one integration test has failed. See logs in ${target.test.xml} or report in ${target.test.html}" />
         </target>
 
-    
-    <target name="doit" depends=":run,:run-integration,:report" />
-    
 </project>

Modified: incubator/easyant/plugins/trunk/build-tools/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/build-tools/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/build-tools/module.ivy (original)
+++ incubator/easyant/plugins/trunk/build-tools/module.ivy Mon Apr 11 21:51:53 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="build-tools" revision="0.2">
+    <info organisation="org.apache.easyant.plugins" module="build-tools" revision="0.3">
            <description>This module is a build tools for multi-module projects.</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
         </info>

Modified: incubator/easyant/plugins/trunk/build-tools/src/main/resources/build-tools.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/build-tools/src/main/resources/build-tools.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/build-tools/src/main/resources/build-tools.ant (original)
+++ incubator/easyant/plugins/trunk/build-tools/src/main/resources/build-tools.ant Mon Apr 11 21:51:53 2011
@@ -14,27 +14,14 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins#build-tools"
-    xmlns:ea="antlib:org.apache.easyant"
-    xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="org.apache.easyant.plugins#build-tools" xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
-    <target name=":init" phase="validate">
-        
-        <ea:parameter phase="validate" />
-        <ea:parameter phase="verify" />
+    <ea:core-version requiredrevision="[0.9,+]" />
+
+    <ea:parameter property="project.ivy.instance" default="project.ivy.instance" description="ivy instance name" />
+    <ea:parameter property="project.ivy.file" required="true" description="ivy file (use to resolve dependencies for the project)" />
+    <ea:parameter property="pre.module.targets" default="validate,clean" description="list of targets that must be executed BEFORE subproject(s) delegation" />
+
+    <ea:parameter property="submodule.dirs" description="pattern or comma-separated list indicating which submodules directories should be included in the build" default="**/*" />
 
-        <ea:parameter property="project.ivy.instance" default="project.ivy.instance"
-                description="ivy instance name"/>
-        <ea:parameter property="project.ivy.file" required="true" 
-                description="ivy file (use to resolve dependencies for the project)"/>
-        <ea:parameter property="pre.module.targets" default="validate,clean"
-                description="list of targets that must be executed BEFORE subproject(s) delegation"/>
-        
-        <ea:parameter property="submodule.dirs" description="pattern or comma-separated list indicating which submodules directories should be included in the build" default="**/*"/>
-    </target>
-    
-    <target name="doit" depends="verify" />
-    
 </project>

Modified: incubator/easyant/plugins/trunk/checkstyle/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/checkstyle/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/checkstyle/module.ivy (original)
+++ incubator/easyant/plugins/trunk/checkstyle/module.ivy Mon Apr 11 21:51:53 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="checkstyle" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="checkstyle" revision="0.2">
            <description>This module is used to check code quality.<br/>
 By default this module generates XML report, but you can use a specific target (:report-html) to generate HTML report.<br/>
 This module can breaks the build-process, if code is not conform to a Checkstyle rules.<br/>

Modified: incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.ant (original)
+++ incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.ant Mon Apr 11 21:51:53 2011
@@ -16,15 +16,11 @@
 -->
 <project name="org.apache.easyant.plugins#checkstyle" xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
+    <ea:core-version requiredrevision="[0.9,+]" />
+
     <dirname file="${ant.file.org.apache.easyant.plugins#checkstyle}" property="ant.dir.org.apache.easyant.plugins#checkstyle" />
-    
-    <target name=":init" phase="validate">
-        <ea:parameter phase="validate" />
-        <ea:parameter phase="verify"/>
-        <ea:parameter phase="report" />
 
+    <target name="checkstyle:init">
         <ea:parameter property="checkstyle.xsl.file" default="${ant.dir.org.apache.easyant.plugins#checkstyle}/checkstyle.xsl" description="checkstyle xsl, used to transform XML -> HTML" />
         <ea:parameter property="checkstyle.config.file" default="${ant.dir.org.apache.easyant.plugins#checkstyle}/checkstyle.xml" description="checkstyle rules file" />
         <ea:parameter property="target.checkstyle.report" default="${target.report}/checkstyle" description="directory where checkstyle report will be generated" />
@@ -40,11 +36,10 @@
 
         <taskdef resource="checkstyletask.properties" classpathref="org.apache.easyant.plugins#checkstyle.classpath" />
 
-
         <available file="${src.main.java}" property="has.src.main.java" />
     </target>
-            
-    <target name=":checkstyle" unless="skip.checkstyle" phase="report" depends="validate" description="generate checkstyle report">
+
+    <target name="checkstyle:checkstyle" unless="skip.checkstyle" depends="checkstyle:init" description="generate checkstyle report">
         <mkdir dir="${target.checkstyle.report}"/>
 
         <checkstyle config="${checkstyle.config.file}" failureProperty="checkstyle.failure" failOnViolation="false">
@@ -53,14 +48,12 @@
         </checkstyle>
     </target>
 
-    <target name=":report-html" phase="report" depends=":checkstyle" unless="checkstyle.failure">
+    <target name="checkstyle:report-html" depends="checkstyle:checkstyle" unless="checkstyle.failure">
         <xslt in="${target.checkstyle.report}/${checkstyle.report.name}.xml" out="${target.checkstyle.report}/${checkstyle.report.name}.html" style="${checkstyle.xsl.file}" />
     </target>
-        
-    <target name="-check" depends=":checkstyle" unless="skip.checkstyle" phase="verify">
+
+    <target name="-checkstyle:check" depends="checkstyle:checkstyle" unless="skip.checkstyle">
         <fail if="checkstyle.failure" message="There is checkstyle violation(s), please check your ${target.checkstyle.report}/${checkstyle.report.name}.html" />
     </target>
 
-
-    <target name="doit" depends=":checkstyle" />
 </project>

Modified: incubator/easyant/plugins/trunk/clean-std/src/main/resources/clean-std.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/clean-std/src/main/resources/clean-std.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/clean-std/src/main/resources/clean-std.ant (original)
+++ incubator/easyant/plugins/trunk/clean-std/src/main/resources/clean-std.ant Mon Apr 11 21:51:53 2011
@@ -14,19 +14,15 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins#clean-std"
-    xmlns:ea="antlib:org.apache.easyant">
+<project name="org.apache.easyant.plugins#clean-std" xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
-    <target name=":init" phase="validate">
-        <ea:parameter phase="validate"/>
-        <ea:parameter property="target" required="true"
-                      description="the target directory to clean" />
-    </target>
-    
-    <target name=":clean" phase="clean" depends=":init" description="clean project">
-        <delete dir="${target}"/>
+    <ea:core-version requiredrevision="[0.9,+]" />
+
+    <ea:parameter property="target" required="true" description="the target directory to clean" />
+
+    <target name="clean-std:clean" description="clean project">
+        <echo message="Cleaning ${target}..." />
+        <delete dir="${target}" />
     </target>
-    
+
 </project>

Modified: incubator/easyant/plugins/trunk/compile-groovy/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-groovy/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-groovy/module.ivy (original)
+++ incubator/easyant/plugins/trunk/compile-groovy/module.ivy Mon Apr 11 21:51:53 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="compile-groovy" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="compile-groovy" revision="0.2">
            <description>This module provides groovy compilation feature.</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
         </info>

Modified: incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant (original)
+++ incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant Mon Apr 11 21:51:53 2011
@@ -16,12 +16,9 @@
 -->
 <project name="org.apache.easyant.plugins#compile-groovy" xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
-
-    <target name=":init" phase="validate">
-        <ea:parameter phase="validate" />
-        <ea:parameter phase="compile" />
+    <ea:core-version requiredrevision="[0.9,+]" />
 
+    <target name="compile-groovy:init">
         <ea:parameter property="src.main.groovy" required="true" description="directory where sources to be compiled are" />
         <ea:parameter property="target.main.classes" required="true" description="destination directory for compiled test classes" />
 
@@ -33,8 +30,8 @@
         <ea:path pathid="compile.main.classpath" overwrite="false" />
         
     </target>
-    
-    <target name="-configure" phase="provision">
+
+    <target name="-compile-groovy:configure" depends="compile-groovy:init">
         <ea:findclasspath pathid="resolved.groovy.classpath" organisation="org.codehaus.groovy" module="groovy-all" revision="1.6.0">
             <ea:project-dependency-strategy />
             <ea:environment-strategy env="GROOVY_HOME"/>
@@ -45,7 +42,7 @@
 
     </target>
 
-    <target name=":compile" depends="validate" if="has.src.main.groovy" phase="compile">
+    <target name="compile-groovy:compile" depends="compile-groovy:init" if="has.src.main.groovy">
         <mkdir dir="${target.main.classes}" />
         <!--
         <groovyc> Attributes
@@ -82,6 +79,4 @@
             excludes="${compile.groovy.excludes.pattern}" />
     </target>
 
-
-    <target name="doit" depends=":init" />
 </project>

Modified: incubator/easyant/plugins/trunk/compile-java/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-java/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-java/module.ivy (original)
+++ incubator/easyant/plugins/trunk/compile-java/module.ivy Mon Apr 11 21:51:53 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="compile-java" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="compile-java" revision="0.2">
            <description>This module provides java compilation 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=1091226&r1=1091225&r2=1091226&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 Mon Apr 11 21:51:53 2011
@@ -17,36 +17,37 @@
 <project name="org.apache.easyant.plugins#compile-java"
     xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
-    <target name=":init" phase="validate">
-        <ea:parameter phase="validate" />
-        <ea:parameter phase="compile" />
-        
+    <ea:core-version requiredrevision="[0.9,+]" />
+
+    <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.2" />
+
+    <!-- We expect at this point to have every source available, even the ones which are generated -->
+    <extension-point name="compile-java:compile-ready" />
+
+    <target name="compile-java:init">
         <ea:parameter property="src.main.java" required="true"
             description="directory where sources to be compiled are" />
         <ea:parameter property="target.main.classes" required="true" 
             description="destination directory for compiled test classes" />
         <ea:parameter property="javac.debug.mode" default="true" 
             description="javac debug mode, true or false" />
-        
+
         <ea:parameter property="compile.java.includes.pattern" default="**/*.java" 
             description="Pattern describing files included in compilation process" />
         <ea:parameter property="compile.java.excludes.pattern" default="" 
             description="Pattern describing files excluded in compilation process" />
-        
+
         <ea:parameter property="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="compile.java.source.version" default="${ant.java.version}" 
             description="Specify a value of the -source command-line switch; will be ignored by all implementations prior to javac1.4 (or modern when Ant is not running in a 1.3 VM) and jikes" />
-        
+
         <available file="${src.main.java}" property="has.src.main.java" />
 
         <ea:path pathid="compile.main.classpath" overwrite="false" />
-    </target>   
-    
-    <target name=":compile" depends="validate" if="has.src.main.java"
-        phase="compile">
+    </target>
+
+    <target name="compile-java:compile" depends="compile-java:init,ivy-provisioning:resolve-main-confs,compile-java:compile-ready" if="has.src.main.java">
         <mkdir dir="${target.main.classes}" />
         <javac  srcdir="${src.main.java}"
                 destdir="${target.main.classes}"
@@ -57,8 +58,7 @@
                 includes="${compile.java.includes.pattern}"
                 excludes="${compile.java.excludes.pattern}"
                 includeantruntime="no">
-        </javac>    
-    </target>   
-    
-    <target name="doit" depends=":compile" />
+        </javac>
+    </target>
+
 </project>

Modified: incubator/easyant/plugins/trunk/compile-scala/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-scala/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-scala/module.ivy (original)
+++ incubator/easyant/plugins/trunk/compile-scala/module.ivy Mon Apr 11 21:51:53 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="compile-scala" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="compile-scala" revision="0.2">
            <description>This module provides scala compilation feature.</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
         </info>

Modified: incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant (original)
+++ incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant Mon Apr 11 21:51:53 2011
@@ -17,11 +17,9 @@
 <project name="org.apache.easyant.plugins#compile-scala"
     xmlns:ea="antlib:org.apache.easyant">
     
-    <ea:core-version requiredrevision="[0.8,+]" />
+    <ea:core-version requiredrevision="[0.9,+]" />
     
-    <target name=":init" phase="validate">
-        <ea:parameter phase="validate" />
-        <ea:parameter phase="compile" />
+    <target name="compile-scala:init">
         <property environment="env"/>
         <ea:parameter property="src.main.scala" required="true"
             description="directory where sources to be compiled are" />
@@ -40,8 +38,8 @@
 
         <ea:path pathid="compile.main.classpath" overwrite="false" />
     </target>
-    
-    <target name="-configure" phase="provision">
+
+    <target name="-compile-scala:configure" depends="compile-scala:init">
         <ea:findclasspath pathid="resolved.scala.classpath" organisation="org.scala-lang" module="scala-compiler" revision="2.7.7">
             <ea:project-dependency-strategy />
             <ea:environment-strategy env="SCALA_HOME"/>
@@ -56,10 +54,8 @@
             <path refid="resolved.scala.classpath"/>
         </ea:path>
     </target>
-    
-    <target name=":compile" depends="validate" if="has.src.main.scala"
-        phase="compile">
-        
+
+    <target name="compile-scala:compile" depends="-compile-scala:configure" if="has.src.main.scala">
         <mkdir dir="${target.main.classes}" />
         <scalac  srcdir="${src.main.scala}"
                 destdir="${target.main.classes}"
@@ -67,9 +63,6 @@
                 classpathref="compile.main.classpath"
                 includes="${compile.scala.includes.pattern}"
                 excludes="${compile.scala.excludes.pattern}">
-        
         </scalac>   
     </target>   
-    
-    <target name="doit" depends=":compile" />
 </project>

Modified: incubator/easyant/plugins/trunk/compile-test-groovy/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-groovy/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-groovy/module.ivy (original)
+++ incubator/easyant/plugins/trunk/compile-test-groovy/module.ivy Mon Apr 11 21:51:53 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="compile-test-groovy" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="compile-test-groovy" revision="0.2">
            <description>This module provides groovy compilation feature for tests.</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
         </info>

Modified: incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant (original)
+++ incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant Mon Apr 11 21:51:53 2011
@@ -17,9 +17,9 @@
 <project name="org.apache.easyant.plugins#compile-test-groovy"
     xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
-    <ea:include mrid="org.apache.easyant.plugins#abstract-test;0.1" as=":abstract-test"/>
+    <ea:core-version requiredrevision="[0.9,+]" />
+
+    <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.2" />
 
     <macrodef name="compile-groovy-tests">
         <attribute name="prefix"/>
@@ -32,8 +32,8 @@
                 excludes="${@{test}.compile.excludes.pattern}"/>
         </sequential>
     </macrodef>
-    
-    <target name="-configure" phase="provision">
+
+    <target name="-compile-test-groovy:configure" depends="ivy-provisioning:resolve-test-confs">
         <ea:findclasspath pathid="resolved.groovy.classpath" organisation="org.codehaus.groovy" module="groovy-all" revision="1.6.0">
             <ea:project-dependency-strategy />
             <ea:environment-strategy env="GROOVY_HOME"/>
@@ -42,14 +42,12 @@
 
         <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="resolved.groovy.classpath" />
     </target>
-    
-    <target name=":compile" depends="validate, compile, test-process-resources" if="has.src.test.java"
-        phase="test-compile">
+
+    <target name="compile-test-groovy:compile" depends="-compile-test-groovy:configure" if="has.src.test.java">
         <compile-groovy-tests prefix="test"/>
     </target>
 
-    <target name=":compile-integration" depends="validate, compile, test-process-resources" if="has.src.test.integration.java"
-        phase="test-compile">
+    <target name="compile-test-groovy:compile-integration" depends="-compile-test-groovy:configure" if="has.src.test.integration.java">
         <compile-groovy-tests prefix="test.integration"/>
     </target>
 

Modified: incubator/easyant/plugins/trunk/compile-test-java/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-java/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-java/module.ivy (original)
+++ incubator/easyant/plugins/trunk/compile-test-java/module.ivy Mon Apr 11 21:51:53 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="compile-test-java" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="compile-test-java" revision="0.2">
            <description>This module provides java compilation feature for tests.</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
         </info>

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=1091226&r1=1091225&r2=1091226&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 Mon Apr 11 21:51:53 2011
@@ -17,10 +17,10 @@
 <project name="org.apache.easyant.plugins#compile-test-java"
     xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
-    <ea:include mrid="org.apache.easyant.plugins#abstract-test;0.1" as=":abstract-compile-test-java"/>
-    
+    <ea:core-version requiredrevision="[0.9,+]" />
+
+    <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.2" />
+
     <macrodef name="compile-java-tests">
         <attribute name="prefix"/>
         <sequential>
@@ -34,13 +34,11 @@
                     includes="${@{prefix}.compile.includes.pattern}"
                     excludes="${@{prefix}.compile.excludes.pattern}"
                     includeantruntime="no">
-            </javac>    
+            </javac>
         </sequential>
     </macrodef>
 
-    <target name=":compile" depends="validate, compile, test-process-resources" if="has.src.test.java"
-        phase="test-compile">
-        
+    <target name="compile-test-java:compile" depends="ivy-provisioning:resolve-test-confs" 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}" 
@@ -48,17 +46,12 @@
         <compile-java-tests prefix="test"/>
     </target>
 
-    <target name=":compile-integration" depends="validate, compile, test-process-resources" if="has.src.test.integration.java"
-        phase="test-compile">
-        
+    <target name="compile-test-java:compile-integration" depends="ivy-provisioning:resolve-test-confs" 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}" 
             description="Specify a value of the -source command-line switch; will be ignored by all implementations prior to javac1.4 (or modern when Ant is not running in a 1.3 VM) and jikes" />
-        
         <compile-java-tests prefix="test.integration"/> 
     </target>
 
-    
-
 </project>

Modified: incubator/easyant/plugins/trunk/compile-test-scala/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-scala/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-scala/module.ivy (original)
+++ incubator/easyant/plugins/trunk/compile-test-scala/module.ivy Mon Apr 11 21:51:53 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="compile-test-scala" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="compile-test-scala" revision="0.2">
            <description>This module provides scala compilation feature for tests.</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
         </info>

Modified: incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant (original)
+++ incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant Mon Apr 11 21:51:53 2011
@@ -17,11 +17,11 @@
 <project name="org.apache.easyant.plugins#compile-test-scala"
     xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
-    <ea:include mrid="org.apache.easyant.plugins#abstract-test;0.1" as=":abstract-test"/>
-    
-    <target name="-configure" phase="provision">
+    <ea:core-version requiredrevision="[0.9,+]" />
+
+    <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.2" />
+
+    <target name="-compile-test-scala:configure" depends="ivy-provisioning:resolve-test-confs">
         <ea:findclasspath pathid="resolved.scala.classpath" organisation="org.scala-lang" module="scala-compiler" revision="2.7.7">
             <ea:project-dependency-strategy />
             <ea:environment-strategy env="SCALA_HOME"/>
@@ -34,9 +34,8 @@
         <ea:path pathid="compile.test.classpath" overwrite="prepend">
             <path refid="resolved.scala.classpath"/>
         </ea:path>
-
     </target>
-    
+
     <macrodef name="compile-scala-tests">
         <attribute name="prefix"/>
         <sequential>
@@ -50,16 +49,13 @@
             </scalac>
         </sequential>
     </macrodef>
-    
-    <target name=":compile" depends="validate, compile, test-process-resources" if="has.src.test.java"
-        phase="test-compile">
-            <compile-scala-tests prefix="test"/>
+
+    <target name="compile-test-scala:compile" depends="-compile-test-scala:configure" if="has.src.test.java">
+        <compile-scala-tests prefix="test"/>
     </target>
-    
-    <target name=":compile-integration" depends="validate, compile, test-process-resources" if="has.src.test.integration.java"
-        phase="test-compile">
+
+    <target name="compile-test-scala:compile-integration" depends="-compile-test-scala:configure" if="has.src.test.integration.java">
         <compile-scala-tests prefix="test.integration"/>
     </target>
 
-
 </project>

Modified: incubator/easyant/plugins/trunk/coverage-cobertura/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/coverage-cobertura/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/coverage-cobertura/module.ivy (original)
+++ incubator/easyant/plugins/trunk/coverage-cobertura/module.ivy Mon Apr 11 21:51:53 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="coverage-cobertura" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="coverage-cobertura" revision="0.2">
         <description>
 Provides test code coverage report using cobertura framework.
         </description>

Modified: incubator/easyant/plugins/trunk/coverage-cobertura/src/main/resources/coverage-cobertura.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/coverage-cobertura/src/main/resources/coverage-cobertura.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/coverage-cobertura/src/main/resources/coverage-cobertura.ant (original)
+++ incubator/easyant/plugins/trunk/coverage-cobertura/src/main/resources/coverage-cobertura.ant Mon Apr 11 21:51:53 2011
@@ -17,15 +17,12 @@
 <project name="org.apache.easyant.plugins#coverage-cobertura" 
     xmlns:ac="antlib:net.sf.antcontrib"
     xmlns:ea="antlib:org.apache.easyant">
-    
-    <ea:core-version requiredrevision="[0.8,+]" />
-        
-    <ea:include mrid="org.apache.easyant.plugins#abstract-coverage;0.1" as=":abstract-coverage"/>
-
-    <target name=":init" phase="validate" depends=":abstract-coverage:init">
-        
-        <ea:parameter phase="verify"/>
 
+    <ea:core-version requiredrevision="[0.9,+]" />
+
+    <ea:import mrid="org.apache.easyant.plugins#abstract-coverage;0.2" />
+
+    <target name="coverage-cobertura:init" depends="abstract-coverage:init">
         <ea:parameter property="coverage.report.format" description="report output format; text/html/xml" default="html"/>
         <ea:parameter property="cobertura.datafile.path" description="serialized object file where cobertura tracks coverage statistics" 
             default="${target.coverage.report}/cobertura.ser"/>
@@ -36,7 +33,7 @@
         <ea:parameter property="coverage.required.packagebranchrate" description="the required minimum branch coverage for each package, as a percentage" default="0"/>
         <ea:parameter property="coverage.required.totallinerate" description="the required minimum line coverage for the entire module, as a percentage" default="0"/>
         <ea:parameter property="coverage.required.totalbranchrate" description="the required minimum branch coverage for the entire module, as a percentage" default="0"/>
-        
+
         <available property="cobertura.available" classname="net.sourceforge.cobertura.ant.CheckTask" classpathref="org.apache.easyant.plugins#coverage-cobertura.classpath"/>
         <fail unless="cobertura.available" message="Cobertura not found on project classpath!" />
 
@@ -54,12 +51,12 @@
 
     </target>
 
-    <target name=":instrument" depends=":init" phase="process-classes" if="has.src.test.java">
+    <target name="coverage-cobertura:instrument" depends="coverage-cobertura:init" if="has.src.test.java" extensionOf="abstract-test:test-ready">
         <ea:path overwrite="prepend" pathid="run.test.classpath">
             <pathelement path="${target.coverage.classes}" />
             <path refid="org.apache.easyant.plugins#coverage-cobertura.classpath"/>
-        </ea:path>  
-                
+        </ea:path>
+
         <!-- Apply instrumentation to app classes -->
         <cobertura-instrument todir="${target.coverage.classes}"
                 datafile="${net.sourceforge.cobertura.datafile}">
@@ -70,14 +67,12 @@
         </cobertura-instrument>
     </target>
 
-    <target name=":report" depends=":init" phase="report" if="has.src.test.java">
-
+    <target name="coverage-cobertura:report" depends="coverage-cobertura:init,abstract-test:test-run" if="has.src.test.java" description="generate cobertura covera report">
         <cobertura-report format="${coverage.report.format}" destdir="${target.coverage.report}" srcdir="${src.main.java}" 
             datafile="${net.sourceforge.cobertura.datafile}"/>
-        
     </target>
-    
-    <target name=":check" depends=":init" phase="verify" if="has.src.test.java"
+
+    <target name="coverage-cobertura:check" depends="coverage-cobertura:init" if="has.src.test.java"
             description="fail the build if code coverage targets are not satisfied">
         <cobertura-check branchrate="${coverage.required.branchrate}" 
                          linerate="${coverage.required.linerate}" 
@@ -88,7 +83,4 @@
                          datafile="${net.sourceforge.cobertura.datafile}"/>
     </target>
 
-    <target name=":cobertura" depends="validate,test,report" description="generate cobertura covera report" />
-    <target name="doit" depends=":cobertura" />
-    
 </project>

Modified: incubator/easyant/plugins/trunk/default-version-strategy/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/default-version-strategy/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/default-version-strategy/module.ivy (original)
+++ incubator/easyant/plugins/trunk/default-version-strategy/module.ivy Mon Apr 11 21:51:53 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="default-version-strategy" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="default-version-strategy" revision="0.2">
            <description>This module provides the default version strategy. A version strategy is in charge to define the version for integrations (snapshot) and releases </description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
         </info>

Modified: incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant (original)
+++ incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant Mon Apr 11 21:51:53 2011
@@ -18,15 +18,12 @@
     xmlns:ivy="antlib:org.apache.ivy.ant"
     xmlns:ac="antlib:net.sf.antcontrib"
     xmlns:ea="antlib:org.apache.easyant">
-    
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
-    <target name=":init" phase="validate">
-        <ea:parameter phase="validate" />
-        <ea:parameter phase="generate-local-version"/>
-        <ea:parameter phase="generate-shared-version"/>
-        <ea:parameter phase="generate-release-version"/>
 
+    <ea:core-version requiredrevision="[0.9,+]" />
+
+    <ea:import mrid="org.apache.easyant.plugins#ivy-publication;0.2" />
+
+    <target name="default-version-strategy:init">
         <ea:parameter property="release.resolver" default="shared" 
                 description="the name of the resolver use for release publication"/>
         <ea:parameter property="shared.resolver" default="shared" 
@@ -35,16 +32,16 @@
                 description="ivy instance name"/>
         <ea:parameter property="project.ivy.file" required="true" 
                 description="ivy file (use to resolve dependencies for the project)"/>
-    
+
         <ea:parameter property="default.build.number" default="1" 
                 description="default project version"/>
         <ea:parameter property="revision.separator" default="-dev-build" 
                 description="separator for version"/>
-        
+
         <!-- is project ivy settings configured ? -->
         <ea:parameter property="project.ivy.settings.file" description="the ivysettings file used by your project" />
         <ea:parameter property="project.ivy.settings.url" description="the ivysettings url used by your project" />
-        
+
         <ea:parameter property="fail.publication.if.no.revision" default="true" description="fail build if current module has no revision in 'info' tag of the module.ivy"/>
         <condition property="is.project.ivy.settings.configured">
             <isreference refid="${project.ivy.instance}"/>
@@ -52,7 +49,7 @@
         <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"/>
 
     </target>
-    
+
     <macrodef name="check-version-number">
         <sequential>
             <property name="pub.no.revision.message" value="It seems that you did not specify the revision number of your project, we strongly recommend you to set it through the 'info' tag in your module ivy before any publication"/>
@@ -74,25 +71,24 @@
     </macrodef>
 
     <!-- version numbers -->
-    <target name="-local" phase="generate-local-version">
+    <target name="default-version-strategy:local" depends="default-version-strategy:init" extensionOf="ivy-publication:generate-local-version">
         <check-version-number/>
         <tstamp>
             <format property="now" pattern="yyyyMMddHHmmss" />
         </tstamp>
         <property name="version" value="${ivy.revision}-local-${now}" />
     </target>
-    
-    <target name="-shared" phase="generate-shared-version" depends="validate" unless="ivy.new.revision">
+
+    <target name="default-version-strategy:shared" depends="default-version-strategy:init" unless="ivy.new.revision" extensionOf="ivy-publication:generate-shared-version">
         <ea:checkresolver resolver="shared.resolver" settingsRef="${project.ivy.instance}" description="name of the repository used to publish shared integration versions (snapshots)"/>
         <check-version-number/>
         <ivy:buildnumber organisation="${ivy.organisation}" module="${ivy.module}" revision="${ivy.revision}" defaultBuildNumber="${default.build.number}" revSep="${revision.separator}" settingsRef="${project.ivy.instance}" resolver="${shared.resolver}"/>
         <property name="version" value="${ivy.new.revision}" />
     </target>
 
-    <target name="-release" phase="generate-release-version" depends="validate" unless="ivy.new.revision">
+    <target name="default-version-strategy:release" depends="default-version-strategy:init" unless="ivy.new.revision" extensionOf="ivy-publication:generate-release-version">
         <check-version-number/>
         <property name="version" value="${ivy.revision}" />
     </target>
 
-    <target name="doit" depends=":init" />
 </project>

Modified: incubator/easyant/plugins/trunk/deps-lib/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/deps-lib/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/deps-lib/module.ivy (original)
+++ incubator/easyant/plugins/trunk/deps-lib/module.ivy Mon Apr 11 21:51:53 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="deps-lib" revision="0.2">
+    <info organisation="org.apache.easyant.plugins" module="deps-lib" revision="0.3">
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
         </info>
         <configurations>

Modified: incubator/easyant/plugins/trunk/distribution/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/distribution/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/distribution/module.ivy (original)
+++ incubator/easyant/plugins/trunk/distribution/module.ivy Mon Apr 11 21:51:53 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="distribution" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="distribution" revision="0.2">
            <description>This module allow you to make binary distributions of your project such as zip, tar.bz2, tar.gz, etc...
             It provides ready to use distributions like bin, with-dependencies, sources. It also comes with a macro that can be reused to make your own distribution.
            </description>

Modified: incubator/easyant/plugins/trunk/distribution/src/main/resources/distribution.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/distribution/src/main/resources/distribution.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/distribution/src/main/resources/distribution.ant (original)
+++ incubator/easyant/plugins/trunk/distribution/src/main/resources/distribution.ant Mon Apr 11 21:51:53 2011
@@ -16,7 +16,7 @@
 -->
 <project name="org.apache.easyant.plugins;distribution" xmlns:ac="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
+    <ea:core-version requiredrevision="[0.9,+]" />
 
     <macrodef name="generate-bundle-checksum" description="generate checksum files for a given file">
         <attribute name="usechecksum" description="Defines if checksum files need to be generated" default="true" />
@@ -78,13 +78,11 @@
                     <generate-bundle-checksum file="@{destfile}.jar" usechecksum="@{usechecksum}" />
                 </ac:then>
             </ac:if>
-
-            
         </sequential>
 
     </macrodef>
 
-    <target name=":init" phase="validate">
+    <target name="distribution:init">
         <ea:parameter property="target.distributions" default="${target}/distributions" description="directory where distribution packages will be generated" />
         <ea:parameter property="project.basedir" default="${basedir}" description="defines the project base directory" />
         <ea:parameter property="project.prefix" default="" description="defines the project prefix, used as distribution root directory" />
@@ -92,7 +90,6 @@
         <ea:parameter property="project.bin.dir" default="${basedir}/bin" description="directory of project binaries (scripts, executables, etc...)"/>
         <ea:parameter property="lib.main" default="${basedir}/lib/main" description="directory where main libraries are picked up" />       
 
-        
         <!-- project artifacts -->
         <zipfileset id="project.artifacts.zipfileset" dir="${target.artifacts}" prefix="${project.prefix}/lib">
             <exclude name="**/*-test.jar"/>
@@ -109,7 +106,7 @@
             <include name="NOTICE" />
             <include name="LICENSE" />
         </zipfileset>
-        
+
         <!-- all project files -->
         <zipfileset id="project.allfiles.zipfileset" dir="${project.basedir}" prefix="${project.prefix}" >
             <exclude name="**/target/**"/>
@@ -117,19 +114,19 @@
             <exclude name="**/lib/**"/>
             <exclude name="**/.git/**"/>
         </zipfileset>
-        
+
         <mkdir dir="${target.distributions}" />
     </target>
 
-    <target name=":clean" description="clean distribution dir">
+    <target name="distribution:clean" description="clean distribution dir">
         <delete dir="${target.distributions}"/>
     </target>
-    
-    <target name="-force-retrieve" depends="validate">
+
+    <target name="-distribution:force-retrieve" depends="distribution:init">
         <property name="retrieve.dependencies" value="true"/>
     </target>
-    
-    <target name=":bin" depends="-force-retrieve,package" description="create a binary distribution">
+
+    <target name="distribution:bin" depends="-distribution:force-retrieve" description="create a binary distribution">
         <bundle destfile="${target.distributions}/${module.name}-bin">
             <!-- project artifacts -->
             <zipfileset refid="project.artifacts.zipfileset" />
@@ -144,12 +141,12 @@
         </bundle>
     </target>
 
-    <target name=":jar-with-dependencies" depends="-force-retrieve,package" description="create a jar archive which contains the binary output of your project, along its the unpacked dependencies (only works on jar projects)">
+    <target name="distribution:jar-with-dependencies" depends="-distribution:force-retrieve" description="create a jar archive which contains the binary output of your project, along its the unpacked dependencies (only works on jar projects)">
         <condition property="target.main.artifact.exist">
             <and>
                 <isset property="target.main.artifact"/>
                 <available file="${target.main.artifact}"/>
-            </and>      
+            </and>
         </condition>
         <fail unless="${target.main.artifact.exist}" message="${target.main.artifact} not found"/>
         <ea:parameter property="bundle.withdependencies.excludes.pattern" default="META-INF/MANIFEST.MF" 
@@ -163,8 +160,8 @@
             </zipfileset>
         </bundle>
     </target>
-    
-    <target name=":source" depends="package" description="create a source distribution">
+
+    <target name="distribution:source" description="create a source distribution">
         <bundle destfile="${target.distributions}/${module.name}-source">
             <!-- project artifacts -->
             <zipfileset refid="project.artifacts.zipfileset" />
@@ -178,7 +175,5 @@
             <zipfileset refid="project.allfiles.zipfileset" />
         </bundle>
     </target>
-    
-    <!-- define a generic default target for this plugin -->
-    <target name="doit" depends="validate" />
+
 </project>

Modified: incubator/easyant/plugins/trunk/docbook/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/docbook/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/docbook/module.ivy (original)
+++ incubator/easyant/plugins/trunk/docbook/module.ivy Mon Apr 11 21:51:53 2011
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven" xmlns:ea="http://www.easyant.org"> 
-    <info organisation="org.apache.easyant.plugins" module="docbook" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="docbook" revision="0.2">
            <description>Generates project documentation as HTML or PDF using docbook-xsl.  
            See <a href="http://www.sagehill.net/docbookxsl">http://www.sagehill.net/docbookxsl</a>
            for instructions on writing DocBook documentation and configuring the DocBook generator.

Modified: incubator/easyant/plugins/trunk/documentation/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/documentation/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/documentation/module.ivy (original)
+++ incubator/easyant/plugins/trunk/documentation/module.ivy Mon Apr 11 21:51:53 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="documentation" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="documentation" revision="0.2">
            <description><p>This module is used to generate documentation (out of XDOC files).<br/>
             Your project must have the following structure:<br/>
                 src--<br/>

Modified: incubator/easyant/plugins/trunk/documentation/src/main/resources/documentation.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/documentation/src/main/resources/documentation.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/documentation/src/main/resources/documentation.ant (original)
+++ incubator/easyant/plugins/trunk/documentation/src/main/resources/documentation.ant Mon Apr 11 21:51:53 2011
@@ -15,16 +15,12 @@
    limitations under the License.
 -->
 <project name="org.apache.easyant.plugins#documentation" xmlns:ea="antlib:org.apache.easyant">
-    
-    <ea:core-version requiredrevision="[0.8,+]" />
 
-    <dirname file="${org.apache.easyant.plugins#documentation.style.css.file}" property="org.apache.easyant.plugins#documentation.style.css.dir" />
+    <ea:core-version requiredrevision="[0.9,+]" />
 
-    <target name=":init" phase="validate">
-        <ea:parameter phase="validate" />
-        <ea:parameter phase="verify" />
-        <ea:parameter phase="documentation" />
+    <dirname file="${org.apache.easyant.plugins#documentation.style.css.file}" property="org.apache.easyant.plugins#documentation.style.css.dir" />
 
+    <target name="documentation:init">
         <ea:parameter property="documentation.xsl.file" default="${org.apache.easyant.plugins#documentation.site.xsl.file}" description="xsl, used to transform XML -> HTML" />
         <ea:parameter property="documentation.css.dir" default="{org.apache.easyant.plugins#documentation.style.css.dir}" description="path where the css are stored, used for nice looking HTML" />
         <ea:parameter property="target.documentation.dir" default="${target}/documentation" description="directory where the documentation will be generated to" />
@@ -46,26 +42,26 @@
         <available file="${documentation.css.dir}" property="has.documentation.css.dir" />
     </target>
 
-    <target name="-warn-src.documentation.dir.missing" unless="has.src.documentation.dir">
+    <target name="-documentation:warn-src.documentation.dir.missing" unless="has.src.documentation.dir">
         <echo>WARN: Your project doesn't match with documentation structure.</echo>
         <echo>  If you want to use the documentation feature you must create ${src.documentation.dir} directory. This directory must have a menu.xml file</echo>
         <echo>  If you want to have more information, you should look at the documentation of this module.</echo>
         <property name="skip.documentation" value="true" />
     </target>
 
-    <target name="-warn-documentation.menu.file.missing" unless="has.documentation.menu.file">
+    <target name="-documentation:warn-documentation.menu.file.missing" unless="has.documentation.menu.file">
         <echo>WARN: Your project doesn't match with documentation structure (documentation menu file is missing).</echo> 
         <echo>  If you want to have more information, you should look at the documentation of this module.</echo>
         <property name="skip.documentation" value="true" />
     </target>
 
-    <target name="-documentation" unless="skip.documentation" 
-        phase="documentation" 
-        depends="validate, -warn-src.documentation.dir.missing, -warn-documentation.menu.file.missing, -copy-css, process-documentation-resources">
+    <target name="-documentation:documentation" unless="skip.documentation" 
+        depends="documentation:init, -documentation:warn-src.documentation.dir.missing, -documentation:warn-documentation.menu.file.missing, -documentation:copy-css">
         <mkdir dir="${target.documentation.dir}" />
 
         <echo message="Transforming the site documents..." />
-        <xslt basedir="${src.documentation.dir}" destdir="${target.documentation.dir}" extension=".html" style="${documentation.xsl.file}" excludes="${documentation.menu.file}" includes="*.xml">          <param name="relative-path" expression="." />
+        <xslt basedir="${src.documentation.dir}" destdir="${target.documentation.dir}" extension=".html" style="${documentation.xsl.file}" excludes="${documentation.menu.file}" includes="*.xml">
+            <param name="relative-path" expression="." />
             <param name="menu-src-path" expression="${src.documentation.dir}" />
             <param name="menu-file" expression="${documentation.menu.file}" />
         </xslt>
@@ -85,7 +81,7 @@
     </target>
 
     <!-- Copy CSS stylesheets -->
-    <target name="-copy-css" if="has.documentation.css.dir" unless="skip.documentation" phase="process-documentation-resources">
+    <target name="-documentation:copy-css" if="has.documentation.css.dir" unless="skip.documentation">
         <echo message="Copying CSS files..." />
         <copy todir="${target.documentation.dir}" filtering="no">
             <fileset dir="${documentation.css.dir}">
@@ -94,10 +90,8 @@
         </copy>
     </target>
 
-    <target name=":documentation" depends="-documentation" unless="skip.documentation" description="generate documentation">
+    <target name="documentation:documentation" depends="-documentation:documentation" unless="skip.documentation" description="generate documentation">
         <fail if="documentation.failure" message="There are documentation violation(s)" />
     </target>
 
-
-    <target name="doit" depends=":documentation" />
 </project>

Modified: incubator/easyant/plugins/trunk/eadoc/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/eadoc/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/eadoc/module.ivy (original)
+++ incubator/easyant/plugins/trunk/eadoc/module.ivy Mon Apr 11 21:51:53 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="eadoc" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="eadoc" revision="0.2">
            <description>
            EADoc generates <a href="http://xooki.sourceforge.net/">xooki</a> 
            documentation for EasyAnt modules (plugins and buildtypes).  

Modified: incubator/easyant/plugins/trunk/eadoc/src/main/resources/eadoc.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/eadoc/src/main/resources/eadoc.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/eadoc/src/main/resources/eadoc.ant (original)
+++ incubator/easyant/plugins/trunk/eadoc/src/main/resources/eadoc.ant Mon Apr 11 21:51:53 2011
@@ -19,34 +19,30 @@
     xmlns:ea="antlib:org.apache.easyant"
     xmlns:ivy="antlib:org.apache.ivy.ant"
     xmlns:ac="antlib:net.sf.antcontrib">
-    
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
-    <target name=":init" description="Read and verify property configuration, load required task libraries" phase="validate">
-        <ea:parameter phase="validate" />
-        <ea:parameter phase="documentation" />
 
+    <ea:core-version requiredrevision="[0.9,+]" />
+
+    <target name="eadoc:init" description="Read and verify property configuration, load required task libraries">
         <ea:parameter property="eadoc.repository.name"
             description="name of the repository to document" default="local"/>
         <ea:parameter property="target.documentation.dir" default="${target}/documentation" 
             description="directory where the documentation will be generated to" />
         <ea:parameter property="eadoc.documentation.dir"
             description="target directory for generated documentation" default="${target.documentation.dir}"/>
-        
+
         <ea:parameter property="eadoc.module.org" 
             description="org name for easyant modules" default="*" />
         <ea:parameter property="eadoc.module.includes"
             description="name pattern of modules to document" default="*"/>
-    
+
         <ea:parameter property="eadoc.module.types"
             description="List of module types to be documented" default="plugin,buildtype"/>
-        
     </target>
 
-    <target name=":generate"
+    <target name="eadoc:generate"
             description="generate documentation for all EasyAnt plugins in the target repository" 
-            depends="validate" phase="process-documentation-resources">
-    
+            depends="eadoc:init">
+
         <!-- generate xooki TOC for each module type -->
         <ac:for list="${eadoc.module.types}" param="current.type">
             <sequential>
@@ -70,9 +66,6 @@
 
             </sequential>
         </ac:for>
-        
     </target>
-    
-    <target name="doit" depends=":generate" />
-    
+
 </project>

Modified: incubator/easyant/plugins/trunk/easyant-plugin-publication/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/easyant-plugin-publication/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/easyant-plugin-publication/module.ivy (original)
+++ incubator/easyant/plugins/trunk/easyant-plugin-publication/module.ivy Mon Apr 11 21:51:53 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="easyant-plugin-publication" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="easyant-plugin-publication" revision="0.2">
            <description>This module provides publication features for easyant plugins.</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
         </info>



Mime
View raw message