incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1091227 - in /incubator/easyant/buildtypes/trunk: build-osgi-bundle-java/src/main/resources/ build-std-ant-plugin/ build-std-ant-plugin/src/main/resources/ build-std-groovy/ build-std-groovy/src/main/resources/ build-std-java/ build-std-ja...
Date Mon, 11 Apr 2011 21:52:42 GMT
Author: hibou
Date: Mon Apr 11 21:52:41 2011
New Revision: 1091227

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

Modified:
    incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/src/main/resources/build-osgi-bundle-java.ant
    incubator/easyant/buildtypes/trunk/build-std-ant-plugin/module.ivy
    incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant
    incubator/easyant/buildtypes/trunk/build-std-groovy/module.ivy
    incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant
    incubator/easyant/buildtypes/trunk/build-std-java/module.ivy
    incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant
    incubator/easyant/buildtypes/trunk/build-std-scala/module.ivy
    incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant
    incubator/easyant/buildtypes/trunk/build-std-skeleton/module.ivy
    incubator/easyant/buildtypes/trunk/build-std-skeleton/src/main/resources/build-std-skeleton.ant
    incubator/easyant/buildtypes/trunk/build-webapp-java/module.ivy
    incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant
    incubator/easyant/buildtypes/trunk/meta-build/module.ivy
    incubator/easyant/buildtypes/trunk/meta-build/src/main/resources/meta-build.ant

Modified: incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/src/main/resources/build-osgi-bundle-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/src/main/resources/build-osgi-bundle-java.ant?rev=1091227&r1=1091226&r2=1091227&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/src/main/resources/build-osgi-bundle-java.ant
(original)
+++ incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/src/main/resources/build-osgi-bundle-java.ant
Mon Apr 11 21:52:41 2011
@@ -16,37 +16,34 @@
 -->
 <project name="org.apache.easyant.buildtypes#build-osgi-bundle-java"
     xmlns:ea="antlib:org.apache.easyant">
-    
-    <ea:core-version requiredrevision="[0.8,+]" />
+
+    <ea:core-version requiredrevision="[0.9,+]" />
+
     <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-osgi-bundle-java..."/>
-    
-    <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
 
     <property file="${org.apache.easyant.buildtypes#build-osgi-bundle-java.properties.file}"
/>
-    
-    <ea:parameter property="version.strategy.plugin.org" description="Organisation name
of the version strategy plugin" default="org.apache.easyant.plugins"/>
-    <ea:parameter property="version.strategy.plugin.module" description="Module name of
the version strategy plugin" default="default-version-strategy"/>
-    <ea:parameter property="version.strategy.plugin.rev" description="Revision number
of the version strategy plugin" default="0.1"/>
-    <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the
version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
-
-    <ea:parameter property="test.plugin.org" description="Organisation name of the test
plugin" default="org.apache.easyant.plugins"/>
-    <ea:parameter property="test.plugin.module" description="Module name of the test plugin"
default="test-${test.framework}"/>
-    <ea:parameter property="test.plugin.rev" description="Revision number of the test
plugin" default="0.2"/>
-    <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin"
default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
-
-    
-    <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
-    
-    <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
-    <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
-    <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
-    <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
-    <ea:include mrid="org.apache.easyant.plugins#compile-java;0.1" as="compile" />
-    <ea:include mrid="org.apache.easyant.plugins#compile-test-java;0.1" as="compile-test"
/>
-    <ea:include mrid="${test.plugin.mrid}" as="test" />
-    
-    <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
-    <ea:include mrid="org.apache.easyant.plugins#osgi-bundle;0.1" as="osgi" />
-    
-    <target name="doit" depends="verify" />
+
+    <ea:import mrid="org.apache.easyant.plugins#clean-std;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#default-version-strategy;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-publication;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#resources-std;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#compile-java;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#compile-test-java;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#test-junit;0.3" />
+    <ea:import mrid="org.apache.easyant.plugins#manifest;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#osgi-bundle;0.2" />
+
+    <!-- plugin binding -->
+    <bindtargets targets="compile-java:compile,manifest:manifest,resources-std:copy-resources"
extensionPoint="osgi-bundle:bundle-ready" />
+    <bindtargets targets="compile-test-java:compile,resources-std:copy-test-resources"
extensionPoint="abstract-test:test-ready" />
+    <bindtargets targets="osgi-bundle:bundle" extensionPoint="ivy-publication:publish-ready"
/>
+
+    <!-- friendly target names -->
+    <target name="clean" depends="clean-std:clean" description="Clean the project" />
+    <target name="compile" depends="compile-java:compile" description="Compile the project"
/>
+    <target name="test" depends="test-junit:run" description="Launch the unit tests" />
+    <target name="dist" depends="ivy-publication:publish-ready" description="Produce every
artifact to be distributed" />
+    <target name="install" depends="ivy-publication:publish-local" description="Install
the artifacts into the repository" />
+
 </project>

Modified: incubator/easyant/buildtypes/trunk/build-std-ant-plugin/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-ant-plugin/module.ivy?rev=1091227&r1=1091226&r2=1091227&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-ant-plugin/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-ant-plugin/module.ivy Mon Apr 11 21:52:41
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.buildtypes" module="build-std-ant-plugin" revision="0.1">
+    <info organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.2">
            <description>A standard build for true ant plugins, relying on standard
phases, and providing compilation, execution and unit tests</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin"
revision="0.1"/>
         </info>

Modified: incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant?rev=1091227&r1=1091226&r2=1091227&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant
(original)
+++ incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant
Mon Apr 11 21:52:41 2011
@@ -17,25 +17,23 @@
 <project name="org.apache.easyant.buildtypes#build-std-ant-plugin"
     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,+]" />
+
     <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-ant-plugin..."/>
-    
-    <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
 
     <property file="${org.apache.easyant.buildtypes#build-std-ant-plugin.properties.file}"
/>
-    
-    <ea:parameter property="version.strategy.plugin.org" description="Organisation name
of the version strategy plugin" default="org.apache.easyant.plugins"/>
-    <ea:parameter property="version.strategy.plugin.module" description="Module name of
the version strategy plugin" default="default-version-strategy"/>
-    <ea:parameter property="version.strategy.plugin.rev" description="Revision number
of the version strategy plugin" default="0.1"/>
-    <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the
version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
-    
-    <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
-    <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
-    <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
-    <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
-    <ea:include mrid="org.apache.easyant.plugins#easyant-plugin-publication;0.1" as="publish"
/>
-    <ea:include mrid="org.apache.easyant.plugins#antunit;0.1" as="test" />
-    
-    <target name="doit" depends="verify" />
+
+    <ea:import mrid="org.apache.easyant.plugins#clean-std;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#resources-std;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#default-version-strategy;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#easyant-plugin-publication;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#antunit;0.2" />
+
+    <!-- friendly target names -->
+    <target name="clean" depends="clean-std:clean" description="Clean the project" />
+    <target name="test" depends="antunit:run" description="Launch the unit tests" />
+    <target name="dist" depends="easyant-plugin-publication:before-test" description="Produce
every artifact to be distributed" />
+
 </project>

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

Modified: incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant?rev=1091227&r1=1091226&r2=1091227&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant
(original)
+++ incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant
Mon Apr 11 21:52:41 2011
@@ -17,35 +17,34 @@
 <project name="org.apache.easyant.buildtypes#build-std-groovy"
     xmlns:ea="antlib:org.apache.easyant">
     
-    <ea:core-version requiredrevision="[0.8,+]" />
+    <ea:core-version requiredrevision="[0.9,+]" />
+
     <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-groovy..."/>
-    
-    <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
 
     <property file="${org.apache.easyant.buildtypes#build-std-groovy.properties.file}"
/>
-    
-    <ea:parameter property="version.strategy.plugin.org" description="Organisation name
of the version strategy plugin" default="org.apache.easyant.plugins"/>
-    <ea:parameter property="version.strategy.plugin.module" description="Module name of
the version strategy plugin" default="default-version-strategy"/>
-    <ea:parameter property="version.strategy.plugin.rev" description="Revision number
of the version strategy plugin" default="0.1"/>
-    <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the
version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
-
-    <ea:parameter property="test.plugin.org" description="Organisation name of the test
plugin" default="org.apache.easyant.plugins"/>
-    <ea:parameter property="test.plugin.module" description="Module name of the test plugin"
default="test-${test.framework}"/>
-    <ea:parameter property="test.plugin.rev" description="Revision number of the test
plugin" default="0.2"/>
-    <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin"
default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
 
-    
-    <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
-    
-    <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
-    <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
-    <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
-    <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
-    <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
-    <ea:include mrid="org.apache.easyant.plugins#compile-groovy;0.1" as="compile" />
-    <ea:include mrid="org.apache.easyant.plugins#compile-test-groovy;0.1" as="compile-test"
/>
-    <ea:include mrid="${test.plugin.mrid}" as="test" />
-    <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
-    <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
-    <target name="doit" depends="verify" />
+    <ea:import mrid="org.apache.easyant.plugins#clean-std;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#default-version-strategy;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-publication;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-utils;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#resources-std;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#compile-groovy;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#compile-test-groovy;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#test-junit;0.3" />
+    <ea:import mrid="org.apache.easyant.plugins#manifest;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#package-jar;0.2" />
+
+    <!-- plugin binding -->
+    <bindtargets targets="compile-groovy:compile,manifest:manifest,resources-std:copy-resources"
extensionPoint="package-jar:jar-ready" />
+    <bindtargets targets="compile-test-groovy:compile,resources-std:copy-test-resources"
extensionPoint="abstract-test:test-ready" />
+    <bindtargets targets="package-jar:jar" extensionPoint="ivy-publication:publish-ready"
/>
+
+    <!-- friendly target names -->
+    <target name="clean" depends="clean-std:clean" description="Clean the project" />
+    <target name="compile" depends="compile-groovy:compile" description="Compile the project"
/>
+    <target name="test" depends="test-junit:run" description="Launch the unit tests" />
+    <target name="dist" depends="ivy-publication:publish-ready" description="Produce every
artifact to be distributed" />
+    <target name="install" depends="ivy-publication:publish-local" description="Install
the artifacts into the repository" />
+
 </project>

Modified: incubator/easyant/buildtypes/trunk/build-std-java/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-java/module.ivy?rev=1091227&r1=1091226&r2=1091227&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-java/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-java/module.ivy Mon Apr 11 21:52:41 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.buildtypes" module="build-std-java" revision="0.2">
+    <info organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.3">
            <description>A standard build for simple java modules, relying on standard
phases, and providing compilation, execution and unit tests</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin"
revision="0.1"/>
         </info>

Modified: incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant?rev=1091227&r1=1091226&r2=1091227&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant
(original)
+++ incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant
Mon Apr 11 21:52:41 2011
@@ -16,39 +16,35 @@
 -->
 <project name="org.apache.easyant.buildtypes#build-std-java" xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
+    <ea:core-version requiredrevision="[0.9,+]" />
 
     <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-java..."
/>
 
-    <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
-
     <property file="${org.apache.easyant.buildtypes#build-std-java.properties.file}" />
 
-    <ea:parameter property="version.strategy.plugin.org" description="Organisation name
of the version strategy plugin" default="org.apache.easyant.plugins"/>
-    <ea:parameter property="version.strategy.plugin.module" description="Module name of
the version strategy plugin" default="default-version-strategy"/>
-    <ea:parameter property="version.strategy.plugin.rev" description="Revision number
of the version strategy plugin" default="0.1"/>
-    <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the
version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
-
-    <ea:parameter property="test.plugin.org" description="Organisation name of the test
plugin" default="org.apache.easyant.plugins"/>
-    <ea:parameter property="test.plugin.module" description="Module name of the test plugin"
default="test-${test.framework}"/>
-    <ea:parameter property="test.plugin.rev" description="Revision number of the test
plugin" default="0.2"/>
-    <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin"
default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
-
-    
-    <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
-
-    <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
-    <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
-    <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
-    <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
-    <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
-    <ea:include mrid="org.apache.easyant.plugins#compile-java;0.1" as="compile" />
-    <ea:include mrid="org.apache.easyant.plugins#compile-test-java;0.1" as="compile-test"
/>
-
-    <ea:include mrid="${test.plugin.mrid}" as="test" />
-    <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
-    
-    <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
+    <ea:import mrid="org.apache.easyant.plugins#clean-std;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#default-version-strategy;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#resources-std;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#compile-java;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#compile-test-java;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-publication;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#test-junit;0.3" />
+    <ea:import mrid="org.apache.easyant.plugins#manifest;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#package-jar;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#source-jar;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-utils;0.2" />
+
+    <!-- plugin binding -->
+    <bindtargets targets="compile-java:compile,manifest:manifest,manifest:manifest-runnable,resources-std:copy-resources"
extensionPoint="package-jar:jar-ready" />
+    <bindtargets targets="compile-test-java:compile,resources-std:copy-test-resources"
extensionPoint="abstract-test:test-ready" />
+    <bindtargets targets="package-jar:jar,source-jar:main" extensionPoint="ivy-publication:publish-ready"
/>
+
+    <!-- friendly target names -->
+    <target name="clean" depends="clean-std:clean" description="Clean the project" />
+    <target name="compile" depends="compile-java:compile" description="Compile the project"
/>
+    <target name="test" depends="test-junit:run" description="Launch the unit tests" />
+    <target name="dist" depends="ivy-publication:publish-ready" description="Produce every
artifact to be distributed" />
+    <target name="install" depends="ivy-publication:publish-local" description="Install
the artifacts into the repository" />
 
-    <target name="doit" depends="verify" />
 </project>

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

Modified: incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant?rev=1091227&r1=1091226&r2=1091227&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant
(original)
+++ incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant
Mon Apr 11 21:52:41 2011
@@ -16,37 +16,35 @@
 -->
 <project name="org.apache.easyant.buildtypes#build-std-scala"
     xmlns:ea="antlib:org.apache.easyant">
-    
-    <ea:core-version requiredrevision="[0.8,+]" />
+
+    <ea:core-version requiredrevision="[0.9,+]" />
+
     <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-scala..."/>
-    
-    <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
 
     <property file="${org.apache.easyant.buildtypes#build-std-scala.properties.file}"
/>
-    
-    <ea:parameter property="version.strategy.plugin.org" description="Organisation name
of the version strategy plugin" default="org.apache.easyant.plugins"/>
-    <ea:parameter property="version.strategy.plugin.module" description="Module name of
the version strategy plugin" default="default-version-strategy"/>
-    <ea:parameter property="version.strategy.plugin.rev" description="Revision number
of the version strategy plugin" default="0.1"/>
-    <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the
version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
-
-    <ea:parameter property="test.plugin.org" description="Organisation name of the test
plugin" default="org.apache.easyant.plugins"/>
-    <ea:parameter property="test.plugin.module" description="Module name of the test plugin"
default="test-${test.framework}"/>
-    <ea:parameter property="test.plugin.rev" description="Revision number of the test
plugin" default="0.2"/>
-    <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin"
default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
-
-    
-    <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
-    
-    <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
-    <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
-    <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
-    <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
-    <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
-    <ea:include mrid="org.apache.easyant.plugins#compile-scala;0.1" as="compile" />
-    <ea:include mrid="org.apache.easyant.plugins#compile-test-scala;0.1" as="compile-test"
/>
-    <ea:include mrid="${test.plugin.mrid}" as="test" />
-    <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
-    <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
 
-    <target name="doit" depends="verify" />
+    <ea:import mrid="org.apache.easyant.plugins#clean-std;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#default-version-strategy;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-publication;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-utils;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#resources-std;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#compile-scala;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#compile-test-scala;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#test-junit;0.3" />
+    <ea:import mrid="org.apache.easyant.plugins#manifest;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#package-jar;0.2" />
+
+    <!-- plugin binding -->
+    <bindtargets targets="compile-scala:compile,manifest:manifest,manifest:manifest-runnable,resources-std:copy-resources"
extensionPoint="package-jar:jar-ready" />
+    <bindtargets targets="compile-test-scala:compile,resources-std:copy-test-resources"
extensionPoint="abstract-test:test-ready" />
+    <bindtargets targets="package-jar:jar,source-jar:main" extensionPoint="ivy-publication:publish-ready"
/>
+
+    <!-- friendly target names -->
+    <target name="clean" depends="clean-std:clean" description="Clean the project" />
+    <target name="compile" depends="compile-scala:compile" description="Compile the project"
/>
+    <target name="test" depends="test-junit:run" description="Launch the unit tests" />
+    <target name="dist" depends="ivy-publication:publish-ready" description="Produce every
artifact to be distributed" />
+    <target name="install" depends="ivy-publication:publish-local" description="Install
the artifacts into the repository" />
+
 </project>

Modified: incubator/easyant/buildtypes/trunk/build-std-skeleton/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-skeleton/module.ivy?rev=1091227&r1=1091226&r2=1091227&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-skeleton/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-skeleton/module.ivy Mon Apr 11 21:52:41 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.buildtypes" module="build-std-skeleton" revision="0.1">
+    <info organisation="org.apache.easyant.buildtypes" module="build-std-skeleton" revision="0.2">
            <description>A standard build skeleton, relying on standard phases, and
providing unit tests</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin"
revision="0.1"/>
         </info>

Modified: incubator/easyant/buildtypes/trunk/build-std-skeleton/src/main/resources/build-std-skeleton.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-skeleton/src/main/resources/build-std-skeleton.ant?rev=1091227&r1=1091226&r2=1091227&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-skeleton/src/main/resources/build-std-skeleton.ant
(original)
+++ incubator/easyant/buildtypes/trunk/build-std-skeleton/src/main/resources/build-std-skeleton.ant
Mon Apr 11 21:52:41 2011
@@ -17,27 +17,24 @@
 <project name="org.apache.easyant.buildtypes#build-std-skeleton"
     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,+]" />
     <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-skeleton..."/>
-    
-    <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
 
     <property file="${org.apache.easyant.buildtypes#build-std-skeleton.properties.file}"
/>
-    
-    <ea:parameter property="version.strategy.plugin.org" description="Organisation name
of the version strategy plugin" default="org.apache.easyant.plugins"/>
-    <ea:parameter property="version.strategy.plugin.module" description="Module name of
the version strategy plugin" default="default-version-strategy"/>
-    <ea:parameter property="version.strategy.plugin.rev" description="Revision number
of the version strategy plugin" default="0.1"/>
-    <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the
version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
-    
-    <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
-    <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
-    <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
-    <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
-    <ea:include mrid="org.apache.easyant.plugins#easyant-plugin-publication;0.1" as="publish"
/>
-    <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />   
 
-    <ea:include mrid="org.apache.easyant.plugins#antunit;0.1" as="test" />
-    <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
 
-    <target name="doit" depends="verify" />
+    <ea:import mrid="org.apache.easyant.plugins#clean-std;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#resources-std;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#default-version-strategy;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#easyant-plugin-publication;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#manifest;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#antunit;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#package-jar;0.2" />
+
+    <!-- friendly target names -->
+    <target name="clean" depends="clean-std:clean" description="Clean the project" />
+    <target name="test" depends="antunit:run" description="Launch the unit tests" />
+    <target name="dist" depends="easyant-plugin-publication:before-test" description="Produce
every artifact to be distributed" />
+
 </project>

Modified: incubator/easyant/buildtypes/trunk/build-webapp-java/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-webapp-java/module.ivy?rev=1091227&r1=1091226&r2=1091227&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-webapp-java/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-webapp-java/module.ivy Mon Apr 11 21:52:41 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.buildtypes" module="build-webapp-java" revision="0.1">
+    <info organisation="org.apache.easyant.buildtypes" module="build-webapp-java" revision="0.2">
            <description>A standard build for webapp java modules, relying on standard
phases, and providing compilation, execution and unit tests</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin"
revision="0.1"/>
         </info>

Modified: incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant?rev=1091227&r1=1091226&r2=1091227&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant
(original)
+++ incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant
Mon Apr 11 21:52:41 2011
@@ -16,37 +16,36 @@
 -->
 <project name="org.apache.easyant.buildtypes#build-webapp-java"
     xmlns:ea="antlib:org.apache.easyant">
-    
-    <ea:core-version requiredrevision="[0.8,+]" />
+
+    <ea:core-version requiredrevision="[0.9,+]" />
+
     <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-webapp-java..."/>
-    
-    <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
 
     <property file="${org.apache.easyant.buildtypes#build-webapp-java.properties.file}"
/>
-    
-    <ea:parameter property="version.strategy.plugin.org" description="Organisation name
of the version strategy plugin" default="org.apache.easyant.plugins"/>
-    <ea:parameter property="version.strategy.plugin.module" description="Module name of
the version strategy plugin" default="default-version-strategy"/>
-    <ea:parameter property="version.strategy.plugin.rev" description="Revision number
of the version strategy plugin" default="0.1"/>
-    <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the
version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
-
-    <ea:parameter property="test.plugin.org" description="Organisation name of the test
plugin" default="org.apache.easyant.plugins"/>
-    <ea:parameter property="test.plugin.module" description="Module name of the test plugin"
default="test-${test.framework}"/>
-    <ea:parameter property="test.plugin.rev" description="Revision number of the test
plugin" default="0.2"/>
-    <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin"
default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
-
-    
-    <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
-    
-    <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
-    <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
-    <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
-    <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
-    <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
-    <ea:include mrid="org.apache.easyant.plugins#compile-java;0.1" as="compile" />
-    <ea:include mrid="org.apache.easyant.plugins#compile-test-java;0.1" as="compile-test"
/>
-    <ea:include mrid="${test.plugin.mrid}" as="test" />
-    <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
-    <ea:include mrid="org.apache.easyant.plugins#package-war;0.1" as="war" />
-    
-    <target name="doit" depends="verify" />
+
+    <ea:import mrid="org.apache.easyant.plugins#clean-std;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#default-version-strategy;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-publication;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#ivy-utils;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#resources-std;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#compile-java;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#compile-test-java;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#test-junit;0.3" />
+    <ea:import mrid="org.apache.easyant.plugins#manifest;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#package-war;0.2" />
+
+    <!-- plugin binding -->
+    <bindtargets targets="compile-java:compile,manifest:manifest,manifest:manifest-runnable,resources-std:copy-resources"
extensionPoint="package-jar:jar-ready" />
+    <bindtargets targets="compile-test-java:compile,resources-std:copy-test-resources"
extensionPoint="abstract-test:test-ready" />
+    <bindtargets targets="package-jar:jar" extensionPoint="package-war:war-ready" />
+    <bindtargets targets="package-war:war" extensionPoint="ivy-publication:publish-ready"
/>
+
+    <!-- friendly target names -->
+    <target name="clean" depends="clean-std:clean" description="Clean the project" />
+    <target name="compile" depends="compile-java:compile" description="Compile the project"
/>
+    <target name="test" depends="test-junit:run" description="Launch the unit tests" />
+    <target name="dist" depends="ivy-publication:publish-ready" description="Produce every
artifact to be distributed" />
+    <target name="install" depends="ivy-publication:publish-local" description="Install
the artifacts into the repository" />
+
 </project>

Modified: incubator/easyant/buildtypes/trunk/meta-build/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/meta-build/module.ivy?rev=1091227&r1=1091226&r2=1091227&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/meta-build/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/meta-build/module.ivy Mon Apr 11 21:52:41 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.buildtypes" module="meta-build" revision="0.2">
+    <info organisation="org.apache.easyant.buildtypes" module="meta-build" revision="0.3">
            <description>This build type allows you to recursively build multi-module
projects,
            with internal dependencies between modules.</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin"
revision="0.1"/>

Modified: incubator/easyant/buildtypes/trunk/meta-build/src/main/resources/meta-build.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/meta-build/src/main/resources/meta-build.ant?rev=1091227&r1=1091226&r2=1091227&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/meta-build/src/main/resources/meta-build.ant (original)
+++ incubator/easyant/buildtypes/trunk/meta-build/src/main/resources/meta-build.ant Mon Apr
11 21:52:41 2011
@@ -17,15 +17,15 @@
 <project name="org.apache.easyant.buildtypes#meta-build"
     xmlns:ea="antlib:org.apache.easyant"
     xmlns:ivy="antlib:org.apache.ivy.ant">
-    
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
-    <ea:include mrid="org.apache.easyant.plugins#phases-std;0.2"/>
-    
+
+    <ea:core-version requiredrevision="[0.9,+]" />
+
     <property file="${org.apache.easyant.buildtypes#meta-build.properties.file}" />
 
-    <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean"/>
-    <ea:include mrid="org.apache.easyant.plugins#build-tools;0.2" as="meta"/>
+    <ea:import mrid="org.apache.easyant.plugins#clean-std;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#build-tools;0.3" />
+
+    <!-- friendly target names -->
+    <target name="clean" depends="clean-std:clean" description="Clean the project" />
 
-    <target name="doit" depends="verify" />
 </project>



Mime
View raw message