You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by hi...@apache.org on 2011/02/22 14:59:20 UTC
svn commit: r1073355 [7/8] - in /incubator/easyant/plugins/trunk: ./
abstract-coverage/ abstract-coverage/src/main/resources/ abstract-test/
abstract-test/src/main/resources/ antcontrib-activator/
antcontrib-activator/src/main/resources/ antunit/ antun...
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=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/scaladoc/src/main/resources/scaladoc.ant (original)
+++ incubator/easyant/plugins/trunk/scaladoc/src/main/resources/scaladoc.ant Tue Feb 22 14:59:17 2011
@@ -15,47 +15,47 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#scaladoc"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="report" />
-
- <ea: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" />
- <available file="${src.test.scala}" property="has.src.test.scala" />
- </target>
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="report" />
+
+ <ea: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" />
+ <available file="${src.test.scala}" property="has.src.test.scala" />
+ </target>
- <target name="-main" if="has.src.main.scala">
- <mkdir dir="${target.scaladoc.main}"/>
- <scaladoc destdir="${target.scaladoc.main}" srcdir="${src.main.scala}" classpathref="compile.main.classpath"/>
- </target>
-
- <target name="-test" if="has.src.test.scala">
- <mkdir name="${target.scaladoc.test}"/>
- <scaladoc destdir="${target.scaladoc.test}" srcdir="${src.test.scala}" classpathref="compile.test.classpath"/>
- </target>
-
- <target name=":scaladoc" depends="validate,-main,-test" phase="report" description="generate scaladoc report for main classes and test classes"/>
- <target name="doit" depends=":scaladoc" />
+ <target name="-main" if="has.src.main.scala">
+ <mkdir dir="${target.scaladoc.main}"/>
+ <scaladoc destdir="${target.scaladoc.main}" srcdir="${src.main.scala}" classpathref="compile.main.classpath"/>
+ </target>
+
+ <target name="-test" if="has.src.test.scala">
+ <mkdir name="${target.scaladoc.test}"/>
+ <scaladoc destdir="${target.scaladoc.test}" srcdir="${src.test.scala}" classpathref="compile.test.classpath"/>
+ </target>
+
+ <target name=":scaladoc" depends="validate,-main,-test" phase="report" description="generate scaladoc report for main classes and test classes"/>
+ <target name="doit" depends=":scaladoc" />
</project>
Modified: incubator/easyant/plugins/trunk/scm-svn/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/scm-svn/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/scm-svn/module.ivy (original)
+++ incubator/easyant/plugins/trunk/scm-svn/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,9 +15,9 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="scm-svn" revision="0.1">
- <description>This module provides svn feature.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="scm-svn" 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"/>
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=1073355&r1=1073354&r2=1073355&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 Feb 22 14:59:17 2011
@@ -15,50 +15,50 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#scm-svn" xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
-
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+
<target name=":init" phase="validate" >
<ea:parameter phase="validate" />
- <typedef resource="org/tigris/subversion/svnant/svnantlib.xml" classpathref="org.apache.easyant.plugins#scm-svn.classpath" />
+ <typedef resource="org/tigris/subversion/svnant/svnantlib.xml" classpathref="org.apache.easyant.plugins#scm-svn.classpath" />
</target>
<target name="-config" depends=":init">
- <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=":tag" description="tag the project" depends="-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>
+ <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=":branch" description="branch the project" depends="-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>
+ <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="-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.commit.message" default="EasyAnt: release ${version}" description="the commit message"/>
</target>
<target name=":release" phase="release" depends="generate-release-version,-init-release,:tag"/>
@@ -66,8 +66,8 @@
<!-- integration -->
<target name="-init-integration">
- <ea:parameter property="scm.tag.name" default="${version}" description="name of the tag to create"/>
- <ea:parameter property="scm.commit.message" default="EasyAnt: release ${version}" description="the commit message"/>
+ <ea:parameter property="scm.tag.name" default="${version}" description="name of the tag to create"/>
+ <ea:parameter property="scm.commit.message" default="EasyAnt: release ${version}" description="the commit message"/>
</target>
<target name=":integration" phase="publish-shared" depends="generate-shared-version,-init-integration,:tag"/>
Modified: incubator/easyant/plugins/trunk/skeleton/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/skeleton/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/skeleton/module.ivy (original)
+++ incubator/easyant/plugins/trunk/skeleton/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,17 +15,17 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="skeleton" revision="0.2">
- <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 organisation="org.apache.easyant.plugins" module="skeleton" revision="0.2">
+ <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"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ <artifact name="ivy.xml" type="tpl"/>
+ </publications>
</ivy-module>
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=1073355&r1=1073354&r2=1073355&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 Feb 22 14:59:17 2011
@@ -18,6 +18,6 @@
<info organisation="@skeleton.organisation@" module="@skeleton.module@" revision="@skeleton.revision@"/>
<publications>
- <artifact type="@skeleton.type@"/>
+ <artifact type="@skeleton.type@"/>
</publications>
</ivy-module>
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=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/skeleton/src/main/resources/skeleton.ant (original)
+++ incubator/easyant/plugins/trunk/skeleton/src/main/resources/skeleton.ant Tue Feb 22 14:59:17 2011
@@ -32,7 +32,7 @@
<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="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" />
@@ -49,19 +49,19 @@
<target name="-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>
- <ac:if>
- <and>
- <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>
- </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>
- </ac:else>
- </ac:if>
+ <ac:if>
+ <and>
+ <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>
+ </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>
+ </ac:else>
+ </ac:if>
</target>
<target name="-check-generate" if="skeleton.is.interactive">
@@ -77,7 +77,7 @@
</target>
<target name="-select" depends="validate" if="skeleton.is.interactive">
- <echo>Choose a skeleton in the following list:</echo>
+ <echo>Choose a skeleton in the following list:</echo>
<ea:searchmodule organisation="org.apache.easyant.skeletons" module="*" revision="*" propertyprefix="skeleton" settingsRef="easyant.ivy.instance"/>
</target>
@@ -108,10 +108,10 @@
<!-- 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/**"/>
- </patternset>
- </unjar>
+ <patternset>
+ <exclude name="META-INF/**"/>
+ </patternset>
+ </unjar>
<filterset id="skeleton.create.replace.filter">
<filter token="project.module" value="${project.module}" />
@@ -148,24 +148,24 @@
<echo>Cleaning your ${skeleton.download.artifact} directory</echo>
<delete file="${skeleton.download.artifact}"/>
</target>
-
- <target name="-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"/>
- </target>
-
- <target name=":newplugin" depends="-newplugin,:generate" description="create a new easyant plugin"/>
-
- <target name="-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"/>
- </target>
-
- <target name=":newskeleton" depends="-newskeleton,:generate" description="create a new skeleton"/>
-
+
+ <target name="-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"/>
+ </target>
+
+ <target name=":newplugin" depends="-newplugin,:generate" description="create a new easyant plugin"/>
+
+ <target name="-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"/>
+ </target>
+
+ <target name=":newskeleton" depends="-newskeleton,:generate" description="create a new skeleton"/>
+
<target name="doit" depends="validate" />
</project>
Modified: incubator/easyant/plugins/trunk/source-jar/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/source-jar/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/source-jar/module.ivy (original)
+++ incubator/easyant/plugins/trunk/source-jar/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,40 +15,40 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="source-jar" 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"/>
- <!-- 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">
- <!-- here, the target prefix is not mandatory as easyant can determine it from plugin element -->
- <!-- for main sources -->
- <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 organisation="org.apache.easyant.plugins" module="source-jar" 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"/>
+ <!-- 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">
+ <!-- here, the target prefix is not mandatory as easyant can determine it from plugin element -->
+ <!-- for main sources -->
+ <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>
- <publications>
- <artifact type="ant"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
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=1073355&r1=1073354&r2=1073355&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 Feb 22 14:59:17 2011
@@ -16,60 +16,60 @@
-->
<project name="org.apache.easyant.plugins#source-jar" xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="package" />
-
- <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" required="true" description="destination directory for target artifacts"/>
-
-
- <ea:parameter property="src.main.java" required="true" description="directory where main java files are stored" />
- <ea:parameter property="src.test.java" required="true" description="directory where test java files are stored" />
-
- <ea:parameter property="src.main.resources" required="true" description="directory where main resources files are stored" />
- <ea:parameter property="src.test.resources" required="true" description="directory where test resources files are stored" />
-
- <condition property="has.src.main">
- <or>
- <available file="${src.main.java}" />
- <available file="${src.main.resources}" />
- </or>
- </condition>
-
- <condition property="has.src.test">
- <or>
- <available file="${src.test.java}" />
- <available file="${src.test.resources}" />
- </or>
- </condition>
- </target>
-
- <!-- Main Sources -->
-
- <target name=":main" depends="validate" 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}"/>
- </target>
-
- <!-- Test sources -->
-
- <target name=":test" depends="validate" 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}"/>
- </target>
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="package" />
+
+ <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" required="true" description="destination directory for target artifacts"/>
+
+
+ <ea:parameter property="src.main.java" required="true" description="directory where main java files are stored" />
+ <ea:parameter property="src.test.java" required="true" description="directory where test java files are stored" />
+
+ <ea:parameter property="src.main.resources" required="true" description="directory where main resources files are stored" />
+ <ea:parameter property="src.test.resources" required="true" description="directory where test resources files are stored" />
+
+ <condition property="has.src.main">
+ <or>
+ <available file="${src.main.java}" />
+ <available file="${src.main.resources}" />
+ </or>
+ </condition>
+
+ <condition property="has.src.test">
+ <or>
+ <available file="${src.test.java}" />
+ <available file="${src.test.resources}" />
+ </or>
+ </condition>
+ </target>
+
+ <!-- Main Sources -->
+
+ <target name=":main" depends="validate" 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}"/>
+ </target>
+
+ <!-- Test sources -->
+
+ <target name=":test" depends="validate" 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}"/>
+ </target>
- <target name="doit" depends=":main" />
+ <target name="doit" depends=":main" />
</project>
Modified: incubator/easyant/plugins/trunk/test-junit/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/test-junit/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/test-junit/module.ivy (original)
+++ incubator/easyant/plugins/trunk/test-junit/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,18 +15,18 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="test-junit" revision="0.2">
- <description>This module provides junit tests compilation and execution feature.<br/>
+ <info organisation="org.apache.easyant.plugins" module="test-junit" revision="0.2">
+ <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"/>
+ <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>
-
+ <publications>
+ <artifact type="ant"/>
+ </publications>
+
</ivy-module>
Modified: incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant (original)
+++ incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant Tue Feb 22 14:59:17 2011
@@ -15,54 +15,54 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#test-junit"
- xmlns:ea="antlib:org.apache.easyant">
+ xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
+ <ea:core-version requiredrevision="[0.8,+]" />
- <ea:include mrid="org.apache.easyant.plugins#abstract-test;0.1" as=":abstract-junit-test"/>
+ <ea:include mrid="org.apache.easyant.plugins#abstract-test;0.1" as=":abstract-junit-test"/>
<ea:include mrid="org.apache.easyant.plugins#antcontrib-activator;0.1" as=":ac"/>
- <target name="/skip" description="skip tests">
- <property name="skip.test" value="true" />
- <property name="skip.test.integration" value="true" />
- </target>
-
- <target name=":init" phase="validate" depends=":abstract-junit-test:init">
- <ea:parameter phase="validate" />
- <ea:parameter phase="test" />
- <ea:parameter phase="integration-test" />
-
- <ea:parameter property="test.run.includes.pattern"
- default="**/*" description="Pattern describing class files included in test run" />
- <ea:parameter property="test.run.excludes.pattern"
- default="" description="Pattern describing class files excluded in test run" />
-
- <ea:parameter property="test.integration.run.includes.pattern"
- default="**/*" description="Pattern describing class files included in integration test run" />
- <ea:parameter property="test.integration.run.excludes.pattern"
- default="" description="Pattern describing class files excluded in integration test run" />
-
- <ea:parameter property="test.run.forkmode"
- default="perTest" description="The forkmode for junit tests; 'perTest' or 'once'"/>
- <ea:parameter property="test.run.fork"
- default="true" description="Run the tests in a separate VM. (true/false)"/>
- <ea:parameter property="test.run.jvmargs"
- default="" description="Extra parameters to pass to the test JVM, for example to enable debugging"/>
-
- <ea:parameter property="test.integration.run.forkmode"
- default="perTest" description="The forkmode for junit integration tests; 'perTest' or 'once'"/>
- <ea:parameter property="test.integration.run.fork"
- default="true" description="Run integration tests in a separate VM. (true/false)"/>
- <ea:parameter property="test.integration.run.jvmargs"
- default="" description="Extra parameters to pass to the integration test JVM, for example to enable debugging"/>
-
-
- <ea:parameter property="target.test.xml" required="true"
- description="Directory were xml test reports will be generated"/>
- <ea:parameter property="test.run.dir"
- default="${basedir}" description="working directory for unit test process, defaults to the project basedir"/>
- <ea:parameter property="test.integration.run.dir"
- default="${basedir}" description="working directory for integration test process, defaults to the project basedir"/>
+ <target name="/skip" description="skip tests">
+ <property name="skip.test" value="true" />
+ <property name="skip.test.integration" value="true" />
+ </target>
+
+ <target name=":init" phase="validate" depends=":abstract-junit-test:init">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="test" />
+ <ea:parameter phase="integration-test" />
+
+ <ea:parameter property="test.run.includes.pattern"
+ default="**/*" description="Pattern describing class files included in test run" />
+ <ea:parameter property="test.run.excludes.pattern"
+ default="" description="Pattern describing class files excluded in test run" />
+
+ <ea:parameter property="test.integration.run.includes.pattern"
+ default="**/*" description="Pattern describing class files included in integration test run" />
+ <ea:parameter property="test.integration.run.excludes.pattern"
+ default="" description="Pattern describing class files excluded in integration test run" />
+
+ <ea:parameter property="test.run.forkmode"
+ default="perTest" description="The forkmode for junit tests; 'perTest' or 'once'"/>
+ <ea:parameter property="test.run.fork"
+ default="true" description="Run the tests in a separate VM. (true/false)"/>
+ <ea:parameter property="test.run.jvmargs"
+ default="" description="Extra parameters to pass to the test JVM, for example to enable debugging"/>
+
+ <ea:parameter property="test.integration.run.forkmode"
+ default="perTest" description="The forkmode for junit integration tests; 'perTest' or 'once'"/>
+ <ea:parameter property="test.integration.run.fork"
+ default="true" description="Run integration tests in a separate VM. (true/false)"/>
+ <ea:parameter property="test.integration.run.jvmargs"
+ default="" description="Extra parameters to pass to the integration test JVM, for example to enable debugging"/>
+
+
+ <ea:parameter property="target.test.xml" required="true"
+ description="Directory were xml test reports will be generated"/>
+ <ea:parameter property="test.run.dir"
+ default="${basedir}" description="working directory for unit test process, defaults to the project basedir"/>
+ <ea:parameter property="test.integration.run.dir"
+ default="${basedir}" description="working directory for integration test process, defaults to the project basedir"/>
<ea:parameter property="test.scan.path" default="false"
description="if true, the full test classpath will be scanned for additional test cases to run"/>
@@ -74,7 +74,7 @@
<ea:parameter property="test.integration.jar.pattern" default=".*-test.jar"
description="when test.scan.path is enabled, identifies which jars should be examined for test cases"/>
- <ea:path pathid="run.test.classpath" overwrite="append-if-not-exist">
+ <ea:path pathid="run.test.classpath" overwrite="append-if-not-exist">
<pathelement location="${target.test.classes}" />
<path refid="compile.test.classpath" />
</ea:path>
@@ -84,7 +84,7 @@
<path refid="compile.test.classpath" />
</ea:path>
- </target>
+ </target>
<macrodef name="compute-test-path" description="Compute the set of test cases to run.">
<attribute name="prefix" description="one of 'test' or 'test.integration'"/>
@@ -147,38 +147,38 @@
</sequential>
</macrodef>
-
- <macrodef name="junit-test">
- <attribute name="prefix"/>
- <sequential>
- <mkdir dir="${target.test.xml}" />
- <mkdir dir="${@{prefix}.run.dir}"/>
-
- <junit
- haltonfailure="off"
- haltonerror="off"
- errorproperty="@{prefix}.failed"
- failureproperty="@{prefix}.failed"
- showoutput="no"
- printsummary="yes"
- includeantruntime="yes"
- dir="${@{prefix}.run.dir}"
- fork="${@{prefix}.run.fork}" forkmode="${@{prefix}.run.forkmode}">
-
- <jvmarg line="${@{prefix}.run.jvmargs}"/>
-
- <classpath>
- <path refid="run.@{prefix}.classpath" />
- </classpath>
-
- <formatter type="xml"/>
- <batchtest todir="${target.test.xml}">
- <resources refid="target.@{prefix}.set"/>
- </batchtest>
- </junit>
+
+ <macrodef name="junit-test">
+ <attribute name="prefix"/>
+ <sequential>
+ <mkdir dir="${target.test.xml}" />
+ <mkdir dir="${@{prefix}.run.dir}"/>
+
+ <junit
+ haltonfailure="off"
+ haltonerror="off"
+ errorproperty="@{prefix}.failed"
+ failureproperty="@{prefix}.failed"
+ showoutput="no"
+ printsummary="yes"
+ includeantruntime="yes"
+ dir="${@{prefix}.run.dir}"
+ fork="${@{prefix}.run.fork}" forkmode="${@{prefix}.run.forkmode}">
+
+ <jvmarg line="${@{prefix}.run.jvmargs}"/>
+
+ <classpath>
+ <path refid="run.@{prefix}.classpath" />
+ </classpath>
+
+ <formatter type="xml"/>
+ <batchtest todir="${target.test.xml}">
+ <resources refid="target.@{prefix}.set"/>
+ </batchtest>
+ </junit>
- </sequential>
- </macrodef>
+ </sequential>
+ </macrodef>
<target name="-compute-test-sets" depends="test-compile" description="compute the set of test cases to run">
@@ -192,31 +192,31 @@
</target>
- <target name="-test" depends="-compute-test-sets" unless="skip.test">
- <junit-test prefix="test"/>
+ <target name="-test" depends="-compute-test-sets" unless="skip.test">
+ <junit-test prefix="test"/>
</target>
- <target name="-integration-test" depends="-compute-test-sets" unless="skip.test.integration">
- <junit-test prefix="test.integration"/>
- </target>
-
- <target name=":run" if="test.mode.run" unless="skip.test" depends="-test"
- phase="test" description="run junit tests">
- <check-test-result propertytocheck="test.failed"
- message="At least one test has failed. See logs in ${target.test.xml} for details or use the report target to run the test with a report"/>
- </target>
-
- <target name=":run-integration" if="test.mode.run" unless="skip.test.integration" depends="-integration-test"
- phase="integration-test" description="run junit integration tests">
- <check-test-result propertytocheck="test.integration.failed"
- message="At least one integration test has failed. See logs in ${target.test.xml} for details or use the report target to run the test with a report" />
- </target>
+ <target name="-integration-test" depends="-compute-test-sets" unless="skip.test.integration">
+ <junit-test prefix="test.integration"/>
+ </target>
+
+ <target name=":run" if="test.mode.run" unless="skip.test" depends="-test"
+ phase="test" description="run junit tests">
+ <check-test-result propertytocheck="test.failed"
+ message="At least one test has failed. See logs in ${target.test.xml} for details or use the report target to run the test with a report"/>
+ </target>
+
+ <target name=":run-integration" if="test.mode.run" unless="skip.test.integration" depends="-integration-test"
+ phase="integration-test" description="run junit integration tests">
+ <check-test-result propertytocheck="test.integration.failed"
+ message="At least one integration test has failed. See logs in ${target.test.xml} for details or use the report target to run the test with a report" />
+ </target>
<target name=":report" if="test.mode.report" unless="skip.test" depends="-test,-integration-test"
- phase="report" description="generate junit report">
+ phase="report" description="generate junit report">
<junitreport todir="${target.test.xml}">
<fileset dir="${target.test.xml}">
- <include name="TEST-*.xml" />
+ <include name="TEST-*.xml" />
</fileset>
<report format="frames" todir="${target.test.html}" />
</junitreport>
@@ -225,7 +225,7 @@
<fail if="test.integration.failed"
message="At least one integration test has failed. See logs in ${target.test.xml} or report in ${target.test.html}" />
</target>
-
- <target name=":doit" depends=":run, :run-integration, :report" />
+
+ <target name=":doit" depends=":run, :run-integration, :report" />
</project>
Modified: incubator/easyant/plugins/trunk/test-testng/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/test-testng/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/test-testng/module.ivy (original)
+++ incubator/easyant/plugins/trunk/test-testng/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,17 +15,17 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="test-testng" revision="0.2">
- <description>This module provides testng tests compilation and execution feature.<br/>
+ <info organisation="org.apache.easyant.plugins" module="test-testng" revision="0.2">
+ <description>This module provides testng 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"/>
+ <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>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant (original)
+++ incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant Tue Feb 22 14:59:17 2011
@@ -15,23 +15,23 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#test-testng"
- xmlns:ea="antlib:org.apache.easyant">
+ xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <ea:include mrid="org.apache.easyant.plugins#abstract-test;0.1" as=":abstract-testng-test"/>
-
- <target name="/skip" description="skip tests">
- <property name="skip.test" value="true" />
- <property name="skip.test.integration" value="true" />
- </target>
-
- <target name=":init" phase="validate" depends=":abstract-testng-test:init">
- <ea:parameter phase="validate" />
- <ea:parameter phase="test" />
- <ea:parameter phase="integration-test" />
-
- <ea:parameter property="testng.filename" description="testng configuration filename" default="testng.xml"/>
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <ea:include mrid="org.apache.easyant.plugins#abstract-test;0.1" as=":abstract-testng-test"/>
+
+ <target name="/skip" description="skip tests">
+ <property name="skip.test" value="true" />
+ <property name="skip.test.integration" value="true" />
+ </target>
+
+ <target name=":init" phase="validate" depends=":abstract-testng-test:init">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="test" />
+ <ea:parameter phase="integration-test" />
+
+ <ea:parameter property="testng.filename" description="testng configuration filename" default="testng.xml"/>
<ea:path pathid="run.test.classpath" overwrite="append-if-not-exist">
<pathelement location="${target.test.classes}" />
@@ -42,73 +42,73 @@
<pathelement location="${target.test.integration.classes}" />
<path refid="compile.test.classpath" />
</ea:path>
-
- <condition property="skip.test">
- <not><isset property="has.src.test.java"/></not>
- </condition>
-
- <condition property="skip.test.integration">
- <not><isset property="has.src.test.integration.java"/></not>
- </condition>
-
- </target>
-
- <target name="-load" depends="provision">
- <available property="testng.available" classname="org.testng.TestNGAntTask">
- <classpath refid="run.test.classpath" />
- </available>
-
- <fail unless="testng.available" message="Testng is unavailable, perhaps you forget to add testng in you project dependencies."/>
- <taskdef name="testng" classname="com.beust.testng.TestNGAntTask">
- <classpath refid="run.test.classpath" />
- </taskdef>
- </target>
-
- <macrodef name="testng-test">
- <attribute name="prefix"/>
- <sequential>
- <mkdir dir="${target.test.xml}" />
- <!-- Xml and HTML file will be generated in target.test.xml -->
- <testng outputDir="${target.test.xml}"
- haltonfailure="off"
- failureproperty="@{prefix}.failed">
- <classpath refid="run.@{prefix}.classpath" />
- <xmlfileset dir="${target.@{prefix}.classes}" includes="${testng.filename}" />
- <!-- Alternative way to launch testng, maybe this could be an alternative target? -->
- <!--
- <classfileset dir="${build.test.dir}" includes="**/*.class" />
- -->
- </testng>
- </sequential>
- </macrodef>
-
- <target name="-test" depends="test-compile,-load" unless="skip.test">
- <testng-test prefix="test"/>
- </target>
+ <condition property="skip.test">
+ <not><isset property="has.src.test.java"/></not>
+ </condition>
+
+ <condition property="skip.test.integration">
+ <not><isset property="has.src.test.integration.java"/></not>
+ </condition>
+
+ </target>
+
+ <target name="-load" depends="provision">
+ <available property="testng.available" classname="org.testng.TestNGAntTask">
+ <classpath refid="run.test.classpath" />
+ </available>
+
+ <fail unless="testng.available" message="Testng is unavailable, perhaps you forget to add testng in you project dependencies."/>
+ <taskdef name="testng" classname="com.beust.testng.TestNGAntTask">
+ <classpath refid="run.test.classpath" />
+ </taskdef>
+ </target>
+
+ <macrodef name="testng-test">
+ <attribute name="prefix"/>
+ <sequential>
+ <mkdir dir="${target.test.xml}" />
+ <!-- Xml and HTML file will be generated in target.test.xml -->
+ <testng outputDir="${target.test.xml}"
+ haltonfailure="off"
+ failureproperty="@{prefix}.failed">
+ <classpath refid="run.@{prefix}.classpath" />
+ <xmlfileset dir="${target.@{prefix}.classes}" includes="${testng.filename}" />
+ <!-- Alternative way to launch testng, maybe this could be an alternative target? -->
+ <!--
+ <classfileset dir="${build.test.dir}" includes="**/*.class" />
+ -->
+ </testng>
+ </sequential>
+ </macrodef>
+
+ <target name="-test" depends="test-compile,-load" unless="skip.test">
+ <testng-test prefix="test"/>
+
+ </target>
- <target name="-integration-test" depends="test-compile,-load" unless="skip.test.integration">
- <testng-test prefix="test.integration"/>
- </target>
-
-
- <target name=":run" if="test.mode.run" unless="skip.test" depends="-test"
- phase="test" description="run testng tests">
- <check-test-result propertytocheck="test.failed"
+ <target name="-integration-test" depends="test-compile,-load" unless="skip.test.integration">
+ <testng-test prefix="test.integration"/>
+ </target>
+
+
+ <target name=":run" if="test.mode.run" unless="skip.test" depends="-test"
+ phase="test" description="run testng tests">
+ <check-test-result propertytocheck="test.failed"
message="At least one test has failed. See logs in ${target.test.xml} for details or use the report target to run the test with a report" />
- </target>
+ </target>
- <target name=":run-integration" if="test.mode.run" unless="skip.test.integration" depends="-integration-test"
- phase="integration-test" description="run testng integration tests">
- <check-test-result propertytocheck="test.integration.failed"
+ <target name=":run-integration" if="test.mode.run" unless="skip.test.integration" depends="-integration-test"
+ phase="integration-test" description="run testng integration tests">
+ <check-test-result propertytocheck="test.integration.failed"
message="At least one integration test has failed. See logs in ${target.test.xml} for details or use the report target to run the test with a report" />
- </target>
-
+ </target>
+
<target name=":report" if="test.mode.report" unless="skip.test" depends="-test,-integration-test"
- phase="report" description="generate testng reports">
+ phase="report" description="generate testng reports">
<junitreport todir="${target.test.xml}">
<fileset dir="${target.test.xml}">
- <include name="TEST-*.xml" />
+ <include name="TEST-*.xml" />
</fileset>
<report format="frames" todir="${target.test.html}" />
</junitreport>
@@ -117,6 +117,6 @@
<fail if="test.integration.failed"
message="At least one integration test has failed. See logs in ${target.test.xml} or report in ${target.test.html}" />
</target>
-
+
<target name=":doit" depends=":run, :run-integration, :report" />
</project>
Modified: incubator/easyant/plugins/trunk/webstart/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/webstart/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/webstart/module.ivy (original)
+++ incubator/easyant/plugins/trunk/webstart/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,19 +15,19 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="webstart" revision="0.1">
- <description>This module allows different webstart processus.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="webstart" revision="0.1">
+ <description>This module allows different webstart processus.</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>
+ <publications>
<artifact name="webstart" type="ant"/>
</publications>
- <dependencies>
- <dependency org="org.apache.easyant.tasks" name="partial-jnlp-task" rev="0.1" conf="default->default"/>
- </dependencies>
+ <dependencies>
+ <dependency org="org.apache.easyant.tasks" name="partial-jnlp-task" rev="0.1" conf="default->default"/>
+ </dependencies>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/webstart/src/main/resources/webstart.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/webstart/src/main/resources/webstart.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/webstart/src/main/resources/webstart.ant (original)
+++ incubator/easyant/plugins/trunk/webstart/src/main/resources/webstart.ant Tue Feb 22 14:59:17 2011
@@ -15,111 +15,111 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins;webstart"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ea="antlib:org.apache.easyant">
-
- <!-- Force compliance with easyant-core to 0.7 or higher -->
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <macrodef name="signJars">
- <attribute name="alias" description="the alias signer" />
- <attribute name="storepass" description="the keystore password"/>
- <attribute name="keypass" default="@{storepass}" description="the key password"/>
- <attribute name="keystore" description="the path to the keystore"/>
- <attribute name="lazy" default="false" description="tell if the already signed jars have to be signed a second time"/>
- <element name="signFolder" optional="yes"/>
- <sequential>
- <echo>Sign...</echo>
-
- <if>
-
- <isset property="@{keystore}"/>
-
- <then>
-
- <signjar alias="@{alias}" keypass="@{keypass}" keystore="@{keystore}" storepass="@{storepass}" lazy="@{replaceSign}">
- <signFolder/>
- </signjar>
-
-
- </then>
- <else>
- <signjar alias="@{alias}" keypass="@{keypass}" storepass="@{storepass}" lazy="@{replaceSign}">
- <signFolder/>
- </signjar>
- </else>
- </if>
-
- <echo>Sign done !</echo>
- </sequential>
- </macrodef>
-
- <target name=":init">
- <ea:parameter property="jnlp.file" required="true" description="the jnlp to modify" />
- <ea:parameter property="signJar" required="false" default="false" description="tell if the jars has to be signed" />
- <ea:parameter property="flat.path" required="false" description="tell if the path resources have to be declared in relative or absolute" />
-
-
- <ea:parameter property="alias" required="false" description="the alias signer" />
- <ea:parameter property="storepass" required="false" description="the keystore password" />
- <ea:parameter property="keypass" required="false" default="${storepass}" description="the key password" />
- <ea:parameter property="keystore" required="false" default=" " description="the path to the keystore" />
- <ea:parameter property="lazy" required="false" default="false" description="tell if the already signed jars have to be signed a second time" />
- <taskdef name="partial-jnlp" classname="org.apache.easyant.tasks.JNLPTask"
- classpathref="org.apache.easyant.plugins#webstart.classpath" />
-
-
- </target>
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <!-- Force compliance with easyant-core to 0.7 or higher -->
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <macrodef name="signJars">
+ <attribute name="alias" description="the alias signer" />
+ <attribute name="storepass" description="the keystore password"/>
+ <attribute name="keypass" default="@{storepass}" description="the key password"/>
+ <attribute name="keystore" description="the path to the keystore"/>
+ <attribute name="lazy" default="false" description="tell if the already signed jars have to be signed a second time"/>
+ <element name="signFolder" optional="yes"/>
+ <sequential>
+ <echo>Sign...</echo>
+
+ <if>
+
+ <isset property="@{keystore}"/>
+
+ <then>
+
+ <signjar alias="@{alias}" keypass="@{keypass}" keystore="@{keystore}" storepass="@{storepass}" lazy="@{replaceSign}">
+ <signFolder/>
+ </signjar>
+
+
+ </then>
+ <else>
+ <signjar alias="@{alias}" keypass="@{keypass}" storepass="@{storepass}" lazy="@{replaceSign}">
+ <signFolder/>
+ </signjar>
+ </else>
+ </if>
+
+ <echo>Sign done !</echo>
+ </sequential>
+ </macrodef>
+
+ <target name=":init">
+ <ea:parameter property="jnlp.file" required="true" description="the jnlp to modify" />
+ <ea:parameter property="signJar" required="false" default="false" description="tell if the jars has to be signed" />
+ <ea:parameter property="flat.path" required="false" description="tell if the path resources have to be declared in relative or absolute" />
+
+
+ <ea:parameter property="alias" required="false" description="the alias signer" />
+ <ea:parameter property="storepass" required="false" description="the keystore password" />
+ <ea:parameter property="keypass" required="false" default="${storepass}" description="the key password" />
+ <ea:parameter property="keystore" required="false" default=" " description="the path to the keystore" />
+ <ea:parameter property="lazy" required="false" default="false" description="tell if the already signed jars have to be signed a second time" />
+ <taskdef name="partial-jnlp" classname="org.apache.easyant.tasks.JNLPTask"
+ classpathref="org.apache.easyant.plugins#webstart.classpath" />
+
+
+ </target>
-
+
- <target name=":editJnlp" depends=":init, package" description="edit an existing jnlp file">
- <echo message="[Library directory]: ${lib.main}" />
- <echo message="[libArtifact]: ${target.artifacts}/${target.artifacts.main.jar.name}" />
- <if>
- <equals arg1="${flat.path}" arg2="$${flat.path}" />
- <then>
- <partial-jnlp mainJar="${target.artifacts}/${target.artifacts.main.jar.name}" jnlpFile="${jnlp.file}">
- <fileset dir="${lib.main}">
- <include name="*.jar" />
- </fileset>
- </partial-jnlp>
- </then>
- <else>
- <partial-jnlp mainJar="${target.artifacts}/${target.artifacts.main.jar.name}" jnlpFile="${jnlp.file}" flatPathResources="${flat.path}">
- <fileset dir="${lib.main}">
- <include name="*.jar" />
- </fileset>
- </partial-jnlp>
- </else>
- </if>
+ <target name=":editJnlp" depends=":init, package" description="edit an existing jnlp file">
+ <echo message="[Library directory]: ${lib.main}" />
+ <echo message="[libArtifact]: ${target.artifacts}/${target.artifacts.main.jar.name}" />
+ <if>
+ <equals arg1="${flat.path}" arg2="$${flat.path}" />
+ <then>
+ <partial-jnlp mainJar="${target.artifacts}/${target.artifacts.main.jar.name}" jnlpFile="${jnlp.file}">
+ <fileset dir="${lib.main}">
+ <include name="*.jar" />
+ </fileset>
+ </partial-jnlp>
+ </then>
+ <else>
+ <partial-jnlp mainJar="${target.artifacts}/${target.artifacts.main.jar.name}" jnlpFile="${jnlp.file}" flatPathResources="${flat.path}">
+ <fileset dir="${lib.main}">
+ <include name="*.jar" />
+ </fileset>
+ </partial-jnlp>
+ </else>
+ </if>
- </target>
- <target name=":sign" depends="package">
- <if>
- <equals arg1="${signJar}" arg2="true" />
- <then>
- <signJars alias="${alias}" storepass="${storepass}" keypass="${keypass}" keystore="${keystore}" lazy="${lazy}" >
- <signfolder>
- <fileset dir="${lib.main}" includes="*.jar"/>
- <fileset dir="${target.artifacts}" includes="*.jar"/>
- </signfolder>
- </signJars>
- </then>
- </if>
- </target>
-
- <target name=":prepare" depends=":editJnlp,:sign" description="edit the jnlp file and sign as necessary"/>
-
-
-
- <target name=":run" depends=":prepare" description="run the application in java webstart">
- <exec executable="javaws">
- <arg value="${jnlp.file}" />
- </exec>
- </target>
+ </target>
+ <target name=":sign" depends="package">
+ <if>
+ <equals arg1="${signJar}" arg2="true" />
+ <then>
+ <signJars alias="${alias}" storepass="${storepass}" keypass="${keypass}" keystore="${keystore}" lazy="${lazy}" >
+ <signfolder>
+ <fileset dir="${lib.main}" includes="*.jar"/>
+ <fileset dir="${target.artifacts}" includes="*.jar"/>
+ </signfolder>
+ </signJars>
+ </then>
+ </if>
+ </target>
+
+ <target name=":prepare" depends=":editJnlp,:sign" description="edit the jnlp file and sign as necessary"/>
+
+
+
+ <target name=":run" depends=":prepare" description="run the application in java webstart">
+ <exec executable="javaws">
+ <arg value="${jnlp.file}" />
+ </exec>
+ </target>
-
-
- <target name="doit" depends=":run" />
+
+
+ <target name="doit" depends=":run" />
</project>
Modified: incubator/easyant/plugins/trunk/webstart/src/test/antunit/common/test-utils.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/webstart/src/test/antunit/common/test-utils.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/webstart/src/test/antunit/common/test-utils.ant (original)
+++ incubator/easyant/plugins/trunk/webstart/src/test/antunit/common/test-utils.ant Tue Feb 22 14:59:17 2011
@@ -17,21 +17,21 @@
-->
<project name="easyant-test-utils">
- <description>Macros and targets to assist in writing AntUnit test cases for EasyAnt</description>
-
- <macrodef name="easyant" description="fork an easyant process for testing">
- <attribute name="target" description="(optional) the easyant target(s), passed on the command line" default=""/>
- <attribute name="dir" description="(optional) the base directory from which to invoke easyant" default="${basedir}"/>
- <attribute name="home" description="(optional) location of easyant home directory" default="${user.dir}"/>
- <attribute name="args" description="(optional) extra command line arguments to pass to the easyant process" default=""/>
- <element name="args" description="(optional) nested <arg> elements are passed to the easyant process" implicit="true" optional="true"/>
- <sequential>
- <exec dir="@{dir}" executable="@{home}/bin/easyant" vmlauncher="false" failonerror="true">
- <arg line="@{args}"/>
- <args/>
- <arg line="@{target}"/>
- </exec>
- </sequential>
- </macrodef>
-
-</project>
\ No newline at end of file
+ <description>Macros and targets to assist in writing AntUnit test cases for EasyAnt</description>
+
+ <macrodef name="easyant" description="fork an easyant process for testing">
+ <attribute name="target" description="(optional) the easyant target(s), passed on the command line" default=""/>
+ <attribute name="dir" description="(optional) the base directory from which to invoke easyant" default="${basedir}"/>
+ <attribute name="home" description="(optional) location of easyant home directory" default="${user.dir}"/>
+ <attribute name="args" description="(optional) extra command line arguments to pass to the easyant process" default=""/>
+ <element name="args" description="(optional) nested <arg> elements are passed to the easyant process" implicit="true" optional="true"/>
+ <sequential>
+ <exec dir="@{dir}" executable="@{home}/bin/easyant" vmlauncher="false" failonerror="true">
+ <arg line="@{args}"/>
+ <args/>
+ <arg line="@{target}"/>
+ </exec>
+ </sequential>
+ </macrodef>
+
+</project>
Modified: incubator/easyant/plugins/trunk/webstart/src/test/antunit/webstart-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/webstart/src/test/antunit/webstart-test.xml?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/webstart/src/test/antunit/webstart-test.xml (original)
+++ incubator/easyant/plugins/trunk/webstart/src/test/antunit/webstart-test.xml Tue Feb 22 14:59:17 2011
@@ -15,44 +15,44 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins;webstart-test" xmlns:au="antlib:org.apache.ant.antunit">
-
- <!-- Mocking required phase -->
- <phase name="validate"/>
- <phase name="package"/>
+
+ <!-- Mocking required phase -->
+ <phase name="validate"/>
+ <phase name="package"/>
- <!-- disable corerevision checker -->
- <property name="skip.corerevision.checker" value="true"/>
-
- <!-- Import your plugin -->
- <import file="../../main/resources/webstart.ant"/>
-
- <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
- <target name="clean" description="remove stale build artifacts before / after each test">
- <delete dir="${basedir}" includeemptydirs="true">
- <include name="**/target/**"/>
- <include name="**/lib/**"/>
- </delete>
- </target>
-
- <target name="setUp" depends="clean"/>
- <target name="tearDown" depends="clean"/>
-
- <!-- init test case -->
- <target name="testInit">
- <au:expectfailure expectedMessage="expected property 'jnlp.file': the jnlp to modify">
- <antcall target=":init"/>
- </au:expectfailure>
- </target>
-
- <!--
- A sample ant unit test case,
- see the antunit official documentation for more informations
-
- <target name="testSample" description="a sample of ant unit test case">
- <au:assertTrue>
- <matches string="abc" pattern="abc"/>
- </au:assertTrue>
- </target>
- -->
+ <!-- disable corerevision checker -->
+ <property name="skip.corerevision.checker" value="true"/>
+
+ <!-- Import your plugin -->
+ <import file="../../main/resources/webstart.ant"/>
+
+ <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
+ <target name="clean" description="remove stale build artifacts before / after each test">
+ <delete dir="${basedir}" includeemptydirs="true">
+ <include name="**/target/**"/>
+ <include name="**/lib/**"/>
+ </delete>
+ </target>
+
+ <target name="setUp" depends="clean"/>
+ <target name="tearDown" depends="clean"/>
+
+ <!-- init test case -->
+ <target name="testInit">
+ <au:expectfailure expectedMessage="expected property 'jnlp.file': the jnlp to modify">
+ <antcall target=":init"/>
+ </au:expectfailure>
+ </target>
+
+ <!--
+ A sample ant unit test case,
+ see the antunit official documentation for more informations
+
+ <target name="testSample" description="a sample of ant unit test case">
+ <au:assertTrue>
+ <matches string="abc" pattern="abc"/>
+ </au:assertTrue>
+ </target>
+ -->
</project>
Modified: incubator/easyant/plugins/trunk/xooki/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/xooki/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/xooki/module.ivy (original)
+++ incubator/easyant/plugins/trunk/xooki/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,22 +15,22 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="xooki" revision="0.1">
- <description>
- This module provides functionalities for setting up a xooki-based documentation structure in your project.
- </description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="xooki" revision="0.1">
+ <description>
+ This module provides functionalities for setting up a xooki-based documentation structure in your project.
+ </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="xooki" name="xooki" rev="0.1"/>
- <dependency org="org.apache.easyant.tasks" name="xooki-menu-generator" rev="0.1" conf="default"/>
- </dependencies>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
+ <dependencies>
+ <dependency org="xooki" name="xooki" rev="0.1"/>
+ <dependency org="org.apache.easyant.tasks" name="xooki-menu-generator" rev="0.1" conf="default"/>
+ </dependencies>
</ivy-module>