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/10/03 17:30:52 UTC
svn commit: r1393630 - in /incubator/easyant/buildtypes/trunk: ./
build-std-groovy/src/main/resources/ build-std-groovy/src/test/antunit/
build-std-java/src/main/resources/ build-std-java/src/test/antunit/
build-std-scala/src/main/resources/ build-std-...
Author: jlboudart
Date: Wed Oct 3 17:30:51 2012
New Revision: 1393630
URL: http://svn.apache.org/viewvc?rev=1393630&view=rev
Log:
Rename extension-point ending with 'finished' documents extension-points
Modified:
incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant
incubator/easyant/buildtypes/trunk/build-std-groovy/src/test/antunit/build-std-groovy-test.xml
incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant
incubator/easyant/buildtypes/trunk/build-std-java/src/test/antunit/build-std-java-test.xml
incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant
incubator/easyant/buildtypes/trunk/build-std-scala/src/test/antunit/build-std-scala-test.xml
incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant
incubator/easyant/buildtypes/trunk/build-webapp-java/src/test/antunit/build-webapp-java-test.xml
incubator/easyant/buildtypes/trunk/module.ivy
Modified: incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant?rev=1393630&r1=1393629&r2=1393630&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant (original)
+++ incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant Wed Oct 3 17:30:51 2012
@@ -38,15 +38,15 @@
<!-- plugin binding -->
<bindtargets targets="manifest:manifest-runnable,resources-std:copy-resources" extensionPoint="abstract-package:package-ready" />
- <bindtargets targets="abstract-compile:compile-finished,resources-std:copy-resources,resources-std:copy-test-resources" extensionPoint="abstract-test:test-ready" />
+ <bindtargets targets="abstract-compile:compile,resources-std:copy-resources,resources-std:copy-test-resources" extensionPoint="abstract-test:test-ready" />
<bindtargets targets="package-jar:jar" extensionPoint="ivy-publication:publish-ready" />
<!-- bind high level targets -->
<bindtargets targets="clean-std:clean" extensionPoint="clean"/>
- <bindtargets targets="abstract-compile:compile-finished" extensionPoint="compile"/>
+ <bindtargets targets="abstract-compile:compile" extensionPoint="compile"/>
<bindtargets targets="abstract-test:test-run" extensionPoint="test"/>
<bindtargets targets="abstract-test:integration-test-run" extensionPoint="integration-test"/>
- <bindtargets targets="abstract-package:package-finished" extensionPoint="package"/>
+ <bindtargets targets="abstract-package:package" extensionPoint="package"/>
<bindtargets targets="ivy-publication:publish-local" extensionPoint="publish-local"/>
<bindtargets targets="ivy-publication:publish-shared" extensionPoint="publish-shared"/>
<bindtargets targets="ivy-publication:release" extensionPoint="release"/>
Modified: incubator/easyant/buildtypes/trunk/build-std-groovy/src/test/antunit/build-std-groovy-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-groovy/src/test/antunit/build-std-groovy-test.xml?rev=1393630&r1=1393629&r2=1393630&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-groovy/src/test/antunit/build-std-groovy-test.xml (original)
+++ incubator/easyant/buildtypes/trunk/build-std-groovy/src/test/antunit/build-std-groovy-test.xml Wed Oct 3 17:30:51 2012
@@ -46,17 +46,17 @@
</target>
<target name="test-build-std-groovy:compile" depends="compile">
- <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-groovy:compile' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning-finished, abstract-compile:compile-ready, compile-groovy:init, -compile-groovy:configure, compile-groovy:compile, compile-test-groovy:configure, compile-test-groovy:compile, compile-test-groovy:compile-integration, abstract-compile:compile-finished, compile, test-build-std-groovy:compile]" level="debug"/>
+ <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-groovy:compile' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-groovy:init, -compile-groovy:configure, compile-groovy:compile, compile-test-groovy:configure, compile-test-groovy:compile, compile-test-groovy:compile-integration, abstract-compile:compile, compile, test-build-std-groovy:compile]" level="debug"/>
</target>
<target name="test-build-std-groovy:test" depends="test">
<au:assertLogContains text="Running org.apache.easyant.example.ExampleTest"/>
<au:assertLogContains text="Tests run: 2, Failures: 0, Errors: 0"/>
- <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-groovy:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning-finished, abstract-compile:compile-ready, compile-groovy:init, -compile-groovy:configure, compile-groovy:compile, compile-test-groovy:configure, compile-test-groovy:compile, compile-test-groovy:compile-integration, abstract-compile:compile-finished, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, test-junit:init, abstract-test:compute-test-sets, -test-junit:test, test-junit:run, abstract-test:test-run, test, test-build-std-groovy:test]" level="debug"/>
+ <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-groovy:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-groovy:init, -compile-groovy:configure, compile-groovy:compile, compile-test-groovy:configure, compile-test-groovy:compile, compile-test-groovy:compile-integration, abstract-compile:compile, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, test-junit:init, abstract-test:compute-test-sets, -test-junit:test, test-junit:run, abstract-test:test-run, test, test-build-std-groovy:test]" level="debug"/>
</target>
<target name="test-build-std-groovy:package" depends="package">
- <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-groovy:package' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning-finished, abstract-compile:compile-ready, compile-groovy:init, -compile-groovy:configure, compile-groovy:compile, compile-test-groovy:configure, compile-test-groovy:compile, compile-test-groovy:compile-integration, abstract-compile:compile-finished, compile, manifest:init, -manifest:generate-version-number, manifest:manifest, manifest:manifest-runnable, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, abstract-package:package-ready, abstract-package:init, abstract-package:compute-metainf, package-jar:init, package-jar:jar, abstract-package:register-m
ain-artifact, abstract-package:package-finished, package, test-build-std-groovy:package]" level="debug"/>
+ <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-groovy:package' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-groovy:init, -compile-groovy:configure, compile-groovy:compile, compile-test-groovy:configure, compile-test-groovy:compile, compile-test-groovy:compile-integration, abstract-compile:compile, compile, manifest:init, -manifest:generate-version-number, manifest:manifest, manifest:manifest-runnable, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, abstract-package:package-ready, abstract-package:init, abstract-package:compute-metainf, package-jar:init, package-jar:jar, abstract-package:register-main-artifact, abst
ract-package:package, package, test-build-std-groovy:package]" level="debug"/>
</target>
</project>
Modified: incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant?rev=1393630&r1=1393629&r2=1393630&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant (original)
+++ incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant Wed Oct 3 17:30:51 2012
@@ -37,15 +37,15 @@
<!-- plugin binding -->
<bindtargets targets="manifest:manifest-runnable,resources-std:copy-resources" extensionPoint="abstract-package:package-ready" />
- <bindtargets targets="abstract-compile:compile-finished,resources-std:copy-resources,resources-std:copy-test-resources" extensionPoint="abstract-test:test-ready" />
+ <bindtargets targets="abstract-compile:compile,resources-std:copy-resources,resources-std:copy-test-resources" extensionPoint="abstract-test:test-ready" />
<bindtargets targets="package-jar:jar" extensionPoint="ivy-publication:publish-ready" />
<!-- bind high level targets -->
<bindtargets targets="clean-std:clean" extensionPoint="clean"/>
- <bindtargets targets="abstract-compile:compile-finished" extensionPoint="compile"/>
+ <bindtargets targets="abstract-compile:compile" extensionPoint="compile"/>
<bindtargets targets="abstract-test:test-run" extensionPoint="test"/>
<bindtargets targets="abstract-test:integration-test-run" extensionPoint="integration-test"/>
- <bindtargets targets="abstract-package:package-finished" extensionPoint="package"/>
+ <bindtargets targets="abstract-package:package" extensionPoint="package"/>
<bindtargets targets="ivy-publication:publish-local" extensionPoint="publish-local"/>
<bindtargets targets="ivy-publication:publish-shared" extensionPoint="publish-shared"/>
<bindtargets targets="ivy-publication:release" extensionPoint="release"/>
Modified: incubator/easyant/buildtypes/trunk/build-std-java/src/test/antunit/build-std-java-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-java/src/test/antunit/build-std-java-test.xml?rev=1393630&r1=1393629&r2=1393630&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-java/src/test/antunit/build-std-java-test.xml (original)
+++ incubator/easyant/buildtypes/trunk/build-std-java/src/test/antunit/build-std-java-test.xml Wed Oct 3 17:30:51 2012
@@ -46,16 +46,16 @@
</target>
<target name="test-build-std-java:compile" depends="compile">
- <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-java:compile' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning-finished, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile-finished, compile, test-build-std-java:compile]" level="debug"/>
+ <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-java:compile' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile, compile, test-build-std-java:compile]" level="debug"/>
</target>
<target name="test-build-std-java:test" depends="test">
<au:assertLogContains text="Running org.apache.easyant.example.ExampleTest"/>
<au:assertLogContains text="Tests run: 2, Failures: 0, Errors: 0"/>
- <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-java:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning-finished, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile-finished, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, test-junit:init, abstract-test:compute-test-sets, -test-junit:test, test-junit:run, abstract-test:test-run, test, test-build-std-java:test]" level="debug"/>
+ <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-java:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, test-junit:init, abstract-test:compute-test-sets, -test-junit:test, test-junit:run, abstract-test:test-run, test, test-build-std-java:test]" level="debug"/>
</target>
<target name="test-build-std-java:package" depends="package">
- <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-java:package' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning-finished, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile-finished, compile, manifest:init, -manifest:generate-version-number, manifest:manifest, manifest:manifest-runnable, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, abstract-package:package-ready, abstract-package:init, abstract-package:compute-metainf, package-jar:init, package-jar:jar, abstract-package:register-main-artifact, abstract-package:package-finished, package, test-build
-std-java:package]" level="debug"/>
+ <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-java:package' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile, compile, manifest:init, -manifest:generate-version-number, manifest:manifest, manifest:manifest-runnable, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, abstract-package:package-ready, abstract-package:init, abstract-package:compute-metainf, package-jar:init, package-jar:jar, abstract-package:register-main-artifact, abstract-package:package, package, test-build-std-java:package]" level="
debug"/>
</target>
</project>
Modified: incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant?rev=1393630&r1=1393629&r2=1393630&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant (original)
+++ incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant Wed Oct 3 17:30:51 2012
@@ -38,15 +38,15 @@
<!-- plugin binding -->
<bindtargets targets="manifest:manifest-runnable,resources-std:copy-resources" extensionPoint="abstract-package:package-ready" />
- <bindtargets targets="abstract-compile:compile-finished,resources-std:copy-resources,resources-std:copy-test-resources" extensionPoint="abstract-test:test-ready" />
+ <bindtargets targets="abstract-compile:compile,resources-std:copy-resources,resources-std:copy-test-resources" extensionPoint="abstract-test:test-ready" />
<bindtargets targets="package-jar:jar" extensionPoint="ivy-publication:publish-ready" />
<!-- bind high level targets -->
<bindtargets targets="clean-std:clean" extensionPoint="clean"/>
- <bindtargets targets="abstract-compile:compile-finished" extensionPoint="compile"/>
+ <bindtargets targets="abstract-compile:compile" extensionPoint="compile"/>
<bindtargets targets="abstract-test:test-run" extensionPoint="test"/>
<bindtargets targets="abstract-test:integration-test-run" extensionPoint="integration-test"/>
- <bindtargets targets="abstract-package:package-finished" extensionPoint="package"/>
+ <bindtargets targets="abstract-package:package" extensionPoint="package"/>
<bindtargets targets="ivy-publication:publish-local" extensionPoint="publish-local"/>
<bindtargets targets="ivy-publication:publish-shared" extensionPoint="publish-shared"/>
<bindtargets targets="ivy-publication:release" extensionPoint="release"/>
Modified: incubator/easyant/buildtypes/trunk/build-std-scala/src/test/antunit/build-std-scala-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-scala/src/test/antunit/build-std-scala-test.xml?rev=1393630&r1=1393629&r2=1393630&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-scala/src/test/antunit/build-std-scala-test.xml (original)
+++ incubator/easyant/buildtypes/trunk/build-std-scala/src/test/antunit/build-std-scala-test.xml Wed Oct 3 17:30:51 2012
@@ -46,17 +46,17 @@ xmlns:ea="antlib:org.apache.easyant">
</target>
<target name="test-build-std-scala:compile" depends="compile">
- <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-scala:compile' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning-finished, abstract-compile:compile-ready, compile-scala:init, compile-scala:configure, compile-scala:compile, compile-test-scala:configure, compile-test-scala:compile, compile-test-scala:compile-integration, abstract-compile:compile-finished, compile, test-build-std-scala:compile]" level="debug"/>
+ <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-scala:compile' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-scala:init, compile-scala:configure, compile-scala:compile, compile-test-scala:configure, compile-test-scala:compile, compile-test-scala:compile-integration, abstract-compile:compile, compile, test-build-std-scala:compile]" level="debug"/>
</target>
<target name="test-build-std-scala:test" depends="test">
<au:assertLogContains text="Running org.apache.easyant.example.ExampleTest"/>
<au:assertLogContains text="Tests run: 2, Failures: 0, Errors: 0"/>
- <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-scala:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning-finished, abstract-compile:compile-ready, compile-scala:init, compile-scala:configure, compile-scala:compile, compile-test-scala:configure, compile-test-scala:compile, compile-test-scala:compile-integration, abstract-compile:compile-finished, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, test-junit:init, abstract-test:compute-test-sets, -test-junit:test, test-junit:run, abstract-test:test-run, test, test-build-std-scala:test]" level="debug"/>
+ <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-scala:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-scala:init, compile-scala:configure, compile-scala:compile, compile-test-scala:configure, compile-test-scala:compile, compile-test-scala:compile-integration, abstract-compile:compile, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, test-junit:init, abstract-test:compute-test-sets, -test-junit:test, test-junit:run, abstract-test:test-run, test, test-build-std-scala:test]" level="debug"/>
</target>
<target name="test-build-std-scala:package" depends="package">
-<au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-scala:package' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning-finished, abstract-compile:compile-ready, compile-scala:init, compile-scala:configure, compile-scala:compile, compile-test-scala:configure, compile-test-scala:compile, compile-test-scala:compile-integration, abstract-compile:compile-finished, compile, manifest:init, -manifest:generate-version-number, manifest:manifest, manifest:manifest-runnable, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, abstract-package:package-ready, abstract-package:init, abstract-package:compute-metainf, package-jar:init, package-jar:jar, abstract-package:register-main-artifact, a
bstract-package:package-finished, package, test-build-std-scala:package]" level="debug"/>
+<au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-scala:package' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-scala:init, compile-scala:configure, compile-scala:compile, compile-test-scala:configure, compile-test-scala:compile, compile-test-scala:compile-integration, abstract-compile:compile, compile, manifest:init, -manifest:generate-version-number, manifest:manifest, manifest:manifest-runnable, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, abstract-package:package-ready, abstract-package:init, abstract-package:compute-metainf, package-jar:init, package-jar:jar, abstract-package:register-main-artifact, abstract-package:pa
ckage, package, test-build-std-scala:package]" level="debug"/>
</target>
</project>
Modified: incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant?rev=1393630&r1=1393629&r2=1393630&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant (original)
+++ incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant Wed Oct 3 17:30:51 2012
@@ -39,15 +39,15 @@
<!-- plugin binding -->
<bindtargets targets="manifest:manifest-runnable,resources-std:copy-resources" extensionPoint="abstract-package:package-ready" />
- <bindtargets targets="abstract-compile:compile-finished,resources-std:copy-resources,resources-std:copy-test-resources" extensionPoint="abstract-test:test-ready" />
+ <bindtargets targets="abstract-compile:compile,resources-std:copy-resources,resources-std:copy-test-resources" extensionPoint="abstract-test:test-ready" />
<bindtargets targets="package-war:war" extensionPoint="ivy-publication:publish-ready" />
<!-- bind high level targets -->
<bindtargets targets="clean-std:clean" extensionPoint="clean"/>
- <bindtargets targets="abstract-compile:compile-finished" extensionPoint="compile"/>
+ <bindtargets targets="abstract-compile:compile" extensionPoint="compile"/>
<bindtargets targets="abstract-test:test-run" extensionPoint="test"/>
<bindtargets targets="abstract-test:integration-test-run" extensionPoint="integration-test"/>
- <bindtargets targets="abstract-package:package-finished" extensionPoint="package"/>
+ <bindtargets targets="abstract-package:package" extensionPoint="package"/>
<bindtargets targets="ivy-publication:publish-local" extensionPoint="publish-local"/>
<bindtargets targets="ivy-publication:publish-shared" extensionPoint="publish-shared"/>
<bindtargets targets="ivy-publication:release" extensionPoint="release"/>
Modified: incubator/easyant/buildtypes/trunk/build-webapp-java/src/test/antunit/build-webapp-java-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-webapp-java/src/test/antunit/build-webapp-java-test.xml?rev=1393630&r1=1393629&r2=1393630&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-webapp-java/src/test/antunit/build-webapp-java-test.xml (original)
+++ incubator/easyant/buildtypes/trunk/build-webapp-java/src/test/antunit/build-webapp-java-test.xml Wed Oct 3 17:30:51 2012
@@ -46,16 +46,16 @@
</target>
<target name="test-build-webapp-java:compile" depends="compile">
- <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-webapp-java:compile' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning-finished, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile-finished, compile, test-build-webapp-java:compile]" level="debug"/>
+ <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-webapp-java:compile' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile, compile, test-build-webapp-java:compile]" level="debug"/>
</target>
<target name="test-build-webapp-java:test" depends="test">
<au:assertLogContains text="Running org.apache.easyant.example.ExampleTest"/>
<au:assertLogContains text="Tests run: 2, Failures: 0, Errors: 0"/>
- <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-webapp-java:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning-finished, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile-finished, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, test-junit:init, abstract-test:compute-test-sets, -test-junit:test, test-junit:run, abstract-test:test-run, test, test-build-webapp-java:test]" level="debug"/>
+ <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-webapp-java:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, test-junit:init, abstract-test:compute-test-sets, -test-junit:test, test-junit:run, abstract-test:test-run, test, test-build-webapp-java:test]" level="debug"/>
</target>
<target name="test-build-webapp-java:package" depends="package">
- <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-webapp-java:package' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning-finished, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile-finished, compile, manifest:init, -manifest:generate-version-number, manifest:manifest, manifest:manifest-runnable, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, abstract-package:package-ready, abstract-package:init, abstract-package:compute-metainf, package-war:init, -package-war:prepare-war, package-war:war, abstract-package:register-main-artifact, abstract-package:package-
finished, package, test-build-webapp-java:package]" level="debug"/>
+ <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-webapp-java:package' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile, compile, manifest:init, -manifest:generate-version-number, manifest:manifest, manifest:manifest-runnable, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, abstract-package:package-ready, abstract-package:init, abstract-package:compute-metainf, package-war:init, -package-war:prepare-war, package-war:war, abstract-package:register-main-artifact, abstract-package:package, package, test-bui
ld-webapp-java:package]" level="debug"/>
</target>
</project>
Modified: incubator/easyant/buildtypes/trunk/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/module.ivy?rev=1393630&r1=1393629&r2=1393630&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/module.ivy Wed Oct 3 17:30:51 2012
@@ -18,7 +18,5 @@
<info organisation="org.apache.easyant.buildtypes" module="buildtypes-orchestrator" revision="0.1" >
<description>This module acts as orchestrator to build all easyant buildtypes.</description>
<ea:build module="meta-build" revision="0.2"/>
- <!-- If we use build scoped repository easyant use it as a dictator resolver, this have side effects as we use same ivy instance to build the plugin and to resolve plugin dependencies -->
- <ea:property name="use.build.repository" value="false"/>
</info>
</ivy-module>