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 21:33:21 UTC
svn commit: r1398999 [3/4] - in /incubator/easyant/plugins/trunk: javadoc/
javadoc/src/main/resources/ javadoc/src/test/antunit/ jetty-deploy/
jetty-deploy/src/main/resources/ jetty-deploy/src/test/antunit/ manifest/
manifest/src/main/resources/ manife...
Modified: incubator/easyant/plugins/trunk/resources-std/src/test/antunit/resources-std-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/resources-std/src/test/antunit/resources-std-test.xml?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/resources-std/src/test/antunit/resources-std-test.xml (original)
+++ incubator/easyant/plugins/trunk/resources-std/src/test/antunit/resources-std-test.xml Tue Oct 16 21:33:19 2012
@@ -14,70 +14,65 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;resources-std-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;resources-std-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 -->
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <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" 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">
- <property name="target.main.classes" value="${target}/classes"/>
- <property name="target.test.classes" value="${target}/test-classes"/>
+ <property name="target.main.classes" value="${target}/classes" />
+ <property name="target.test.classes" value="${target}/test-classes" />
<!--
<property name="target.test.integration.classes" value="${target}/test-classes"/>
-->
-
</target>
- <target name="tearDown" depends="clean"/>
-
+
+ <target name="tearDown" depends="clean" />
+
<target name="test-resources-std:init" depends="resources-std:init">
- <au:assertPropertyEquals name="src.main.resources" value="${basedir}/src/main/resources"/>
- <au:assertPropertyEquals name="src.test.resources" value="${basedir}/src/test/resources"/>
- <au:assertPropertyEquals name="src.test.integration.resources" value="${basedir}/src/integration-test/resources"/>
- <au:assertPropertyEquals name="resources.std.includes.pattern" value="**/*"/>
- <au:assertPropertyEquals name="resources.std.excludes.pattern" value=""/>
- <au:assertPropertyEquals name="resources.std.include.emptydir" value="true"/>
- <au:assertPropertyEquals name="resources.std.test.includes.pattern" value="**/*"/>
- <au:assertPropertyEquals name="resources.std.test.excludes.pattern" value=""/>
- <au:assertPropertyEquals name="resources.std.test.integration.includes.pattern" value="**/*"/>
- <au:assertPropertyEquals name="resources.std.test.integration.excludes.pattern" value=""/>
-
- <au:assertReferenceSet refid="src.main.resources.filter"/>
- <au:assertReferenceSet refid="src.test.resources.filter"/>
- <au:assertReferenceSet refid="src.test.integration.resources.filter"/>
+ <au:assertPropertyEquals name="src.main.resources" value="${basedir}/src/main/resources" />
+ <au:assertPropertyEquals name="src.test.resources" value="${basedir}/src/test/resources" />
+ <au:assertPropertyEquals name="src.test.integration.resources" value="${basedir}/src/integration-test/resources" />
+ <au:assertPropertyEquals name="resources.std.includes.pattern" value="**/*" />
+ <au:assertPropertyEquals name="resources.std.excludes.pattern" value="" />
+ <au:assertPropertyEquals name="resources.std.include.emptydir" value="true" />
+ <au:assertPropertyEquals name="resources.std.test.includes.pattern" value="**/*" />
+ <au:assertPropertyEquals name="resources.std.test.excludes.pattern" value="" />
+ <au:assertPropertyEquals name="resources.std.test.integration.includes.pattern" value="**/*" />
+ <au:assertPropertyEquals name="resources.std.test.integration.excludes.pattern" value="" />
+ <au:assertReferenceSet refid="src.main.resources.filter" />
+ <au:assertReferenceSet refid="src.test.resources.filter" />
+ <au:assertReferenceSet refid="src.test.integration.resources.filter" />
</target>
<target name="test-resources-std:check-resources" depends="-resources-std:check-resources">
- <au:assertPropertyEquals name="has.src.main.resources" value="true"/>
- <au:assertPropertyEquals name="has.src.test.resources" value="true"/>
- <au:assertPropertyEquals name="has.src.test.integration.resources" value="true"/>
+ <au:assertPropertyEquals name="has.src.main.resources" value="true" />
+ <au:assertPropertyEquals name="has.src.test.resources" value="true" />
+ <au:assertPropertyEquals name="has.src.test.integration.resources" value="true" />
</target>
- <target name="test-resources-std:copy-resources" depends="resources-std:copy-resources" >
- <au:assertFileExists file="${target.main.classes}"/>
+ <target name="test-resources-std:copy-resources" depends="resources-std:copy-resources">
+ <au:assertFileExists file="${target.main.classes}" />
</target>
- <target name="test-resources-std:copy-test-resources" depends="resources-std:copy-test-resources" >
- <au:assertFileExists file="${target.test.classes}"/>
+ <target name="test-resources-std:copy-test-resources" depends="resources-std:copy-test-resources">
+ <au:assertFileExists file="${target.test.classes}" />
</target>
- <target name="test-resources-std:copy-test-integration-resources" depends="resources-std:copy-test-integration-resources" >
- <au:assertFileExists file="${target.test.integration.classes}"/>
+ <target name="test-resources-std:copy-test-integration-resources" depends="resources-std:copy-test-integration-resources">
+ <au:assertFileExists file="${target.test.integration.classes}" />
</target>
-
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/run-java/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/run-java/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/run-java/module.ivy (original)
+++ incubator/easyant/plugins/trunk/run-java/module.ivy Tue Oct 16 21:33:19 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.plugins" module="run-java" revision="0.9">
- <description>This module provides java bytecode execution feature.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
- </info>
- <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.plugins" module="parent-plugin" revision="0.1" />
+ <description>This module provides java bytecode execution feature.</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+ </info>
+ <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="ant" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/run-java/src/main/resources/run-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/run-java/src/main/resources/run-java.ant?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/run-java/src/main/resources/run-java.ant (original)
+++ incubator/easyant/plugins/trunk/run-java/src/main/resources/run-java.ant Tue Oct 16 21:33:19 2012
@@ -15,7 +15,6 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#run-java" xmlns:ea="antlib:org.apache.easyant">
-
<ea:core-version requiredrevision="[0.9,+]" />
<ea:import mrid="org.apache.easyant.plugins#abstract-package;0.9" />
@@ -23,16 +22,20 @@
<target name="run-java:init">
<ea:parameter property="target.main.classes" required="true" description="directory where main compiled classes are" />
- <ea:parameter property="project.main.classname" description="Used to define the project main class. The mainclass will then be used by many plugins (manifest, run-java, etc...)" />
+ <ea:parameter property="project.main.classname"
+ description="Used to define the project main class. The mainclass will then be used by many plugins (manifest, run-java, etc...)" />
<condition property="project.main.classname.isset">
<not>
- <isset property="project.main.classname"/>
+ <isset property="project.main.classname" />
</not>
</condition>
<ea:parameter property="run.main.classname" required="${project.main.classname.isset}" default="${project.main.classname}">
-Name of the main class to run.
-By default this property take the same value as 'project.main.classname' property.
-If you are looking for a way to reference your mainclass one time for all plugins you should set project.main.classname instead.
+ Name of the main class to run.
+ By default this property take the same value as 'project.main.classname'
+ property.
+ If you are looking for a way to reference your mainclass one time for all plugins you should set
+ project.main.classname
+ instead.
</ea:parameter>
<ea:parameter path="compile.main.classpath" required="true" description="path used to compile main sources" />
@@ -45,10 +48,10 @@ If you are looking for a way to referenc
</target>
<target name="run-java:run" depends="run-java:init,abstract-package:package-ready" description="run the application">
- <available classname="${run.main.classname}" property="is.run.main.classname.configured" classpathref="run.main.classpath"/>
- <fail unless="is.run.main.classname.configured" message="the 'run.main.classname' property is not properly configured. By default this property take the same value as 'project.main.classname' property. If you're looking for a way to reference your mainclass one time for all plugins you should set project.main.classname instead."/>
+ <available classname="${run.main.classname}" property="is.run.main.classname.configured" classpathref="run.main.classpath" />
+ <fail unless="is.run.main.classname.configured"
+ message="the 'run.main.classname' property is not properly configured. By default this property take the same value as 'project.main.classname' property. If you're looking for a way to reference your mainclass one time for all plugins you should set project.main.classname instead." />
<java classpathref="run.main.classpath" classname="${run.main.classname}" />
</target>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/run-java/src/test/antunit/run-java-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/run-java/src/test/antunit/run-java-test.xml?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/run-java/src/test/antunit/run-java-test.xml (original)
+++ incubator/easyant/plugins/trunk/run-java/src/test/antunit/run-java-test.xml Tue Oct 16 21:33:19 2012
@@ -14,45 +14,42 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;run-java-test"
- xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:ivy="antlib:org.apache.ivy.ant"
+<project name="org.apache.easyant.plugins;run-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 -->
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <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" 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">
- <property name="target.main.classes" value="${target}/main/classes"/>
- <property name="project.main.classname" value="org.apache.easyant.example.Example"/>
- <mkdir dir="${target.main.classes}"/>
+ <property name="target.main.classes" value="${target}/main/classes" />
+ <property name="project.main.classname" value="org.apache.easyant.example.Example" />
+ <mkdir dir="${target.main.classes}" />
- <javac srcdir="src/main/java" destdir="${target.main.classes}"/>
+ <javac srcdir="src/main/java" destdir="${target.main.classes}" />
</target>
- <target name="tearDown" depends="clean"/>
-
+ <target name="tearDown" depends="clean" />
+
<target name="test-run-java:init" depends="run-java:init">
- <au:assertPropertyEquals name="target.main.classes" value="target/test-antunit/main/classes"/>
- <au:assertPropertyEquals name="project.main.classname" value="org.apache.easyant.example.Example"/>
- <au:assertPropertyEquals name="run.main.classname" value="org.apache.easyant.example.Example"/>
- <au:assertReferenceSet refid="run.main.classpath"/>
+ <au:assertPropertyEquals name="target.main.classes" value="target/test-antunit/main/classes" />
+ <au:assertPropertyEquals name="project.main.classname" value="org.apache.easyant.example.Example" />
+ <au:assertPropertyEquals name="run.main.classname" value="org.apache.easyant.example.Example" />
+ <au:assertReferenceSet refid="run.main.classpath" />
</target>
<target name="test-run-java:run" depends="run-java:run">
- <au:assertPropertyEquals name="is.run.main.classname.configured" value="true"/>
- <au:assertLogContains text="Hello World !"/>
+ <au:assertPropertyEquals name="is.run.main.classname.configured" value="true" />
+ <au:assertLogContains text="Hello World !" />
</target>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/scaladoc/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/scaladoc/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/scaladoc/module.ivy (original)
+++ incubator/easyant/plugins/trunk/scaladoc/module.ivy Tue Oct 16 21:33:19 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.plugins" module="scaladoc" revision="0.9">
- <description>This module provides scaladoc feature.</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.plugins" module="parent-plugin" revision="0.1" />
+ <description>This module provides scaladoc feature.</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="ant" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/scaladoc/src/main/resources/scaladoc.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/scaladoc/src/main/resources/scaladoc.ant?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/scaladoc/src/main/resources/scaladoc.ant (original)
+++ incubator/easyant/plugins/trunk/scaladoc/src/main/resources/scaladoc.ant Tue Oct 16 21:33:19 2012
@@ -14,29 +14,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins#scaladoc"
- xmlns:ea="antlib:org.apache.easyant">
-
+<project name="org.apache.easyant.plugins#scaladoc" xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.9,+]" />
<target name="scaladoc:init">
- <ea:parameter property="src.main.scala" required="true"
- description="directory where sources to be compiled are" />
- <ea:parameter property="src.test.scala" required="true"
- description="directory where test sources to be compiled are" />
- <ea:parameter path="compile.main.classpath" required="true"
- description="path used to compile main sources" />
- <ea:parameter path="compile.test.classpath" required="true"
- description="path used to compile test sources" />
-
- <ea:parameter property="target.report" default="${target}/report"
- description="base directory for reports"/>
- <ea:parameter property="target.scaladoc" default="${target.report}/javadoc"
- description="base directory where scaladoc will be generated" />
-
- <ea:parameter property="target.scaladoc.main" default="${target.scaladoc}/main"
- description="directory where scaladoc will be generated" />
- <ea:parameter property="target.scaladoc.test" default="${target.scaladoc}/test"
+ <ea:parameter property="src.main.scala" required="true" description="directory where sources to be compiled are" />
+ <ea:parameter property="src.test.scala" required="true" description="directory where test sources to be compiled are" />
+ <ea:parameter path="compile.main.classpath" required="true" description="path used to compile main sources" />
+ <ea:parameter path="compile.test.classpath" required="true" description="path used to compile test sources" />
+
+ <ea:parameter property="target.report" default="${target}/report" description="base directory for reports" />
+ <ea:parameter property="target.scaladoc" default="${target.report}/javadoc" description="base directory where scaladoc will be generated" />
+ <ea:parameter property="target.scaladoc.main" default="${target.scaladoc}/main" description="directory where scaladoc will be generated" />
+ <ea:parameter property="target.scaladoc.test" default="${target.scaladoc}/test"
description="directory where scaladoc for tests will be generated" />
<available file="${src.main.scala}" property="has.src.main.scala" />
@@ -44,14 +34,14 @@
</target>
<target name="-scaladoc:main" depends="scaladoc:init" if="has.src.main.scala">
- <mkdir dir="${target.scaladoc.main}"/>
- <scaladoc destdir="${target.scaladoc.main}" srcdir="${src.main.scala}" classpathref="compile.main.classpath"/>
+ <mkdir dir="${target.scaladoc.main}" />
+ <scaladoc destdir="${target.scaladoc.main}" srcdir="${src.main.scala}" classpathref="compile.main.classpath" />
</target>
-
+
<target name="-scaladoc:test" depends="scaladoc:init" if="has.src.test.scala">
- <mkdir name="${target.scaladoc.test}"/>
- <scaladoc destdir="${target.scaladoc.test}" srcdir="${src.test.scala}" classpathref="compile.test.classpath"/>
+ <mkdir name="${target.scaladoc.test}" />
+ <scaladoc destdir="${target.scaladoc.test}" srcdir="${src.test.scala}" classpathref="compile.test.classpath" />
</target>
- <target name="scaladoc:scaladoc" depends="-scaladoc:main,scaladoc:-test" description="generate scaladoc report for main classes and test classes"/>
-</project>
+ <target name="scaladoc:scaladoc" depends="-scaladoc:main,scaladoc:-test" description="generate scaladoc report for main classes and test classes" />
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/scm-svn/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/scm-svn/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/scm-svn/module.ivy (original)
+++ incubator/easyant/plugins/trunk/scm-svn/module.ivy Tue Oct 16 21:33:19 2012
@@ -16,19 +16,21 @@
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.plugins" module="scm-svn" revision="0.9">
- <description>This module provides svn feature.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
-<ea:plugin module="antunit" revision="0.9"/>
- </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"/>
- </publications>
- <dependencies>
- <dependency org="svnant" name="svnant" rev="1.2.1" conf="default->default"/>
- </dependencies>
-</ivy-module>
+ <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
+ <description>This module provides svn feature.</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" />
+ </publications>
+ <dependencies>
+ <dependency org="svnant" name="svnant" rev="1.2.1" conf="default->default" />
+ </dependencies>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/scm-svn/src/main/resources/scm-svn.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/scm-svn/src/main/resources/scm-svn.ant?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/scm-svn/src/main/resources/scm-svn.ant (original)
+++ incubator/easyant/plugins/trunk/scm-svn/src/main/resources/scm-svn.ant Tue Oct 16 21:33:19 2012
@@ -15,61 +15,74 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#scm-svn" xmlns:ea="antlib:org.apache.easyant">
-
<ea:core-version requiredrevision="[0.9,+]" />
- <ea:import organisation="org.apache.easyant.plugins" module="ivy-publication" revision="0.9"/>
+ <ea:import organisation="org.apache.easyant.plugins" module="ivy-publication" revision="0.9" />
- <typedef resource="org/tigris/subversion/svnant/svnantlib.xml" classpathref="org.apache.easyant.plugins#scm-svn.classpath" />
+ <typedef resource="org/tigris/subversion/svnant/svnantlib.xml" classpathref="org.apache.easyant.plugins#scm-svn.classpath" />
<target name="-scm-svn:config">
- <ea:parameter property="scm.connection.username" description="defines the username used to connect to the SCM" default=""/>
- <ea:parameter property="scm.connection.password" description="defines the password used to connect to the SCM" default=""/>
- <ea:parameter property="scm.connection.baseurl" description="the base scm url of your project" required="true"/>
- <ea:parameter property="scm.svn.javahl" description="set to 'false' to use command line interface instead of JNI JavaHL binding" default="true"/>
- <ea:parameter property="scm.svn.svnkit" description="set to 'false' to use command line interface instead of SVNKit binding" default="false"/>
- <ea:parameter property="scm.svn.failonerror" description="controls wheter an error stops the build or is merely reported to the screen" default="true"/>
- <ea:parameter property="scm.svn.dateformatter" description="formatter definition used to format/parse date (e.g. when revision is specified as date)" default="MM/DD/YYYY HH:MM AM_PM"/>
- <ea:parameter property="scm.svn.datetimezone" description="time zone used to format/parse dates (e.g. when revision is specified as date)" default="local"/>
- <ea:parameter property="scm.working.copy" default="${basedir}" description="Define the source url (used for copy)"/>
+ <ea:parameter property="scm.connection.username" description="defines the username used to connect to the SCM"
+ default="" />
+ <ea:parameter property="scm.connection.password" description="defines the password used to connect to the SCM"
+ default="" />
+ <ea:parameter property="scm.connection.baseurl" description="the base scm url of your project"
+ required="true" />
+ <ea:parameter property="scm.svn.javahl" description="set to 'false' to use command line interface instead of JNI JavaHL binding"
+ default="true" />
+ <ea:parameter property="scm.svn.svnkit" description="set to 'false' to use command line interface instead of SVNKit binding"
+ default="false" />
+ <ea:parameter property="scm.svn.failonerror"
+ description="controls wheter an error stops the build or is merely reported to the screen" default="true" />
+ <ea:parameter property="scm.svn.dateformatter"
+ description="formatter definition used to format/parse date (e.g. when revision is specified as date)"
+ default="MM/DD/YYYY HH:MM AM_PM" />
+ <ea:parameter property="scm.svn.datetimezone"
+ description="time zone used to format/parse dates (e.g. when revision is specified as date)" default="local" />
+ <ea:parameter property="scm.working.copy" default="${basedir}" description="Define the source url (used for copy)" />
</target>
<target name="scm-svn:tag" description="tag the project" depends="-scm-svn:config">
- <echo>creating tag on the project</echo>
- <ea:parameter property="scm.svn.base.tags" default="${scm.connection.baseurl}/tags" description="The url of tags base directory (used by svn protocol). It is not necessary to set it if you use the standard svn layout (branches/tags/trunk)."/>
- <ea:parameter property="scm.tag.name" required="true" description="name of the tag to create"/>
- <ea:parameter property="scm.commit.message" required="true" description="the commit message"/>
- <svn username="${scm.connection.username}" password="${scm.connection.password}" javahl="${scm.svn.javahl}" svnkit="${scm.svn.svnkit}" dateFormatter="${scm.svn.dateformatter}" dateTimeZone="${scm.svn.datetimezone}" failOnError="${scm.svn.failonerror}">
- <copy srcPath="${scm.working.copy}" destUrl="${scm.svn.base.tags}/${scm.tag.name}" message="${scm.commit.message}"/>
- </svn>
+ <echo>creating tag on the project</echo>
+ <ea:parameter property="scm.svn.base.tags" default="${scm.connection.baseurl}/tags"
+ description="The url of tags base directory (used by svn protocol). It is not necessary to set it if you use the standard svn layout (branches/tags/trunk)." />
+ <ea:parameter property="scm.tag.name" required="true" description="name of the tag to create" />
+ <ea:parameter property="scm.commit.message" required="true" description="the commit message" />
+ <svn username="${scm.connection.username}" password="${scm.connection.password}" javahl="${scm.svn.javahl}"
+ svnkit="${scm.svn.svnkit}" dateFormatter="${scm.svn.dateformatter}" dateTimeZone="${scm.svn.datetimezone}"
+ failOnError="${scm.svn.failonerror}">
+ <copy srcPath="${scm.working.copy}" destUrl="${scm.svn.base.tags}/${scm.tag.name}" message="${scm.commit.message}" />
+ </svn>
</target>
<target name="scm-svn:branch" description="branch the project" depends="-scm-svn:config">
- <echo>creating branch on the project</echo>
- <ea:parameter property="scm.svn.base.branches" default="${scm.connection.baseurl}/branches" description="The url of tags base directory (used by svn protocol). It is not necessary to set it if you use the standard svn layout (branches/tags/trunk)."/>
- <ea:parameter property="scm.commit.message" required="true" description="the commit message"/>
- <ea:parameter property="scm.branch.name" default="${module.version.target}" description="name of the branch to create"/>
- <svn username="${scm.connection.username}" password="${scm.connection.password}" javahl="${scm.svn.javahl}" svnkit="${scm.svn.svnkit}" dateFormatter="${scm.svn.dateformatter}" dateTimeZone="${scm.svn.datetimezone}" failOnError="${scm.svn.failonerror}">
- <copy srcPath="${scm.working.copy}" destUrl="${scm.svn.base.branches}/${scm.branch.name}" message="${scm.commit.message}"/>
- </svn>
+ <echo>creating branch on the project</echo>
+ <ea:parameter property="scm.svn.base.branches" default="${scm.connection.baseurl}/branches"
+ description="The url of tags base directory (used by svn protocol). It is not necessary to set it if you use the standard svn layout (branches/tags/trunk)." />
+ <ea:parameter property="scm.commit.message" required="true" description="the commit message" />
+ <ea:parameter property="scm.branch.name" default="${module.version.target}" description="name of the branch to create" />
+ <svn username="${scm.connection.username}" password="${scm.connection.password}" javahl="${scm.svn.javahl}"
+ svnkit="${scm.svn.svnkit}" dateFormatter="${scm.svn.dateformatter}" dateTimeZone="${scm.svn.datetimezone}"
+ failOnError="${scm.svn.failonerror}">
+ <copy srcPath="${scm.working.copy}" destUrl="${scm.svn.base.branches}/${scm.branch.name}" message="${scm.commit.message}" />
+ </svn>
</target>
<!-- release -->
<target name="-scm-svn:init-release">
- <ea:parameter property="scm.tag.name" default="${version}" description="name of the tag to create"/>
- <ea:parameter property="scm.commit.message" default="EasyAnt: release ${version}" description="the commit message"/>
+ <ea:parameter property="scm.tag.name" default="${version}" description="name of the tag to create" />
+ <ea:parameter property="scm.commit.message" default="EasyAnt: release ${version}" description="the commit message" />
</target>
- <target name="scm-svn:release" depends="ivy-publication:generate-release-version,-scm-svn:init-release,scm-svn:tag"/>
+ <target name="scm-svn:release" depends="ivy-publication:generate-release-version,-scm-svn:init-release,scm-svn:tag" />
<!-- integration -->
<target name="-scm-svn:init-integration">
- <ea:parameter property="scm.tag.name" default="${version}" description="name of the tag to create"/>
- <ea:parameter property="scm.commit.message" default="EasyAnt: integration ${version}" description="the commit message"/>
+ <ea:parameter property="scm.tag.name" default="${version}" description="name of the tag to create" />
+ <ea:parameter property="scm.commit.message" default="EasyAnt: integration ${version}" description="the commit message" />
</target>
- <target name="scm-svn:integration" depends="ivy-publication:generate-shared-version,-scm-svn:init-integration,scm-svn:tag"/>
-
-</project>
+ <target name="scm-svn:integration" depends="ivy-publication:generate-shared-version,-scm-svn:init-integration,scm-svn:tag" />
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/scm-svn/src/test/antunit/scm-svn-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/scm-svn/src/test/antunit/scm-svn-test.xml?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/scm-svn/src/test/antunit/scm-svn-test.xml (original)
+++ incubator/easyant/plugins/trunk/scm-svn/src/test/antunit/scm-svn-test.xml Tue Oct 16 21:33:19 2012
@@ -14,59 +14,56 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;scm-svn-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"/>
- <!-- configure easyant in current project -->
- <ea:configure-easyant-ivy-instance />
- <!-- import our local plugin -->
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
-
- <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
- <target name="clean" description="remove stale build artifacts before / after each test">
- <delete dir="${basedir}" includeemptydirs="true">
- <include name="**/target/**"/>
- <include name="**/lib/**"/>
- </delete>
- </target>
-
- <target name="setUp" depends="clean">
- <property name="scm.connection.baseurl" value="mybaseurl"/>
- </target>
- <target name="tearDown" depends="clean"/>
-
- <target name="test-scm-svn:config" depends="-scm-svn:config">
- <au:assertPropertyEquals name="scm.connection.username" value=""/>
- <au:assertPropertyEquals name="scm.connection.password" value=""/>
- <au:assertPropertyEquals name="scm.connection.baseurl" value="mybaseurl"/>
- <au:assertPropertyEquals name="scm.svn.javahl" value="true"/>
- <au:assertPropertyEquals name="scm.svn.svnkit" value="false"/>
- <au:assertPropertyEquals name="scm.svn.failonerror" value="true"/>
- <au:assertPropertyEquals name="scm.svn.dateformatter" value="MM/DD/YYYY HH:MM AM_PM"/>
- <au:assertPropertyEquals name="scm.svn.datetimezone" value="local"/>
- <au:assertPropertyEquals name="scm.working.copy" value="${basedir}"/>
- </target>
-
- <target name="test-scm-svn:init-release" depends="-scm-svn:init-release">
- <au:assertPropertyEquals name="scm.tag.name" value="${version}"/>
- <au:assertPropertyEquals name="scm.commit.message" value="EasyAnt: release ${version}"/>
- </target>
-
- <target name="test-scm-svn:init-integration" depends="-scm-svn:init-integration">
- <au:assertPropertyEquals name="scm.tag.name" value="${version}"/>
- <au:assertPropertyEquals name="scm.commit.message" value="EasyAnt: integration ${version}"/>
- </target>
+<project name="org.apache.easyant.plugins;scm-svn-test" xmlns:au="antlib:org.apache.ant.antunit" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ea="antlib:org.apache.easyant">
- <!-- to be tested -->
- <!--
+ <!-- Import your plugin -->
+ <property name="target" value="target/test-antunit" />
+ <!-- configure easyant in current project -->
+ <ea:configure-easyant-ivy-instance />
+ <!-- import our local plugin -->
+ <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources" />
+
+ <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
+ <target name="clean" description="remove stale build artifacts before / after each test">
+ <delete dir="${basedir}" includeemptydirs="true">
+ <include name="**/target/**" />
+ <include name="**/lib/**" />
+ </delete>
+ </target>
+
+ <target name="setUp" depends="clean">
+ <property name="scm.connection.baseurl" value="mybaseurl" />
+ </target>
+ <target name="tearDown" depends="clean" />
+
+ <target name="test-scm-svn:config" depends="-scm-svn:config">
+ <au:assertPropertyEquals name="scm.connection.username" value="" />
+ <au:assertPropertyEquals name="scm.connection.password" value="" />
+ <au:assertPropertyEquals name="scm.connection.baseurl" value="mybaseurl" />
+ <au:assertPropertyEquals name="scm.svn.javahl" value="true" />
+ <au:assertPropertyEquals name="scm.svn.svnkit" value="false" />
+ <au:assertPropertyEquals name="scm.svn.failonerror" value="true" />
+ <au:assertPropertyEquals name="scm.svn.dateformatter" value="MM/DD/YYYY HH:MM AM_PM" />
+ <au:assertPropertyEquals name="scm.svn.datetimezone" value="local" />
+ <au:assertPropertyEquals name="scm.working.copy" value="${basedir}" />
+ </target>
+
+ <target name="test-scm-svn:init-release" depends="-scm-svn:init-release">
+ <au:assertPropertyEquals name="scm.tag.name" value="${version}" />
+ <au:assertPropertyEquals name="scm.commit.message" value="EasyAnt: release ${version}" />
+ </target>
+
+ <target name="test-scm-svn:init-integration" depends="-scm-svn:init-integration">
+ <au:assertPropertyEquals name="scm.tag.name" value="${version}" />
+ <au:assertPropertyEquals name="scm.commit.message" value="EasyAnt: integration ${version}" />
+ </target>
+
+ <!-- to be tested -->
+ <!--
<target name="test-scm-svn:tag"/>
<target name="test-scm-svn:branch"/>
<target name="test-scm-svn:release"/>
<target name="test-scm-svn:integration"/>
-->
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/skeleton/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/skeleton/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/skeleton/module.ivy (original)
+++ incubator/easyant/plugins/trunk/skeleton/module.ivy Tue Oct 16 21:33:19 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.plugins" module="skeleton" revision="0.9">
- <description>This modules provides targets to create or install skeleton of projects.</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.plugins" module="parent-plugin" revision="0.1" />
+ <description>This modules provides targets to create or install skeleton of projects.</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 name="ivy.xml" type="tpl"/>
+ <artifact type="ant" />
+ <artifact name="ivy.xml" type="tpl" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/skeleton/src/main/resources/ivy.xml.tpl
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/skeleton/src/main/resources/ivy.xml.tpl?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/skeleton/src/main/resources/ivy.xml.tpl (original)
+++ incubator/easyant/plugins/trunk/skeleton/src/main/resources/ivy.xml.tpl Tue Oct 16 21:33:19 2012
@@ -16,8 +16,7 @@
-->
<ivy-module version="1.0">
<info organisation="@skeleton.organisation@" module="@skeleton.module@" revision="@skeleton.revision@"/>
-
<publications>
<artifact type="@skeleton.type@"/>
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/skeleton/src/main/resources/skeleton.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/skeleton/src/main/resources/skeleton.ant?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/skeleton/src/main/resources/skeleton.ant (original)
+++ incubator/easyant/plugins/trunk/skeleton/src/main/resources/skeleton.ant Tue Oct 16 21:33:19 2012
@@ -14,9 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins#skeleton"
- xmlns:ac="antlib:net.sf.antcontrib"
- xmlns:ivy="antlib:org.apache.ivy.ant"
+<project name="org.apache.easyant.plugins#skeleton" xmlns:ac="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.9,+]" />
@@ -24,19 +22,28 @@
<dirname file="${ant.file.org.apache.easyant.plugins#skeleton}" property="ant.dir.org.apache.easyant.plugins#skeleton" />
<target name="skeleton:init">
- <ea:parameter property="skeleton.default.basedir" default="${basedir}" description="define the root path of your skeleton project" />
- <ea:parameter property="skeleton.default.excludes.pattern" default="target/**" description="define the default excludes pattern used to package a project skeleton" />
- <ea:parameter property="skeleton.default.includes.pattern" default="" description="define the default excludes pattern used to package a project skeleton" />
- <ea:parameter property="skeleton.default.type" default="zip" description="define the default type of a skeleton (jar/zip...)" />
- <ea:parameter property="skeleton.default.to.resolver" default="easyant-shared-modules" description="the repository name where the skeleton jar will be published" />
- <ea:parameter property="skeleton.default.revision" default="0.1" description="The default revision if the skeleton that will be published"/>
- <ea:parameter property="skeleton.default.organisation" default="org.apache.easyant.skeletons" description="The default organisation name of skeletons"/>
- <ea:parameter property="project.default.organisation" default="" description="The default organisation name of generated project"/>
+ <ea:parameter property="skeleton.default.basedir" default="${basedir}"
+ description="define the root path of your skeleton project" />
+ <ea:parameter property="skeleton.default.excludes.pattern" default="target/**"
+ description="define the default excludes pattern used to package a project skeleton" />
+ <ea:parameter property="skeleton.default.includes.pattern" default=""
+ description="define the default excludes pattern used to package a project skeleton" />
+ <ea:parameter property="skeleton.default.type" default="zip"
+ description="define the default type of a skeleton (jar/zip...)" />
+ <ea:parameter property="skeleton.default.to.resolver" default="easyant-shared-modules"
+ description="the repository name where the skeleton jar will be published" />
+ <ea:parameter property="skeleton.default.revision" default="0.1"
+ description="The default revision if the skeleton that will be published" />
+ <ea:parameter property="skeleton.default.organisation" default="org.apache.easyant.skeletons"
+ description="The default organisation name of skeletons" />
+ <ea:parameter property="project.default.organisation" default=""
+ description="The default organisation name of generated project" />
- <ea:parameter property="skeleton.interactive.mode" default="true" description="specify if easyant should ask questions instead of using -Dproperties" />
+ <ea:parameter property="skeleton.interactive.mode" default="true"
+ description="specify if easyant should ask questions instead of using -Dproperties" />
<condition property="skeleton.is.interactive">
- <istrue value="${skeleton.interactive.mode}"/>
+ <istrue value="${skeleton.interactive.mode}" />
</condition>
</target>
@@ -46,68 +53,80 @@
================================= -->
<target name="-skeleton:generate-usage">
<echo level="info">This target will now create a new project from a project skeleton.</echo>
- <echo level="info">This target can be called with -Dparameters, refer to the skeleton plugin documentation to have more informations.</echo>
+ <echo level="info">This target can be called with -Dparameters, refer to the skeleton plugin documentation to have
+ more informations.</echo>
<ac:if>
<and>
- <isset property="skeleton.org"/>
- <isset property="skeleton.module"/>
- <isset property="skeleton.rev"/>
+ <isset property="skeleton.org" />
+ <isset property="skeleton.module" />
+ <isset property="skeleton.rev" />
</and>
<ac:then>
- <echo level="info"> Example: easyant skeleton:create -Dskeleton.org=${skeleton.org} -Dskeleton.module=${skeleton.module} -Dskeleton.rev=${skeleton.rev} -Dproject.org=org.mycompany -Dproject.module=myproject -Dproject.ref=0.1</echo>
+ <echo level="info"> Example: easyant skeleton:create -Dskeleton.org=${skeleton.org}
+ -Dskeleton.module=${skeleton.module} -Dskeleton.rev=${skeleton.rev} -Dproject.org=org.mycompany
+ -Dproject.module=myproject -Dproject.ref=0.1</echo>
</ac:then>
<ac:else>
- <echo level="info"> Example: easyant skeleton:create -Dskeleton.org=foo -Dskeleton.module=bar-skeleton -Dskeleton.rev=0.1 -Dproject.org=org.mycompany -Dproject.module=myproject -Dproject.ref=0.1</echo>
+ <echo level="info"> Example: easyant skeleton:create -Dskeleton.org=foo -Dskeleton.module=bar-skeleton
+ -Dskeleton.rev=0.1 -Dproject.org=org.mycompany -Dproject.module=myproject -Dproject.ref=0.1</echo>
</ac:else>
</ac:if>
</target>
<target name="-skeleton:check-generate" if="skeleton.is.interactive">
- <input message="Organisation name of the skeleton project" addproperty="skeleton.org" defaultvalue="${skeleton.default.organisation}"/>
- <input message="Module name of the skeleton project" addproperty="skeleton.module"/>
- <input message="Revision number of the skeleton project" addproperty="skeleton.rev"/>
-
- <input message="The path where the skeleton project will be unzipped" addproperty="skeleton.target.dir" defaultvalue="${skeleton.default.basedir}"/>
-
- <input message="Organisation name of YOUR project" addproperty="project.org" defaultvalue="${project.default.organisation}"/>
- <input message="Module name of YOUR project" addproperty="project.module"/>
- <input message="Revision number of YOUR project" addproperty="project.rev" defaultvalue="0.1"/>
+ <input message="Organisation name of the skeleton project" addproperty="skeleton.org" defaultvalue="${skeleton.default.organisation}" />
+ <input message="Module name of the skeleton project" addproperty="skeleton.module" />
+ <input message="Revision number of the skeleton project" addproperty="skeleton.rev" />
+
+ <input message="The path where the skeleton project will be unzipped" addproperty="skeleton.target.dir"
+ defaultvalue="${skeleton.default.basedir}" />
+
+ <input message="Organisation name of YOUR project" addproperty="project.org" defaultvalue="${project.default.organisation}" />
+ <input message="Module name of YOUR project" addproperty="project.module" />
+ <input message="Revision number of YOUR project" addproperty="project.rev" defaultvalue="0.1" />
</target>
<target name="-skeleton:select" depends="skeleton:init" if="skeleton.is.interactive">
<echo>Choose a skeleton in the following list:</echo>
- <ea:searchmodule organisation="org.apache.easyant.skeletons" module="*" revision="*" propertyprefix="skeleton" settingsRef="easyant.ivy.instance"/>
+ <ea:searchmodule organisation="org.apache.easyant.skeletons" module="*" revision="*"
+ propertyprefix="skeleton" settingsRef="easyant.ivy.instance" />
</target>
- <target name="skeleton:select" depends="-skeleton:select,skeleton:generate" description="select and create a new project from a list of all available skeletons" if="skeleton.is.interactive"/>
+ <target name="skeleton:select" depends="-skeleton:select,skeleton:generate"
+ description="select and create a new project from a list of all available skeletons" if="skeleton.is.interactive" />
- <target name="skeleton:generate" depends="skeleton:init,-skeleton:generate-usage,-skeleton:check-generate" description="generate a new project from skeleton">
+ <target name="skeleton:generate" depends="skeleton:init,-skeleton:generate-usage,-skeleton:check-generate"
+ description="generate a new project from skeleton">
<ea:parameter property="skeleton.org" default="${skeleton.default.organisation}" description="Organisation name of the skeleton project" />
<ea:parameter property="skeleton.module" required="true" description="Module name of the skeleton project" />
<ea:parameter property="skeleton.rev" required="true" description="Revision number of the skeleton project" />
- <ea:parameter property="skeleton.target.dir" default="${skeleton.default.basedir}" description="The path where the skeleton project will be unzipped"/>
+ <ea:parameter property="skeleton.target.dir" default="${skeleton.default.basedir}"
+ description="The path where the skeleton project will be unzipped" />
<ea:parameter property="project.org" required="true" description="Organisation name of YOUR project" />
<ea:parameter property="project.module" required="true" description="Module name of YOUR project" />
<ea:parameter property="project.rev" default="0.1" description="Revision number of YOUR project" />
- <ea:parameter property="skeleton.postinstall.script" default="${skeleton.target.dir}/skeleton.postinstall.ant" description="An optional postinstall script"/>
+ <ea:parameter property="skeleton.postinstall.script" default="${skeleton.target.dir}/skeleton.postinstall.ant"
+ description="An optional postinstall script" />
<echo>Retrieving project skeleton : ${skeleton.org}#${skeleton.module};${skeleton.rev}</echo>
- <ivy:retrieve organisation="${skeleton.org}" module="${skeleton.module}" revision="${skeleton.rev}" inline="true" pattern="${skeleton.target.dir}/[artifact].[ext]" log="quiet" settingsRef="easyant.ivy.instance"/>
- <ivy:artifactproperty organisation="${skeleton.org}" module="${skeleton.module}" revision="${skeleton.rev}" inline="true" name="skeleton.artifact.name" value="[artifact].[ext]" settingsRef="easyant.ivy.instance"/>
+ <ivy:retrieve organisation="${skeleton.org}" module="${skeleton.module}" revision="${skeleton.rev}"
+ inline="true" pattern="${skeleton.target.dir}/[artifact].[ext]" log="quiet" settingsRef="easyant.ivy.instance" />
+ <ivy:artifactproperty organisation="${skeleton.org}" module="${skeleton.module}" revision="${skeleton.rev}"
+ inline="true" name="skeleton.artifact.name" value="[artifact].[ext]" settingsRef="easyant.ivy.instance" />
<!--
In the case where artifacts exist but does not match with skeleton.type, ivy does throw an error.
So we should check it manually
-->
- <property name="skeleton.download.artifact" value="${skeleton.target.dir}/${skeleton.artifact.name}"/>
- <available file="${skeleton.download.artifact}" property="skeleton.download.artifact.exist"/>
- <fail unless="skeleton.download.artifact.exist" message="Impossible to find the downloaded artifact!"/>
+ <property name="skeleton.download.artifact" value="${skeleton.target.dir}/${skeleton.artifact.name}" />
+ <available file="${skeleton.download.artifact}" property="skeleton.download.artifact.exist" />
+ <fail unless="skeleton.download.artifact.exist" message="Impossible to find the downloaded artifact!" />
<!-- Unzip the project skeleton -->
<echo>Unzipping project skeleton to ${skeleton.target.dir}</echo>
<unjar dest="${skeleton.target.dir}" src="${skeleton.download.artifact}">
<patternset>
- <exclude name="META-INF/**"/>
+ <exclude name="META-INF/**" />
</patternset>
</unjar>
@@ -121,48 +140,47 @@
<echo level="info">Trying to replace property related to YOUR project in .tpl files</echo>
<move todir="${skeleton.target.dir}">
<fileset dir="${skeleton.target.dir}" includes="**/*.tpl" />
- <filterset refid="skeleton.create.replace.filter"/>
+ <filterset refid="skeleton.create.replace.filter" />
<mapper type="glob" from="*.tpl" to="*" />
</move>
<condition property="skeleton.postinstall.script.exists">
- <available file="${skeleton.postinstall.script}"/>
+ <available file="${skeleton.postinstall.script}" />
</condition>
<ac:if>
- <isset property="skeleton.postinstall.script.exists"/>
+ <isset property="skeleton.postinstall.script.exists" />
<ac:then>
<!-- compute absolute path for script -->
- <property name="postinstall.script.path" location="${skeleton.postinstall.script}"/>
+ <property name="postinstall.script.path" location="${skeleton.postinstall.script}" />
<!-- Run post install script (Optionnal) -->
- <ant antfile="${postinstall.script.path}" inheritall="true" inheritrefs="true" dir="${skeleton.target.dir}"/>
+ <ant antfile="${postinstall.script.path}" inheritall="true" inheritrefs="true" dir="${skeleton.target.dir}" />
<!-- Delete skeleton post install script -->
- <delete file="${skeleton.postinstall.script}"/>
+ <delete file="${skeleton.postinstall.script}" />
</ac:then>
</ac:if>
<!-- Delete the skeleton archive -->
<echo>Cleaning your ${skeleton.download.artifact} directory</echo>
- <delete file="${skeleton.download.artifact}"/>
+ <delete file="${skeleton.download.artifact}" />
</target>
<target name="-skeleton:newplugin">
- <property name="skeleton.org" value="org.apache.easyant.skeletons"/>
- <property name="skeleton.module" value="std-ant-plugin"/>
- <property name="skeleton.rev" value="latest.integration"/>
- <property name="project.default.organisation" value="org.apache.easyant.plugins"/>
+ <property name="skeleton.org" value="org.apache.easyant.skeletons" />
+ <property name="skeleton.module" value="std-ant-plugin" />
+ <property name="skeleton.rev" value="latest.integration" />
+ <property name="project.default.organisation" value="org.apache.easyant.plugins" />
</target>
- <target name="skeleton:newplugin" depends="-skeleton:newplugin,skeleton:generate" description="create a new easyant plugin"/>
+ <target name="skeleton:newplugin" depends="-skeleton:newplugin,skeleton:generate" description="create a new easyant plugin" />
<target name="-skeleton:newskeleton">
- <property name="skeleton.org" value="org.apache.easyant.skeletons"/>
- <property name="skeleton.module" value="std-skeleton"/>
- <property name="skeleton.rev" value="latest.integration"/>
- <property name="project.default.organisation" value="org.apache.easyant.skeletons"/>
+ <property name="skeleton.org" value="org.apache.easyant.skeletons" />
+ <property name="skeleton.module" value="std-skeleton" />
+ <property name="skeleton.rev" value="latest.integration" />
+ <property name="project.default.organisation" value="org.apache.easyant.skeletons" />
</target>
- <target name="skeleton:newskeleton" depends="-skeleton:newskeleton,skeleton:generate" description="create a new skeleton"/>
-
-</project>
+ <target name="skeleton:newskeleton" depends="-skeleton:newskeleton,skeleton:generate" description="create a new skeleton" />
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/skeleton/src/test/antunit/skeleton-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/skeleton/src/test/antunit/skeleton-test.xml?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/skeleton/src/test/antunit/skeleton-test.xml (original)
+++ incubator/easyant/plugins/trunk/skeleton/src/test/antunit/skeleton-test.xml Tue Oct 16 21:33:19 2012
@@ -14,35 +14,32 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;skeleton-test"
- xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:ivy="antlib:org.apache.ivy.ant"
+<project name="org.apache.easyant.plugins;skeleton-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 -->
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <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" 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"/>
- <target name="tearDown" depends="clean"/>
-
+
+ <target name="setUp" depends="clean" />
+ <target name="tearDown" depends="clean" />
+
<target name="test-skeleton:init">
- <au:assertPropertyEquals name="target.main.classes" value="target/test-antunit/main/classes"/>
- <au:assertPropertyEquals name="target.test.classes" value="target/test-antunit/test/classes"/>
- <au:assertPropertyEquals name="target.test.integration.classes" value="target/test-antunit/integration-test/classes"/>
- <au:assertReferenceSet refid="compile.main.classpath"/>
- <au:assertReferenceSet refid="compile.test.classpath"/>
+ <au:assertPropertyEquals name="target.main.classes" value="target/test-antunit/main/classes" />
+ <au:assertPropertyEquals name="target.test.classes" value="target/test-antunit/test/classes" />
+ <au:assertPropertyEquals name="target.test.integration.classes" value="target/test-antunit/integration-test/classes" />
+ <au:assertReferenceSet refid="compile.main.classpath" />
+ <au:assertReferenceSet refid="compile.test.classpath" />
</target>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/source-jar/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/source-jar/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/source-jar/module.ivy (original)
+++ incubator/easyant/plugins/trunk/source-jar/module.ivy Tue Oct 16 21:33:19 2012
@@ -14,41 +14,45 @@
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.plugins" module="source-jar" revision="0.9">
- <description>
- <p>This module provides source jar packaging feature.</p>
-
- <p>
- You can bind targets of this plugin to package phase by using bindtarget element in your module.ivy file.
- Example :
- <code type="xml">
- <plugin name="source-jar" rev="0.1" as="source-jar"/>
+ <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
+ <description>
+ <p>This module provides source jar packaging feature.</p>
+
+ <p>
+ You can bind targets of this plugin to package phase by using bindtarget element in your module.ivy
+ file.
+ Example :
+ <code type="xml">
+ <plugin name="source-jar" rev="0.1" as="source-jar" />
<!-- for main sources -->
- <bindtarget target="source-jar:main" tophase="package"/>
+ <bindtarget target="source-jar:main" tophase="package" />
<!-- for test sources -->
- <bindtarget target="source-jar:test" tophase="package"/>
- </code>
- Or as a nested element of the plugin
- <code type="xml">
- <plugin name="source-jar" rev="0.1" as="source-jar">
+ <bindtarget target="source-jar:test" tophase="package" />
+ </code>
+ Or as a nested element of the plugin
+ <code type="xml">
+ <plugin name="source-jar" rev="0.1" as="source-jar">
<!-- here, the target prefix is not mandatory as easyant can determine it from plugin element -->
<!-- for main sources -->
- <bindtarget target=":main" tophase="package"/>
+ <bindtarget target=":main" tophase="package" />
<!-- for test sources -->
- <bindtarget target=":test:test" tophase="package"/>
- </plugin>
- </code>
- </p>
- </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>
+ <bindtarget target=":test:test" tophase="package" />
+ </plugin>
+ </code>
+ </p>
+ </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="ant" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant (original)
+++ incubator/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant Tue Oct 16 21:33:19 2012
@@ -15,20 +15,22 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#source-jar" xmlns:ea="antlib:org.apache.easyant">
-
<ea:core-version requiredrevision="[0.9,+]" />
- <ea:import mrid="org.apache.easyant.plugins#abstract-package;0.9"/>
+ <ea:import mrid="org.apache.easyant.plugins#abstract-package;0.9" />
<target name="source-jar:init" depends="abstract-package:init">
- <ea:parameter property="target.artifacts.main.source.jar.name" default="${module.name}-sources.jar" description="main source artifact file name" />
+ <ea:parameter property="target.artifacts.main.source.jar.name" default="${module.name}-sources.jar"
+ description="main source artifact file name" />
- <ea:parameter property="target.artifacts.test.source.jar.name" default="${module.name}-test-sources.jar" description="test source artifact file name" />
+ <ea:parameter property="target.artifacts.test.source.jar.name" default="${module.name}-test-sources.jar"
+ description="test source artifact file name" />
<ea:parameter property="src.main.java" default="${basedir}/src/main/java" description="directory where main java files are stored" />
<ea:parameter property="src.test.java" default="${basedir}/src/test/java" description="directory where test java files are stored" />
-
- <ea:parameter property="src.main.resources" default="${basedir}/src/main/resources" description="directory where main resources files are stored" />
- <ea:parameter property="src.test.resources" default="${basedir}/src/test/resources" description="directory where test resources files are stored" />
+ <ea:parameter property="src.main.resources" default="${basedir}/src/main/resources"
+ description="directory where main resources files are stored" />
+ <ea:parameter property="src.test.resources" default="${basedir}/src/test/resources"
+ description="directory where test resources files are stored" />
<ea:parameter property="src.publish.conf" default="source" description="default configuration for source artifacts" />
<condition property="has.src.main">
@@ -48,24 +50,27 @@
<!-- Main Sources -->
- <target name="source-jar:main" depends="source-jar:init" description="package main source as a JAR" if="has.src.main" unless="skip.source">
+ <target name="source-jar:main" depends="source-jar:init" description="package main source as a JAR" if="has.src.main"
+ unless="skip.source">
<mkdir dir="${target.artifacts}" />
<jar destfile="${target.artifacts}/${target.artifacts.main.source.jar.name}">
<fileset dir="${src.main.resources}" erroronmissingdir="false" />
<fileset dir="${src.main.java}" erroronmissingdir="false" />
</jar>
- <ea:registerartifact type="source" ext="jar" classifier="sources" settingsRef="${project.ivy.instance}" confs="${src.publish.conf}"/>
+ <ea:registerartifact type="source" ext="jar" classifier="sources" settingsRef="${project.ivy.instance}"
+ confs="${src.publish.conf}" />
</target>
<!-- Test sources -->
- <target name="source-jar:test" depends="source-jar:init" description="package test source as a JAR" if="has.src.test" unless="skip.source">
+ <target name="source-jar:test" depends="source-jar:init" description="package test source as a JAR" if="has.src.test"
+ unless="skip.source">
<mkdir dir="${target.artifacts}" />
<jar destfile="${target.artifacts}/${target.artifacts.test.source.jar.name}">
<fileset dir="${src.test.resources}" erroronmissingdir="false" />
<fileset dir="${src.test.java}" erroronmissingdir="false" />
</jar>
- <ea:registerartifact type="test-source" ext="jar" classifier="test-sources" settingsRef="${project.ivy.instance}" confs="${src.publish.conf}"/>
+ <ea:registerartifact type="test-source" ext="jar" classifier="test-sources" settingsRef="${project.ivy.instance}"
+ confs="${src.publish.conf}" />
</target>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/source-jar/src/test/antunit/sample-module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/source-jar/src/test/antunit/sample-module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/source-jar/src/test/antunit/sample-module.ivy (original)
+++ incubator/easyant/plugins/trunk/source-jar/src/test/antunit/sample-module.ivy Tue Oct 16 21:33:19 2012
@@ -17,5 +17,4 @@
-->
<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>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/source-jar/src/test/antunit/source-jar-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/source-jar/src/test/antunit/source-jar-test.xml?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/source-jar/src/test/antunit/source-jar-test.xml (original)
+++ incubator/easyant/plugins/trunk/source-jar/src/test/antunit/source-jar-test.xml Tue Oct 16 21:33:19 2012
@@ -14,56 +14,50 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;source-jar-test"
- xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:ivy="antlib:org.apache.ivy.ant"
+<project name="org.apache.easyant.plugins;source-jar-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 -->
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <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" 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">
- <property name="project.ivy.instance" value="project.ivy.instance"/>
- <ivy:settings id="project.ivy.instance"/>
- <ivy:resolve file="sample-module.ivy" settingsRef="project.ivy.instance"/>
+ <property name="project.ivy.instance" value="project.ivy.instance" />
+ <ivy:settings id="project.ivy.instance" />
+ <ivy:resolve file="sample-module.ivy" settingsRef="project.ivy.instance" />
</target>
- <target name="tearDown" depends="clean"/>
-
+ <target name="tearDown" depends="clean" />
+
<target name="test-source-jar:init" depends="source-jar:init">
- <au:assertPropertyEquals name="target.artifacts.main.source.jar.name" value="${module.name}-sources.jar"/>
- <au:assertPropertyEquals name="target.artifacts.test.source.jar.name" value="${module.name}-test-sources.jar"/>
- <au:assertPropertyEquals name="src.main.java" value="${basedir}/src/main/java"/>
- <au:assertPropertyEquals name="src.test.java" value="${basedir}/src/test/java"/>
- <au:assertPropertyEquals name="src.main.resources" value="${basedir}/src/main/resources"/>
- <au:assertPropertyEquals name="src.test.resources" value="${basedir}/src/test/resources"/>
- <au:assertPropertyEquals name="src.publish.conf" value="source"/>
- <au:assertPropertyEquals name="has.src.main" value="true"/>
- <au:assertPropertyEquals name="has.src.test" value="true"/>
+ <au:assertPropertyEquals name="target.artifacts.main.source.jar.name" value="${module.name}-sources.jar" />
+ <au:assertPropertyEquals name="target.artifacts.test.source.jar.name" value="${module.name}-test-sources.jar" />
+ <au:assertPropertyEquals name="src.main.java" value="${basedir}/src/main/java" />
+ <au:assertPropertyEquals name="src.test.java" value="${basedir}/src/test/java" />
+ <au:assertPropertyEquals name="src.main.resources" value="${basedir}/src/main/resources" />
+ <au:assertPropertyEquals name="src.test.resources" value="${basedir}/src/test/resources" />
+ <au:assertPropertyEquals name="src.publish.conf" value="source" />
+ <au:assertPropertyEquals name="has.src.main" value="true" />
+ <au:assertPropertyEquals name="has.src.test" value="true" />
</target>
<target name="test-source-jar:main" depends="source-jar:main">
- <au:assertFileExists file="${target.artifacts}"/>
- <au:assertFileExists file="${target.artifacts}/${target.artifacts.main.source.jar.name}"/>
+ <au:assertFileExists file="${target.artifacts}" />
+ <au:assertFileExists file="${target.artifacts}/${target.artifacts.main.source.jar.name}" />
</target>
<target name="test-source-jar:test" depends="source-jar:test">
- <au:assertFileExists file="${target.artifacts}"/>
- <au:assertFileExists file="${target.artifacts}/${target.artifacts.test.source.jar.name}"/>
-
-
+ <au:assertFileExists file="${target.artifacts}" />
+ <au:assertFileExists file="${target.artifacts}/${target.artifacts.test.source.jar.name}" />
</target>
-
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/test-junit/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/test-junit/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/test-junit/module.ivy (original)
+++ incubator/easyant/plugins/trunk/test-junit/module.ivy Tue Oct 16 21:33:19 2012
@@ -14,19 +14,24 @@
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.plugins" module="test-junit" revision="0.9">
- <description>This module provides junit tests compilation and execution feature.<br/>
-This module extends abstract-test module.</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.plugins" module="parent-plugin" revision="0.1" />
+ <description>
+ This module provides junit tests compilation and execution feature.
+ <br />
+ This module extends abstract-test module.
+ </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="ant" />
</publications>
-
-</ivy-module>
+</ivy-module>
\ No newline at end of file