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/16 18:37:36 UTC
svn commit: r1398917 [1/2] - in /incubator/easyant/buildtypes/trunk: ./
build-std-ant-plugin/ build-std-ant-plugin/src/main/resources/
build-std-groovy/ build-std-groovy/src/main/resources/
build-std-groovy/src/test/antunit/ build-std-java/ build-std-j...
Author: jlboudart
Date: Tue Oct 16 18:37:35 2012
New Revision: 1398917
URL: http://svn.apache.org/viewvc?rev=1398917&view=rev
Log:
Format buildtype code and reference the parent
Modified:
incubator/easyant/buildtypes/trunk/build-std-ant-plugin/module.ivy
incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant
incubator/easyant/buildtypes/trunk/build-std-groovy/module.ivy
incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant
incubator/easyant/buildtypes/trunk/build-std-groovy/src/test/antunit/build-std-groovy-test.xml
incubator/easyant/buildtypes/trunk/build-std-groovy/src/test/antunit/module.ivy
incubator/easyant/buildtypes/trunk/build-std-java/module.ivy
incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant
incubator/easyant/buildtypes/trunk/build-std-java/src/test/antunit/build-std-java-test.xml
incubator/easyant/buildtypes/trunk/build-std-java/src/test/antunit/module.ivy
incubator/easyant/buildtypes/trunk/build-std-scala/module.ivy
incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant
incubator/easyant/buildtypes/trunk/build-std-scala/src/test/antunit/build-std-scala-test.xml
incubator/easyant/buildtypes/trunk/build-std-scala/src/test/antunit/module.ivy
incubator/easyant/buildtypes/trunk/build-std-skeleton/module.ivy
incubator/easyant/buildtypes/trunk/build-std-skeleton/src/main/resources/build-std-skeleton.ant
incubator/easyant/buildtypes/trunk/build-webapp-java/module.ivy
incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant
incubator/easyant/buildtypes/trunk/build-webapp-java/src/test/antunit/build-webapp-java-test.xml
incubator/easyant/buildtypes/trunk/build-webapp-java/src/test/antunit/module.ivy
incubator/easyant/buildtypes/trunk/meta-build/module.ivy
incubator/easyant/buildtypes/trunk/meta-build/src/main/resources/meta-build.ant
incubator/easyant/buildtypes/trunk/module.ivy
incubator/easyant/buildtypes/trunk/parent.ivy
Modified: incubator/easyant/buildtypes/trunk/build-std-ant-plugin/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-ant-plugin/module.ivy?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-ant-plugin/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-ant-plugin/module.ivy Tue Oct 16 18:37:35 2012
@@ -14,18 +14,22 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.9">
- <description>A standard build for true ant plugins, relying on standard phases, and providing compilation, execution and unit tests</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
- </info>
- <configurations>
- <conf name="default" description="runtime dependencies artifact can be used with this conf"/>
- <conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
- <conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
- </configurations>
+ <extends organisation="org.apache.easyant.buildtypes" module="parent-buildtype" revision="0.1"/>
+ <description>A standard build for true ant plugins, relying on standard phases, and providing compilation,
+ execution and unit tests</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+ </info>
+ <configurations>
+ <conf name="default" description="runtime dependencies artifact can be used with this conf" />
+ <conf name="test"
+ description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+ <conf name="provided"
+ description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
+ </configurations>
<publications>
- <artifact type="ant"/>
- <artifact type="properties"/>
+ <artifact type="ant" />
+ <artifact type="properties" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant (original)
+++ incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant Tue Oct 16 18:37:35 2012
@@ -14,16 +14,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.buildtypes#build-std-ant-plugin"
- xmlns:ivy="antlib:org.apache.ivy.ant"
+<project name="org.apache.easyant.buildtypes#build-std-ant-plugin" xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:ea="antlib:org.apache.easyant">
-
<ea:core-version requiredrevision="[0.9,+]" />
-
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-ant-plugin..."/>
-
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-ant-plugin..." />
<property file="${org.apache.easyant.buildtypes#build-std-ant-plugin.properties.file}" />
-
<ea:import mrid="org.apache.easyant.plugins#phases-std;0.9" />
<ea:import mrid="org.apache.easyant.plugins#clean-std;0.9" />
<ea:import mrid="org.apache.easyant.plugins#resources-std;0.9" />
@@ -37,17 +32,16 @@
<bindtargets targets="resources-std:copy-resources" extensionPoint="ivy-publication:publish-ready" />
<!-- bind high level targets -->
- <bindtargets targets="clean-std:clean" extensionPoint="clean"/>
- <bindtargets targets="abstract-test:test-run" extensionPoint="test"/>
- <bindtargets targets="abstract-test:integration-test-run" extensionPoint="integration-test"/>
- <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"/>
- <bindtargets targets="antunit:run" extensionPoint="test"/>
+ <bindtargets targets="clean-std:clean" extensionPoint="clean" />
+ <bindtargets targets="abstract-test:test-run" extensionPoint="test" />
+ <bindtargets targets="abstract-test:integration-test-run" extensionPoint="integration-test" />
+ <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" />
+ <bindtargets targets="antunit:run" extensionPoint="test" />
<!-- additionnal friendtly target names -->
<target name="dist" depends="ivy-publication:publish-ready" description="Produce every artifact to be distributed" />
<target name="install" depends="ivy-publication:publish-local" description="Install the artifacts into local repository" />
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/buildtypes/trunk/build-std-groovy/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-groovy/module.ivy?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-groovy/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-groovy/module.ivy Tue Oct 16 18:37:35 2012
@@ -14,17 +14,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.buildtypes" module="build-std-groovy" revision="0.9">
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
- </info>
- <configurations>
- <conf name="default" description="runtime dependencies artifact can be used with this conf"/>
- <conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
- <conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
- </configurations>
+ <extends organisation="org.apache.easyant.buildtypes" module="parent-buildtype" revision="0.1"/>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+ </info>
+ <configurations>
+ <conf name="default" description="runtime dependencies artifact can be used with this conf" />
+ <conf name="test"
+ description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+ <conf name="provided"
+ description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
+ </configurations>
<publications>
- <artifact type="ant"/>
- <artifact type="properties"/>
+ <artifact type="ant" />
+ <artifact type="properties" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
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=1398917&r1=1398916&r2=1398917&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 Tue Oct 16 18:37:35 2012
@@ -14,15 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.buildtypes#build-std-groovy"
- xmlns:ea="antlib:org.apache.easyant">
-
+<project name="org.apache.easyant.buildtypes#build-std-groovy" xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.9,+]" />
-
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-groovy..."/>
-
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-groovy..." />
<property file="${org.apache.easyant.buildtypes#build-std-groovy.properties.file}" />
-
<ea:import mrid="org.apache.easyant.plugins#phases-std;0.9" />
<ea:import mrid="org.apache.easyant.plugins#clean-std;0.9" />
<ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.9" />
@@ -38,21 +33,21 @@
<!-- plugin binding -->
<bindtargets targets="manifest:manifest-runnable,resources-std:copy-resources" extensionPoint="abstract-package:package-ready" />
- <bindtargets targets="abstract-compile:compile,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" 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" 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"/>
+ <bindtargets targets="clean-std:clean" extensionPoint="clean" />
+ <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" 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" />
<!-- additionnal friendtly target names -->
<target name="dist" depends="ivy-publication:publish-ready" description="Produce every artifact to be distributed" />
<target name="install" depends="ivy-publication:publish-local" description="Install the artifacts into local repository" />
-
-</project>
+</project>
\ No newline at end of file
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=1398917&r1=1398916&r2=1398917&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 Tue Oct 16 18:37:35 2012
@@ -14,49 +14,49 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;build-std-groovy-test"
- xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ea="antlib:org.apache.easyant">
+<project name="org.apache.easyant.plugins;build-std-groovy-test" xmlns:au="antlib:org.apache.ant.antunit"
+ xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ea="antlib:org.apache.easyant">
- <!-- Import your plugin -->
- <property name="target" value="target/test-antunit"/>
+ <!-- Import your plugin -->
+ <property name="target" value="target/test-antunit" />
<!-- configure easyant in current project -->
<ea:configure-easyant-ivy-instance />
<!-- import our local plugin -->
- <property name="easyant.file" value="${basedir}/module.ivy"/>
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <property name="easyant.file" value="${basedir}/module.ivy" />
+ <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources" />
- <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
+ <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
<target name="clean-test" description="remove stale build artifacts before / after each test">
<delete dir="${basedir}" includeemptydirs="true">
- <include name="**/target/**"/>
- <include name="**/lib/**"/>
+ <include name="**/target/**" />
+ <include name="**/lib/**" />
</delete>
</target>
-
<target name="setUp" depends="clean-test">
- <ivy:settings id="project.ivy.instance"/>
+ <ivy:settings id="project.ivy.instance" />
</target>
- <target name="tearDown" depends="clean-test"/>
-
+ <target name="tearDown" depends="clean-test" />
<target name="test-build-std-groovy:clean" depends="clean">
- <au:assertLogContains text="Cleaning ${target}..."/>
- <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-groovy:clean' is [clean-test, setUp, clean-std:clean, clean, test-build-std-groovy:clean]" level="debug"/>
- </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, 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"/>
+ <au:assertLogContains text="Cleaning ${target}..." />
+ <au:assertLogContains
+ text="Build sequence for target(s) `setUp', `test-build-std-groovy:clean' is [clean-test, setUp, clean-std:clean, clean, test-build-std-groovy:clean]"
+ level="debug" />
+ </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, 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, 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"/>
+ <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, 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, 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>
+ <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, 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, abstract-package:pack
age, package, test-build-std-groovy:package]"
+ level="debug" />
+ </target>
+</project>
\ No newline at end of file
Modified: incubator/easyant/buildtypes/trunk/build-std-groovy/src/test/antunit/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-groovy/src/test/antunit/module.ivy?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-groovy/src/test/antunit/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-groovy/src/test/antunit/module.ivy Tue Oct 16 18:37:35 2012
@@ -14,18 +14,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration" >
-<ea:build module="build-std-groovy" revision="0.9"/>
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+ <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration">
+ <ea:build module="build-std-groovy" revision="0.9" />
</info>
<configurations>
- <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
- <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
+ <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" />
+ <conf name="test" visibility="private"
+ description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
</configurations>
<dependencies>
- <dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" conf="default->default"/>
+ <dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" conf="default->default" />
<dependency org="junit" name="junit" rev="4.4" conf="test->default" />
- <dependency org="org.codehaus.groovy" name="groovy-all" rev="2.0.0" conf="test->default"/>
-
+ <dependency org="org.codehaus.groovy" name="groovy-all" rev="2.0.0" conf="test->default" />
</dependencies>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/buildtypes/trunk/build-std-java/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-java/module.ivy?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-java/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-java/module.ivy Tue Oct 16 18:37:35 2012
@@ -14,18 +14,22 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.9">
- <description>A standard build for simple java modules, relying on standard phases, and providing compilation, execution and unit tests</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
- </info>
- <configurations>
- <conf name="default" description="runtime dependencies artifact can be used with this conf"/>
- <conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
- <conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
- </configurations>
+ <extends organisation="org.apache.easyant.buildtypes" module="parent-buildtype" revision="0.1"/>
+ <description>A standard build for simple java modules, relying on standard phases, and providing compilation,
+ execution and unit tests</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+ </info>
+ <configurations>
+ <conf name="default" description="runtime dependencies artifact can be used with this conf" />
+ <conf name="test"
+ description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+ <conf name="provided"
+ description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
+ </configurations>
<publications>
- <artifact type="ant"/>
- <artifact type="properties"/>
+ <artifact type="ant" />
+ <artifact type="properties" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
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=1398917&r1=1398916&r2=1398917&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 Tue Oct 16 18:37:35 2012
@@ -15,13 +15,9 @@
limitations under the License.
-->
<project name="org.apache.easyant.buildtypes#build-std-java" xmlns:ea="antlib:org.apache.easyant">
-
<ea:core-version requiredrevision="[0.9,+]" />
-
<echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-java..." />
-
<property file="${org.apache.easyant.buildtypes#build-std-java.properties.file}" />
-
<ea:import mrid="org.apache.easyant.plugins#phases-std;0.9" />
<ea:import mrid="org.apache.easyant.plugins#clean-std;0.9" />
<ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.9" />
@@ -37,21 +33,21 @@
<!-- plugin binding -->
<bindtargets targets="manifest:manifest-runnable,resources-std:copy-resources" extensionPoint="abstract-package:package-ready" />
- <bindtargets targets="abstract-compile:compile,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" 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" 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"/>
+ <bindtargets targets="clean-std:clean" extensionPoint="clean" />
+ <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" 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" />
<!-- additionnal friendtly target names -->
<target name="dist" depends="ivy-publication:publish-ready" description="Produce every artifact to be distributed" />
<target name="install" depends="ivy-publication:publish-local" description="Install the artifacts into local repository" />
-
-</project>
+</project>
\ No newline at end of file
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=1398917&r1=1398916&r2=1398917&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 Tue Oct 16 18:37:35 2012
@@ -14,48 +14,49 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;build-std-java-test"
- xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ea="antlib:org.apache.easyant">
+<project name="org.apache.easyant.plugins;build-std-java-test" xmlns:au="antlib:org.apache.ant.antunit"
+ xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ea="antlib:org.apache.easyant">
- <!-- Import your plugin -->
- <property name="target" value="target/test-antunit"/>
+ <!-- Import your plugin -->
+ <property name="target" value="target/test-antunit" />
<!-- configure easyant in current project -->
<ea:configure-easyant-ivy-instance />
<!-- import our local plugin -->
- <property name="easyant.file" value="${basedir}/module.ivy"/>
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <property name="easyant.file" value="${basedir}/module.ivy" />
+ <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources" />
- <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
+ <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
<target name="clean-test" description="remove stale build artifacts before / after each test">
<delete dir="${basedir}" includeemptydirs="true">
- <include name="**/target/**"/>
- <include name="**/lib/**"/>
+ <include name="**/target/**" />
+ <include name="**/lib/**" />
</delete>
</target>
-
<target name="setUp" depends="clean-test">
- <ivy:settings id="project.ivy.instance"/>
+ <ivy:settings id="project.ivy.instance" />
</target>
- <target name="tearDown" depends="clean-test"/>
-
+ <target name="tearDown" depends="clean-test" />
<target name="test-build-std-java:clean" depends="clean">
- <au:assertLogContains text="Cleaning ${target}..."/>
- <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-java:clean' is [clean-test, setUp, clean-std:clean, clean, test-build-std-java:clean]" level="debug"/>
- </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, 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"/>
+ <au:assertLogContains text="Cleaning ${target}..." />
+ <au:assertLogContains
+ text="Build sequence for target(s) `setUp', `test-build-std-java:clean' is [clean-test, setUp, clean-std:clean, clean, test-build-std-java:clean]"
+ level="debug" />
+ </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, 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, 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"/>
+ <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, 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, 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>
+ <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, 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>
\ No newline at end of file
Modified: incubator/easyant/buildtypes/trunk/build-std-java/src/test/antunit/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-java/src/test/antunit/module.ivy?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-java/src/test/antunit/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-java/src/test/antunit/module.ivy Tue Oct 16 18:37:35 2012
@@ -14,17 +14,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration" >
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.9"/>
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+ <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration">
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.9" />
</info>
<configurations>
- <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
- <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
+ <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" />
+ <conf name="test" visibility="private"
+ description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
</configurations>
<dependencies>
- <dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" conf="default->default"/>
+ <dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" conf="default->default" />
<dependency org="junit" name="junit" rev="4.4" conf="test->default" />
-
</dependencies>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/buildtypes/trunk/build-std-scala/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-scala/module.ivy?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-scala/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-scala/module.ivy Tue Oct 16 18:37:35 2012
@@ -14,17 +14,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.buildtypes" module="build-std-scala" revision="0.9">
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
- </info>
- <configurations>
- <conf name="default" description="runtime dependencies artifact can be used with this conf"/>
- <conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
- <conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
- </configurations>
+ <extends organisation="org.apache.easyant.buildtypes" module="parent-buildtype" revision="0.1"/>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+ </info>
+ <configurations>
+ <conf name="default" description="runtime dependencies artifact can be used with this conf" />
+ <conf name="test"
+ description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+ <conf name="provided"
+ description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
+ </configurations>
<publications>
- <artifact type="ant"/>
- <artifact type="properties"/>
+ <artifact type="ant" />
+ <artifact type="properties" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
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=1398917&r1=1398916&r2=1398917&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 Tue Oct 16 18:37:35 2012
@@ -14,15 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.buildtypes#build-std-scala"
- xmlns:ea="antlib:org.apache.easyant">
-
+<project name="org.apache.easyant.buildtypes#build-std-scala" xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.9,+]" />
-
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-scala..."/>
-
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-scala..." />
<property file="${org.apache.easyant.buildtypes#build-std-scala.properties.file}" />
-
<ea:import mrid="org.apache.easyant.plugins#phases-std;0.9" />
<ea:import mrid="org.apache.easyant.plugins#clean-std;0.9" />
<ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.9" />
@@ -38,21 +33,21 @@
<!-- plugin binding -->
<bindtargets targets="manifest:manifest-runnable,resources-std:copy-resources" extensionPoint="abstract-package:package-ready" />
- <bindtargets targets="abstract-compile:compile,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" 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" 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"/>
+ <bindtargets targets="clean-std:clean" extensionPoint="clean" />
+ <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" 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" />
<!-- additionnal friendtly target names -->
<target name="dist" depends="ivy-publication:publish-ready" description="Produce every artifact to be distributed" />
<target name="install" depends="ivy-publication:publish-local" description="Install the artifacts into local repository" />
-
-</project>
+</project>
\ No newline at end of file
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=1398917&r1=1398916&r2=1398917&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 Tue Oct 16 18:37:35 2012
@@ -14,49 +14,49 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;build-std-scala-test"
-xmlns:au="antlib:org.apache.ant.antunit"
-xmlns:ivy="antlib:org.apache.ivy.ant"
-xmlns:ea="antlib:org.apache.easyant">
+<project name="org.apache.easyant.plugins;build-std-scala-test" xmlns:au="antlib:org.apache.ant.antunit"
+ xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ea="antlib:org.apache.easyant">
-<!-- Import your plugin -->
-<property name="target" value="target/test-antunit"/>
+<!-- Import your plugin -->
+ <property name="target" value="target/test-antunit" />
<!-- configure easyant in current project -->
-<ea:configure-easyant-ivy-instance />
+ <ea:configure-easyant-ivy-instance />
<!-- import our local plugin -->
-<property name="easyant.file" value="${basedir}/module.ivy"/>
-<ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <property name="easyant.file" value="${basedir}/module.ivy" />
+ <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources" />
-<!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
-<target name="clean-test" description="remove stale build artifacts before / after each test">
-<delete dir="${basedir}" includeemptydirs="true">
- <include name="**/target/**"/>
- <include name="**/lib/**"/>
-</delete>
-</target>
-
-<target name="setUp" depends="clean-test">
-<ivy:settings id="project.ivy.instance"/>
-</target>
-<target name="tearDown" depends="clean-test"/>
-
-<target name="test-build-std-scala:clean" depends="clean">
- <au:assertLogContains text="Cleaning ${target}..."/>
- <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-std-scala:clean' is [clean-test, setUp, clean-std:clean, clean, test-build-std-scala:clean]" level="debug"/>
-</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, 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, 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, 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>
+<!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
+ <target name="clean-test" description="remove stale build artifacts before / after each test">
+ <delete dir="${basedir}" includeemptydirs="true">
+ <include name="**/target/**" />
+ <include name="**/lib/**" />
+ </delete>
+ </target>
+ <target name="setUp" depends="clean-test">
+ <ivy:settings id="project.ivy.instance" />
+ </target>
+ <target name="tearDown" depends="clean-test" />
+ <target name="test-build-std-scala:clean" depends="clean">
+ <au:assertLogContains text="Cleaning ${target}..." />
+ <au:assertLogContains
+ text="Build sequence for target(s) `setUp', `test-build-std-scala:clean' is [clean-test, setUp, clean-std:clean, clean, test-build-std-scala:clean]"
+ level="debug" />
+ </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, 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, 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, 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:package, pac
kage, test-build-std-scala:package]"
+ level="debug" />
+ </target>
+</project>
\ No newline at end of file
Modified: incubator/easyant/buildtypes/trunk/build-std-scala/src/test/antunit/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-scala/src/test/antunit/module.ivy?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-scala/src/test/antunit/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-scala/src/test/antunit/module.ivy Tue Oct 16 18:37:35 2012
@@ -14,16 +14,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration" >
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+ <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration">
</info>
<configurations>
- <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
- <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
+ <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" />
+ <conf name="test" visibility="private"
+ description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
</configurations>
<dependencies>
- <dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" conf="default->default"/>
+ <dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" conf="default->default" />
<dependency org="junit" name="junit" rev="4.4" conf="test->default" />
-
</dependencies>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/buildtypes/trunk/build-std-skeleton/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-skeleton/module.ivy?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-skeleton/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-skeleton/module.ivy Tue Oct 16 18:37:35 2012
@@ -14,18 +14,21 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.buildtypes" module="build-std-skeleton" revision="0.9">
- <description>A standard build skeleton, relying on standard phases, and providing unit tests</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
- </info>
- <configurations>
- <conf name="default" description="runtime dependencies artifact can be used with this conf"/>
- <conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
- <conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
- </configurations>
+ <extends organisation="org.apache.easyant.buildtypes" module="parent-buildtype" revision="0.1" />
+ <description>A standard build skeleton, relying on standard phases, and providing unit tests</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+ </info>
+ <configurations>
+ <conf name="default" description="runtime dependencies artifact can be used with this conf" />
+ <conf name="test"
+ description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+ <conf name="provided"
+ description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
+ </configurations>
<publications>
- <artifact type="ant"/>
- <artifact type="properties"/>
+ <artifact type="ant" />
+ <artifact type="properties" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/buildtypes/trunk/build-std-skeleton/src/main/resources/build-std-skeleton.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-skeleton/src/main/resources/build-std-skeleton.ant?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-skeleton/src/main/resources/build-std-skeleton.ant (original)
+++ incubator/easyant/buildtypes/trunk/build-std-skeleton/src/main/resources/build-std-skeleton.ant Tue Oct 16 18:37:35 2012
@@ -14,15 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.buildtypes#build-std-skeleton"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ea="antlib:org.apache.easyant">
-
+<project name="org.apache.easyant.buildtypes#build-std-skeleton" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.9,+]" />
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-skeleton..."/>
-
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-skeleton..." />
<property file="${org.apache.easyant.buildtypes#build-std-skeleton.properties.file}" />
-
<ea:import mrid="org.apache.easyant.plugins#phases-std;0.9" />
<ea:import mrid="org.apache.easyant.plugins#clean-std;0.9" />
<ea:import mrid="org.apache.easyant.plugins#resources-std;0.9" />
@@ -35,17 +30,15 @@
<bindtargets targets="resources-std:copy-resources" extensionPoint="ivy-publication:publish-ready" />
<!-- bind high level targets -->
- <bindtargets targets="clean-std:clean" extensionPoint="clean"/>
- <bindtargets targets="abstract-test:test-run" extensionPoint="test"/>
- <bindtargets targets="abstract-test:integration-test-run" extensionPoint="integration-test"/>
- <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"/>
- <bindtargets targets="antunit:run" extensionPoint="test"/>
+ <bindtargets targets="clean-std:clean" extensionPoint="clean" />
+ <bindtargets targets="abstract-test:test-run" extensionPoint="test" />
+ <bindtargets targets="abstract-test:integration-test-run" extensionPoint="integration-test" />
+ <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" />
+ <bindtargets targets="antunit:run" extensionPoint="test" />
<!-- additionnal friendtly target names -->
<target name="dist" depends="ivy-publication:publish-ready" description="Produce every artifact to be distributed" />
<target name="install" depends="ivy-publication:publish-local" description="Install the artifacts into local repository" />
-
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/buildtypes/trunk/build-webapp-java/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-webapp-java/module.ivy?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-webapp-java/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-webapp-java/module.ivy Tue Oct 16 18:37:35 2012
@@ -14,18 +14,22 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.buildtypes" module="build-webapp-java" revision="0.9">
- <description>A standard build for webapp java modules, relying on standard phases, and providing compilation, execution and unit tests</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
- </info>
- <configurations>
- <conf name="default" description="runtime dependencies artifact can be used with this conf"/>
- <conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
- <conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
- </configurations>
+ <extends organisation="org.apache.easyant.buildtypes" module="parent-buildtype" revision="0.1" />
+ <description>A standard build for webapp java modules, relying on standard phases, and providing compilation,
+ execution and unit tests</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+ </info>
+ <configurations>
+ <conf name="default" description="runtime dependencies artifact can be used with this conf" />
+ <conf name="test"
+ description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+ <conf name="provided"
+ description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
+ </configurations>
<publications>
- <artifact type="ant"/>
- <artifact type="properties"/>
+ <artifact type="ant" />
+ <artifact type="properties" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
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=1398917&r1=1398916&r2=1398917&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 Tue Oct 16 18:37:35 2012
@@ -14,17 +14,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.buildtypes#build-webapp-java"
- xmlns:ea="antlib:org.apache.easyant">
-
+<project name="org.apache.easyant.buildtypes#build-webapp-java" xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.9,+]" />
-
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-webapp-java..."/>
-
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-webapp-java..." />
<property file="${org.apache.easyant.buildtypes#build-webapp-java.properties.file}" />
-
<ea:import mrid="org.apache.easyant.plugins#phases-std;0.9" />
-
<ea:import mrid="org.apache.easyant.plugins#clean-std;0.9" />
<ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.9" />
<ea:import mrid="org.apache.easyant.plugins#default-version-strategy;0.9" />
@@ -39,20 +33,21 @@
<!-- plugin binding -->
<bindtargets targets="manifest:manifest-runnable,resources-std:copy-resources" extensionPoint="abstract-package:package-ready" />
- <bindtargets targets="abstract-compile:compile,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" 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" 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"/>
+ <bindtargets targets="clean-std:clean" extensionPoint="clean" />
+ <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" 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" />
<!-- additionnal friendtly target names -->
<target name="dist" depends="ivy-publication:publish-ready" description="Produce every artifact to be distributed" />
<target name="install" depends="ivy-publication:publish-local" description="Install the artifacts into local repository" />
-</project>
+</project>
\ No newline at end of file
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=1398917&r1=1398916&r2=1398917&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 Tue Oct 16 18:37:35 2012
@@ -14,48 +14,49 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;build-webapp-java-test"
- xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ea="antlib:org.apache.easyant">
+<project name="org.apache.easyant.plugins;build-webapp-java-test" xmlns:au="antlib:org.apache.ant.antunit"
+ xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ea="antlib:org.apache.easyant">
- <!-- Import your plugin -->
- <property name="target" value="target/test-antunit"/>
+ <!-- Import your plugin -->
+ <property name="target" value="target/test-antunit" />
<!-- configure easyant in current project -->
<ea:configure-easyant-ivy-instance />
<!-- import our local plugin -->
- <property name="easyant.file" value="${basedir}/module.ivy"/>
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <property name="easyant.file" value="${basedir}/module.ivy" />
+ <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources" />
- <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
+ <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
<target name="clean-test" description="remove stale build artifacts before / after each test">
<delete dir="${basedir}" includeemptydirs="true">
- <include name="**/target/**"/>
- <include name="**/lib/**"/>
+ <include name="**/target/**" />
+ <include name="**/lib/**" />
</delete>
</target>
-
<target name="setUp" depends="clean-test">
- <ivy:settings id="project.ivy.instance"/>
+ <ivy:settings id="project.ivy.instance" />
</target>
- <target name="tearDown" depends="clean-test"/>
-
+ <target name="tearDown" depends="clean-test" />
<target name="test-build-webapp-java:clean" depends="clean">
- <au:assertLogContains text="Cleaning ${target}..."/>
- <au:assertLogContains text="Build sequence for target(s) `setUp', `test-build-webapp-java:clean' is [clean-test, setUp, clean-std:clean, clean, test-build-webapp-java:clean]" level="debug"/>
- </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, 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"/>
+ <au:assertLogContains text="Cleaning ${target}..." />
+ <au:assertLogContains
+ text="Build sequence for target(s) `setUp', `test-build-webapp-java:clean' is [clean-test, setUp, clean-std:clean, clean, test-build-webapp-java:clean]"
+ level="debug" />
+ </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, 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, 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"/>
+ <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, 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, 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>
+ <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, 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-build-webapp-java:pa
ckage]"
+ level="debug" />
+ </target>
+</project>
\ No newline at end of file
Modified: incubator/easyant/buildtypes/trunk/build-webapp-java/src/test/antunit/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-webapp-java/src/test/antunit/module.ivy?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-webapp-java/src/test/antunit/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-webapp-java/src/test/antunit/module.ivy Tue Oct 16 18:37:35 2012
@@ -14,17 +14,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration" >
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-webapp-java" revision="0.9"/>
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+ <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration">
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-webapp-java" revision="0.9" />
</info>
<configurations>
- <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
- <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
+ <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" />
+ <conf name="test" visibility="private"
+ description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
</configurations>
<dependencies>
- <dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" conf="default->default"/>
+ <dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" conf="default->default" />
<dependency org="junit" name="junit" rev="4.4" conf="test->default" />
-
</dependencies>
-</ivy-module>
+</ivy-module>
\ No newline at end of file