You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by jl...@apache.org on 2012/01/22 22:08:08 UTC
svn commit: r1234631 - in /incubator/easyant/plugins/trunk:
checkstyle/src/main/resources/ clean-std/src/main/resources/
compile-groovy/src/main/resources/ compile-java/src/main/resources/
compile-scala/src/main/resources/ compile-test-groovy/src/main/...
Author: jlboudart
Date: Sun Jan 22 22:08:07 2012
New Revision: 1234631
URL: http://svn.apache.org/viewvc?rev=1234631&view=rev
Log:
Removing prefix on plugin's target (too error prone for the moment, we will take this in consideration on next release with a better conflict management on plugins)
Modified:
incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.ant
incubator/easyant/plugins/trunk/clean-std/src/main/resources/clean-std.ant
incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant
incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant
incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant
incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant
incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant
incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant
incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant
incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant
incubator/easyant/plugins/trunk/distribution/src/main/resources/distribution.ant
Modified: incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.ant?rev=1234631&r1=1234630&r2=1234631&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.ant (original)
+++ incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.ant Sun Jan 22 22:08:07 2012
@@ -20,7 +20,7 @@
<dirname file="${ant.file.org.apache.easyant.plugins#checkstyle}" property="ant.dir.org.apache.easyant.plugins#checkstyle" />
- <target name="checkstyle:init">
+ <target name="-init">
<ea:parameter property="checkstyle.xsl.file" default="${ant.dir.org.apache.easyant.plugins#checkstyle}/checkstyle.xsl" description="checkstyle xsl, used to transform XML -> HTML" />
<ea:parameter property="checkstyle.config.file" default="${ant.dir.org.apache.easyant.plugins#checkstyle}/checkstyle.xml" description="checkstyle rules file" />
<ea:parameter property="target.checkstyle.report" default="${target.report}/checkstyle" description="directory where checkstyle report will be generated" />
@@ -39,7 +39,7 @@
<available file="${src.main.java}" property="has.src.main.java" />
</target>
- <target name="checkstyle:checkstyle" unless="skip.checkstyle" depends="checkstyle:init" description="generate checkstyle report">
+ <target name=":checkstyle" unless="skip.checkstyle" depends="-init" description="generate checkstyle report">
<mkdir dir="${target.checkstyle.report}"/>
<checkstyle config="${checkstyle.config.file}" failureProperty="checkstyle.failure" failOnViolation="false">
@@ -48,11 +48,11 @@
</checkstyle>
</target>
- <target name="checkstyle:report-html" depends="checkstyle:checkstyle" unless="checkstyle.failure">
+ <target name=":report-html" depends=":checkstyle" unless="checkstyle.failure">
<xslt in="${target.checkstyle.report}/${checkstyle.report.name}.xml" out="${target.checkstyle.report}/${checkstyle.report.name}.html" style="${checkstyle.xsl.file}" />
</target>
- <target name="-checkstyle:check" depends="checkstyle:checkstyle" unless="skip.checkstyle">
+ <target name="-check" depends=":checkstyle" unless="skip.checkstyle">
<fail if="checkstyle.failure" message="There is checkstyle violation(s), please check your ${target.checkstyle.report}/${checkstyle.report.name}.html" />
</target>
Modified: incubator/easyant/plugins/trunk/clean-std/src/main/resources/clean-std.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/clean-std/src/main/resources/clean-std.ant?rev=1234631&r1=1234630&r2=1234631&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/clean-std/src/main/resources/clean-std.ant (original)
+++ incubator/easyant/plugins/trunk/clean-std/src/main/resources/clean-std.ant Sun Jan 22 22:08:07 2012
@@ -20,7 +20,7 @@
<ea:parameter property="target" required="true" description="the target directory to clean" />
- <target name="clean-std:clean" description="clean project">
+ <target name=":clean" description="clean project">
<echo message="Cleaning ${target}..." />
<delete dir="${target}" />
</target>
Modified: incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant?rev=1234631&r1=1234630&r2=1234631&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant (original)
+++ incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant Sun Jan 22 22:08:07 2012
@@ -22,7 +22,7 @@
<ea:import mrid="org.apache.easyant.plugins#abstract-compile;0.2" />
- <target name="compile-groovy:init">
+ <target name="-init">
<ea:parameter property="src.main.groovy" required="true" description="directory where sources to be compiled are" />
<ea:parameter property="compile.groovy.includes.pattern" default="**/*.groovy" description="Pattern describing files included in compilation process" />
@@ -32,7 +32,7 @@
</target>
- <target name="-compile-groovy:configure" depends="compile-groovy:init,abstract-compile:compile-ready">
+ <target name="-configure" depends="-init,abstract-compile:compile-ready">
<ea:findclasspath pathid="resolved.groovy.classpath" organisation="org.codehaus.groovy" module="groovy-all" revision="1.6.0">
<ea:project-dependency-strategy />
<ea:environment-strategy env="GROOVY_HOME"/>
@@ -43,7 +43,7 @@
</target>
- <target name="compile-groovy:compile" depends="compile-groovy:configure" if="has.src.main.groovy">
+ <target name=":compile" depends="-configure" if="has.src.main.groovy">
<mkdir dir="${target.main.classes}" />
<!--
<groovyc> Attributes
Modified: incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant?rev=1234631&r1=1234630&r2=1234631&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant (original)
+++ incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant Sun Jan 22 22:08:07 2012
@@ -21,7 +21,7 @@
<ea:import mrid="org.apache.easyant.plugins#abstract-compile;0.2" />
- <target name="compile-java:init">
+ <target name="-init">
<ea:parameter property="src.main.java" required="true"
description="directory where sources to be compiled are" />
<ea:parameter property="javac.debug.mode" default="true"
@@ -41,7 +41,7 @@
</target>
- <target name="compile-java:compile" depends="compile-java:init,abstract-compile:compile-ready" if="has.src.main.java">
+ <target name=":compile" depends="-init,abstract-compile:compile-ready" if="has.src.main.java">
<mkdir dir="${target.main.classes}" />
<javac srcdir="${src.main.java}"
destdir="${target.main.classes}"
Modified: incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant?rev=1234631&r1=1234630&r2=1234631&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant (original)
+++ incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant Sun Jan 22 22:08:07 2012
@@ -21,7 +21,7 @@
<ea:import mrid="org.apache.easyant.plugins#abstract-compile;0.2" />
- <target name="compile-scala:init">
+ <target name="-init">
<property environment="env"/>
<ea:parameter property="src.main.scala" required="true"
description="directory where sources to be compiled are" />
@@ -38,7 +38,7 @@
</target>
- <target name="compile-scala:configure" depends="compile-scala:init,abstract-compile:compile-ready">
+ <target name="-configure" depends="-init,abstract-compile:compile-ready">
<ea:findclasspath pathid="resolved.scala.classpath" organisation="org.scala-lang" module="scala-compiler" revision="2.7.7">
<ea:project-dependency-strategy />
<ea:environment-strategy env="SCALA_HOME"/>
@@ -54,7 +54,7 @@
</ea:path>
</target>
- <target name="compile-scala:compile" depends="compile-scala:configure" if="has.src.main.scala">
+ <target name=":compile" depends="-configure" if="has.src.main.scala">
<mkdir dir="${target.main.classes}" />
<scalac srcdir="${src.main.scala}"
destdir="${target.main.classes}"
Modified: incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant?rev=1234631&r1=1234630&r2=1234631&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant (original)
+++ incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant Sun Jan 22 22:08:07 2012
@@ -33,7 +33,7 @@
</sequential>
</macrodef>
- <target name="compile-test-groovy:configure" depends="abstract-compile:compile-ready">
+ <target name="-configure" depends="abstract-compile:compile-ready">
<ea:findclasspath pathid="resolved.groovy.classpath" organisation="org.codehaus.groovy" module="groovy-all" revision="1.6.0">
<ea:project-dependency-strategy />
<ea:environment-strategy env="GROOVY_HOME"/>
@@ -43,11 +43,11 @@
<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="resolved.groovy.classpath" />
</target>
- <target name="compile-test-groovy:compile" depends="compile-test-groovy:configure" if="has.src.test.java">
+ <target name=":compile" depends="-configure" if="has.src.test.java">
<compile-groovy-tests prefix="test"/>
</target>
- <target name="compile-test-groovy:compile-integration" depends="compile-test-groovy:configure" if="has.src.test.integration.java">
+ <target name=":compile-integration" depends="-configure" if="has.src.test.integration.java">
<compile-groovy-tests prefix="test.integration"/>
</target>
Modified: incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant?rev=1234631&r1=1234630&r2=1234631&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant (original)
+++ incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant Sun Jan 22 22:08:07 2012
@@ -38,7 +38,7 @@
</sequential>
</macrodef>
- <target name="compile-test-java:compile" depends="abstract-compile:compile-ready" if="has.src.test.java">
+ <target name=":compile" depends="abstract-compile:compile-ready" if="has.src.test.java">
<ea:parameter property="test.compile.java.target.version" default="${ant.java.version}"
description="Specify a VM version for Generated class files (e.g., 1.1 or 1.2)." />
<ea:parameter property="test.compile.java.source.version" default="${ant.java.version}"
@@ -46,7 +46,7 @@
<compile-java-tests prefix="test"/>
</target>
- <target name="compile-test-java:compile-integration" depends="abstract-compile:compile-ready" if="has.src.test.integration.java">
+ <target name=":compile-integration" depends="abstract-compile:compile-ready" if="has.src.test.integration.java">
<ea:parameter property="test.integration.compile.java.target.version" default="${ant.java.version}"
description="Specify a VM version for Generated class files (e.g., 1.1 or 1.2)." />
<ea:parameter property="test.integration.compile.java.source.version" default="${ant.java.version}"
Modified: incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant?rev=1234631&r1=1234630&r2=1234631&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant (original)
+++ incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant Sun Jan 22 22:08:07 2012
@@ -21,7 +21,7 @@
<ea:import mrid="org.apache.easyant.plugins#abstract-compile;0.1" />
- <target name="compile-test-scala:configure" depends="abstract-compile:compile-ready">
+ <target name="-configure" depends="abstract-compile:compile-ready">
<ea:findclasspath pathid="resolved.scala.classpath" organisation="org.scala-lang" module="scala-compiler" revision="2.7.7">
<ea:project-dependency-strategy />
<ea:environment-strategy env="SCALA_HOME"/>
@@ -50,11 +50,11 @@
</sequential>
</macrodef>
- <target name="compile-test-scala:compile" depends="compile-test-scala:configure" if="has.src.test.java">
+ <target name=":compile" depends="-configure" if="has.src.test.java">
<compile-scala-tests prefix="test"/>
</target>
- <target name="compile-test-scala:compile-integration" depends="compile-test-scala:configure" if="has.src.test.integration.java">
+ <target name=":compile-integration" depends="-configure" if="has.src.test.integration.java">
<compile-scala-tests prefix="test.integration"/>
</target>
Modified: incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant?rev=1234631&r1=1234630&r2=1234631&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant (original)
+++ incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant Sun Jan 22 22:08:07 2012
@@ -23,7 +23,7 @@
<ea:import mrid="org.apache.easyant.plugins#ivy-publication;0.2" />
- <target name="default-version-strategy:init">
+ <target name="-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"
@@ -71,7 +71,7 @@
</macrodef>
<!-- version numbers -->
- <target name="default-version-strategy:local" depends="default-version-strategy:init" extensionOf="ivy-publication:generate-local-version">
+ <target name=":local" depends="-init" extensionOf="ivy-publication:generate-local-version">
<check-version-number/>
<tstamp>
<format property="now" pattern="yyyyMMddHHmmss" />
@@ -79,14 +79,14 @@
<property name="version" value="${ivy.revision}-local-${now}" />
</target>
- <target name="default-version-strategy:shared" depends="default-version-strategy:init" unless="ivy.new.revision" extensionOf="ivy-publication:generate-shared-version">
+ <target name=":shared" depends="-init" unless="ivy.new.revision" extensionOf="ivy-publication:generate-shared-version">
<ea:checkresolver resolver="shared.resolver" settingsRef="${project.ivy.instance}" description="name of the repository used to publish shared integration versions (snapshots)"/>
<check-version-number/>
<ivy:buildnumber organisation="${ivy.organisation}" module="${ivy.module}" revision="${ivy.revision}" defaultBuildNumber="${default.build.number}" revSep="${revision.separator}" settingsRef="${project.ivy.instance}" resolver="${shared.resolver}"/>
<property name="version" value="${ivy.new.revision}" />
</target>
- <target name="default-version-strategy:release" depends="default-version-strategy:init" unless="ivy.new.revision" extensionOf="ivy-publication:generate-release-version">
+ <target name=":release" depends="-init" unless="ivy.new.revision" extensionOf="ivy-publication:generate-release-version">
<check-version-number/>
<property name="version" value="${ivy.revision}" />
</target>
Modified: incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant?rev=1234631&r1=1234630&r2=1234631&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant (original)
+++ incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant Sun Jan 22 22:08:07 2012
@@ -20,7 +20,7 @@
<ea:core-version requiredrevision="[0.9,+]" />
<ea:import mrid="org.apache.easyant.plugins#abstract-provisioning;0.1" />
- <target name="deps-lib:init" extensionOf="abstract-provisioning:provisioning-ready">
+ <target name="-init" extensionOf="abstract-provisioning:provisioning-ready">
<fileset id="lib.main.fileset" dir="${lib.main}">
<include name="*.jar" />
</fileset>
@@ -30,7 +30,7 @@
</fileset>
</target>
- <target name="deps-lib:plugin" extensionOf="abstract-provisioning:provisioning-finished">
+ <target name=":plugin" depends="-init" extensionOf="abstract-provisioning:provisioning-finished">
<ea:parameter path="compile.main.classpath"
description="main compilation path" />
<ea:parameter path="compile.test.classpath"
Modified: incubator/easyant/plugins/trunk/distribution/src/main/resources/distribution.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/distribution/src/main/resources/distribution.ant?rev=1234631&r1=1234630&r2=1234631&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/distribution/src/main/resources/distribution.ant (original)
+++ incubator/easyant/plugins/trunk/distribution/src/main/resources/distribution.ant Sun Jan 22 22:08:07 2012
@@ -82,7 +82,7 @@
</macrodef>
- <target name="distribution:init">
+ <target name="-init">
<ea:parameter property="target.distributions" default="${target}/distributions" description="directory where distribution packages will be generated" />
<ea:parameter property="project.basedir" default="${basedir}" description="defines the project base directory" />
<ea:parameter property="project.prefix" default="" description="defines the project prefix, used as distribution root directory" />
@@ -118,15 +118,15 @@
<mkdir dir="${target.distributions}" />
</target>
- <target name="distribution:clean" description="clean distribution dir">
+ <target name=":clean" description="clean distribution dir">
<delete dir="${target.distributions}"/>
</target>
- <target name="-distribution:force-retrieve" depends="distribution:init">
+ <target name="-force-retrieve" depends="-init">
<property name="retrieve.dependencies" value="true"/>
</target>
- <target name="distribution:bin" depends="-distribution:force-retrieve" description="create a binary distribution">
+ <target name=":bin" depends="-force-retrieve" description="create a binary distribution">
<bundle destfile="${target.distributions}/${module.name}-bin">
<!-- project artifacts -->
<zipfileset refid="project.artifacts.zipfileset" />
@@ -141,7 +141,7 @@
</bundle>
</target>
- <target name="distribution:jar-with-dependencies" depends="-distribution:force-retrieve" description="create a jar archive which contains the binary output of your project, along its the unpacked dependencies (only works on jar projects)">
+ <target name=":jar-with-dependencies" depends="-force-retrieve" description="create a jar archive which contains the binary output of your project, along its the unpacked dependencies (only works on jar projects)">
<condition property="target.main.artifact.exist">
<and>
<isset property="target.main.artifact"/>
@@ -161,7 +161,7 @@
</bundle>
</target>
- <target name="distribution:source" description="create a source distribution">
+ <target name=":source" description="create a source distribution">
<bundle destfile="${target.distributions}/${module.name}-source">
<!-- project artifacts -->
<zipfileset refid="project.artifacts.zipfileset" />