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 15:56:09 UTC
svn commit: r1073371 [22/28] - in /incubator/easyant/core/trunk: ./ bin/
example/build-configurations/
example/build-configurations/src/main/java/org/apache/easyant/example/
example/build-configurations/src/test/java/org/apache/easyant/example/
example...
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-java/0.2/build-std-java.properties
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-java/0.2/build-std-java.properties?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-java/0.2/build-std-java.properties (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-java/0.2/build-std-java.properties Tue Feb 22 15:55:55 2011
@@ -34,4 +34,4 @@ target.artifacts.test.jar.name=${module.
target.report=${target}/report
manifest.file=${target}/MANIFEST.MF
-test.framework=junit
\ No newline at end of file
+test.framework=junit
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-scala/0.1/build-std-scala.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-scala/0.1/build-std-scala.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-scala/0.1/build-std-scala.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-scala/0.1/build-std-scala.ant Tue Feb 22 15:55:55 2011
@@ -15,38 +15,38 @@
limitations under the License.
-->
<project name="org.apache.easyant.buildtypes#build-std-scala"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-scala..."/>
-
- <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-scala..."/>
+
+ <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
- <property file="${org.apache.easyant.buildtypes#build-std-scala.properties.file}" />
-
- <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
- <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
- <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
+ <property file="${org.apache.easyant.buildtypes#build-std-scala.properties.file}" />
+
+ <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
+ <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
+ <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
- <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
- <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
- <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
+ <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
+ <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
+ <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
-
- <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
-
- <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
- <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
- <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
- <ea:include mrid="org.apache.easyant.plugins#compile-scala;0.1" as="compile" />
- <ea:include mrid="org.apache.easyant.plugins#compile-test-scala;0.1" as="compile-test" />
- <ea:include mrid="${test.plugin.mrid}" as="test" />
- <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
- <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
+
+ <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
+
+ <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
+ <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
+ <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-scala;0.1" as="compile" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-test-scala;0.1" as="compile-test" />
+ <ea:include mrid="${test.plugin.mrid}" as="test" />
+ <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
+ <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
- <target name="doit" depends="verify" />
+ <target name="doit" depends="verify" />
</project>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-scala/0.1/build-std-scala.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-scala/0.1/build-std-scala.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-scala/0.1/build-std-scala.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-scala/0.1/build-std-scala.ivy Tue Feb 22 15:55:55 2011
@@ -15,13 +15,13 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.easyant.buildtypes"
- module="build-std-scala"
- status="milestone"
- revision="0.1"
- />
- <publications>
- <artifact type="ant" />
- <artifact type="properties" />
- </publications>
+ <info organisation="org.apache.easyant.buildtypes"
+ module="build-std-scala"
+ status="milestone"
+ revision="0.1"
+ />
+ <publications>
+ <artifact type="ant" />
+ <artifact type="properties" />
+ </publications>
</ivy-module>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-scala/0.1/build-std-scala.properties
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-scala/0.1/build-std-scala.properties?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-scala/0.1/build-std-scala.properties (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-scala/0.1/build-std-scala.properties Tue Feb 22 15:55:55 2011
@@ -42,4 +42,4 @@ target.report=${target}/report
manifest.file=${target}/MANIFEST.MF
-test.framework=junit
\ No newline at end of file
+test.framework=junit
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-skeleton/0.1/build-std-skeleton.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-skeleton/0.1/build-std-skeleton.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-skeleton/0.1/build-std-skeleton.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-skeleton/0.1/build-std-skeleton.ant Tue Feb 22 15:55:55 2011
@@ -15,29 +15,29 @@
limitations under the License.
-->
<project name="org.apache.easyant.buildtypes#build-std-skeleton"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-skeleton..."/>
-
- <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-skeleton..."/>
+
+ <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
- <property file="${org.apache.easyant.buildtypes#build-std-skeleton.properties.file}" />
-
- <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
- <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
- <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
-
- <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
- <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
- <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
- <ea:include mrid="org.apache.easyant.plugins#easyant-plugin-publication;0.1" as="publish" />
- <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
- <ea:include mrid="org.apache.easyant.plugins#antunit;0.1" as="test" />
- <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
+ <property file="${org.apache.easyant.buildtypes#build-std-skeleton.properties.file}" />
+
+ <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
+ <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
+ <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
+
+ <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
+ <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
+ <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
+ <ea:include mrid="org.apache.easyant.plugins#easyant-plugin-publication;0.1" as="publish" />
+ <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
+ <ea:include mrid="org.apache.easyant.plugins#antunit;0.1" as="test" />
+ <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
- <target name="doit" depends="verify" />
+ <target name="doit" depends="verify" />
</project>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-skeleton/0.1/build-std-skeleton.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-skeleton/0.1/build-std-skeleton.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-skeleton/0.1/build-std-skeleton.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-skeleton/0.1/build-std-skeleton.ivy Tue Feb 22 15:55:55 2011
@@ -15,14 +15,14 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.easyant.buildtypes"
- module="build-std-skeleton"
- status="milestone"
- revision="0.1">
- <description>A standard build skeleton, relying on standard phases, and providing unit tests</description>
- </info>
- <publications>
- <artifact type="ant" />
- <artifact type="properties" />
- </publications>
+ <info organisation="org.apache.easyant.buildtypes"
+ module="build-std-skeleton"
+ status="milestone"
+ revision="0.1">
+ <description>A standard build skeleton, relying on standard phases, and providing unit tests</description>
+ </info>
+ <publications>
+ <artifact type="ant" />
+ <artifact type="properties" />
+ </publications>
</ivy-module>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-webapp-java/0.1/build-webapp-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-webapp-java/0.1/build-webapp-java.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-webapp-java/0.1/build-webapp-java.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-webapp-java/0.1/build-webapp-java.ant Tue Feb 22 15:55:55 2011
@@ -15,38 +15,38 @@
limitations under the License.
-->
<project name="org.apache.easyant.buildtypes#build-webapp-java"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-webapp-java..."/>
-
- <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-webapp-java..."/>
+
+ <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
- <property file="${org.apache.easyant.buildtypes#build-webapp-java.properties.file}" />
-
- <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
- <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
- <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
+ <property file="${org.apache.easyant.buildtypes#build-webapp-java.properties.file}" />
+
+ <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
+ <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
+ <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
- <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
- <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
- <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
+ <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
+ <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
+ <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
-
- <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
-
- <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
- <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
- <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
- <ea:include mrid="org.apache.easyant.plugins#compile-java;0.1" as="compile" />
- <ea:include mrid="org.apache.easyant.plugins#compile-test-java;0.1" as="compile-test" />
- <ea:include mrid="${test.plugin.mrid}" as="test" />
- <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
- <ea:include mrid="org.apache.easyant.plugins#package-war;0.1" as="war" />
-
- <target name="doit" depends="verify" />
+
+ <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
+
+ <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
+ <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
+ <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-java;0.1" as="compile" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-test-java;0.1" as="compile-test" />
+ <ea:include mrid="${test.plugin.mrid}" as="test" />
+ <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
+ <ea:include mrid="org.apache.easyant.plugins#package-war;0.1" as="war" />
+
+ <target name="doit" depends="verify" />
</project>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-webapp-java/0.1/build-webapp-java.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-webapp-java/0.1/build-webapp-java.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-webapp-java/0.1/build-webapp-java.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-webapp-java/0.1/build-webapp-java.ivy Tue Feb 22 15:55:55 2011
@@ -15,14 +15,14 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.easyant.buildtypes"
- module="build-webapp-java"
- status="milestone"
- revision="0.1">
- <description>A standard build for webapp java modules, relying on standard phases, and providing compilation, execution and unit tests</description>
- </info>
- <publications>
- <artifact type="ant" />
- <artifact type="properties" />
- </publications>
+ <info organisation="org.apache.easyant.buildtypes"
+ module="build-webapp-java"
+ status="milestone"
+ revision="0.1">
+ <description>A standard build for webapp java modules, relying on standard phases, and providing compilation, execution and unit tests</description>
+ </info>
+ <publications>
+ <artifact type="ant" />
+ <artifact type="properties" />
+ </publications>
</ivy-module>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.1/meta-build.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.1/meta-build.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.1/meta-build.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.1/meta-build.ant Tue Feb 22 15:55:55 2011
@@ -15,21 +15,21 @@
limitations under the License.
-->
<project name="org.apache.easyant.buildtypes#meta-build"
- xmlns:ea="antlib:org.apache.easyant"
- xmlns:ivy="antlib:org.apache.ivy.ant">
-
- <ea:core-version requiredrevision="0.6">
+ xmlns:ea="antlib:org.apache.easyant"
+ xmlns:ivy="antlib:org.apache.ivy.ant">
+
+ <ea:core-version requiredrevision="0.6">
meta-build 0.1 has been deprecated. Please upgrade your project to meta-build 0.2 or higher.
- </ea:core-version>
-
- <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2"/>
-
- <property file="${org.apache.easyant.buildtypes#meta-build.properties.file}" />
+ </ea:core-version>
+
+ <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2"/>
+
+ <property file="${org.apache.easyant.buildtypes#meta-build.properties.file}" />
- <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean"/>
- <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish"/>
- <ea:include mrid="org.apache.easyant.plugins#build-tools;0.1" as="meta"/>
+ <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean"/>
+ <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish"/>
+ <ea:include mrid="org.apache.easyant.plugins#build-tools;0.1" as="meta"/>
- <target name="doit" depends="verify" />
+ <target name="doit" depends="verify" />
</project>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.1/meta-build.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.1/meta-build.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.1/meta-build.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.1/meta-build.ivy Tue Feb 22 15:55:55 2011
@@ -15,14 +15,14 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.easyant.buildtypes"
- module="meta-build"
- status="milestone"
- revision="0.1">
- <description>This module is a meta module that allow you to build multi projects.</description>
- </info>
- <publications>
- <artifact type="ant" />
- <artifact type="properties" />
- </publications>
+ <info organisation="org.apache.easyant.buildtypes"
+ module="meta-build"
+ status="milestone"
+ revision="0.1">
+ <description>This module is a meta module that allow you to build multi projects.</description>
+ </info>
+ <publications>
+ <artifact type="ant" />
+ <artifact type="properties" />
+ </publications>
</ivy-module>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.1/meta-build.properties
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.1/meta-build.properties?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.1/meta-build.properties (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.1/meta-build.properties Tue Feb 22 15:55:55 2011
@@ -23,4 +23,4 @@ src.test.resources=${basedir}/src/test/r
ivy.haltonmissing=false
-target=${basedir}/target
\ No newline at end of file
+target=${basedir}/target
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.2/meta-build.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.2/meta-build.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.2/meta-build.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.2/meta-build.ant Tue Feb 22 15:55:55 2011
@@ -15,17 +15,17 @@
limitations under the License.
-->
<project name="org.apache.easyant.buildtypes#meta-build"
- xmlns:ea="antlib:org.apache.easyant"
- xmlns:ivy="antlib:org.apache.ivy.ant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <ea:include mrid="org.apache.easyant.plugins#phases-std;0.2"/>
-
- <property file="${org.apache.easyant.buildtypes#meta-build.properties.file}" />
+ xmlns:ea="antlib:org.apache.easyant"
+ xmlns:ivy="antlib:org.apache.ivy.ant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <ea:include mrid="org.apache.easyant.plugins#phases-std;0.2"/>
+
+ <property file="${org.apache.easyant.buildtypes#meta-build.properties.file}" />
- <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean"/>
- <ea:include mrid="org.apache.easyant.plugins#build-tools;0.2" as="meta"/>
+ <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean"/>
+ <ea:include mrid="org.apache.easyant.plugins#build-tools;0.2" as="meta"/>
- <target name="doit" depends="verify" />
+ <target name="doit" depends="verify" />
</project>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.2/meta-build.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.2/meta-build.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.2/meta-build.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.2/meta-build.ivy Tue Feb 22 15:55:55 2011
@@ -15,15 +15,15 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.easyant.buildtypes"
- module="meta-build"
- status="milestone"
- revision="0.2">
- <description>This build type allows you to recursively build multi-module projects,
- with internal dependencies between modules.</description>
- </info>
- <publications>
- <artifact type="ant" />
- <artifact type="properties" />
- </publications>
+ <info organisation="org.apache.easyant.buildtypes"
+ module="meta-build"
+ status="milestone"
+ revision="0.2">
+ <description>This build type allows you to recursively build multi-module projects,
+ with internal dependencies between modules.</description>
+ </info>
+ <publications>
+ <artifact type="ant" />
+ <artifact type="properties" />
+ </publications>
</ivy-module>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.2/meta-build.properties
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.2/meta-build.properties?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.2/meta-build.properties (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.2/meta-build.properties Tue Feb 22 15:55:55 2011
@@ -24,4 +24,4 @@ target=${basedir}/target
# record the meta-build target directory, to be inherited by submodules
meta.target=${target}
-meta.repository=${meta.target}/repository
\ No newline at end of file
+meta.repository=${meta.target}/repository
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-coverage/0.1/abstract-coverage.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-coverage/0.1/abstract-coverage.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-coverage/0.1/abstract-coverage.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-coverage/0.1/abstract-coverage.ant Tue Feb 22 15:55:55 2011
@@ -15,31 +15,31 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#abstract-coverage"
- xmlns:ea="antlib:org.apache.easyant">
+ xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate" description="defines a common set of configuration parameters used by code coverage tools">
- <ea:parameter phase="validate" />
- <ea:parameter phase="process-classes" />
- <ea:parameter phase="report" />
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <target name=":init" phase="validate" description="defines a common set of configuration parameters used by code coverage tools">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="process-classes" />
+ <ea:parameter phase="report" />
- <ea:parameter property="target.main.classes" required="true" description="destination directory for compiled test classes" />
- <ea:parameter property="target.test.classes" required="true" description="destination directory for compiled coverage test classes" />
-
- <ea:parameter property="target" default="target" description="the target directory" />
- <ea:parameter property="target.report" default="${target}/report" description="the target report directory" />
-
- <ea:parameter property="coverage.exclude.filter" default="" description="a list of pattern that coverage framework will ignore during instrumentation phase" />
- <ea:parameter property="coverage.verbosity" default="info" description="coverage verbosity" />
- <ea:parameter property="coverage.report.name" default="coverage" description="the name of the generated report (without file type)" />
+ <ea:parameter property="target.main.classes" required="true" description="destination directory for compiled test classes" />
+ <ea:parameter property="target.test.classes" required="true" description="destination directory for compiled coverage test classes" />
+
+ <ea:parameter property="target" default="target" description="the target directory" />
+ <ea:parameter property="target.report" default="${target}/report" description="the target report directory" />
+
+ <ea:parameter property="coverage.exclude.filter" default="" description="a list of pattern that coverage framework will ignore during instrumentation phase" />
+ <ea:parameter property="coverage.verbosity" default="info" description="coverage verbosity" />
+ <ea:parameter property="coverage.report.name" default="coverage" description="the name of the generated report (without file type)" />
- <ea:parameter property="target.coverage.classes" default="${target}/coverage/classes" description="directory where coverage classes will be generated" />
- <ea:parameter property="target.coverage.report" default="${target.report}/coverage" description="directory where coverage report will be generated" />
-
- <ea:parameter path="compile.test.classpath" required="true" description="test compilation path" />
-
- <available file="${src.test.java}" property="has.src.test.java" />
- </target>
+ <ea:parameter property="target.coverage.classes" default="${target}/coverage/classes" description="directory where coverage classes will be generated" />
+ <ea:parameter property="target.coverage.report" default="${target.report}/coverage" description="directory where coverage report will be generated" />
+
+ <ea:parameter path="compile.test.classpath" required="true" description="test compilation path" />
+
+ <available file="${src.test.java}" property="has.src.test.java" />
+ </target>
</project>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-coverage/0.1/abstract-coverage.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-coverage/0.1/abstract-coverage.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-coverage/0.1/abstract-coverage.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-coverage/0.1/abstract-coverage.ivy Tue Feb 22 15:55:55 2011
@@ -15,16 +15,16 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.easyant.plugins"
- module="abstract-coverage"
- status="milestone"
- revision="0.1">
- <description>Abstract base plugin, that any modules providing
- test code coverage features should include. abstract-coverage
- defines common configuration properties governing code coverage
- behavior.</description>
- </info>
- <publications>
- <artifact type="ant" />
- </publications>
+ <info organisation="org.apache.easyant.plugins"
+ module="abstract-coverage"
+ status="milestone"
+ revision="0.1">
+ <description>Abstract base plugin, that any modules providing
+ test code coverage features should include. abstract-coverage
+ defines common configuration properties governing code coverage
+ behavior.</description>
+ </info>
+ <publications>
+ <artifact type="ant" />
+ </publications>
</ivy-module>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-test/0.1/abstract-test.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-test/0.1/abstract-test.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-test/0.1/abstract-test.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-test/0.1/abstract-test.ant Tue Feb 22 15:55:55 2011
@@ -15,106 +15,106 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#abstract-test"
- xmlns:ac="antlib:net.sf.antcontrib"
- xmlns:ea="antlib:org.apache.easyant">
+ xmlns:ac="antlib:net.sf.antcontrib"
+ xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="compile" />
- <ea:parameter phase="test-compile" />
- <ea:parameter phase="test" />
-
- <ea:parameter property="src.test.java" required="true"
- description="directory with unit test source files" />
- <ea:parameter property="src.test.integration.java" default="${basedir}/src/integration-test/java"
- description="directory for integration test source files" />
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="compile" />
+ <ea:parameter phase="test-compile" />
+ <ea:parameter phase="test" />
+
+ <ea:parameter property="src.test.java" required="true"
+ description="directory with unit test source files" />
+ <ea:parameter property="src.test.integration.java" default="${basedir}/src/integration-test/java"
+ description="directory for integration test source files" />
<ea:parameter property="src.test.resources" default="${basedir}/src/test/resources"
description="directory with unit test resource files (configuration files, data files, etc)" />
<ea:parameter property="src.test.integration.resources" default="${basedir}/src/integration-test/resources"
description="directory for integration test resources (configuration files, data files, etc)"/>
- <ea:parameter property="target.main.classes" required="true"
- description="directory where main compiled classes are" />
- <ea:parameter property="target.test.classes" required="true"
- description="destination directory for compiled unit test classes" />
- <ea:parameter property="target.test.integration.classes" default="${basedir}/target/integration-test/classes"
- description="destination directory for compiled integration test classes" />
-
-
- <ea:parameter property="target.test.xml" required="true"
- description="destination directory for xml test report" />
- <ea:parameter property="target.test.html" required="true"
- description="destination directory for html test report" />
-
- <ea:parameter property="test.mode" default="run"
- description="mode to use to execute tests: 'run' to only run tests, 'report' to generate html report" />
- <ea:parameter property="javac.debug.mode" default="true"
- description="javac debug mode, true or false" />
- <ea:parameter property="test.compile.includes.pattern" default="**/*.java"
- description="Pattern describing files included in test compilation process" />
- <ea:parameter property="test.compile.excludes.pattern" default=""
- description="Pattern describing files excluded in test compilation process" />
- <ea:parameter property="test.integration.compile.includes.pattern" default="**/*.java"
- description="Pattern describing files included in integration test compilation process" />
- <ea:parameter property="test.integration.compile.excludes.pattern" default=""
- description="Pattern describing files excluded in integration test compilation process" />
-
- <ea:parameter property="test.run.failonerror" default="true"
- description="specify if the build should be stopped when tests are failed. Typically this property should be set to false in continuous environmnent systems"/>
-
-
- <ea:parameter path="compile.main.classpath" required="true"
- description="path used to compile main sources" />
-
- <path id="compile.test.classpath">
- <pathelement location="${target.main.classes}" />
- <path refid="compile.main.classpath" />
+ <ea:parameter property="target.main.classes" required="true"
+ description="directory where main compiled classes are" />
+ <ea:parameter property="target.test.classes" required="true"
+ description="destination directory for compiled unit test classes" />
+ <ea:parameter property="target.test.integration.classes" default="${basedir}/target/integration-test/classes"
+ description="destination directory for compiled integration test classes" />
+
+
+ <ea:parameter property="target.test.xml" required="true"
+ description="destination directory for xml test report" />
+ <ea:parameter property="target.test.html" required="true"
+ description="destination directory for html test report" />
+
+ <ea:parameter property="test.mode" default="run"
+ description="mode to use to execute tests: 'run' to only run tests, 'report' to generate html report" />
+ <ea:parameter property="javac.debug.mode" default="true"
+ description="javac debug mode, true or false" />
+ <ea:parameter property="test.compile.includes.pattern" default="**/*.java"
+ description="Pattern describing files included in test compilation process" />
+ <ea:parameter property="test.compile.excludes.pattern" default=""
+ description="Pattern describing files excluded in test compilation process" />
+ <ea:parameter property="test.integration.compile.includes.pattern" default="**/*.java"
+ description="Pattern describing files included in integration test compilation process" />
+ <ea:parameter property="test.integration.compile.excludes.pattern" default=""
+ description="Pattern describing files excluded in integration test compilation process" />
+
+ <ea:parameter property="test.run.failonerror" default="true"
+ description="specify if the build should be stopped when tests are failed. Typically this property should be set to false in continuous environmnent systems"/>
+
+
+ <ea:parameter path="compile.main.classpath" required="true"
+ description="path used to compile main sources" />
+
+ <path id="compile.test.classpath">
+ <pathelement location="${target.main.classes}" />
+ <path refid="compile.main.classpath" />
</path>
- <available file="${src.test.java}" property="has.src.test.java" />
- <available file="${src.test.integration.java}" property="has.src.test.integration.java"/>
-
- <condition property="test.mode.run">
- <equals arg1="${test.mode}" arg2="run" />
- </condition>
-
- <condition property="test.mode.report">
- <equals arg1="${test.mode}" arg2="report" />
- </condition>
+ <available file="${src.test.java}" property="has.src.test.java" />
+ <available file="${src.test.integration.java}" property="has.src.test.integration.java"/>
+
+ <condition property="test.mode.run">
+ <equals arg1="${test.mode}" arg2="run" />
+ </condition>
+
+ <condition property="test.mode.report">
+ <equals arg1="${test.mode}" arg2="report" />
+ </condition>
<!-- shouldn't this be in junit plugin? -->
- <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"
- classpathref="org.apache.easyant.plugins#abstract-test.classpath" />
- <taskdef name="junitreport" classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"
- classpathref="org.apache.easyant.plugins#abstract-test.classpath" />
-
- </target>
-
- <macrodef name="check-test-result" description="check test results">
- <attribute name="propertytocheck"/>
- <attribute name="message" />
- <attribute name="echolevel" default="error"/>
- <sequential>
- <ac:if>
- <istrue value="${test.run.failonerror}"/>
- <ac:then>
- <fail if="@{propertytocheck}" message="@{message}" />
- </ac:then>
- <ac:else>
- <ac:if>
- <isset property="@{propertytocheck}"/>
- <ac:then>
- <echo message="@{message}" level="@{echolevel}"/>
- </ac:then>
- </ac:if>
- </ac:else>
- </ac:if>
- </sequential>
-
- </macrodef>
+ <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"
+ classpathref="org.apache.easyant.plugins#abstract-test.classpath" />
+ <taskdef name="junitreport" classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"
+ classpathref="org.apache.easyant.plugins#abstract-test.classpath" />
+
+ </target>
+
+ <macrodef name="check-test-result" description="check test results">
+ <attribute name="propertytocheck"/>
+ <attribute name="message" />
+ <attribute name="echolevel" default="error"/>
+ <sequential>
+ <ac:if>
+ <istrue value="${test.run.failonerror}"/>
+ <ac:then>
+ <fail if="@{propertytocheck}" message="@{message}" />
+ </ac:then>
+ <ac:else>
+ <ac:if>
+ <isset property="@{propertytocheck}"/>
+ <ac:then>
+ <echo message="@{message}" level="@{echolevel}"/>
+ </ac:then>
+ </ac:if>
+ </ac:else>
+ </ac:if>
+ </sequential>
+
+ </macrodef>
</project>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-test/0.1/abstract-test.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-test/0.1/abstract-test.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-test/0.1/abstract-test.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-test/0.1/abstract-test.ivy Tue Feb 22 15:55:55 2011
@@ -15,20 +15,20 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.easyant.plugins"
- module="abstract-test"
- status="milestone"
- revision="0.1">
- <description>This module provides tests compilation feature.<br/>
+ <info organisation="org.apache.easyant.plugins"
+ module="abstract-test"
+ status="milestone"
+ revision="0.1">
+ <description>This module provides tests compilation feature.<br/>
This module initialize compile.test.classpath and run.test.classpath.<br/>
Tests can be skipped using skip.test property.</description>
- </info>
- <publications>
- <artifact type="ant" />
- </publications>
-
- <dependencies>
- <dependency org="org.apache.ant" name="ant-junit" rev="1.8.2" />
- </dependencies>
-
+ </info>
+ <publications>
+ <artifact type="ant" />
+ </publications>
+
+ <dependencies>
+ <dependency org="org.apache.ant" name="ant-junit" rev="1.8.2" />
+ </dependencies>
+
</ivy-module>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antcontrib-activator/0.1/antcontrib-activator.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antcontrib-activator/0.1/antcontrib-activator.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antcontrib-activator/0.1/antcontrib-activator.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antcontrib-activator/0.1/antcontrib-activator.ant Tue Feb 22 15:55:55 2011
@@ -15,18 +15,18 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#antcontrib-activator"
- xmlns:ea="antlib:org.apache.easyant">
+ 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"/>
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate"/>
- <echo level="verbose" message="loading antcontrib"/>
-
- <taskdef resource="net/sf/antcontrib/antlib.xml"
- classpathref="org.apache.easyant.plugins#antcontrib-activator.classpath"/>
- </target>
-
- <target name="doit" depends=":init" />
+ <echo level="verbose" message="loading antcontrib"/>
+
+ <taskdef resource="net/sf/antcontrib/antlib.xml"
+ classpathref="org.apache.easyant.plugins#antcontrib-activator.classpath"/>
+ </target>
+
+ <target name="doit" depends=":init" />
</project>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antcontrib-activator/0.1/antcontrib-activator.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antcontrib-activator/0.1/antcontrib-activator.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antcontrib-activator/0.1/antcontrib-activator.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antcontrib-activator/0.1/antcontrib-activator.ivy Tue Feb 22 15:55:55 2011
@@ -15,18 +15,18 @@
limitations under the License.
-->
<ivy-module version="2.0" >
- <info organisation="org.apache.easyant.plugins"
- module="antcontrib-activator"
- status="milestone"
- revision="0.1">
- <description>
- This module is in charge to load antcontrib taksdefs.
- </description>
- </info>
- <publications>
- <artifact type="ant" />
- </publications>
- <dependencies>
- <dependency org="ant-contrib" name="ant-contrib" rev="1.0b2"/>
- </dependencies>
+ <info organisation="org.apache.easyant.plugins"
+ module="antcontrib-activator"
+ status="milestone"
+ revision="0.1">
+ <description>
+ This module is in charge to load antcontrib taksdefs.
+ </description>
+ </info>
+ <publications>
+ <artifact type="ant" />
+ </publications>
+ <dependencies>
+ <dependency org="ant-contrib" name="ant-contrib" rev="1.0b2"/>
+ </dependencies>
</ivy-module>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/antunit.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/antunit.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/antunit.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/antunit.ant Tue Feb 22 15:55:55 2011
@@ -15,157 +15,157 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#antunit"
- xmlns:ac="antlib:net.sf.antcontrib"
- xmlns:ea="antlib:org.apache.easyant"
- xmlns:au="antlib:org.apache.ant.antunit">
-
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <dirname property="antunit.plugin.dir" file="${org.apache.easyant.plugins#antunit.junit-frames.xsl.file}"/>
-
- <target name=":init" phase="validate" description="load parameters, antunit tasks, and create report directories">
-
- <ea:parameter phase="validate" />
- <ea:parameter phase="test" />
-
- <ea:parameter property="target.antunit.xml" default="${target}/antunit/xml" description="destination directory for xml test report" />
- <ea:parameter property="target.antunit.html" default="${target}/antunit/html" description="destination directory for html test report" />
-
- <!-- Create the default antunit stylesheet dir -->
- <property name="default.antunit.stylesheet.dir" value="${java.io.tmpdir}/antunit-stylesheet"/>
- <echo message="Copying default stylesheet in default.antunit.stylesheet.dir"/>
- <mkdir dir="${default.antunit.stylesheet.dir}" />
- <copy tofile="${default.antunit.stylesheet.dir}/junit-frames.xsl" file="${org.apache.easyant.plugins#antunit.junit-frames.xsl.file}" verbose="false"/>
- <copy tofile="${default.antunit.stylesheet.dir}/junit-noframes.xsl" file="${org.apache.easyant.plugins#antunit.junit-noframes.xsl.file}" verbose="false"/>
-
- <ea:parameter property="target.antunit.xsl.dir" default="${default.antunit.stylesheet.dir}" description="Location of directory containing XSL transforms for test reports"/>
-
- <ea:parameter property="src.test.antunit" default="src/test/antunit" description="directory where antunit test scripts are stored" />
- <ea:parameter property="antunit.testcase" description="specify a list of testcase that you want to run, if no one is specified includes pattern will be used" />
- <ea:parameter property="test.antunit.log.level" default="error" description="Verbosity level of messages from the antunit test: none, info, warn, error, debug, verbose" />
- <ea:parameter property="test.antunit.includes.pattern" description="Pattern describing files included in antunit test process" />
- <ea:parameter property="test.antunit.excludes.pattern" default="" description="Pattern describing files excluded in antunit test process" />
-
- <ea:parameter property="src.test.integration.antunit" default="src/integration-test/antunit"
- description="directory where antunit integration tests are stored. Integration tests are run after packaging, in the integration-test phase."/>
- <ea:parameter property="test.integration.antunit.includes.pattern" description="Pattern describing files included in antunit integration test process"/>
- <ea:parameter property="test.integration.antunit.excludes.pattern" default="" description="Pattern describing files excluded in antunit integration test process" />
-
- <ea:parameter property="test.run.failonerror" default="true"
- description="specify if the build should be stopped when tests are failed. Typically this property should be set to false in continuous environmnent systems"/>
-
-
- <condition property="test.antunit.includes.pattern" value="${antunit.testcase}" else="**/test.xml,**/*-test.xml">
- <isset property="antunit.testcase" />
- </condition>
+ xmlns:ac="antlib:net.sf.antcontrib"
+ xmlns:ea="antlib:org.apache.easyant"
+ xmlns:au="antlib:org.apache.ant.antunit">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <dirname property="antunit.plugin.dir" file="${org.apache.easyant.plugins#antunit.junit-frames.xsl.file}"/>
+
+ <target name=":init" phase="validate" description="load parameters, antunit tasks, and create report directories">
+
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="test" />
+
+ <ea:parameter property="target.antunit.xml" default="${target}/antunit/xml" description="destination directory for xml test report" />
+ <ea:parameter property="target.antunit.html" default="${target}/antunit/html" description="destination directory for html test report" />
+
+ <!-- Create the default antunit stylesheet dir -->
+ <property name="default.antunit.stylesheet.dir" value="${java.io.tmpdir}/antunit-stylesheet"/>
+ <echo message="Copying default stylesheet in default.antunit.stylesheet.dir"/>
+ <mkdir dir="${default.antunit.stylesheet.dir}" />
+ <copy tofile="${default.antunit.stylesheet.dir}/junit-frames.xsl" file="${org.apache.easyant.plugins#antunit.junit-frames.xsl.file}" verbose="false"/>
+ <copy tofile="${default.antunit.stylesheet.dir}/junit-noframes.xsl" file="${org.apache.easyant.plugins#antunit.junit-noframes.xsl.file}" verbose="false"/>
+
+ <ea:parameter property="target.antunit.xsl.dir" default="${default.antunit.stylesheet.dir}" description="Location of directory containing XSL transforms for test reports"/>
+
+ <ea:parameter property="src.test.antunit" default="src/test/antunit" description="directory where antunit test scripts are stored" />
+ <ea:parameter property="antunit.testcase" description="specify a list of testcase that you want to run, if no one is specified includes pattern will be used" />
+ <ea:parameter property="test.antunit.log.level" default="error" description="Verbosity level of messages from the antunit test: none, info, warn, error, debug, verbose" />
+ <ea:parameter property="test.antunit.includes.pattern" description="Pattern describing files included in antunit test process" />
+ <ea:parameter property="test.antunit.excludes.pattern" default="" description="Pattern describing files excluded in antunit test process" />
+
+ <ea:parameter property="src.test.integration.antunit" default="src/integration-test/antunit"
+ description="directory where antunit integration tests are stored. Integration tests are run after packaging, in the integration-test phase."/>
+ <ea:parameter property="test.integration.antunit.includes.pattern" description="Pattern describing files included in antunit integration test process"/>
+ <ea:parameter property="test.integration.antunit.excludes.pattern" default="" description="Pattern describing files excluded in antunit integration test process" />
+
+ <ea:parameter property="test.run.failonerror" default="true"
+ description="specify if the build should be stopped when tests are failed. Typically this property should be set to false in continuous environmnent systems"/>
+
+
+ <condition property="test.antunit.includes.pattern" value="${antunit.testcase}" else="**/test.xml,**/*-test.xml">
+ <isset property="antunit.testcase" />
+ </condition>
<condition property="test.integration.antunit.includes.pattern" value="${antunit.testcase}" else="**/test.xml,**/*-test.xml">
<isset property="antunit.testcase" />
</condition>
- <!--Load antunit tasks -->
- <taskdef uri="antlib:org.apache.ant.antunit" resource="org/apache/ant/antunit/antlib.xml" classpathref="org.apache.easyant.plugins#antunit.classpath"/>
- <taskdef name="junitreport" classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"
- classpathref="org.apache.easyant.plugins#antunit.classpath" onerror="ignore"/>
-
- <mkdir dir="${target.antunit.xml}"/>
- <mkdir dir="${target.antunit.html}"/>
-
- <available file="${src.test.antunit}" property="has.src.test.antunit" />
- <available file="${src.test.integration.antunit}" property="has.src.test.integration.antunit"/>
-
- <condition property="skip.antunit.test">
- <not><isset property="has.src.test.antunit"/></not>
- </condition>
-
- <condition property="skip.antunit.integration">
- <not><isset property="has.src.test.integration.antunit"/></not>
- </condition>
-
- </target>
-
- <macrodef name="antunit-test">
- <attribute name="prefix"/>
- <sequential>
- <au:antunit failOnError="false" errorProperty="@{prefix}.failed">
- <propertySet>
- <propertyref name="ant.file.org.apache.easyant#easyant" />
- <propertyref regex="org\.apache\.easyant.*" />
- <propertyref name="org.apache.tools.ant.ProjectHelper"/>
- </propertySet>
- <referenceSet>
- <reference regex="^easyant\..*"/>
- <reference regex="^plugin\..*"/>
- <reference refid="ant.projectHelper"/>
- <reference refid="ant.executor"/>
- </referenceSet>
- <fileset dir="${src.@{prefix}.antunit}" includes="${@{prefix}.antunit.includes.pattern}" excludes="${@{prefix}.antunit.excludes.pattern}" />
- <au:plainlistener logLevel="${test.antunit.log.level}"/>
- <au:xmllistener toDir="${target.antunit.xml}" logLevel="${test.antunit.log.level}"/>
- </au:antunit>
- </sequential>
- </macrodef>
-
- <target name="-test" depends="validate" unless="skip.antunit.test">
- <antunit-test prefix="test"/>
- </target>
-
- <target name="-integration-test" depends="validate" unless="skip.antunit.integration">
- <antunit-test prefix="test.integration"/>
- </target>
-
- <macrodef name="check-test-result" description="check test results">
- <attribute name="propertytocheck"/>
- <attribute name="message" />
- <attribute name="echolevel" default="error"/>
- <sequential>
- <ac:if>
- <istrue value="${test.run.failonerror}"/>
- <ac:then>
- <fail if="@{propertytocheck}" message="@{message}" />
- </ac:then>
- <ac:else>
- <ac:if>
- <isset property="@{propertytocheck}"/>
- <ac:then>
- <echo message="@{message}" level="@{echolevel}"/>
- </ac:then>
- </ac:if>
- </ac:else>
- </ac:if>
- </sequential>
- </macrodef>
-
-
- <target name=":run" depends="-test" if="test.mode.run" unless="skip.antunit.test"
- phase="test" description="run all antunit 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" depends="-integration-test"
- if="test.mode.run" unless="skip.antunit.integration"
- phase="integration-test" description="run antunit 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.antunit.test" depends="-test,-integration-test"
- phase="report" description="generate junit report">
- <junitreport todir="${target.test.xml}">
- <fileset dir="${target.test.xml}">
- <include name="TEST-*.xml" />
- </fileset>
- <report format="frames" todir="${target.test.html}" />
- </junitreport>
- <fail if="test.failed"
- message="At least one test has failed. See logs in ${target.test.xml} or report in ${target.test.html}" />
- <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" />
-
+ <!--Load antunit tasks -->
+ <taskdef uri="antlib:org.apache.ant.antunit" resource="org/apache/ant/antunit/antlib.xml" classpathref="org.apache.easyant.plugins#antunit.classpath"/>
+ <taskdef name="junitreport" classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"
+ classpathref="org.apache.easyant.plugins#antunit.classpath" onerror="ignore"/>
+
+ <mkdir dir="${target.antunit.xml}"/>
+ <mkdir dir="${target.antunit.html}"/>
+
+ <available file="${src.test.antunit}" property="has.src.test.antunit" />
+ <available file="${src.test.integration.antunit}" property="has.src.test.integration.antunit"/>
+
+ <condition property="skip.antunit.test">
+ <not><isset property="has.src.test.antunit"/></not>
+ </condition>
+
+ <condition property="skip.antunit.integration">
+ <not><isset property="has.src.test.integration.antunit"/></not>
+ </condition>
+
+ </target>
+
+ <macrodef name="antunit-test">
+ <attribute name="prefix"/>
+ <sequential>
+ <au:antunit failOnError="false" errorProperty="@{prefix}.failed">
+ <propertySet>
+ <propertyref name="ant.file.org.apache.easyant#easyant" />
+ <propertyref regex="org\.apache\.easyant.*" />
+ <propertyref name="org.apache.tools.ant.ProjectHelper"/>
+ </propertySet>
+ <referenceSet>
+ <reference regex="^easyant\..*"/>
+ <reference regex="^plugin\..*"/>
+ <reference refid="ant.projectHelper"/>
+ <reference refid="ant.executor"/>
+ </referenceSet>
+ <fileset dir="${src.@{prefix}.antunit}" includes="${@{prefix}.antunit.includes.pattern}" excludes="${@{prefix}.antunit.excludes.pattern}" />
+ <au:plainlistener logLevel="${test.antunit.log.level}"/>
+ <au:xmllistener toDir="${target.antunit.xml}" logLevel="${test.antunit.log.level}"/>
+ </au:antunit>
+ </sequential>
+ </macrodef>
+
+ <target name="-test" depends="validate" unless="skip.antunit.test">
+ <antunit-test prefix="test"/>
+ </target>
+
+ <target name="-integration-test" depends="validate" unless="skip.antunit.integration">
+ <antunit-test prefix="test.integration"/>
+ </target>
+
+ <macrodef name="check-test-result" description="check test results">
+ <attribute name="propertytocheck"/>
+ <attribute name="message" />
+ <attribute name="echolevel" default="error"/>
+ <sequential>
+ <ac:if>
+ <istrue value="${test.run.failonerror}"/>
+ <ac:then>
+ <fail if="@{propertytocheck}" message="@{message}" />
+ </ac:then>
+ <ac:else>
+ <ac:if>
+ <isset property="@{propertytocheck}"/>
+ <ac:then>
+ <echo message="@{message}" level="@{echolevel}"/>
+ </ac:then>
+ </ac:if>
+ </ac:else>
+ </ac:if>
+ </sequential>
+ </macrodef>
+
+
+ <target name=":run" depends="-test" if="test.mode.run" unless="skip.antunit.test"
+ phase="test" description="run all antunit 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" depends="-integration-test"
+ if="test.mode.run" unless="skip.antunit.integration"
+ phase="integration-test" description="run antunit 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.antunit.test" depends="-test,-integration-test"
+ phase="report" description="generate junit report">
+ <junitreport todir="${target.test.xml}">
+ <fileset dir="${target.test.xml}">
+ <include name="TEST-*.xml" />
+ </fileset>
+ <report format="frames" todir="${target.test.html}" />
+ </junitreport>
+ <fail if="test.failed"
+ message="At least one test has failed. See logs in ${target.test.xml} or report in ${target.test.html}" />
+ <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/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/antunit.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/antunit.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/antunit.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/antunit.ivy Tue Feb 22 15:55:55 2011
@@ -15,19 +15,19 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.easyant.plugins"
- module="antunit"
- status="milestone"
- revision="0.1">
- <description>This module provides antunit test features.</description>
- </info>
- <publications>
- <artifact type="ant" />
- <artifact name="junit-frames" type="xsl" />
- <artifact name="junit-noframes" type="xsl" />
- </publications>
- <dependencies>
- <dependency org="org.apache.ant" name="ant-antunit" rev="1.2alpha"/>
- <dependency org="org.apache.ant" name="ant-junit" rev="1.7.1"/>
- </dependencies>
+ <info organisation="org.apache.easyant.plugins"
+ module="antunit"
+ status="milestone"
+ revision="0.1">
+ <description>This module provides antunit test features.</description>
+ </info>
+ <publications>
+ <artifact type="ant" />
+ <artifact name="junit-frames" type="xsl" />
+ <artifact name="junit-noframes" type="xsl" />
+ </publications>
+ <dependencies>
+ <dependency org="org.apache.ant" name="ant-antunit" rev="1.2alpha"/>
+ <dependency org="org.apache.ant" name="ant-junit" rev="1.7.1"/>
+ </dependencies>
</ivy-module>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/junit-frames.xsl
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/junit-frames.xsl?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/junit-frames.xsl (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/junit-frames.xsl Tue Feb 22 15:55:55 2011
@@ -217,38 +217,38 @@ h6 {
<xsl:template match="testsuites" mode="all.tests">
<xsl:param name="type" select="'all'"/>
<html>
- <xsl:variable name="title">
- <xsl:choose>
- <xsl:when test="$type = 'fails'">
- <xsl:text>All Failures</xsl:text>
- </xsl:when>
- <xsl:when test="$type = 'errors'">
- <xsl:text>All Errors</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>All Tests</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <head>
- <title>AntUnit Test Results: <xsl:value-of select="$title"/></title>
- <xsl:call-template name="create.stylesheet.link">
+ <xsl:variable name="title">
+ <xsl:choose>
+ <xsl:when test="$type = 'fails'">
+ <xsl:text>All Failures</xsl:text>
+ </xsl:when>
+ <xsl:when test="$type = 'errors'">
+ <xsl:text>All Errors</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>All Tests</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <head>
+ <title>AntUnit Test Results: <xsl:value-of select="$title"/></title>
+ <xsl:call-template name="create.stylesheet.link">
<xsl:with-param name="directory.name"/>
</xsl:call-template>
- </head>
- <body>
- <xsl:attribute name="onload">open('allprojects-frame.html','projectListFrame')</xsl:attribute>
+ </head>
+ <body>
+ <xsl:attribute name="onload">open('allprojects-frame.html','projectListFrame')</xsl:attribute>
<xsl:call-template name="pageHeader"/>
<h2><xsl:value-of select="$title"/></h2>
<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
- <xsl:call-template name="testcase.test.header">
- <xsl:with-param name="show.project" select="'yes'"/>
- </xsl:call-template>
- <!--
+ <xsl:call-template name="testcase.test.header">
+ <xsl:with-param name="show.project" select="'yes'"/>
+ </xsl:call-template>
+ <!--
test can even not be started at all (failure to load the project)
- so report the error directly
- -->
+ so report the error directly
+ -->
<xsl:if test="./error">
<tr class="Error">
<td colspan="4">
@@ -339,39 +339,39 @@ h6 {
<xsl:apply-templates select="." mode="print.test"/>
</table>
- <xsl:choose>
- <xsl:when test="$type = 'fails'">
- <h2>Failures</h2>
- </xsl:when>
- <xsl:when test="$type = 'errors'">
- <h2>Errors</h2>
- </xsl:when>
- <xsl:otherwise>
- <h2>Tests</h2>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="$type = 'fails'">
+ <h2>Failures</h2>
+ </xsl:when>
+ <xsl:when test="$type = 'errors'">
+ <h2>Errors</h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <h2>Tests</h2>
+ </xsl:otherwise>
+ </xsl:choose>
<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
- <xsl:call-template name="testcase.test.header"/>
- <!--
+ <xsl:call-template name="testcase.test.header"/>
+ <!--
test can even not be started at all (failure to load the project)
- so report the error directly
- -->
+ so report the error directly
+ -->
<xsl:if test="./error">
<tr class="Error">
<td colspan="4"><xsl:apply-templates select="./error"/></td>
</tr>
</xsl:if>
- <xsl:choose>
- <xsl:when test="$type = 'fails'">
- <xsl:apply-templates select="./testcase[failure]" mode="print.test"/>
- </xsl:when>
- <xsl:when test="$type = 'errors'">
- <xsl:apply-templates select="./testcase[error]" mode="print.test"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="./testcase" mode="print.test"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="$type = 'fails'">
+ <xsl:apply-templates select="./testcase[failure]" mode="print.test"/>
+ </xsl:when>
+ <xsl:when test="$type = 'errors'">
+ <xsl:apply-templates select="./testcase[error]" mode="print.test"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="./testcase" mode="print.test"/>
+ </xsl:otherwise>
+ </xsl:choose>
</table>
<!--div class="Properties">
<a>
@@ -715,9 +715,9 @@ h6 {
<xsl:template name="testcase.test.header">
<xsl:param name="show.project" select="''"/>
<tr valign="top">
- <xsl:if test="boolean($show.project)">
- <th>Project</th>
- </xsl:if>
+ <xsl:if test="boolean($show.project)">
+ <th>Project</th>
+ </xsl:if>
<th>Name</th>
<th>Status</th>
<th width="80%">Type</th>
@@ -739,25 +739,25 @@ h6 {
<td><a title="Display all tests" href="{@id}_{@name}.html"><xsl:value-of select="@name"/></a></td>
<td><a title="Display all tests" href="{@id}_{@name}.html"><xsl:apply-templates select="tests/text()"/></a></td>
<td>
- <xsl:choose>
- <xsl:when test="errors/text() != 0">
- <a title="Display only errors" href="{@id}_{@name}-errors.html"><xsl:apply-templates select="errors/text()"/></a>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="errors/text()"/>
- </xsl:otherwise>
- </xsl:choose>
- </td>
+ <xsl:choose>
+ <xsl:when test="errors/text() != 0">
+ <a title="Display only errors" href="{@id}_{@name}-errors.html"><xsl:apply-templates select="errors/text()"/></a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="errors/text()"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
<td>
- <xsl:choose>
- <xsl:when test="failures/text() != 0">
- <a title="Display only failures" href="{@id}_{@name}-fails.html"><xsl:apply-templates select="failures/text()"/></a>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="failures/text()"/>
- </xsl:otherwise>
- </xsl:choose>
- </td>
+ <xsl:choose>
+ <xsl:when test="failures/text() != 0">
+ <a title="Display only failures" href="{@id}_{@name}-fails.html"><xsl:apply-templates select="failures/text()"/></a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="failures/text()"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
<td><xsl:call-template name="display-time">
<xsl:with-param name="value" select="time/text()"/>
</xsl:call-template>
@@ -777,23 +777,23 @@ h6 {
<xsl:otherwise>TableRowColor</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
- <xsl:variable name="project.href">
- <xsl:value-of select="concat(translate(../@package,'.','/'), '/', ../@id, '_', ../@name, '.html')"/>
- </xsl:variable>
- <xsl:if test="boolean($show.project)">
- <td><a href="{$project.href}"><xsl:value-of select="../@name"/></a></td>
- </xsl:if>
+ <xsl:variable name="project.href">
+ <xsl:value-of select="concat(translate(../@package,'.','/'), '/', ../@id, '_', ../@name, '.html')"/>
+ </xsl:variable>
+ <xsl:if test="boolean($show.project)">
+ <td><a href="{$project.href}"><xsl:value-of select="../@name"/></a></td>
+ </xsl:if>
<td>
- <a name="{@name}"/>
- <xsl:choose>
- <xsl:when test="boolean($show.project)">
- <a href="{concat($project.href, '#', @name)}"><xsl:value-of select="@name"/></a>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@name"/>
- </xsl:otherwise>
- </xsl:choose>
- </td>
+ <a name="{@name}"/>
+ <xsl:choose>
+ <xsl:when test="boolean($show.project)">
+ <a href="{concat($project.href, '#', @name)}"><xsl:value-of select="@name"/></a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="@name"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
<xsl:choose>
<xsl:when test="failure">
<td>Failure</td>
@@ -859,7 +859,7 @@ h6 {
<xsl:template name="JS-escape">
<xsl:param name="string"/>
- <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/>
+ <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\')"/>
<xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/>
<xsl:value-of select="$tmp2"/>
</xsl:template>
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/junit-noframes.xsl
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/junit-noframes.xsl?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/junit-noframes.xsl (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antunit/0.1/junit-noframes.xsl Tue Feb 22 15:55:55 2011
@@ -455,7 +455,7 @@
<xsl:template name="JS-escape">
<xsl:param name="string"/>
- <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/>
+ <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\')"/>
<xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/>
<xsl:value-of select="$tmp2"/>
</xsl:template>