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 [1/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...
Author: hibou
Date: Tue Feb 22 14:59:17 2011
New Revision: 1073355
URL: http://svn.apache.org/viewvc?rev=1073355&view=rev
Log:
4 spaces in place of tabulations
Modified:
incubator/easyant/plugins/trunk/abstract-coverage/module.ivy
incubator/easyant/plugins/trunk/abstract-coverage/src/main/resources/abstract-coverage.ant
incubator/easyant/plugins/trunk/abstract-test/module.ivy
incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant
incubator/easyant/plugins/trunk/antcontrib-activator/module.ivy
incubator/easyant/plugins/trunk/antcontrib-activator/src/main/resources/antcontrib-activator.ant
incubator/easyant/plugins/trunk/antunit/module.ivy
incubator/easyant/plugins/trunk/antunit/src/main/resources/antunit.ant
incubator/easyant/plugins/trunk/antunit/src/main/resources/junit-frames.xsl
incubator/easyant/plugins/trunk/antunit/src/main/resources/junit-noframes.xsl
incubator/easyant/plugins/trunk/build-tools/module.ivy
incubator/easyant/plugins/trunk/build-tools/src/main/resources/build-tools.ant
incubator/easyant/plugins/trunk/checkstyle/module.ivy
incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.ant
incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.xml
incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.xsl
incubator/easyant/plugins/trunk/clean-std/module.ivy
incubator/easyant/plugins/trunk/clean-std/src/main/resources/clean-std.ant
incubator/easyant/plugins/trunk/compile-groovy/module.ivy
incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant
incubator/easyant/plugins/trunk/compile-java/module.ivy
incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant
incubator/easyant/plugins/trunk/compile-scala/module.ivy
incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant
incubator/easyant/plugins/trunk/compile-test-groovy/module.ivy
incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant
incubator/easyant/plugins/trunk/compile-test-java/module.ivy
incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant
incubator/easyant/plugins/trunk/compile-test-scala/module.ivy
incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant
incubator/easyant/plugins/trunk/coverage-cobertura/module.ivy
incubator/easyant/plugins/trunk/coverage-cobertura/src/main/resources/coverage-cobertura.ant
incubator/easyant/plugins/trunk/default-version-strategy/module.ivy
incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant
incubator/easyant/plugins/trunk/deps-lib/module.ivy
incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant
incubator/easyant/plugins/trunk/distribution/module.ivy
incubator/easyant/plugins/trunk/distribution/src/main/resources/distribution.ant
incubator/easyant/plugins/trunk/docbook/module.ivy
incubator/easyant/plugins/trunk/docbook/src/main/resources/docbook.ant
incubator/easyant/plugins/trunk/documentation/module.ivy
incubator/easyant/plugins/trunk/documentation/src/main/resources/documentation.ant
incubator/easyant/plugins/trunk/documentation/src/main/resources/site.xsl
incubator/easyant/plugins/trunk/documentation/src/main/resources/style.css
incubator/easyant/plugins/trunk/eadoc/module.ivy
incubator/easyant/plugins/trunk/eadoc/src/main/resources/eadoc-buildtype.xsl
incubator/easyant/plugins/trunk/eadoc/src/main/resources/eadoc-plugin.xsl
incubator/easyant/plugins/trunk/eadoc/src/main/resources/eadoc.ant
incubator/easyant/plugins/trunk/easyant-plugin-publication/module.ivy
incubator/easyant/plugins/trunk/easyant-plugin-publication/src/main/resources/easyant-plugin-publication.ant
incubator/easyant/plugins/trunk/emma/module.ivy
incubator/easyant/plugins/trunk/emma/src/main/resources/emma.ant
incubator/easyant/plugins/trunk/ivy-provisioning/module.ivy
incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant
incubator/easyant/plugins/trunk/ivy-publication/module.ivy
incubator/easyant/plugins/trunk/ivy-publication/src/main/resources/ivy-publication.ant
incubator/easyant/plugins/trunk/ivy-repo-management/module.ivy
incubator/easyant/plugins/trunk/ivy-repo-management/src/main/resources/ivy-repo-management.ant
incubator/easyant/plugins/trunk/ivy-utils/module.ivy
incubator/easyant/plugins/trunk/ivy-utils/src/main/resources/ivy-utils.ant
incubator/easyant/plugins/trunk/javadoc/module.ivy
incubator/easyant/plugins/trunk/javadoc/src/main/resources/javadoc.ant
incubator/easyant/plugins/trunk/jetty-deploy/module.ivy
incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant
incubator/easyant/plugins/trunk/manifest/module.ivy
incubator/easyant/plugins/trunk/manifest/src/main/resources/manifest.ant
incubator/easyant/plugins/trunk/maven-publication/module.ivy
incubator/easyant/plugins/trunk/maven-publication/src/main/resources/maven-publication.ant
incubator/easyant/plugins/trunk/maven-version-strategy/module.ivy
incubator/easyant/plugins/trunk/maven-version-strategy/src/main/resources/maven-version-strategy.ant
incubator/easyant/plugins/trunk/module.ivy
incubator/easyant/plugins/trunk/osgi-bundle/module.ivy
incubator/easyant/plugins/trunk/osgi-bundle/src/main/resources/osgi-bundle.ant
incubator/easyant/plugins/trunk/package-jar/module.ivy
incubator/easyant/plugins/trunk/package-jar/src/main/resources/package-jar.ant
incubator/easyant/plugins/trunk/package-test-jar/module.ivy
incubator/easyant/plugins/trunk/package-test-jar/src/main/resources/package-test-jar.ant
incubator/easyant/plugins/trunk/package-war/module.ivy
incubator/easyant/plugins/trunk/package-war/src/main/resources/package-war.ant
incubator/easyant/plugins/trunk/phases-std/module.ivy
incubator/easyant/plugins/trunk/phases-std/src/main/resources/phases-std.ant
incubator/easyant/plugins/trunk/rat/module.ivy
incubator/easyant/plugins/trunk/rat/src/main/resources/rat.ant
incubator/easyant/plugins/trunk/rat/src/test/antunit/rat-test.xml
incubator/easyant/plugins/trunk/resources-std/module.ivy
incubator/easyant/plugins/trunk/resources-std/src/main/resources/resources-std.ant
incubator/easyant/plugins/trunk/run-java/module.ivy
incubator/easyant/plugins/trunk/run-java/src/main/resources/run-java.ant
incubator/easyant/plugins/trunk/scaladoc/module.ivy
incubator/easyant/plugins/trunk/scaladoc/src/main/resources/scaladoc.ant
incubator/easyant/plugins/trunk/scm-svn/module.ivy
incubator/easyant/plugins/trunk/scm-svn/src/main/resources/scm-svn.ant
incubator/easyant/plugins/trunk/skeleton/module.ivy
incubator/easyant/plugins/trunk/skeleton/src/main/resources/ivy.xml.tpl
incubator/easyant/plugins/trunk/skeleton/src/main/resources/skeleton.ant
incubator/easyant/plugins/trunk/source-jar/module.ivy
incubator/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant
incubator/easyant/plugins/trunk/test-junit/module.ivy
incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant
incubator/easyant/plugins/trunk/test-testng/module.ivy
incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant
incubator/easyant/plugins/trunk/webstart/module.ivy
incubator/easyant/plugins/trunk/webstart/src/main/resources/webstart.ant
incubator/easyant/plugins/trunk/webstart/src/test/antunit/common/test-utils.ant
incubator/easyant/plugins/trunk/webstart/src/test/antunit/webstart-test.xml
incubator/easyant/plugins/trunk/xooki/module.ivy
incubator/easyant/plugins/trunk/xooki/src/main/resources/xooki.ant
Modified: incubator/easyant/plugins/trunk/abstract-coverage/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-coverage/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-coverage/module.ivy (original)
+++ incubator/easyant/plugins/trunk/abstract-coverage/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="abstract-coverage" 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>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="abstract-coverage" 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>
+ <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/abstract-coverage/src/main/resources/abstract-coverage.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-coverage/src/main/resources/abstract-coverage.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-coverage/src/main/resources/abstract-coverage.ant (original)
+++ incubator/easyant/plugins/trunk/abstract-coverage/src/main/resources/abstract-coverage.ant Tue Feb 22 14:59:17 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/plugins/trunk/abstract-test/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-test/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-test/module.ivy (original)
+++ incubator/easyant/plugins/trunk/abstract-test/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,24 +15,24 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="abstract-test" revision="0.1">
- <description>This module provides tests compilation feature.<br/>
+ <info organisation="org.apache.easyant.plugins" module="abstract-test" 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>
- <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>
-
- <dependencies>
- <dependency org="org.apache.ant" name="ant-junit" rev="1.8.2"/>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
+
+ <dependencies>
+ <dependency org="org.apache.ant" name="ant-junit" rev="1.8.2"/>
- </dependencies>
-
+ </dependencies>
+
</ivy-module>
Modified: incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant (original)
+++ incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant Tue Feb 22 14:59:17 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/plugins/trunk/antcontrib-activator/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/antcontrib-activator/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/antcontrib-activator/module.ivy (original)
+++ incubator/easyant/plugins/trunk/antcontrib-activator/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,21 +15,21 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="antcontrib-activator" revision="0.1">
- <description>
- This module is in charge to load antcontrib taksdefs.
- </description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="antcontrib-activator" revision="0.1">
+ <description>
+ This module is in charge to load antcontrib taksdefs.
+ </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="ant-contrib" name="ant-contrib" rev="1.0b2"/>
- </dependencies>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
+ <dependencies>
+ <dependency org="ant-contrib" name="ant-contrib" rev="1.0b2"/>
+ </dependencies>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/antcontrib-activator/src/main/resources/antcontrib-activator.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/antcontrib-activator/src/main/resources/antcontrib-activator.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/antcontrib-activator/src/main/resources/antcontrib-activator.ant (original)
+++ incubator/easyant/plugins/trunk/antcontrib-activator/src/main/resources/antcontrib-activator.ant Tue Feb 22 14:59:17 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/plugins/trunk/antunit/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/antunit/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/antunit/module.ivy (original)
+++ incubator/easyant/plugins/trunk/antunit/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="antunit" revision="0.1">
- <description>This module provides antunit test features.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="antunit" revision="0.1">
+ <description>This module provides antunit test features.</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="junit-frames" type="xsl"/>
- <artifact name="junit-noframes" type="xsl"/>
- </publications>
- <dependencies>
- <dependency org="org.apache.ant" name="ant-antunit" rev="1.2alpha" conf="default->default"/>
- <dependency org="org.apache.ant" name="ant-junit" rev="1.7.1" conf="default->default"/>
- </dependencies>
+ <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" conf="default->default"/>
+ <dependency org="org.apache.ant" name="ant-junit" rev="1.7.1" conf="default->default"/>
+ </dependencies>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/antunit/src/main/resources/antunit.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/antunit/src/main/resources/antunit.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/antunit/src/main/resources/antunit.ant (original)
+++ incubator/easyant/plugins/trunk/antunit/src/main/resources/antunit.ant Tue Feb 22 14:59:17 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/plugins/trunk/antunit/src/main/resources/junit-frames.xsl
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/antunit/src/main/resources/junit-frames.xsl?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/antunit/src/main/resources/junit-frames.xsl (original)
+++ incubator/easyant/plugins/trunk/antunit/src/main/resources/junit-frames.xsl Tue Feb 22 14:59:17 2011
@@ -235,38 +235,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">
@@ -357,39 +357,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>
@@ -733,9 +733,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>
@@ -757,25 +757,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>
@@ -795,23 +795,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>
@@ -877,7 +877,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/plugins/trunk/antunit/src/main/resources/junit-noframes.xsl
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/antunit/src/main/resources/junit-noframes.xsl?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/antunit/src/main/resources/junit-noframes.xsl (original)
+++ incubator/easyant/plugins/trunk/antunit/src/main/resources/junit-noframes.xsl Tue Feb 22 14:59:17 2011
@@ -472,7 +472,7 @@ under the License.
<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/plugins/trunk/build-tools/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/build-tools/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/build-tools/module.ivy (original)
+++ incubator/easyant/plugins/trunk/build-tools/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,16 +15,16 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="build-tools" revision="0.2">
- <description>This module is a build tools for multi-module projects.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="build-tools" revision="0.2">
+ <description>This module is a build tools for multi-module 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"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/build-tools/src/main/resources/build-tools.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/build-tools/src/main/resources/build-tools.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/build-tools/src/main/resources/build-tools.ant (original)
+++ incubator/easyant/plugins/trunk/build-tools/src/main/resources/build-tools.ant Tue Feb 22 14:59:17 2011
@@ -15,27 +15,26 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#build-tools"
- xmlns:ea="antlib:org.apache.easyant"
- xmlns:ivy="antlib:org.apache.ivy.ant">
+ xmlns:ea="antlib:org.apache.easyant"
+ xmlns:ivy="antlib:org.apache.ivy.ant">
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
-
- <ea:parameter phase="validate" />
- <ea:parameter phase="verify" />
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <target name=":init" phase="validate">
+
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="verify" />
- <ea:parameter property="project.ivy.instance" default="project.ivy.instance"
- description="ivy instance name"/>
- <ea:parameter property="project.ivy.file" required="true"
- description="ivy file (use to resolve dependencies for the project)"/>
- <ea:parameter property="pre.module.targets" default="validate,clean"
- description="list of targets that must be executed BEFORE subproject(s) delegation"/>
-
- <ea:parameter property="submodule.dirs" description="pattern or comma-separated list indicating which submodules directories should be included in the build" default="**/*"/>
- </target>
-
- <target name="doit" depends="verify" />
-
+ <ea:parameter property="project.ivy.instance" default="project.ivy.instance"
+ description="ivy instance name"/>
+ <ea:parameter property="project.ivy.file" required="true"
+ description="ivy file (use to resolve dependencies for the project)"/>
+ <ea:parameter property="pre.module.targets" default="validate,clean"
+ description="list of targets that must be executed BEFORE subproject(s) delegation"/>
+
+ <ea:parameter property="submodule.dirs" description="pattern or comma-separated list indicating which submodules directories should be included in the build" default="**/*"/>
+ </target>
+
+ <target name="doit" depends="verify" />
+
</project>
-
Modified: incubator/easyant/plugins/trunk/checkstyle/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/checkstyle/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/checkstyle/module.ivy (original)
+++ incubator/easyant/plugins/trunk/checkstyle/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,28 +15,28 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="checkstyle" revision="0.1">
- <description>This module is used to check code quality.<br/>
+ <info organisation="org.apache.easyant.plugins" module="checkstyle" revision="0.1">
+ <description>This module is used to check code quality.<br/>
By default this module generates XML report, but you can use a specific target (:report-html) to generate HTML report.<br/>
This module can breaks the build-process, if code is not conform to a Checkstyle rules.<br/>
You can easily change checkstyles rules by changing checkstyle.config.file property.<br/>
Checkstyles target can be skipped using skip.checkstyle property</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"/>
- <artifact type="xml"/>
- <artifact type="xsl"/>
- </publications>
- <dependencies>
- <dependency org="checkstyle" name="checkstyle" rev="4.4"/>
- <dependency org="antlr" name="antlr" rev="2.7.6"/>
- <dependency org="commons-beanutils" name="commons-beanutils-core" rev="1.7.0"/>
- <dependency org="commons-logging" name="commons-logging" rev="1.0.3"/>
- </dependencies>
+ <publications>
+ <artifact type="ant"/>
+ <artifact type="xml"/>
+ <artifact type="xsl"/>
+ </publications>
+ <dependencies>
+ <dependency org="checkstyle" name="checkstyle" rev="4.4"/>
+ <dependency org="antlr" name="antlr" rev="2.7.6"/>
+ <dependency org="commons-beanutils" name="commons-beanutils-core" rev="1.7.0"/>
+ <dependency org="commons-logging" name="commons-logging" rev="1.0.3"/>
+ </dependencies>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.ant (original)
+++ incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.ant Tue Feb 22 14:59:17 2011
@@ -16,51 +16,51 @@
-->
<project name="org.apache.easyant.plugins#checkstyle" xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <dirname file="${ant.file.org.apache.easyant.plugins#checkstyle}" property="ant.dir.org.apache.easyant.plugins#checkstyle" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="verify"/>
- <ea:parameter phase="report" />
-
- <ea:parameter property="checkstyle.xsl.file" default="${ant.dir.org.apache.easyant.plugins#checkstyle}/checkstyle.xsl" description="checkstyle xsl, used to transform XML -> HTML" />
- <ea:parameter property="checkstyle.config.file" default="${ant.dir.org.apache.easyant.plugins#checkstyle}/checkstyle.xml" description="checkstyle rules file" />
- <ea:parameter property="target.checkstyle.report" default="${target.report}/checkstyle" description="directory where checkstyle report will be generated" />
- <ea:parameter property="checkstyle.report.name" default="checkstyle_report" description="the name of the generated report (without file type)" />
-
- <available property="checkstyle.available" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" classpathref="org.apache.easyant.plugins#checkstyle.classpath" />
-
- <fail unless="checkstyle.available" message="Checkstyle is unavailable!" />
- <condition property="xslt.available">
- <available classname="org.apache.tools.ant.taskdefs.optional.TraXLiaison" />
- </condition>
- <fail message="Ant xslt was not found. Please install ant-nodeps in your ANT_HOME" unless="xslt.available" />
-
- <taskdef resource="checkstyletask.properties" classpathref="org.apache.easyant.plugins#checkstyle.classpath" />
-
-
- <available file="${src.main.java}" property="has.src.main.java" />
- </target>
-
- <target name=":checkstyle" unless="skip.checkstyle" phase="report" depends="validate" description="generate checkstyle report">
- <mkdir dir="${target.checkstyle.report}"/>
-
- <checkstyle config="${checkstyle.config.file}" failureProperty="checkstyle.failure" failOnViolation="false">
- <fileset dir="${src.main.java}" includes="**/*.java" />
- <formatter type="xml" toFile="${target.checkstyle.report}/${checkstyle.report.name}.xml" />
- </checkstyle>
- </target>
-
- <target name=":report-html" phase="report" depends=":checkstyle" unless="checkstyle.failure">
- <xslt in="${target.checkstyle.report}/${checkstyle.report.name}.xml" out="${target.checkstyle.report}/${checkstyle.report.name}.html" style="${checkstyle.xsl.file}" />
- </target>
-
- <target name="-check" depends=":checkstyle" unless="skip.checkstyle" phase="verify">
- <fail if="checkstyle.failure" message="There is checkstyle violation(s), please check your ${target.checkstyle.report}/${checkstyle.report.name}.html" />
- </target>
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <dirname file="${ant.file.org.apache.easyant.plugins#checkstyle}" property="ant.dir.org.apache.easyant.plugins#checkstyle" />
+
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="verify"/>
+ <ea:parameter phase="report" />
+
+ <ea:parameter property="checkstyle.xsl.file" default="${ant.dir.org.apache.easyant.plugins#checkstyle}/checkstyle.xsl" description="checkstyle xsl, used to transform XML -> HTML" />
+ <ea:parameter property="checkstyle.config.file" default="${ant.dir.org.apache.easyant.plugins#checkstyle}/checkstyle.xml" description="checkstyle rules file" />
+ <ea:parameter property="target.checkstyle.report" default="${target.report}/checkstyle" description="directory where checkstyle report will be generated" />
+ <ea:parameter property="checkstyle.report.name" default="checkstyle_report" description="the name of the generated report (without file type)" />
+
+ <available property="checkstyle.available" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" classpathref="org.apache.easyant.plugins#checkstyle.classpath" />
+
+ <fail unless="checkstyle.available" message="Checkstyle is unavailable!" />
+ <condition property="xslt.available">
+ <available classname="org.apache.tools.ant.taskdefs.optional.TraXLiaison" />
+ </condition>
+ <fail message="Ant xslt was not found. Please install ant-nodeps in your ANT_HOME" unless="xslt.available" />
+
+ <taskdef resource="checkstyletask.properties" classpathref="org.apache.easyant.plugins#checkstyle.classpath" />
+
+
+ <available file="${src.main.java}" property="has.src.main.java" />
+ </target>
+
+ <target name=":checkstyle" unless="skip.checkstyle" phase="report" depends="validate" description="generate checkstyle report">
+ <mkdir dir="${target.checkstyle.report}"/>
+
+ <checkstyle config="${checkstyle.config.file}" failureProperty="checkstyle.failure" failOnViolation="false">
+ <fileset dir="${src.main.java}" includes="**/*.java" />
+ <formatter type="xml" toFile="${target.checkstyle.report}/${checkstyle.report.name}.xml" />
+ </checkstyle>
+ </target>
+
+ <target name=":report-html" phase="report" depends=":checkstyle" unless="checkstyle.failure">
+ <xslt in="${target.checkstyle.report}/${checkstyle.report.name}.xml" out="${target.checkstyle.report}/${checkstyle.report.name}.html" style="${checkstyle.xsl.file}" />
+ </target>
+
+ <target name="-check" depends=":checkstyle" unless="skip.checkstyle" phase="verify">
+ <fail if="checkstyle.failure" message="There is checkstyle violation(s), please check your ${target.checkstyle.report}/${checkstyle.report.name}.html" />
+ </target>
- <target name="doit" depends=":checkstyle" />
+ <target name="doit" depends=":checkstyle" />
</project>
Modified: incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.xml?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.xml (original)
+++ incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.xml Tue Feb 22 14:59:17 2011
@@ -43,7 +43,7 @@
-->
<module name="Checker">
- <property name="severity" value="warning"/>
+ <property name="severity" value="warning"/>
<!-- Checks that a package.html file exists for each package. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
Modified: incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.xsl
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.xsl?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.xsl (original)
+++ incubator/easyant/plugins/trunk/checkstyle/src/main/resources/checkstyle.xsl Tue Feb 22 14:59:17 2011
@@ -16,202 +16,202 @@
limitations under the License.
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
- <xsl:output method="html" indent="yes" />
- <xsl:decimal-format decimal-separator="."
- grouping-separator="," />
+ version="1.0">
+ <xsl:output method="html" indent="yes" />
+ <xsl:decimal-format decimal-separator="."
+ grouping-separator="," />
- <!--
- Checkstyle XML Style Sheet by Stephane Bailliez <sb...@apache.org>
- -->
- <!--
- Part of the Checkstyle distribution found at
- http://checkstyle.sourceforge.net
- -->
- <!--
- Usage (generates checkstyle_report.html):
- -->
- <!--
- <checkstyle failonviolation="false" config="${check.config}">
- -->
- <!--
- <fileset dir="${src.dir}" includes="**/*.java"/>
- -->
- <!--
- <formatter type="xml" toFile="${doc.dir}/checkstyle_report.xml"/>
- -->
- <!--
- </checkstyle>
- -->
- <!--
- <style basedir="${doc.dir}" destdir="${doc.dir}"
- -->
- <!--
- includes="checkstyle_report.xml"
- -->
- <!--
- style="${doc.dir}/checkstyle-noframes-sorted.xsl"/>
- -->
+ <!--
+ Checkstyle XML Style Sheet by Stephane Bailliez <sb...@apache.org>
+ -->
+ <!--
+ Part of the Checkstyle distribution found at
+ http://checkstyle.sourceforge.net
+ -->
+ <!--
+ Usage (generates checkstyle_report.html):
+ -->
+ <!--
+ <checkstyle failonviolation="false" config="${check.config}">
+ -->
+ <!--
+ <fileset dir="${src.dir}" includes="**/*.java"/>
+ -->
+ <!--
+ <formatter type="xml" toFile="${doc.dir}/checkstyle_report.xml"/>
+ -->
+ <!--
+ </checkstyle>
+ -->
+ <!--
+ <style basedir="${doc.dir}" destdir="${doc.dir}"
+ -->
+ <!--
+ includes="checkstyle_report.xml"
+ -->
+ <!--
+ style="${doc.dir}/checkstyle-noframes-sorted.xsl"/>
+ -->
- <xsl:template match="checkstyle">
- <html>
- <head>
- <style type="text/css">
- .bannercell {
- border: 0px;
- padding: 0px;
- }
- body {
- margin-left: 10;
- margin-right: 10;
- font:normal 80% arial,helvetica,sanserif;
- background-color:#FFFFFF;
- color:#000000;
- }
- .a td {
- background: #efefef;
- }
- .b td {
- background: #fff;
- }
- th, td {
- text-align: left;
- vertical-align: top;
- }
- th {
- font-weight:bold;
- background: #ccc;
- color: black;
- }
- table, th, td {
- font-size:100%;
- border: none
- }
- table.log tr td, tr th {
-
- }
- h2 {
- font-weight:bold;
- font-size:140%;
- margin-bottom: 5;
- }
- h3 {
- font-size:100%;
- font-weight:bold;
- background: #525D76;
- color: white;
- text-decoration: none;
- padding: 5px;
- margin-right: 2px;
- margin-left: 2px;
- margin-bottom: 0;
- }
- </style>
- </head>
- <body>
- <a name="top"></a>
- <!-- jakarta logo -->
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td class="bannercell" rowspan="2">
- <!--a href="http://jakarta.apache.org/">
- <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
- </a-->
- </td>
- <td class="text-align:right"><h2>CheckStyle Audit</h2></td>
- </tr>
- <tr>
- <td class="text-align:right">Designed for use with <a href='http://checkstyle.sourceforge.net/'>CheckStyle</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td>
- </tr>
- </table>
- <hr size="1"/>
-
- <!-- Summary part -->
- <xsl:apply-templates select="." mode="summary"/>
- <hr size="1" width="100%" align="left"/>
-
- <!-- Package List part -->
- <xsl:apply-templates select="." mode="filelist"/>
- <hr size="1" width="100%" align="left"/>
-
- <!-- For each package create its part -->
- <xsl:for-each select="file">
- <xsl:sort select="@name"/>
- <xsl:apply-templates select="."/>
- <p/>
- <p/>
- </xsl:for-each>
- <hr size="1" width="100%" align="left"/>
-
-
- </body>
- </html>
- </xsl:template>
-
-
-
- <xsl:template match="checkstyle" mode="filelist">
- <h3>Files</h3>
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <tr>
- <th>Name</th>
- <th>Errors</th>
- </tr>
- <xsl:for-each select="file">
- <xsl:sort data-type="number" order="descending" select="count(error)"/>
- <xsl:variable name="errorCount" select="count(error)"/>
- <tr>
+ <xsl:template match="checkstyle">
+ <html>
+ <head>
+ <style type="text/css">
+ .bannercell {
+ border: 0px;
+ padding: 0px;
+ }
+ body {
+ margin-left: 10;
+ margin-right: 10;
+ font:normal 80% arial,helvetica,sanserif;
+ background-color:#FFFFFF;
+ color:#000000;
+ }
+ .a td {
+ background: #efefef;
+ }
+ .b td {
+ background: #fff;
+ }
+ th, td {
+ text-align: left;
+ vertical-align: top;
+ }
+ th {
+ font-weight:bold;
+ background: #ccc;
+ color: black;
+ }
+ table, th, td {
+ font-size:100%;
+ border: none
+ }
+ table.log tr td, tr th {
+
+ }
+ h2 {
+ font-weight:bold;
+ font-size:140%;
+ margin-bottom: 5;
+ }
+ h3 {
+ font-size:100%;
+ font-weight:bold;
+ background: #525D76;
+ color: white;
+ text-decoration: none;
+ padding: 5px;
+ margin-right: 2px;
+ margin-left: 2px;
+ margin-bottom: 0;
+ }
+ </style>
+ </head>
+ <body>
+ <a name="top"></a>
+ <!-- jakarta logo -->
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td class="bannercell" rowspan="2">
+ <!--a href="http://jakarta.apache.org/">
+ <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
+ </a-->
+ </td>
+ <td class="text-align:right"><h2>CheckStyle Audit</h2></td>
+ </tr>
+ <tr>
+ <td class="text-align:right">Designed for use with <a href='http://checkstyle.sourceforge.net/'>CheckStyle</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td>
+ </tr>
+ </table>
+ <hr size="1"/>
+
+ <!-- Summary part -->
+ <xsl:apply-templates select="." mode="summary"/>
+ <hr size="1" width="100%" align="left"/>
+
+ <!-- Package List part -->
+ <xsl:apply-templates select="." mode="filelist"/>
+ <hr size="1" width="100%" align="left"/>
+
+ <!-- For each package create its part -->
+ <xsl:for-each select="file">
+ <xsl:sort select="@name"/>
+ <xsl:apply-templates select="."/>
+ <p/>
+ <p/>
+ </xsl:for-each>
+ <hr size="1" width="100%" align="left"/>
+
+
+ </body>
+ </html>
+ </xsl:template>
+
+
+
+ <xsl:template match="checkstyle" mode="filelist">
+ <h3>Files</h3>
+ <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+ <tr>
+ <th>Name</th>
+ <th>Errors</th>
+ </tr>
+ <xsl:for-each select="file">
+ <xsl:sort data-type="number" order="descending" select="count(error)"/>
+ <xsl:variable name="errorCount" select="count(error)"/>
+ <tr>
<xsl:call-template name="alternated-row"/>
- <td><a href="#f-{@name}"><xsl:value-of select="@name"/></a></td>
- <td><xsl:value-of select="$errorCount"/></td>
- </tr>
- </xsl:for-each>
- </table>
- </xsl:template>
-
-
- <xsl:template match="file">
- <a name="f-{@name}"></a>
- <h3>File <xsl:value-of select="@name"/></h3>
-
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <tr>
- <th>Error Description</th>
- <th>Line</th>
- </tr>
- <xsl:for-each select="error">
- <tr>
- <xsl:call-template name="alternated-row"/>
- <td><xsl:value-of select="@message"/></td>
- <td><xsl:value-of select="@line"/></td>
- </tr>
- </xsl:for-each>
- </table>
- <a href="#top">Back to top</a>
- </xsl:template>
-
-
- <xsl:template match="checkstyle" mode="summary">
- <h3>Summary</h3>
- <xsl:variable name="fileCount" select="count(file)"/>
- <xsl:variable name="errorCount" select="count(file/error)"/>
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <tr>
- <th>Files</th>
- <th>Errors</th>
- </tr>
- <tr>
- <xsl:call-template name="alternated-row"/>
- <td><xsl:value-of select="$fileCount"/></td>
- <td><xsl:value-of select="$errorCount"/></td>
- </tr>
- </table>
- </xsl:template>
-
- <xsl:template name="alternated-row">
- <xsl:attribute name="class">
- <xsl:if test="position() mod 2 = 1">a</xsl:if>
- <xsl:if test="position() mod 2 = 0">b</xsl:if>
- </xsl:attribute>
- </xsl:template>
- </xsl:stylesheet>
\ No newline at end of file
+ <td><a href="#f-{@name}"><xsl:value-of select="@name"/></a></td>
+ <td><xsl:value-of select="$errorCount"/></td>
+ </tr>
+ </xsl:for-each>
+ </table>
+ </xsl:template>
+
+
+ <xsl:template match="file">
+ <a name="f-{@name}"></a>
+ <h3>File <xsl:value-of select="@name"/></h3>
+
+ <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+ <tr>
+ <th>Error Description</th>
+ <th>Line</th>
+ </tr>
+ <xsl:for-each select="error">
+ <tr>
+ <xsl:call-template name="alternated-row"/>
+ <td><xsl:value-of select="@message"/></td>
+ <td><xsl:value-of select="@line"/></td>
+ </tr>
+ </xsl:for-each>
+ </table>
+ <a href="#top">Back to top</a>
+ </xsl:template>
+
+
+ <xsl:template match="checkstyle" mode="summary">
+ <h3>Summary</h3>
+ <xsl:variable name="fileCount" select="count(file)"/>
+ <xsl:variable name="errorCount" select="count(file/error)"/>
+ <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+ <tr>
+ <th>Files</th>
+ <th>Errors</th>
+ </tr>
+ <tr>
+ <xsl:call-template name="alternated-row"/>
+ <td><xsl:value-of select="$fileCount"/></td>
+ <td><xsl:value-of select="$errorCount"/></td>
+ </tr>
+ </table>
+ </xsl:template>
+
+ <xsl:template name="alternated-row">
+ <xsl:attribute name="class">
+ <xsl:if test="position() mod 2 = 1">a</xsl:if>
+ <xsl:if test="position() mod 2 = 0">b</xsl:if>
+ </xsl:attribute>
+ </xsl:template>
+ </xsl:stylesheet>