You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by hi...@apache.org on 2011/04/11 21:51:55 UTC
svn commit: r1091226 [2/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/...
Modified: incubator/easyant/plugins/trunk/easyant-plugin-publication/src/main/resources/easyant-plugin-publication.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/easyant-plugin-publication/src/main/resources/easyant-plugin-publication.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/easyant-plugin-publication/src/main/resources/easyant-plugin-publication.ant (original)
+++ incubator/easyant/plugins/trunk/easyant-plugin-publication/src/main/resources/easyant-plugin-publication.ant Mon Apr 11 21:51:53 2011
@@ -18,25 +18,22 @@
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,+]" />
-
- <ea:import mrid="org.apache.easyant.plugins#ivy-publication;0.1"/>
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="test" />
+
+ <ea:core-version requiredrevision="[0.9,+]" />
+
+ <ea:import mrid="org.apache.easyant.plugins#ivy-publication;0.2" />
+
+ <target name="easyant-plugin-publication:init">
<ea:parameter property="publish.plugin.before.test"
description="defines if easyant should publish the plugin before running test"/>
</target>
-
+
<!--
publish in build scoped repository before test
-->
- <target name="-before-test" depends="validate" phase="test" if="publish.plugin.before.test">
+ <target name="easyant-plugin-publication:before-test" depends="easyant-plugin-publication:init" if="publish.plugin.before.test">
<ea:configure-build-scoped-repository buildScopedRepositoryName="build" settingsRef="easyant.ivy.instance"/>
<ivy:publish artifactspattern="${target.artifacts}/[artifact](-[classifier]).[ext]" resolver="build" forcedeliver="true" overwrite="true" settingsRef="easyant.ivy.instance" />
</target>
- <target name="doit" depends=":init" />
</project>
Modified: incubator/easyant/plugins/trunk/emma/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/emma/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/emma/module.ivy (original)
+++ incubator/easyant/plugins/trunk/emma/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="emma" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="emma" revision="0.2">
<description>
This module provides coverage report using emma framework.<br/>
Emma library and instrumentation classes (classes used for coverage report) will be prepended at the begining of compile.test.classpath and lib.test.classpath.
Modified: incubator/easyant/plugins/trunk/emma/src/main/resources/emma.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/emma/src/main/resources/emma.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/emma/src/main/resources/emma.ant (original)
+++ incubator/easyant/plugins/trunk/emma/src/main/resources/emma.ant Mon Apr 11 21:51:53 2011
@@ -17,20 +17,20 @@
<project name="org.apache.easyant.plugins#emma"
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:core-version requiredrevision="[0.9,+]" />
+
+ <ea:import mrid="org.apache.easyant.plugins#abstract-coverage;0.2" />
+ <ea:import mrid="org.apache.easyant.plugins#abstract-test;0.2" />
+
+ <target name="emma:init" depends="abstract-coverage:init">
<ea:parameter property="emma.metadata.path" description="location of emma metadata file"
default="${target.coverage.report}/coverage.em"/>
<ea:parameter property="emma.datafile.path" description="location of emma coverage data file"
default="${target.coverage.report}/coverage.ec"/>
-
+
<ea:parameter property="emma.overrides.file" default="${target.coverage.report}/emma-overrides.properties"/>
-
+
<!-- add datafile to system properties during test run, if it isn't explicitly set elsewhere -->
<property name="emma.properties" location="${emma.overrides.file}"/>
<mkdir dir="${target.coverage.report}" />
@@ -40,7 +40,7 @@
<entry key="metadata.out.file" value="${emma.metadata.path}"/>
<entry key="coverage.out.file" value="${emma.datafile.path}"/>
</propertyfile>
-
+
<ac:if>
<not><contains string="${test.run.jvmargs}" substring="emma.properties"/></not>
<ac:then>
@@ -54,12 +54,12 @@
</target>
- <target name=":instrument" depends=":init" phase="process-classes" if="has.src.test.java">
+ <target name="emma:instrument" depends="emma: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#emma.classpath"/>
</ea:path>
-
+
<!-- Apply emma instrumentation to the classes in instrpath and copy to destdir -->
<emma verbosity="${coverage.verbosity}" properties="${emma.properties}">
<instr instrpath="${target.main.classes}" destdir="${target.coverage.classes}" mode="copy" merge="true">
@@ -68,8 +68,7 @@
</emma>
</target>
- <target name=":report" depends=":init" phase="report" if="has.src.test.java">
-
+ <target name="emma:report" depends="emma:init,abstract-test:test-run" if="has.src.test.java" description="generate emma covera report">
<!-- Generate code coverage report -->
<emma>
<report sourcepath="${src.main.java}">
@@ -83,9 +82,6 @@
<html outfile="${target.coverage.report}/${coverage.report.name}.html" />
</report>
</emma>
-
</target>
- <target name=":emma" depends="validate,test,report" description="generate emma covera report" />
- <target name="doit" depends=":emma" />
</project>
Modified: incubator/easyant/plugins/trunk/ivy-provisioning/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/ivy-provisioning/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/ivy-provisioning/module.ivy (original)
+++ incubator/easyant/plugins/trunk/ivy-provisioning/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="ivy-provisioning" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="ivy-provisioning" revision="0.2">
<ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
Modified: incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant (original)
+++ incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant Mon Apr 11 21:51:53 2011
@@ -19,11 +19,9 @@
xmlns:ac="antlib:net.sf.antcontrib"
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="provision" />
+ <target name="-ivy-provisioning:init">
<ea:parameter property="lib.main" default="${basedir}/lib/main" description="directory where main libraries are picked up" />
<ea:parameter property="lib.test" default="${basedir}/lib/test" description="directory where test libraries are picked up" />
<ea:parameter property="lib.provided" default="${basedir}/lib/provided" description="directory where provided libraries are picked up" />
@@ -33,17 +31,17 @@
<ea:parameter property="project.ivy.instance" default="project.ivy.instance" description="the ivy instance name for your project" />
<ea:parameter property="project.ivy.file" required="true" description="the name of the file containing dependencies of your project" />
<ea:parameter property="retrieve.dependencies" default="false" description="defines if dependencies should be retrieve dependencies in the lib directory"/>
-
+
<ea:parameter property="retrieve.pattern.lib.main" default="${lib.main}/[artifact]-[revision].[ext]" description="retrieve pattern for main artifacts" />
<ea:parameter property="retrieve.pattern.lib.test" default="${lib.test}/[artifact]-[revision].[ext]" description="retrieve pattern for test artifacts" />
<ea:parameter property="retrieve.pattern.lib.provided" default="${lib.provided}/[artifact]-[revision].[ext]" description="retrieve pattern for provided artifacts" />
-
+
<ea:parameter property="sync.lib.dir" default="true" description="a boolean that define if lib dir should be synchronized or not"/>
<!-- 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" />
-
+
<condition property="is.project.ivy.settings.configured">
<isreference refid="${project.ivy.instance}"/>
</condition>
@@ -52,7 +50,7 @@
<fileset id="lib.main.fileset" dir="${lib.main}" erroronmissingdir="false"/>
<fileset id="lib.test.fileset" dir="${lib.test}" erroronmissingdir="false"/>
<fileset id="lib.provided.fileset" dir="${lib.provided}" erroronmissingdir="false"/>
-
+
<path id="project.lib.main.classpath"/>
<path id="project.lib.test.classpath"/>
<path id="project.lib.provided.classpath"/>
@@ -60,8 +58,8 @@
<!-- =================================
target: resolve
- ================================= -->
- <target name="-resolve" depends="validate">
+ ================================= -->
+ <target name="-ivy-provisioning:resolve" depends="-ivy-provisioning:init">
<ivy:resolve file="${project.ivy.file}" settingsRef="${project.ivy.instance}" />
<condition property="project.contains.main.confs">
<matches string="${ivy.configurations}" pattern="${main.confs}"/>
@@ -73,14 +71,13 @@
<matches string="${ivy.configurations}" pattern="${provided.confs}"/>
</condition>
</target>
-
- <target name=":resolve" depends="-resolve,-resolve-main-confs,-resolve-test-confs,-resolve-provided-confs" description="resolve and retrieve dependencies with ivy" unless="skip.resolve" phase="provision"/>
-
-
- <target name="-resolve-main-confs" if="project.contains.main.confs">
+
+ <target name="ivy-provisioning:resolve" depends="-ivy-provisioning:resolve,-ivy-provisioning:resolve-main-confs,-ivy-provisioning:resolve-test-confs,-ivy-provisioning:resolve-provided-confs" description="resolve and retrieve dependencies with ivy" unless="skip.resolve" />
+
+ <target name="ivy-provisioning:resolve-main-confs" depends="-ivy-provisioning:resolve" if="project.contains.main.confs">
<ivy:cachepath pathid="cache.main.classpath" conf="${main.confs}" settingsRef="${project.ivy.instance}"/>
<ea:path pathid="compile.main.classpath" overwrite="append-if-not-exist">
- <path refid="cache.main.classpath"/>
+ <path refid="cache.main.classpath"/>
</ea:path>
<ac:if>
<istrue value="${retrieve.dependencies}"/>
@@ -94,7 +91,7 @@
</ac:if>
</target>
- <target name="-resolve-test-confs" if="project.contains.test.confs">
+ <target name="ivy-provisioning:resolve-test-confs" depends="-ivy-provisioning:resolve" if="project.contains.test.confs">
<ivy:cachepath pathid="cache.test.classpath" conf="${test.confs}" settingsRef="${project.ivy.instance}"/>
<ea:path pathid="compile.test.classpath" overwrite="append-if-not-exist">
<path refid="cache.test.classpath"/>
@@ -112,13 +109,11 @@
</ac:if>
</target>
- <target name="-resolve-provided-confs" if="project.contains.provided.confs">
+ <target name="ivy-provisioning:resolve-provided-confs" depends="-ivy-provisioning:resolve" if="project.contains.provided.confs">
<ivy:cachepath pathid="cache.provided.classpath" conf="${provided.confs}" settingsRef="${project.ivy.instance}"/>
<ea:path pathid="compile.main.classpath" overwrite="append-if-not-exist">
<path refid="cache.provided.classpath"/>
</ea:path>
-
-
<ac:if>
<istrue value="${retrieve.dependencies}"/>
<ac:then>
@@ -131,7 +126,5 @@
</ac:then>
</ac:if>
</target>
-
-
</project>
Modified: incubator/easyant/plugins/trunk/ivy-publication/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/ivy-publication/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/ivy-publication/module.ivy (original)
+++ incubator/easyant/plugins/trunk/ivy-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="ivy-publication" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="ivy-publication" revision="0.2">
<description>This module publication features (to share projects with your team).</description>
<ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
Modified: incubator/easyant/plugins/trunk/ivy-publication/src/main/resources/ivy-publication.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/ivy-publication/src/main/resources/ivy-publication.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/ivy-publication/src/main/resources/ivy-publication.ant (original)
+++ incubator/easyant/plugins/trunk/ivy-publication/src/main/resources/ivy-publication.ant Mon Apr 11 21:51:53 2011
@@ -18,18 +18,18 @@
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="publish-local" />
- <ea:parameter phase="publish-shared"/>
- <ea:parameter phase="release" />
- <ea:parameter phase="generate-local-version"/>
- <ea:parameter phase="generate-shared-version"/>
- <ea:parameter phase="generate-release-version"/>
+ <ea:core-version requiredrevision="[0.9,+]" />
+
+ <extension-point name="ivy-publication:generate-release-version" />
+
+ <extension-point name="ivy-publication:generate-shared-version" />
+
+ <extension-point name="ivy-publication:generate-local-version" />
+
+ <extension-point name="ivy-publication:publish-ready" />
+
+ <target name="-ivy-publication: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"
@@ -55,9 +55,8 @@
<isreference refid="${project.ivy.instance}"/>
</condition>
<fail unless="is.project.ivy.settings.configured" message="project ivy instance is not configured, at least one of the following property must be set : project.ivy.settings.file, project.ivy.settings.url"/>
-
</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"/>
@@ -81,7 +80,7 @@
<!-- =================================
target: release
================================= -->
- <target name=":release" phase="release" depends="generate-release-version,verify">
+ <target name="ivy-publication:release" depends="-ivy-publication:init,ivy-publication:generate-release-version,ivy-publication:publish-ready">
<ea:checkresolver resolver="release.resolver" settingsRef="${project.ivy.instance}" description="name of the repository used to publish releases"/>
<check-version-number/>
<ivy:publish artifactspattern="${target.artifacts}/[artifact](-[classifier]).[ext]"
@@ -98,7 +97,7 @@
<!-- =================================
target: publish-shared
================================= -->
- <target name=":publish-shared" phase="publish-shared" depends="generate-shared-version,package">
+ <target name="ivy-publication:publish-shared" depends="-ivy-publication:init,ivy-publication:generate-shared-version,ivy-publication:publish-ready">
<ea:checkresolver resolver="shared.resolver" settingsRef="${project.ivy.instance}" description="name of the repository used to publish shared integration versions (snapshots)"/>
<check-version-number/>
<tstamp>
@@ -120,7 +119,7 @@
<!-- =================================
target: publish-local
================================= -->
- <target name=":publish-local" phase="publish-local" depends="generate-local-version,package">
+ <target name="ivy-publication:publish-local" depends="-ivy-publication:init,ivy-publication:generate-local-version,ivy-publication:publish-ready">
<check-version-number/>
<ivy:publish artifactspattern="${target.artifacts}/[artifact](-[classifier]).[ext]"
resolver="${local.resolver}"
@@ -137,9 +136,8 @@
<!-- =================================
target: clean-local
================================= -->
- <target name=":clean-local" description="cleans the local repository">
+ <target name="ivy-publication:clean-local" description="cleans the local repository">
<delete dir="${ivy.local.default.root}" />
</target>
- <target name="doit" depends=":publish-local" />
</project>
Modified: incubator/easyant/plugins/trunk/ivy-repo-management/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/ivy-repo-management/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/ivy-repo-management/module.ivy (original)
+++ incubator/easyant/plugins/trunk/ivy-repo-management/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="ivy-repo-management" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="ivy-repo-management" revision="0.2">
<description>
<p>
This module provides features to install artifacts on a given repository.<br/>
Modified: incubator/easyant/plugins/trunk/ivy-repo-management/src/main/resources/ivy-repo-management.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/ivy-repo-management/src/main/resources/ivy-repo-management.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/ivy-repo-management/src/main/resources/ivy-repo-management.ant (original)
+++ incubator/easyant/plugins/trunk/ivy-repo-management/src/main/resources/ivy-repo-management.ant Mon Apr 11 21:51:53 2011
@@ -16,10 +16,9 @@
-->
<project name="org.apache.easyant.plugins#ivy-repo-management" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
+ <ea:core-version requiredrevision="[0.9,+]" />
+
+ <target name="ivy-repo-management:init">
<ea:parameter property="project.ivy.instance" default="project.ivy.instance" description="the ivy instance name for your project" />
<ea:parameter property="default.from.resolver" default="public" description="the repository name where the artifact will be picked up" />
<ea:parameter property="default.to.resolver" default="local" description="the repository name where the artifact will be installed" />
@@ -31,23 +30,21 @@
<condition property="install.is.interactive">
<istrue value="${install.interactive.mode}"/>
</condition>
-
+
<!-- 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" />
-
+
<condition property="is.project.ivy.settings.configured">
<isreference refid="${project.ivy.instance}"/>
</condition>
<fail unless="is.project.ivy.settings.configured" message="project ivy instance is not configured, at least one of the following property must be set : project.ivy.settings.file, project.ivy.settings.url"/>
-
-
</target>
-
+
<!--
This target is just here to intialize default value if install.interactive.mode is not set
-->
- <target name="-check-interactive-mode" unless="install.is.interactive">
+ <target name="-ivy-repo-management:check-interactive-mode" unless="install.is.interactive">
<property name="from.resolver" value="${default.from.resolver}"/>
<property name="to.resolver" value="${default.to.resolver}"/>
</target>
@@ -55,15 +52,15 @@
<!-- =================================
target: copy-artifact
================================= -->
- <target name="-check-copy-artifact" depends="-check-interactive-mode" if="install.is.interactive">
+ <target name="-ivy-repo-management:check-copy-artifact" depends="-ivy-repo-management:check-interactive-mode" if="install.is.interactive">
<input message="Please enter the module name:" addproperty="module" />
<input message="Please enter the organasization name :" addproperty="org" />
<input message="Please enter the revision number :" addproperty="rev" />
<input message="Please enter the repository name where the artifact will be picked up :" addproperty="from.resolver" defaultvalue="${default.from.resolver}" />
<input message="Please enter the repository name where the artifact will be installed :" addproperty="to.resolver" defaultvalue="${default.to.resolver}" />
</target>
-
- <target name=":copy-artifact" depends="validate,-check-copy-artifact" description="copy an artifact from an external repository in our repository">
+
+ <target name="ivy-repo-management:copy-artifact" depends="ivy-repo-management:init,-ivy-repo-management:check-copy-artifact" description="copy an artifact from an external repository in our repository">
<property name="mess" value="Usage: copy-artifact{line.separator}
easyant copy-artifact -Dorg=myOrgName -Dmodule=myModuleName -Drev=myRevisionNumber${line.separator}
Exemple:${line.separator}
@@ -84,7 +81,7 @@
<!-- =================================
target: install-artifact
================================= -->
- <target name="-check-install-artifact" depends="-check-interactive-mode" if="install.is.interactive">
+ <target name="-ivy-repo-management:check-install-artifact" depends="-ivy-repo-management:check-interactive-mode" if="install.is.interactive">
<input message="Please enter the module name:" addproperty="module" />
<input message="Please enter the organasization name :" addproperty="org" />
<input message="Please enter the revision number :" addproperty="rev" />
@@ -92,7 +89,7 @@
<input message="Please enter the repository name where the artifact will be installed :" addproperty="to.resolver" defaultvalue="${default.to.resolver}" />
</target>
- <target name=":install-artifact" depends="validate,-check-install-artifact" description="install a new artifact in your repository">
+ <target name="ivy-repo-management:install-artifact" depends="ivy-repo-management:init,-ivy-repo-management:check-install-artifact" description="install a new artifact in your repository">
<property name="mess" value="Usage: install-artifact${line.separator}
easyant install-artifact -Dorg=myOrgName -Dmodule=myModuleName -Drev=myRevisionNumber -Dartifact=myFile${line.separator}
Exemple:${line.separator}
@@ -113,7 +110,7 @@
<available file="${artifact}" property="artifact.available"/>
<fail unless="artifact.available">unable to find artifact at ${artifact}${line.separator}${mess}</fail>
<ea:checkresolver resolver="to.resolver" settingsRef="${project.ivy.instance}" description="the repository name where the artifact will be installed"/>
-
+
<basename file="${artifact}" property="artifact.to.install.file" />
<echo message="Creating ivy temp directory in ${install.temp.directory}" />
@@ -143,6 +140,4 @@
<echo message="${artifact.to.install.file} succefully installed in your ${to.resolver} repository" />
</target>
-
- <target name="doit" depends=":init" />
</project>
Modified: incubator/easyant/plugins/trunk/ivy-utils/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/ivy-utils/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/ivy-utils/module.ivy (original)
+++ incubator/easyant/plugins/trunk/ivy-utils/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="ivy-utils" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="ivy-utils" revision="0.2">
<description>
This module provides utilitaries target related to ivy (clean-cache / dependencies report)
</description>
Modified: incubator/easyant/plugins/trunk/ivy-utils/src/main/resources/ivy-utils.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/ivy-utils/src/main/resources/ivy-utils.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/ivy-utils/src/main/resources/ivy-utils.ant (original)
+++ incubator/easyant/plugins/trunk/ivy-utils/src/main/resources/ivy-utils.ant Mon Apr 11 21:51:53 2011
@@ -16,10 +16,9 @@
-->
<project name="org.apache.easyant.plugins#ivy-utils" 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,+]" />
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
+ <target name="ivy-utils:init">
<ea:parameter property="project.ivy.instance" default="project.ivy.instance"
description="the ivy instance name for your project" />
<ea:parameter property="target.report.ivy" default="${target.report}/deps-report"
@@ -40,14 +39,14 @@
<!-- =================================
target: clean-report
================================= -->
- <target name=":report" depends="provision" phase="report" description="generate dependencies report">
+ <target name="ivy-utils:report" depends="provision" phase="report" description="generate dependencies report">
<ivy:report todir="${target.report.ivy}" settingsRef="${project.ivy.instance}" />
</target>
<!-- =================================
target: clean-cache
================================= -->
- <target name=":clean-cache" depends=":init" description="clean the ivy cache used to resolve project dependencies">
+ <target name="ivy-utils:clean-cache" depends="ivy-utils:init" description="clean the ivy cache used to resolve project dependencies">
<ivy:cleancache settingsRef="${project.ivy.instance}"/>
</target>
@@ -55,7 +54,7 @@
<!-- =================================
target: clean-eacache
================================= -->
- <target name=":clean-eacache" description="clean the ivy cache used by easyant to resolve plugins/ buildtypes">
+ <target name="ivy-utils:clean-eacache" description="clean the ivy cache used by easyant to resolve plugins/ buildtypes">
<!-- clean easyant cache -->
<ivy:cleancache settingsRef="easyant.ivy.instance"/>
</target>
@@ -64,9 +63,8 @@
<!-- =================================
target: clean-lib
================================= -->
- <target name=":clean-lib" description="clean the project libraries directory">
+ <target name="ivy-utils:clean-lib" description="clean the project libraries directory">
<delete includeemptydirs="true" dir="${lib.dir}" />
</target>
- <target name="doit" depends=":report" />
</project>
Modified: incubator/easyant/plugins/trunk/javadoc/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/javadoc/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/javadoc/module.ivy (original)
+++ incubator/easyant/plugins/trunk/javadoc/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="javadoc" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="javadoc" revision="0.2">
<description>
<p>This module provides javadoc feature.</p>
<p>
Modified: incubator/easyant/plugins/trunk/jetty-deploy/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/jetty-deploy/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/jetty-deploy/module.ivy (original)
+++ incubator/easyant/plugins/trunk/jetty-deploy/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="jetty-deploy" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="jetty-deploy" revision="0.2">
<description>
A developer-convenience module for quick war-build-and-deploy with jetty (v 6.1.4). This module will
build a webapplication (following same requirements as build-webapp-java module), launch
Modified: incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant (original)
+++ incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant Mon Apr 11 21:51:53 2011
@@ -16,21 +16,19 @@
-->
<project name="org.apache.easyant.plugins#jetty-deploy" xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="package" />
+ <ea:core-version requiredrevision="[0.9,+]" />
+
+ <ea:import mrid="org.apache.easyant.plugins#package-war;0.2" />
+
+ <target name="jetty-deploy:init">
<ea:parameter property="jetty.temp.dir" default="${target}/jetty-temp" description="Jetty temporary directory. If unspecified, defaults to target/jetty-temp" />
<ea:parameter property="jetty.xml" required="false" description="Jetty configuration XML. If unspecified, defaults to jetty.xml shipped with 6.1.4 jetty." />
<ea:parameter property="jetty.context" default="/" description="Application context in jetty. If unspecified, defaults to root (/)." />
-
<available property="jetty.available" classname="org.mortbay.jetty.ant.JettyRunTask" classpathref="org.apache.easyant.plugins#jetty-deploy.classpath" />
<fail unless="jetty.available" message="Jetty is unavailable!" />
-
<taskdef name="jetty" classname="org.mortbay.jetty.ant.JettyRunTask" classpathref="org.apache.easyant.plugins#jetty-deploy.classpath" />
</target>
@@ -39,12 +37,11 @@
jetty configuration xml: jetty.xml shipped with this module (standard 6.1.4 jetty.xml shipped with jetty)
webapplication context: root (/)
-->
- <target name=":run" depends="package" description="run your webapp inside a jetty application server">
+ <target name="jetty-deploy:run" depends="package-war:war" description="run your webapp inside a jetty application server">
<echo message="Deploying ${module.name} on Jetty .." />
<jetty tempDirectory="${jetty.temp.dir}" jettyXml="${jetty.xml}">
<webApp name="${module.name}" warfile="${target.artifacts}/${target.artifacts.main.war.name}" contextpath="${jetty.context}" />
</jetty>
</target>
- <target name="doit" depends=":run" />
</project>
Modified: incubator/easyant/plugins/trunk/manifest/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/manifest/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/manifest/module.ivy (original)
+++ incubator/easyant/plugins/trunk/manifest/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="manifest" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="manifest" revision="0.2">
<description>This module provides manifest generation feature.<br/>
This module also provide a target to make an executable jar. This features requires to have dependencies in your project directory. This can be done by setting the retrieve.dependencies to true.
</description>
Modified: incubator/easyant/plugins/trunk/manifest/src/main/resources/manifest.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/manifest/src/main/resources/manifest.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/manifest/src/main/resources/manifest.ant (original)
+++ incubator/easyant/plugins/trunk/manifest/src/main/resources/manifest.ant Mon Apr 11 21:51:53 2011
@@ -16,12 +16,9 @@
-->
<project name="org.apache.easyant.plugins#manifest" xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="prepare-package" />
+ <ea:core-version requiredrevision="[0.9,+]" />
+ <target name="manifest:init">
<ea:parameter property="project.main.classname" description="Used to define the project main class. The mainclass will then be used by many plugins (manifest, run-java, etc...)"/>
<ea:parameter property="manifest.main.classname" default="${project.main.classname}">
If defined, Main-Class and Class-Path attributes are added to produce an executable jar file.
@@ -48,7 +45,7 @@
</condition>
</target>
- <target name="-generate-version-number" depends="validate" unless="version">
+ <target name="-manifest:generate-version-number" depends="manifest:init" unless="version">
<tstamp>
<format property="now" pattern="yyyyMMddHHmmss" />
</tstamp>
@@ -56,7 +53,7 @@
<property name="version" value="${ivy.revision}-build-${now}" />
</target>
- <target name=":manifest" depends="validate,-generate-version-number" phase="prepare-package" description="generate manifest file">
+ <target name="manifest:manifest" depends="manifest:init,-manifest:generate-version-number" description="generate manifest file">
<manifest file="${manifest.file}">
<attribute name="Specification-Title" value="${ivy.module}" />
<attribute name="Specification-Version" value="${ivy.revision}" />
@@ -75,8 +72,9 @@
<entry key="DATE" type="date" value="now" />
</propertyfile>
</target>
+
<!-- currently this target is only available if we use retrieve.dependencies=true because manifestclasspath is excepting a relative based structure which is not really usable using the ivy cache for example -->
- <target name=":manifest-runnable" depends=":manifest" phase="prepare-package" description="add manifest attributes required for an executable jar" if="is.manifest.runnable">
+ <target name="manifest:manifest-runnable" depends="manifest:manifest" description="add manifest attributes required for an executable jar" if="is.manifest.runnable">
<condition property="is.retrieve.dependencies.enabled">
<istrue value="${retrieve.dependencies}"/>
</condition>
@@ -94,5 +92,4 @@
</manifest>
</target>
- <target name="doit" depends=":manifest-runnable,:manifest" />
</project>
Modified: incubator/easyant/plugins/trunk/maven-publication/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/maven-publication/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/maven-publication/module.ivy (original)
+++ incubator/easyant/plugins/trunk/maven-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="maven-publication" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="maven-publication" revision="0.2">
<description>
<p>
This module provides functionalities to publish a pom.xml.
Modified: incubator/easyant/plugins/trunk/maven-version-strategy/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/maven-version-strategy/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/maven-version-strategy/module.ivy (original)
+++ incubator/easyant/plugins/trunk/maven-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="maven-version-strategy" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="maven-version-strategy" revision="0.2">
<description>This module provides the maven 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/osgi-bundle/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/osgi-bundle/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/osgi-bundle/module.ivy (original)
+++ incubator/easyant/plugins/trunk/osgi-bundle/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="osgi-bundle" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="osgi-bundle" revision="0.2">
<description>Provides osgi features.</description>
<ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
Modified: incubator/easyant/plugins/trunk/osgi-bundle/src/main/resources/osgi-bundle.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/osgi-bundle/src/main/resources/osgi-bundle.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/osgi-bundle/src/main/resources/osgi-bundle.ant (original)
+++ incubator/easyant/plugins/trunk/osgi-bundle/src/main/resources/osgi-bundle.ant Mon Apr 11 21:51:53 2011
@@ -16,10 +16,9 @@
-->
<project name="org.apache.easyant.plugins#osgi-bundle" 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" />
+ <target name="osgi-bundle:init">
<ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
<ea:parameter property="target.artifacts.main.bundle.name" required="true"
description="main artifact file name" />
@@ -30,7 +29,9 @@
classpathref="org.apache.easyant.plugins#osgi-bundle.classpath" />
</target>
- <target name=":bundle" depends="validate, compile,prepare-package" phase="package">
+ <extension-point name="osgi-bundle:bundle-ready" />
+
+ <target name="osgi-bundle:bundle" depends="osgi-bundle:init,osgi-bundle:bundle-ready">
<dirname file="${target.artifacts.main.bundle.name}" property="target.artifacts.main.bundle.dir" />
<mkdir dir="${target.artifacts.main.bundle.dir}"/>
@@ -41,17 +42,17 @@
<isset property="osgi.include.resource"/>
</or>
</condition>
-
+
<fail unless="is.osgi.bundle.empty">
-Missing property
-*******************************************************************************
+Missing property
+*******************************************************************************
At least one of the following property must be set :
- osgi.export.package : The packages that will be exported by the bundle.
- osgi.private.package : The private packages of the generated bundle (i.e. packages that are not exported).
- osgi.include.resource : Resource to include in the generated bundle.
-*******************************************************************************
+*******************************************************************************
</fail>
-
+
<!-- Should we provide a way to fill the following properties in interractive mode? -->
<ea:parameter property="osgi.bundle.classpath" default="" description="The (internal) bundle classpath (corresponds to OSGi manifest header 'Bundle-Classpath')."/>
<ea:parameter property="osgi.bundle.copyright" default="" description="Copyright header (corresponds to OSGi manifest header 'Bundle-Copyright')."/>
@@ -85,7 +86,7 @@ At least one of the following property m
<ea:parameter property="osgi.include.resource" default="" description="Resource to include in the generated bundle."/>
<ea:parameter property="osgi.include.resource.header" default="" description="Whether to include the include-resource header in the manifest."/>
<ea:parameter property="osgi.additional.manifest" default="${manifest.file}" description="Specify an additional manifest file"/>
-
+
<!-- Override this path if you need to customize what will be included in the osgi-bundle
<bundle> ant task allow you to make bundle from another JAR, or a list of DIRECTORY.
This is quite strange but you can't use <fileset>.
@@ -94,7 +95,7 @@ At least one of the following property m
<path id="osgi.classpath">
<filelist><file name="${target.main.classes}"/></filelist>
</path>
-
+
<bundle outputDir="${target.artifacts}"
bundleClassPath="${osgi.bundle.classpath}"
bundleCopyright="${osgi.bundle.copyright}"
@@ -124,6 +125,5 @@ At least one of the following property m
filename="${target.artifacts.main.bundle.name}"
classpathRefId="osgi.classpath"/>
</target>
-
- <target name="doit" depends=":bundle" />
+
</project>
Modified: incubator/easyant/plugins/trunk/package-jar/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/package-jar/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/package-jar/module.ivy (original)
+++ incubator/easyant/plugins/trunk/package-jar/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="package-jar" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="package-jar" revision="0.2">
<description>This module provides jar packaging feature. </description>
<ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
Modified: incubator/easyant/plugins/trunk/package-jar/src/main/resources/package-jar.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/package-jar/src/main/resources/package-jar.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/package-jar/src/main/resources/package-jar.ant (original)
+++ incubator/easyant/plugins/trunk/package-jar/src/main/resources/package-jar.ant Mon Apr 11 21:51:53 2011
@@ -16,28 +16,26 @@
-->
<project name="org.apache.easyant.plugins#package-jar"
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="package" />
-
+
+ <ea:core-version requiredrevision="[0.9,+]" />
+
+ <extension-point name="package-jar:jar-ready" />
+
+ <target name="package-jar:init">
<ea:parameter property="target.artifacts.main.jar.name" required="true"
description="main artifact file name" />
<ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
-
+
<ea:parameter property="target.main.artifact" required="false" description="the location of the main artifact"
default="${target.artifacts}/${target.artifacts.main.jar.name}"/>
<ea:parameter property="target.main.classes" required="true"
description="directory where compiled classes that should be packaged are" />
-
+
<ea:parameter property="manifest.file" required="true"
description="the file used to generate manifest" />
-
+
<ea:parameter property="package.jar.includes.pattern" default="**/*"
description="Pattern describing files included in the output jar" />
<ea:parameter property="package.jar.excludes.pattern" default=""
@@ -51,18 +49,16 @@
description="Pattern describing files excluded in the META-INF of the package"/>
<fileset id="package.metainf.fileset" dir="${package.metainf.basedir}" includes="${package.metainf.includes.pattern}" excludes="${package.metainf.excludes.pattern}"/>
-
- </target>
-
- <target name=":jar" depends="validate, compile,prepare-package" description="package project as a JAR"
- phase="package" unless="skip.jar.package">
+
+ </target>
+
+ <target name="package-jar:jar" depends="package-jar:init,package-jar:jar-ready" description="package project as a JAR" unless="skip.jar.package">
<mkdir dir="${target.artifacts}" />
<jar destfile="${target.main.artifact}" manifest="${manifest.file}"
basedir="${target.main.classes}" includes="${package.jar.includes.pattern}"
excludes="${package.jar.excludes.pattern}">
<metainf refid="package.metainf.fileset"/>
</jar>
- </target>
+ </target>
- <target name="doit" depends=":jar" />
</project>
Modified: incubator/easyant/plugins/trunk/package-test-jar/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/package-test-jar/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/package-test-jar/module.ivy (original)
+++ incubator/easyant/plugins/trunk/package-test-jar/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="package-test-jar" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="package-test-jar" revision="0.2">
<description>
<p>This module provides jar packaging feature for tests.</p>
<p>
Modified: incubator/easyant/plugins/trunk/package-war/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/package-war/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/package-war/module.ivy (original)
+++ incubator/easyant/plugins/trunk/package-war/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="package-war" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="package-war" revision="0.2">
<description>This module provides war packaging feature. </description>
<ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
Modified: incubator/easyant/plugins/trunk/package-war/src/main/resources/package-war.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/package-war/src/main/resources/package-war.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/package-war/src/main/resources/package-war.ant (original)
+++ incubator/easyant/plugins/trunk/package-war/src/main/resources/package-war.ant Mon Apr 11 21:51:53 2011
@@ -16,46 +16,43 @@
-->
<project name="org.apache.easyant.plugins#package-war"
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="package" />
-
+
+ <ea:core-version requiredrevision="[0.9,+]" />
+
+ <extension-point name="package-war:war-ready" />
+
+ <target name="package-war:init">
<ea:parameter property="target.artifacts.main.war.name" required="true"
description="main artifact file name" />
<ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
-
<ea:parameter property="target.main.classes" required="true"
description="directory where compiled classes that should be packaged are" />
-
+
<ea:parameter property="manifest.file" required="true"
description="the file used to generate manifest" />
-
- <ea:parameter property="package.war.includes.pattern" default="**/*"
+
+ <ea:parameter property="package.war.includes.pattern" default="**/*"
description="Pattern describing files included in the output war" />
<ea:parameter property="package.war.excludes.pattern" default=""
description="Pattern describing files excluded in the output war" />
-
+
<ea:parameter property="package.war.needxmlfile" default="false"
description="Flag to indicate whether or not the web.xml file is needed. Iit should be set to false when generating servlet 2.5+ WAR files without a web.xml file."/>
-
+
<ea:parameter property="src.main.webapp" required="true"
description="directory where web resources files are stored (like pages, images, etc...)"/>
-
+
<ea:parameter property="package.war.webxml.file" required="${package.war.needxmlfile}"
description="The servlet configuration descriptor to use (WEB-INF/web.xml)."/>
-
+
<ea:parameter property="package.metainf.basedir" default="${basedir}"
description="basedir of the metainf fileset"/>
<ea:parameter property="package.metainf.includes.pattern" default="NOTICE,LICENSE"
description="Pattern describing files included in the META-INF of the package"/>
<ea:parameter property="package.metainf.excludes.pattern" default=""
description="Pattern describing files excluded in the META-INF of the package"/>
-
+
<ea:parameter property="target.webinf.lib.dir" default="${target}/war/WEB-INF/lib"
description="temp directory used to store artifacts that will be included in the WEB-INF lib directory"/>
<ea:parameter property="target.main.artifact" required="false" description="the location of the main artifact"
@@ -64,10 +61,9 @@
<fileset id="package.metainf.fileset" dir="${package.metainf.basedir}" includes="${package.metainf.includes.pattern}" excludes="${package.metainf.excludes.pattern}"/>
<mkdir dir="${target.artifacts}" />
-
</target>
-
- <target name="-prepare-war" depends="validate" phase="prepare-package">
+
+ <target name="-package-war:prepare-war" depends="package-war:init">
<!-- copy cache main classpath to a temp directory and build the corresponding fileset -->
<mkdir dir="${target.webinf.lib.dir}"/>
<copy todir="${target.webinf.lib.dir}" flatten="true">
@@ -75,11 +71,8 @@
</copy>
<fileset id="webinf.lib.fileset" dir="${target.webinf.lib.dir}"/>
</target>
-
- <target name=":war" depends="validate, compile, prepare-package" description="package project as a WAR"
- phase="package">
- <ea:parameter phase="package" />
+ <target name="package-war:war" depends="package-war:init,package-war:prepare-package" description="package project as a WAR">
<war destfile="${target.main.artifact}"
manifest="${manifest.file}"
needxmlfile="false"
@@ -87,12 +80,10 @@
excludes="${package.war.excludes.pattern}">
<fileset dir="${src.main.webapp}" includes="**/*" erroronmissingdir="false"/>
<lib refid="webinf.lib.fileset" erroronmissingdir="false"/>
- <classes dir="${target.main.classes}" includes="**/*" erroronmissingdir="false"/>
+ <classes dir="${target.main.classes}" includes="**/*" erroronmissingdir="false"/>
<metainf refid="package.metainf.fileset"/>
</war>
- <ea:registerartifact type="war" settingsRef="${project.ivy.instance}"/>
-
- </target>
+ <ea:registerartifact type="war" settingsRef="${project.ivy.instance}"/>
+ </target>
- <target name="doit" depends=":war" />
</project>
Modified: incubator/easyant/plugins/trunk/rat/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/rat/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/rat/module.ivy (original)
+++ incubator/easyant/plugins/trunk/rat/module.ivy Mon Apr 11 21:51:53 2011
@@ -15,8 +15,7 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="rat"
- status="integration" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="rat" status="integration" revision="0.2">
<ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
<ea:property name="retrieve.dependencies" value="true"/>
</info>
Modified: incubator/easyant/plugins/trunk/rat/src/main/resources/rat.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/rat/src/main/resources/rat.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/rat/src/main/resources/rat.ant (original)
+++ incubator/easyant/plugins/trunk/rat/src/main/resources/rat.ant Mon Apr 11 21:51:53 2011
@@ -17,12 +17,10 @@
<project name="org.apache.easyant.plugins;rat"
xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:ea="antlib:org.apache.easyant">
-
- <!--
- <ea:core-version requiredrevision="[0.7,+]" />
- -->
-
- <target name=":init" phase="validate">
+
+ <ea:core-version requiredrevision="[0.9,+]" />
+
+ <target name="rat:init">
<typedef resource="org/apache/rat/anttasks/antlib.xml"
uri="antlib:org.apache.rat.anttasks"
classpathref="org.apache.easyant.plugins#rat.classpath" />
@@ -35,18 +33,17 @@
<exclude name="**/*.sha1" />
<exclude name="**/*.md5" />
</fileset>
-
</target>
-
- <target name=":rat" description="generate rat report" depends=":init" phase="report">
+
+ <target name="rat:rat" description="generate rat report" depends="rat:init">
<mkdir dir="${rat.report.dir}"/>
<echo>Generating rat report ...</echo>
<property name="rat.report" value="${rat.report.dir}/rat-report.txt"/>
-
+
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report}">
<fileset refid="rat.fileset"/>
</rat:report>
-
+
<fail message="Some files have missing or incorrect license information. Check RAT report in ${rat.report} for more details!">
<condition>
<and>
Modified: incubator/easyant/plugins/trunk/rat/src/test/antunit/rat-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/rat/src/test/antunit/rat-test.xml?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/rat/src/test/antunit/rat-test.xml (original)
+++ incubator/easyant/plugins/trunk/rat/src/test/antunit/rat-test.xml Mon Apr 11 21:51:53 2011
@@ -15,18 +15,16 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins;rat-test" xmlns:au="antlib:org.apache.ant.antunit" xmlns:ivy="antlib:org.apache.ivy.ant">
-
+
<!-- Mocking required phase -->
- <phase name="validate"/>
- <phase name="report" depends="validate"/>
<path id="org.apache.easyant.plugins#rat.classpath">
<fileset dir="../../../lib/main"/>
</path>
<property name="target.report" value="${basedir}/target/report"/>
-
+
<!-- Import your plugin -->
<import file="../../main/resources/rat.ant"/>
-
+
<!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
<target name="clean" description="remove stale build artifacts before / after each test">
<delete dir="${basedir}" includeemptydirs="true">
@@ -34,10 +32,10 @@
<include name="**/lib/**"/>
</delete>
</target>
-
+
<target name="setUp" depends="clean"/>
<target name="tearDown" depends="clean"/>
-
+
<target name="testRat">
<antcall target=":rat" />
<au:assertLogContains text="Generating rat report ..."/>
Modified: incubator/easyant/plugins/trunk/resources-std/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/resources-std/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/resources-std/module.ivy (original)
+++ incubator/easyant/plugins/trunk/resources-std/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="resources-std" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="resources-std" revision="0.2">
<description>This module provides basic resources management, a la maven.</description>
<ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
Modified: incubator/easyant/plugins/trunk/resources-std/src/main/resources/resources-std.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/resources-std/src/main/resources/resources-std.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/resources-std/src/main/resources/resources-std.ant (original)
+++ incubator/easyant/plugins/trunk/resources-std/src/main/resources/resources-std.ant Mon Apr 11 21:51:53 2011
@@ -16,14 +16,10 @@
-->
<project name="org.apache.easyant.plugins#resources-std"
xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="process-resources" />
- <ea:parameter phase="test-process-resources" />
-
+
+ <ea:core-version requiredrevision="[0.9,+]" />
+
+ <target name="resources-std:init">
<ea:parameter property="src.main.resources" default="${basedir}/src/main/resources"
description="directory where main resources files are stored" />
<ea:parameter property="src.test.resources" default="${basedir}/src/test/resources"
@@ -38,63 +34,58 @@
<ea:parameter property="target.test.integration.classes" default="${basedir}/target/integration-test/classes"
description="destination directory where integration test resources should be put" />
-
-
+
+
<ea:parameter property="resources.std.includes.pattern" default="**/*"
description="Pattern describing files included in compilation process" />
<ea:parameter property="resources.std.excludes.pattern" default=""
description="Pattern describing files excluded in compilation process" />
<ea:parameter property="resources.std.include.emptydir" default="true"
description="Specify if empty directory should be copied as resources"/>
-
+
<ea:parameter property="resources.std.test.includes.pattern" default="**/*"
description="Pattern describing files included in test compilation process" />
<ea:parameter property="resources.std.test.excludes.pattern" default=""
description="Pattern describing files excluded in test compilation process" />
-
+
<ea:parameter property="resources.std.test.integration.includes.pattern" default="**/*"
description="Pattern describing files included in integration test compilation process" />
<ea:parameter property="resources.std.test.integration.excludes.pattern" default=""
description="Pattern describing files excluded in integration test compilation process" />
-
+
<filterset id="src.main.resources.filter"/>
<filterset id="src.test.resources.filter"/>
<filterset id="src.test.integration.resources.filter"/>
</target>
- <target name="-check-resources">
+ <target name="-resources-std:check-resources">
<available file="${src.main.resources}" property="has.src.main.resources" />
<available file="${src.test.resources}" property="has.src.test.resources" />
<available file="${src.test.integration.resources}" property="has.src.test.integration.resources" />
</target>
-
- <target name=":copy-resources" depends="validate,-check-resources" if="has.src.main.resources"
- phase="process-resources">
+
+ <target name="resources-std:copy-resources" depends="resources-std:init,-resources-std:check-resources" if="has.src.main.resources">
<mkdir dir="${target.main.classes}" />
<copy todir="${target.main.classes}" includeEmptyDirs="${resources.std.include.emptydir}">
<fileset dir="${src.main.resources}" includes="${resources.std.includes.pattern}" excludes="${resources.std.excludes.pattern}"/>
<filterset refid="src.main.resources.filter"/>
</copy>
- </target>
-
- <target name=":copy-test-resources" depends="validate,-check-resources" if="has.src.test.resources"
- phase="test-process-resources">
+ </target>
+
+ <target name="resources-std:copy-test-resources" depends="resources-std:init,-resources-std:check-resources" if="has.src.test.resources">
<mkdir dir="${target.test.classes}" />
<copy todir="${target.test.classes}" includeEmptyDirs="${resources.std.include.emptydir}">
<fileset dir="${src.test.resources}" includes="${resources.std.test.includes.pattern}" excludes="${resources.std.test.excludes.pattern}"/>
<filterset refid="src.test.resources.filter"/>
</copy>
</target>
-
- <target name=":copy-test-integration-resources" depends="validate,-check-resources" if="has.src.test.integration.resources"
- phase="test-process-resources">
+
+ <target name="resources-std:copy-test-integration-resources" depends="resources-std:init,-resources-std:check-resources" if="has.src.test.integration.resources">
<mkdir dir="${target.test.integration.classes}" />
<copy todir="${target.test.integration.classes}" includeEmptyDirs="${resources.std.include.emptydir}">
<fileset dir="${src.test.integration.resources}" includes="${resources.std.test.integration.includes.pattern}" excludes="${resources.std.test.integration.excludes.pattern}"/>
<filterset refid="src.test.integration.resources.filter"/>
</copy>
- </target>
+ </target>
-
- <target name="doit" depends=":copy-resources, :copy-test-resources, :copy-test-integration-resources" />
</project>
Modified: incubator/easyant/plugins/trunk/run-java/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/run-java/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/run-java/module.ivy (original)
+++ incubator/easyant/plugins/trunk/run-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="run-java" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="run-java" revision="0.2">
<description>This module provides java bytecode execution feature.</description>
<ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
Modified: incubator/easyant/plugins/trunk/run-java/src/main/resources/run-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/run-java/src/main/resources/run-java.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/run-java/src/main/resources/run-java.ant (original)
+++ incubator/easyant/plugins/trunk/run-java/src/main/resources/run-java.ant Mon Apr 11 21:51:53 2011
@@ -16,12 +16,12 @@
-->
<project name="org.apache.easyant.plugins#run-java" 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" />
+ <!-- we may want some better abstraction to know that a project is ready to be run -->
+ <ea:import mrid="org.apache.easyant.plugins#package-jar;0.2" />
+ <target name="run-java:init">
<ea:parameter property="target.main.classes" required="true" description="directory where main compiled classes are" />
<ea:parameter property="project.main.classname" description="Used to define the project main class. The mainclass will then be used by many plugins (manifest, run-java, etc...)" />
@@ -40,12 +40,11 @@ If you are looking for a way to referenc
</target>
- <target name=":run" depends="validate, compile, process-resources" description="run the application">
+ <target name="run-java:run" depends="run-java:init,package-jar:jar-ready" description="run the application">
<available classname="${run.main.classname}" property="is.run.main.classname.configured" classpathref="run.main.classpath"/>
<fail unless="is.run.main.classname.configured" message="the 'run.main.classname' property is not properly configured. By default this property take the same value as 'project.main.classname' property. If you're looking for a way to reference your mainclass one time for all plugins you should set project.main.classname instead."/>
<java classpathref="run.main.classpath" classname="${run.main.classname}" />
</target>
- <target name=":doit" depends=":init, :run" />
</project>
Modified: incubator/easyant/plugins/trunk/scaladoc/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/scaladoc/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/scaladoc/module.ivy (original)
+++ incubator/easyant/plugins/trunk/scaladoc/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="scaladoc" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="scaladoc" revision="0.2">
<description>This module provides scaladoc feature.</description>
<ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
Modified: incubator/easyant/plugins/trunk/scaladoc/src/main/resources/scaladoc.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/scaladoc/src/main/resources/scaladoc.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/scaladoc/src/main/resources/scaladoc.ant (original)
+++ incubator/easyant/plugins/trunk/scaladoc/src/main/resources/scaladoc.ant Mon Apr 11 21:51:53 2011
@@ -16,13 +16,10 @@
-->
<project name="org.apache.easyant.plugins#scaladoc"
xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="report" />
-
+
+ <ea:core-version requiredrevision="[0.9,+]" />
+
+ <target name="scaladoc:init">
<ea:parameter property="src.main.scala" required="true"
description="directory where sources to be compiled are" />
<ea:parameter property="src.test.scala" required="true"
@@ -31,31 +28,30 @@
description="path used to compile main sources" />
<ea:parameter path="compile.test.classpath" required="true"
description="path used to compile test sources" />
-
+
<ea:parameter property="target.report" default="${target}/report"
description="base directory for reports"/>
<ea:parameter property="target.scaladoc" default="${target.report}/javadoc"
description="base directory where scaladoc will be generated" />
-
+
<ea:parameter property="target.scaladoc.main" default="${target.scaladoc}/main"
description="directory where scaladoc will be generated" />
<ea:parameter property="target.scaladoc.test" default="${target.scaladoc}/test"
description="directory where scaladoc for tests will be generated" />
-
+
<available file="${src.main.scala}" property="has.src.main.scala" />
<available file="${src.test.scala}" property="has.src.test.scala" />
- </target>
+ </target>
- <target name="-main" if="has.src.main.scala">
+ <target name="-scaladoc:main" if="has.src.main.scala">
<mkdir dir="${target.scaladoc.main}"/>
<scaladoc destdir="${target.scaladoc.main}" srcdir="${src.main.scala}" classpathref="compile.main.classpath"/>
</target>
- <target name="-test" if="has.src.test.scala">
+ <target name="-scaladoc:test" if="has.src.test.scala">
<mkdir name="${target.scaladoc.test}"/>
<scaladoc destdir="${target.scaladoc.test}" srcdir="${src.test.scala}" classpathref="compile.test.classpath"/>
</target>
-
- <target name=":scaladoc" depends="validate,-main,-test" phase="report" description="generate scaladoc report for main classes and test classes"/>
- <target name="doit" depends=":scaladoc" />
+
+ <target name="scaladoc:scaladoc" depends="validate,-main,-test" phase="report" description="generate scaladoc report for main classes and test classes"/>
</project>
Modified: incubator/easyant/plugins/trunk/scm-svn/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/scm-svn/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/scm-svn/module.ivy (original)
+++ incubator/easyant/plugins/trunk/scm-svn/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="scm-svn" revision="0.1">
+ <info organisation="org.apache.easyant.plugins" module="scm-svn" revision="0.2">
<description>This module provides svn feature.</description>
<ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
Modified: incubator/easyant/plugins/trunk/scm-svn/src/main/resources/scm-svn.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/scm-svn/src/main/resources/scm-svn.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/scm-svn/src/main/resources/scm-svn.ant (original)
+++ incubator/easyant/plugins/trunk/scm-svn/src/main/resources/scm-svn.ant Mon Apr 11 21:51:53 2011
@@ -15,15 +15,12 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#scm-svn" xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate" >
- <ea:parameter phase="validate" />
- <typedef resource="org/tigris/subversion/svnant/svnantlib.xml" classpathref="org.apache.easyant.plugins#scm-svn.classpath" />
- </target>
- <target name="-config" depends=":init">
+ <ea:core-version requiredrevision="[0.9,+]" />
+
+ <typedef resource="org/tigris/subversion/svnant/svnantlib.xml" classpathref="org.apache.easyant.plugins#scm-svn.classpath" />
+
+ <target name="-scm-svn:config">
<ea:parameter property="scm.connection.username" description="defines the username used to connect to the SCM" default=""/>
<ea:parameter property="scm.connection.password" description="defines the password used to connect to the SCM" default=""/>
<ea:parameter property="scm.connection.baseurl" description="the base scm url of your project" required="true"/>
@@ -35,7 +32,7 @@
<ea:parameter property="scm.working.copy" default="${basedir}" description="Define the source url (used for copy)"/>
</target>
- <target name=":tag" description="tag the project" depends="-config">
+ <target name="scm-svn:tag" description="tag the project" depends="-scm-svn:config">
<echo>creating tag on the project</echo>
<ea:parameter property="scm.svn.base.tags" default="${scm.connection.baseurl}/tags" description="The url of tags base directory (used by svn protocol). It is not necessary to set it if you use the standard svn layout (branches/tags/trunk)."/>
<ea:parameter property="scm.tag.name" required="true" description="name of the tag to create"/>
@@ -44,7 +41,8 @@
<copy srcPath="${scm.working.copy}" destUrl="${scm.svn.base.tags}/${scm.tag.name}" message="${scm.commit.message}"/>
</svn>
</target>
- <target name=":branch" description="branch the project" depends="-config">
+
+ <target name="scm-svn:branch" description="branch the project" depends="-scm-svn:config">
<echo>creating branch on the project</echo>
<ea:parameter property="scm.svn.base.branches" default="${scm.connection.baseurl}/branches" description="The url of tags base directory (used by svn protocol). It is not necessary to set it if you use the standard svn layout (branches/tags/trunk)."/>
<ea:parameter property="scm.commit.message" required="true" description="the commit message"/>
@@ -56,22 +54,20 @@
<!-- release -->
- <target name="-init-release">
+ <target name="-scm-svn:init-release">
<ea:parameter property="scm.tag.name" default="${version}" description="name of the tag to create"/>
<ea:parameter property="scm.commit.message" default="EasyAnt: release ${version}" description="the commit message"/>
</target>
- <target name=":release" phase="release" depends="generate-release-version,-init-release,:tag"/>
+ <target name="scm-svn:release" depends="generate-release-version,-scm-svn:init-release,scm-svn:tag"/>
<!-- integration -->
- <target name="-init-integration">
+ <target name="-scm-svn:init-integration">
<ea:parameter property="scm.tag.name" default="${version}" description="name of the tag to create"/>
<ea:parameter property="scm.commit.message" default="EasyAnt: release ${version}" description="the commit message"/>
</target>
- <target name=":integration" phase="publish-shared" depends="generate-shared-version,-init-integration,:tag"/>
-
- <target name="doit" depends=":init" />
+ <target name="scm-svn:integration" depends="generate-shared-version,-scm-svn:init-integration,scm-svn:tag"/>
</project>