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 [2/8] - in /incubator/easyant/plugins/trunk: ./
abstract-coverage/ abstract-coverage/src/main/resources/ abstract-test/
abstract-test/src/main/resources/ antcontrib-activator/
antcontrib-activator/src/main/resources/ antunit/ antun...
Modified: incubator/easyant/plugins/trunk/clean-std/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/clean-std/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/clean-std/module.ivy (original)
+++ incubator/easyant/plugins/trunk/clean-std/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="clean-std" revision="0.1">
- <description>This module provides project cleaning feature.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="clean-std" revision="0.1">
+ <description>This module provides project cleaning feature.</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
<conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
<conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
</configurations>
- <publications>
- <artifact type="ant"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/clean-std/src/main/resources/clean-std.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/clean-std/src/main/resources/clean-std.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/clean-std/src/main/resources/clean-std.ant (original)
+++ incubator/easyant/plugins/trunk/clean-std/src/main/resources/clean-std.ant Tue Feb 22 14:59:17 2011
@@ -15,18 +15,18 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#clean-std"
- xmlns:ea="antlib:org.apache.easyant">
+ xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate"/>
- <ea:parameter property="target" required="true"
- description="the target directory to clean" />
- </target>
-
- <target name=":clean" phase="clean" depends=":init" description="clean project">
- <delete dir="${target}"/>
- </target>
-
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate"/>
+ <ea:parameter property="target" required="true"
+ description="the target directory to clean" />
+ </target>
+
+ <target name=":clean" phase="clean" depends=":init" description="clean project">
+ <delete dir="${target}"/>
+ </target>
+
</project>
Modified: incubator/easyant/plugins/trunk/compile-groovy/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-groovy/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-groovy/module.ivy (original)
+++ incubator/easyant/plugins/trunk/compile-groovy/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="compile-groovy" revision="0.1">
- <description>This module provides groovy compilation feature.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="compile-groovy" revision="0.1">
+ <description>This module provides groovy compilation feature.</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
<conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
<conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
</configurations>
- <publications>
- <artifact type="ant"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant (original)
+++ incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant Tue Feb 22 14:59:17 2011
@@ -16,72 +16,72 @@
-->
<project name="org.apache.easyant.plugins#compile-groovy" 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" />
- <ea:parameter phase="compile" />
-
- <ea:parameter property="src.main.groovy" required="true" description="directory where sources to be compiled are" />
- <ea:parameter property="target.main.classes" required="true" description="destination directory for compiled test classes" />
-
- <ea:parameter property="compile.groovy.includes.pattern" default="**/*.groovy" description="Pattern describing files included in compilation process" />
- <ea:parameter property="compile.groovy.excludes.pattern" default="" description="Pattern describing files excluded in compilation process" />
-
- <available file="${src.main.groovy}" property="has.src.main.groovy" />
-
- <ea:path pathid="compile.main.classpath" overwrite="false" />
-
- </target>
-
- <target name="-configure" phase="provision">
- <ea:findclasspath pathid="resolved.groovy.classpath" organisation="org.codehaus.groovy" module="groovy-all" revision="1.6.0">
- <ea:project-dependency-strategy />
- <ea:environment-strategy env="GROOVY_HOME"/>
- <ea:basic-configuration-strategy />
- </ea:findclasspath>
-
- <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="resolved.groovy.classpath" />
-
- </target>
-
- <target name=":compile" depends="validate" if="has.src.main.groovy" phase="compile">
- <mkdir dir="${target.main.classes}" />
- <!--
- <groovyc> Attributes
- Attribute Description Required
- srcdir Location of the Groovy (and possibly Java) source files. Yes
- destdir Location to store the class files. Yes
- classpath The classpath to use. No
- classpathref The classpath to use given as a path references. No
- sourcepath The sourcepath to use. No
- sourcepathref The sourcepath to use given as a path reference. No
- encoding Encoding of source files. No
- verbose Asks the compiler for verbose output; defaults to no. No
- includeAntRuntime Whether to include the Ant run-time libraries in the classpath; defaults to yes. No
- includeJavaRuntime Whether to include the default run-time libraries from the executing VM in the classpath; defaults to no. No
- fork Whether to execute groovyc using a spawned instance of the JVM; defaults to no. No
- memoryInitialSize The initial size of the memory for the underlying VM, if using fork mode; ignored otherwise. Defaults to the standard VM memory setting. (Examples: 83886080, 81920k, or 80m) No
- memoryMaximumSize The maximum size of the memory for the underlying VM, if using fork mode; ignored otherwise. Defaults to the standard VM memory setting. (Examples: 83886080, 81920k, or 80m) No
- failonerror Indicates whether compilation errors will fail the build; defaults to true. No
- listfiles Indicates whether the source files to be compiled will be listed; defaults to no. No
- stacktrace if true each compile error message will contain a stacktrace No
- jointCompilationOptions Enable joint compilation, specifying the command line options. (Using a nested javac task is preferred.) No
-
- Notes: Joint compilation is only available since 1.1-beta-2
- <groovyc> Nested Elements
- element kind Required Replaces Attribute
- src a path structure Yes (unless srcdir is used) srcdir
- classpath a path structure No classpath
- javac javac task No jointCompilationOptions
- -->
- <groovyc srcdir="${src.main.groovy}" destdir="${target.main.classes}"
- classpathref="compile.main.classpath"
- includeantruntime="no"
- includes="${compile.groovy.includes.pattern}"
- excludes="${compile.groovy.excludes.pattern}" />
- </target>
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="compile" />
+
+ <ea:parameter property="src.main.groovy" required="true" description="directory where sources to be compiled are" />
+ <ea:parameter property="target.main.classes" required="true" description="destination directory for compiled test classes" />
+
+ <ea:parameter property="compile.groovy.includes.pattern" default="**/*.groovy" description="Pattern describing files included in compilation process" />
+ <ea:parameter property="compile.groovy.excludes.pattern" default="" description="Pattern describing files excluded in compilation process" />
+
+ <available file="${src.main.groovy}" property="has.src.main.groovy" />
+
+ <ea:path pathid="compile.main.classpath" overwrite="false" />
+
+ </target>
+
+ <target name="-configure" phase="provision">
+ <ea:findclasspath pathid="resolved.groovy.classpath" organisation="org.codehaus.groovy" module="groovy-all" revision="1.6.0">
+ <ea:project-dependency-strategy />
+ <ea:environment-strategy env="GROOVY_HOME"/>
+ <ea:basic-configuration-strategy />
+ </ea:findclasspath>
+
+ <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="resolved.groovy.classpath" />
+
+ </target>
+
+ <target name=":compile" depends="validate" if="has.src.main.groovy" phase="compile">
+ <mkdir dir="${target.main.classes}" />
+ <!--
+ <groovyc> Attributes
+ Attribute Description Required
+ srcdir Location of the Groovy (and possibly Java) source files. Yes
+ destdir Location to store the class files. Yes
+ classpath The classpath to use. No
+ classpathref The classpath to use given as a path references. No
+ sourcepath The sourcepath to use. No
+ sourcepathref The sourcepath to use given as a path reference. No
+ encoding Encoding of source files. No
+ verbose Asks the compiler for verbose output; defaults to no. No
+ includeAntRuntime Whether to include the Ant run-time libraries in the classpath; defaults to yes. No
+ includeJavaRuntime Whether to include the default run-time libraries from the executing VM in the classpath; defaults to no. No
+ fork Whether to execute groovyc using a spawned instance of the JVM; defaults to no. No
+ memoryInitialSize The initial size of the memory for the underlying VM, if using fork mode; ignored otherwise. Defaults to the standard VM memory setting. (Examples: 83886080, 81920k, or 80m) No
+ memoryMaximumSize The maximum size of the memory for the underlying VM, if using fork mode; ignored otherwise. Defaults to the standard VM memory setting. (Examples: 83886080, 81920k, or 80m) No
+ failonerror Indicates whether compilation errors will fail the build; defaults to true. No
+ listfiles Indicates whether the source files to be compiled will be listed; defaults to no. No
+ stacktrace if true each compile error message will contain a stacktrace No
+ jointCompilationOptions Enable joint compilation, specifying the command line options. (Using a nested javac task is preferred.) No
+
+ Notes: Joint compilation is only available since 1.1-beta-2
+ <groovyc> Nested Elements
+ element kind Required Replaces Attribute
+ src a path structure Yes (unless srcdir is used) srcdir
+ classpath a path structure No classpath
+ javac javac task No jointCompilationOptions
+ -->
+ <groovyc srcdir="${src.main.groovy}" destdir="${target.main.classes}"
+ classpathref="compile.main.classpath"
+ includeantruntime="no"
+ includes="${compile.groovy.includes.pattern}"
+ excludes="${compile.groovy.excludes.pattern}" />
+ </target>
- <target name="doit" depends=":init" />
+ <target name="doit" depends=":init" />
</project>
Modified: incubator/easyant/plugins/trunk/compile-java/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-java/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-java/module.ivy (original)
+++ incubator/easyant/plugins/trunk/compile-java/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="compile-java" revision="0.1">
- <description>This module provides java compilation feature.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="compile-java" revision="0.1">
+ <description>This module provides java compilation feature.</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
<conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
<conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
</configurations>
- <publications>
- <artifact type="ant"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant (original)
+++ incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant Tue Feb 22 14:59:17 2011
@@ -15,50 +15,50 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#compile-java"
- xmlns:ea="antlib:org.apache.easyant">
+ 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 property="src.main.java" required="true"
- description="directory where sources to be compiled are" />
- <ea:parameter property="target.main.classes" required="true"
- description="destination directory for compiled test classes" />
- <ea:parameter property="javac.debug.mode" default="true"
- description="javac debug mode, true or false" />
-
- <ea:parameter property="compile.java.includes.pattern" default="**/*.java"
- description="Pattern describing files included in compilation process" />
- <ea:parameter property="compile.java.excludes.pattern" default=""
- description="Pattern describing files excluded in compilation process" />
-
- <ea:parameter property="compile.java.target.version" default="${ant.java.version}"
- description="Specify a VM version for Generated class files (e.g., 1.1 or 1.2)." />
- <ea:parameter property="compile.java.source.version" default="${ant.java.version}"
- description="Specify a value of the -source command-line switch; will be ignored by all implementations prior to javac1.4 (or modern when Ant is not running in a 1.3 VM) and jikes" />
-
- <available file="${src.main.java}" property="has.src.main.java" />
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="compile" />
+
+ <ea:parameter property="src.main.java" required="true"
+ description="directory where sources to be compiled are" />
+ <ea:parameter property="target.main.classes" required="true"
+ description="destination directory for compiled test classes" />
+ <ea:parameter property="javac.debug.mode" default="true"
+ description="javac debug mode, true or false" />
+
+ <ea:parameter property="compile.java.includes.pattern" default="**/*.java"
+ description="Pattern describing files included in compilation process" />
+ <ea:parameter property="compile.java.excludes.pattern" default=""
+ description="Pattern describing files excluded in compilation process" />
+
+ <ea:parameter property="compile.java.target.version" default="${ant.java.version}"
+ description="Specify a VM version for Generated class files (e.g., 1.1 or 1.2)." />
+ <ea:parameter property="compile.java.source.version" default="${ant.java.version}"
+ description="Specify a value of the -source command-line switch; will be ignored by all implementations prior to javac1.4 (or modern when Ant is not running in a 1.3 VM) and jikes" />
+
+ <available file="${src.main.java}" property="has.src.main.java" />
- <ea:path pathid="compile.main.classpath" overwrite="false" />
- </target>
-
- <target name=":compile" depends="validate" if="has.src.main.java"
- phase="compile">
- <mkdir dir="${target.main.classes}" />
+ <ea:path pathid="compile.main.classpath" overwrite="false" />
+ </target>
+
+ <target name=":compile" depends="validate" if="has.src.main.java"
+ phase="compile">
+ <mkdir dir="${target.main.classes}" />
<javac srcdir="${src.main.java}"
destdir="${target.main.classes}"
debug="${javac.debug.mode}"
- source="${compile.java.source.version}"
- target="${compile.java.target.version}"
- classpathref="compile.main.classpath"
- includes="${compile.java.includes.pattern}"
- excludes="${compile.java.excludes.pattern}"
+ source="${compile.java.source.version}"
+ target="${compile.java.target.version}"
+ classpathref="compile.main.classpath"
+ includes="${compile.java.includes.pattern}"
+ excludes="${compile.java.excludes.pattern}"
includeantruntime="no">
- </javac>
- </target>
-
- <target name="doit" depends=":compile" />
+ </javac>
+ </target>
+
+ <target name="doit" depends=":compile" />
</project>
Modified: incubator/easyant/plugins/trunk/compile-scala/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-scala/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-scala/module.ivy (original)
+++ incubator/easyant/plugins/trunk/compile-scala/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="compile-scala" revision="0.1">
- <description>This module provides scala compilation feature.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="compile-scala" revision="0.1">
+ <description>This module provides scala compilation feature.</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
<conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
<conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
</configurations>
- <publications>
- <artifact type="ant"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant (original)
+++ incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant Tue Feb 22 14:59:17 2011
@@ -15,61 +15,61 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#compile-scala"
- 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" />
- <property environment="env"/>
- <ea:parameter property="src.main.scala" required="true"
- description="directory where sources to be compiled are" />
- <ea:parameter property="target.main.classes" required="true"
- description="destination directory for compiled test classes" />
- <ea:parameter property="scalac.debug.mode" default="true"
- description="scalac debug mode, true or false" />
- <ea:parameter property="scala.home" default="${env.SCALA_HOME}"
- description="scala home directory"/>
- <ea:parameter property="compile.scala.includes.pattern" default="**/*.scala"
- description="Pattern describing files included in compilation process"/>
- <ea:parameter property="compile.scala.excludes.pattern" default=""
- description="Pattern describing files excluded in compilation process"/>
-
- <available file="${src.main.scala}" property="has.src.main.scala" />
+ 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" />
+ <property environment="env"/>
+ <ea:parameter property="src.main.scala" required="true"
+ description="directory where sources to be compiled are" />
+ <ea:parameter property="target.main.classes" required="true"
+ description="destination directory for compiled test classes" />
+ <ea:parameter property="scalac.debug.mode" default="true"
+ description="scalac debug mode, true or false" />
+ <ea:parameter property="scala.home" default="${env.SCALA_HOME}"
+ description="scala home directory"/>
+ <ea:parameter property="compile.scala.includes.pattern" default="**/*.scala"
+ description="Pattern describing files included in compilation process"/>
+ <ea:parameter property="compile.scala.excludes.pattern" default=""
+ description="Pattern describing files excluded in compilation process"/>
+
+ <available file="${src.main.scala}" property="has.src.main.scala" />
- <ea:path pathid="compile.main.classpath" overwrite="false" />
- </target>
-
- <target name="-configure" phase="provision">
- <ea:findclasspath pathid="resolved.scala.classpath" organisation="org.scala-lang" module="scala-compiler" revision="2.7.7">
- <ea:project-dependency-strategy />
- <ea:environment-strategy env="SCALA_HOME"/>
- <ea:basic-configuration-strategy />
- </ea:findclasspath>
- <taskdef resource="scala/tools/ant/antlib.xml" classpathref="resolved.scala.classpath"/>
+ <ea:path pathid="compile.main.classpath" overwrite="false" />
+ </target>
+
+ <target name="-configure" phase="provision">
+ <ea:findclasspath pathid="resolved.scala.classpath" organisation="org.scala-lang" module="scala-compiler" revision="2.7.7">
+ <ea:project-dependency-strategy />
+ <ea:environment-strategy env="SCALA_HOME"/>
+ <ea:basic-configuration-strategy />
+ </ea:findclasspath>
+ <taskdef resource="scala/tools/ant/antlib.xml" classpathref="resolved.scala.classpath"/>
<!-- when you specify classpath parameter to <scalac /> task it overrides class path
defined inside <taskdef /> rather then adds to it. So just add scala jars to your own class path.
- source http://www.softwaresecretweapons.com/jspwiki/scalatoolsnscfatalerror-object-scala-not-found -->
+ source http://www.softwaresecretweapons.com/jspwiki/scalatoolsnscfatalerror-object-scala-not-found -->
<ea:path pathid="compile.main.classpath" overwrite="prepend">
<path refid="resolved.scala.classpath"/>
</ea:path>
- </target>
-
- <target name=":compile" depends="validate" if="has.src.main.scala"
- phase="compile">
-
- <mkdir dir="${target.main.classes}" />
+ </target>
+
+ <target name=":compile" depends="validate" if="has.src.main.scala"
+ phase="compile">
+
+ <mkdir dir="${target.main.classes}" />
<scalac srcdir="${src.main.scala}"
destdir="${target.main.classes}"
scalacdebugging="${scalac.debug.mode}"
- classpathref="compile.main.classpath"
- includes="${compile.scala.includes.pattern}"
- excludes="${compile.scala.excludes.pattern}">
-
- </scalac>
- </target>
-
- <target name="doit" depends=":compile" />
+ classpathref="compile.main.classpath"
+ includes="${compile.scala.includes.pattern}"
+ excludes="${compile.scala.excludes.pattern}">
+
+ </scalac>
+ </target>
+
+ <target name="doit" depends=":compile" />
</project>
Modified: incubator/easyant/plugins/trunk/compile-test-groovy/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-groovy/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-groovy/module.ivy (original)
+++ incubator/easyant/plugins/trunk/compile-test-groovy/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,17 +15,17 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="compile-test-groovy" revision="0.1">
- <description>This module provides groovy compilation feature for tests.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="compile-test-groovy" revision="0.1">
+ <description>This module provides groovy compilation feature for tests.</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
<conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
<conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
</configurations>
- <publications>
- <artifact type="ant"/>
- </publications>
-
+ <publications>
+ <artifact type="ant"/>
+ </publications>
+
</ivy-module>
Modified: incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant (original)
+++ incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant Tue Feb 22 14:59:17 2011
@@ -15,42 +15,42 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#compile-test-groovy"
- xmlns:ea="antlib:org.apache.easyant">
+ xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <ea:include mrid="org.apache.easyant.plugins#abstract-test;0.1" as=":abstract-test"/>
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <ea:include mrid="org.apache.easyant.plugins#abstract-test;0.1" as=":abstract-test"/>
- <macrodef name="compile-groovy-tests">
- <attribute name="prefix"/>
- <sequential>
- <mkdir dir="${target.@{test}.classes}" />
- <groovyc srcdir="${src.@{test}.java}"
+ <macrodef name="compile-groovy-tests">
+ <attribute name="prefix"/>
+ <sequential>
+ <mkdir dir="${target.@{test}.classes}" />
+ <groovyc srcdir="${src.@{test}.java}"
destdir="${target.@{test}.classes}"
classpathref="compile.test.classpath"
- includes="${@{test}.compile.includes.pattern}"
- excludes="${@{test}.compile.excludes.pattern}"/>
- </sequential>
- </macrodef>
-
- <target name="-configure" phase="provision">
- <ea:findclasspath pathid="resolved.groovy.classpath" organisation="org.codehaus.groovy" module="groovy-all" revision="1.6.0">
- <ea:project-dependency-strategy />
- <ea:environment-strategy env="GROOVY_HOME"/>
- <ea:basic-configuration-strategy />
- </ea:findclasspath>
+ includes="${@{test}.compile.includes.pattern}"
+ excludes="${@{test}.compile.excludes.pattern}"/>
+ </sequential>
+ </macrodef>
+
+ <target name="-configure" phase="provision">
+ <ea:findclasspath pathid="resolved.groovy.classpath" organisation="org.codehaus.groovy" module="groovy-all" revision="1.6.0">
+ <ea:project-dependency-strategy />
+ <ea:environment-strategy env="GROOVY_HOME"/>
+ <ea:basic-configuration-strategy />
+ </ea:findclasspath>
- <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="resolved.groovy.classpath" />
- </target>
-
- <target name=":compile" depends="validate, compile, test-process-resources" if="has.src.test.java"
- phase="test-compile">
- <compile-groovy-tests prefix="test"/>
- </target>
+ <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="resolved.groovy.classpath" />
+ </target>
+
+ <target name=":compile" depends="validate, compile, test-process-resources" if="has.src.test.java"
+ phase="test-compile">
+ <compile-groovy-tests prefix="test"/>
+ </target>
- <target name=":compile-integration" depends="validate, compile, test-process-resources" if="has.src.test.integration.java"
- phase="test-compile">
- <compile-groovy-tests prefix="test.integration"/>
- </target>
+ <target name=":compile-integration" depends="validate, compile, test-process-resources" if="has.src.test.integration.java"
+ phase="test-compile">
+ <compile-groovy-tests prefix="test.integration"/>
+ </target>
</project>
Modified: incubator/easyant/plugins/trunk/compile-test-java/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-java/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-java/module.ivy (original)
+++ incubator/easyant/plugins/trunk/compile-test-java/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="compile-test-java" revision="0.1">
- <description>This module provides java compilation feature for tests.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="compile-test-java" revision="0.1">
+ <description>This module provides java compilation feature for tests.</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
<conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
<conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
</configurations>
- <publications>
- <artifact type="ant"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant (original)
+++ incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant Tue Feb 22 14:59:17 2011
@@ -15,50 +15,50 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#compile-test-java"
- xmlns:ea="antlib:org.apache.easyant">
+ xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <ea:include mrid="org.apache.easyant.plugins#abstract-test;0.1" as=":abstract-compile-test-java"/>
-
- <macrodef name="compile-java-tests">
- <attribute name="prefix"/>
- <sequential>
- <mkdir dir="${target.@{prefix}.classes}" />
- <javac srcdir="${src.@{prefix}.java}"
- destdir="${target.@{prefix}.classes}"
- classpathref="compile.test.classpath"
- debug="${javac.debug.mode}"
- source="${@{prefix}.compile.java.source.version}"
- target="${@{prefix}.compile.java.target.version}"
- includes="${@{prefix}.compile.includes.pattern}"
- excludes="${@{prefix}.compile.excludes.pattern}"
- includeantruntime="no">
- </javac>
- </sequential>
- </macrodef>
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <ea:include mrid="org.apache.easyant.plugins#abstract-test;0.1" as=":abstract-compile-test-java"/>
+
+ <macrodef name="compile-java-tests">
+ <attribute name="prefix"/>
+ <sequential>
+ <mkdir dir="${target.@{prefix}.classes}" />
+ <javac srcdir="${src.@{prefix}.java}"
+ destdir="${target.@{prefix}.classes}"
+ classpathref="compile.test.classpath"
+ debug="${javac.debug.mode}"
+ source="${@{prefix}.compile.java.source.version}"
+ target="${@{prefix}.compile.java.target.version}"
+ includes="${@{prefix}.compile.includes.pattern}"
+ excludes="${@{prefix}.compile.excludes.pattern}"
+ includeantruntime="no">
+ </javac>
+ </sequential>
+ </macrodef>
- <target name=":compile" depends="validate, compile, test-process-resources" if="has.src.test.java"
- phase="test-compile">
-
- <ea:parameter property="test.compile.java.target.version" default="${ant.java.version}"
- description="Specify a VM version for Generated class files (e.g., 1.1 or 1.2)." />
- <ea:parameter property="test.compile.java.source.version" default="${ant.java.version}"
- description="Specify a value of the -source command-line switch; will be ignored by all implementations prior to javac1.4 (or modern when Ant is not running in a 1.3 VM) and jikes" />
- <compile-java-tests prefix="test"/>
- </target>
+ <target name=":compile" depends="validate, compile, test-process-resources" if="has.src.test.java"
+ phase="test-compile">
+
+ <ea:parameter property="test.compile.java.target.version" default="${ant.java.version}"
+ description="Specify a VM version for Generated class files (e.g., 1.1 or 1.2)." />
+ <ea:parameter property="test.compile.java.source.version" default="${ant.java.version}"
+ description="Specify a value of the -source command-line switch; will be ignored by all implementations prior to javac1.4 (or modern when Ant is not running in a 1.3 VM) and jikes" />
+ <compile-java-tests prefix="test"/>
+ </target>
- <target name=":compile-integration" depends="validate, compile, test-process-resources" if="has.src.test.integration.java"
- phase="test-compile">
-
- <ea:parameter property="test.integration.compile.java.target.version" default="${ant.java.version}"
- description="Specify a VM version for Generated class files (e.g., 1.1 or 1.2)." />
- <ea:parameter property="test.integration.compile.java.source.version" default="${ant.java.version}"
- description="Specify a value of the -source command-line switch; will be ignored by all implementations prior to javac1.4 (or modern when Ant is not running in a 1.3 VM) and jikes" />
-
- <compile-java-tests prefix="test.integration"/>
- </target>
+ <target name=":compile-integration" depends="validate, compile, test-process-resources" if="has.src.test.integration.java"
+ phase="test-compile">
+
+ <ea:parameter property="test.integration.compile.java.target.version" default="${ant.java.version}"
+ description="Specify a VM version for Generated class files (e.g., 1.1 or 1.2)." />
+ <ea:parameter property="test.integration.compile.java.source.version" default="${ant.java.version}"
+ description="Specify a value of the -source command-line switch; will be ignored by all implementations prior to javac1.4 (or modern when Ant is not running in a 1.3 VM) and jikes" />
+
+ <compile-java-tests prefix="test.integration"/>
+ </target>
-
+
</project>
Modified: incubator/easyant/plugins/trunk/compile-test-scala/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-scala/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-scala/module.ivy (original)
+++ incubator/easyant/plugins/trunk/compile-test-scala/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="compile-test-scala" revision="0.1">
- <description>This module provides scala compilation feature for tests.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="compile-test-scala" revision="0.1">
+ <description>This module provides scala compilation feature for tests.</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
<conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
<conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
</configurations>
- <publications>
- <artifact type="ant"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant (original)
+++ incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant Tue Feb 22 14:59:17 2011
@@ -15,51 +15,51 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#compile-test-scala"
- xmlns:ea="antlib:org.apache.easyant">
+ xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <ea:include mrid="org.apache.easyant.plugins#abstract-test;0.1" as=":abstract-test"/>
-
- <target name="-configure" phase="provision">
- <ea:findclasspath pathid="resolved.scala.classpath" organisation="org.scala-lang" module="scala-compiler" revision="2.7.7">
- <ea:project-dependency-strategy />
- <ea:environment-strategy env="SCALA_HOME"/>
- <ea:basic-configuration-strategy />
- </ea:findclasspath>
- <taskdef resource="scala/tools/ant/antlib.xml" classpathref="resolved.scala.classpath"/>
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <ea:include mrid="org.apache.easyant.plugins#abstract-test;0.1" as=":abstract-test"/>
+
+ <target name="-configure" phase="provision">
+ <ea:findclasspath pathid="resolved.scala.classpath" organisation="org.scala-lang" module="scala-compiler" revision="2.7.7">
+ <ea:project-dependency-strategy />
+ <ea:environment-strategy env="SCALA_HOME"/>
+ <ea:basic-configuration-strategy />
+ </ea:findclasspath>
+ <taskdef resource="scala/tools/ant/antlib.xml" classpathref="resolved.scala.classpath"/>
<!-- when you specify classpath parameter to <scalac /> task it overrides class path
defined inside <taskdef /> rather then adds to it. So just add scala jars to your own class path.
- source http://www.softwaresecretweapons.com/jspwiki/scalatoolsnscfatalerror-object-scala-not-found -->
+ source http://www.softwaresecretweapons.com/jspwiki/scalatoolsnscfatalerror-object-scala-not-found -->
<ea:path pathid="compile.test.classpath" overwrite="prepend">
<path refid="resolved.scala.classpath"/>
</ea:path>
- </target>
-
- <macrodef name="compile-scala-tests">
- <attribute name="prefix"/>
- <sequential>
- <mkdir dir="${target.@{prefix}.classes}" />
- <scalac srcdir="${src.@{prefix}.java}"
- destdir="${target.@{prefix}.classes}"
- classpathref="compile.test.classpath"
- includes="${@{prefix}.compile.includes.pattern}"
- excludes="${@{prefix}.compile.excludes.pattern}"
- scalacdebugging="${javac.debug.mode}">
- </scalac>
- </sequential>
- </macrodef>
-
- <target name=":compile" depends="validate, compile, test-process-resources" if="has.src.test.java"
- phase="test-compile">
- <compile-scala-tests prefix="test"/>
- </target>
-
- <target name=":compile-integration" depends="validate, compile, test-process-resources" if="has.src.test.integration.java"
- phase="test-compile">
- <compile-scala-tests prefix="test.integration"/>
- </target>
+ </target>
+
+ <macrodef name="compile-scala-tests">
+ <attribute name="prefix"/>
+ <sequential>
+ <mkdir dir="${target.@{prefix}.classes}" />
+ <scalac srcdir="${src.@{prefix}.java}"
+ destdir="${target.@{prefix}.classes}"
+ classpathref="compile.test.classpath"
+ includes="${@{prefix}.compile.includes.pattern}"
+ excludes="${@{prefix}.compile.excludes.pattern}"
+ scalacdebugging="${javac.debug.mode}">
+ </scalac>
+ </sequential>
+ </macrodef>
+
+ <target name=":compile" depends="validate, compile, test-process-resources" if="has.src.test.java"
+ phase="test-compile">
+ <compile-scala-tests prefix="test"/>
+ </target>
+
+ <target name=":compile-integration" depends="validate, compile, test-process-resources" if="has.src.test.integration.java"
+ phase="test-compile">
+ <compile-scala-tests prefix="test.integration"/>
+ </target>
</project>
Modified: incubator/easyant/plugins/trunk/coverage-cobertura/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/coverage-cobertura/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/coverage-cobertura/module.ivy (original)
+++ incubator/easyant/plugins/trunk/coverage-cobertura/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="coverage-cobertura" revision="0.1">
- <description>
+ <info organisation="org.apache.easyant.plugins" module="coverage-cobertura" revision="0.1">
+ <description>
Provides test code coverage report using cobertura framework.
- </description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ </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="net.sourceforge.cobertura" name="cobertura" rev="1.9.2" conf="default"/>
- <exclude org="org.apache.ant" module="*"/>
- </dependencies>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
+ <dependencies>
+ <dependency org="net.sourceforge.cobertura" name="cobertura" rev="1.9.2" conf="default"/>
+ <exclude org="org.apache.ant" module="*"/>
+ </dependencies>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/coverage-cobertura/src/main/resources/coverage-cobertura.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/coverage-cobertura/src/main/resources/coverage-cobertura.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/coverage-cobertura/src/main/resources/coverage-cobertura.ant (original)
+++ incubator/easyant/plugins/trunk/coverage-cobertura/src/main/resources/coverage-cobertura.ant Tue Feb 22 14:59:17 2011
@@ -15,80 +15,80 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#coverage-cobertura"
- xmlns:ac="antlib:net.sf.antcontrib"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <ea:include mrid="org.apache.easyant.plugins#abstract-coverage;0.1" as=":abstract-coverage"/>
-
- <target name=":init" phase="validate" depends=":abstract-coverage:init">
-
- <ea:parameter phase="verify"/>
-
- <ea:parameter property="coverage.report.format" description="report output format; text/html/xml" default="html"/>
- <ea:parameter property="cobertura.datafile.path" description="serialized object file where cobertura tracks coverage statistics"
- default="${target.coverage.report}/cobertura.ser"/>
-
- <ea:parameter property="coverage.required.linerate" description="the required minimum line coverage for each class, as a percentage" default="0"/>
- <ea:parameter property="coverage.required.branchrate" description="the required minimum branch coverage for each class, as a percentage" default="0"/>
- <ea:parameter property="coverage.required.packagelinerate" description="the required minimum line coverage for each package, as a percentage" default="0"/>
- <ea:parameter property="coverage.required.packagebranchrate" description="the required minimum branch coverage for each package, as a percentage" default="0"/>
- <ea:parameter property="coverage.required.totallinerate" description="the required minimum line coverage for the entire module, as a percentage" default="0"/>
- <ea:parameter property="coverage.required.totalbranchrate" description="the required minimum branch coverage for the entire module, as a percentage" default="0"/>
-
- <available property="cobertura.available" classname="net.sourceforge.cobertura.ant.CheckTask" classpathref="org.apache.easyant.plugins#coverage-cobertura.classpath"/>
- <fail unless="cobertura.available" message="Cobertura not found on project classpath!" />
-
- <mkdir dir="${target.coverage.report}" />
- <property name="net.sourceforge.cobertura.datafile" location="${cobertura.datafile.path}"/>
- <taskdef resource="tasks.properties" classpathref="org.apache.easyant.plugins#coverage-cobertura.classpath" />
-
- <!-- add datafile to system properties during test run, if it isn't explicitly set elsewhere -->
- <ac:if>
- <not><contains string="${test.run.jvmargs}" substring="net.sourceforge.cobertura.datafile"/></not>
- <ac:then>
- <ac:var name="test.run.jvmargs" value="-Dnet.sourceforge.cobertura.datafile='${cobertura.datafile.path}' ${test.run.jvmargs}"/>
- </ac:then>
- </ac:if>
-
- </target>
-
- <target name=":instrument" depends=":init" phase="process-classes" if="has.src.test.java">
- <ea:path overwrite="prepend" pathid="run.test.classpath">
- <pathelement path="${target.coverage.classes}" />
- <path refid="org.apache.easyant.plugins#coverage-cobertura.classpath"/>
- </ea:path>
-
- <!-- Apply instrumentation to app classes -->
- <cobertura-instrument todir="${target.coverage.classes}"
- datafile="${net.sourceforge.cobertura.datafile}">
- <fileset dir="${target.main.classes}">
- <include name="**/*.class" />
- <exclude name="${coverage.exclude.filter}" />
- </fileset>
- </cobertura-instrument>
- </target>
-
- <target name=":report" depends=":init" phase="report" if="has.src.test.java">
-
- <cobertura-report format="${coverage.report.format}" destdir="${target.coverage.report}" srcdir="${src.main.java}"
- datafile="${net.sourceforge.cobertura.datafile}"/>
-
- </target>
-
- <target name=":check" depends=":init" phase="verify" if="has.src.test.java"
- description="fail the build if code coverage targets are not satisfied">
- <cobertura-check branchrate="${coverage.required.branchrate}"
- linerate="${coverage.required.linerate}"
- packagebranchrate="${coverage.required.packagebranchrate}"
- packagelinerate="${coverage.required.packagelinerate}"
- totalbranchrate="${coverage.required.totalbranchrate}"
- totallinerate="${coverage.required.totallinerate}"
- datafile="${net.sourceforge.cobertura.datafile}"/>
- </target>
-
- <target name=":cobertura" depends="validate,test,report" description="generate cobertura covera report" />
- <target name="doit" depends=":cobertura" />
-
+ xmlns:ac="antlib:net.sf.antcontrib"
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <ea:include mrid="org.apache.easyant.plugins#abstract-coverage;0.1" as=":abstract-coverage"/>
+
+ <target name=":init" phase="validate" depends=":abstract-coverage:init">
+
+ <ea:parameter phase="verify"/>
+
+ <ea:parameter property="coverage.report.format" description="report output format; text/html/xml" default="html"/>
+ <ea:parameter property="cobertura.datafile.path" description="serialized object file where cobertura tracks coverage statistics"
+ default="${target.coverage.report}/cobertura.ser"/>
+
+ <ea:parameter property="coverage.required.linerate" description="the required minimum line coverage for each class, as a percentage" default="0"/>
+ <ea:parameter property="coverage.required.branchrate" description="the required minimum branch coverage for each class, as a percentage" default="0"/>
+ <ea:parameter property="coverage.required.packagelinerate" description="the required minimum line coverage for each package, as a percentage" default="0"/>
+ <ea:parameter property="coverage.required.packagebranchrate" description="the required minimum branch coverage for each package, as a percentage" default="0"/>
+ <ea:parameter property="coverage.required.totallinerate" description="the required minimum line coverage for the entire module, as a percentage" default="0"/>
+ <ea:parameter property="coverage.required.totalbranchrate" description="the required minimum branch coverage for the entire module, as a percentage" default="0"/>
+
+ <available property="cobertura.available" classname="net.sourceforge.cobertura.ant.CheckTask" classpathref="org.apache.easyant.plugins#coverage-cobertura.classpath"/>
+ <fail unless="cobertura.available" message="Cobertura not found on project classpath!" />
+
+ <mkdir dir="${target.coverage.report}" />
+ <property name="net.sourceforge.cobertura.datafile" location="${cobertura.datafile.path}"/>
+ <taskdef resource="tasks.properties" classpathref="org.apache.easyant.plugins#coverage-cobertura.classpath" />
+
+ <!-- add datafile to system properties during test run, if it isn't explicitly set elsewhere -->
+ <ac:if>
+ <not><contains string="${test.run.jvmargs}" substring="net.sourceforge.cobertura.datafile"/></not>
+ <ac:then>
+ <ac:var name="test.run.jvmargs" value="-Dnet.sourceforge.cobertura.datafile='${cobertura.datafile.path}' ${test.run.jvmargs}"/>
+ </ac:then>
+ </ac:if>
+
+ </target>
+
+ <target name=":instrument" depends=":init" phase="process-classes" if="has.src.test.java">
+ <ea:path overwrite="prepend" pathid="run.test.classpath">
+ <pathelement path="${target.coverage.classes}" />
+ <path refid="org.apache.easyant.plugins#coverage-cobertura.classpath"/>
+ </ea:path>
+
+ <!-- Apply instrumentation to app classes -->
+ <cobertura-instrument todir="${target.coverage.classes}"
+ datafile="${net.sourceforge.cobertura.datafile}">
+ <fileset dir="${target.main.classes}">
+ <include name="**/*.class" />
+ <exclude name="${coverage.exclude.filter}" />
+ </fileset>
+ </cobertura-instrument>
+ </target>
+
+ <target name=":report" depends=":init" phase="report" if="has.src.test.java">
+
+ <cobertura-report format="${coverage.report.format}" destdir="${target.coverage.report}" srcdir="${src.main.java}"
+ datafile="${net.sourceforge.cobertura.datafile}"/>
+
+ </target>
+
+ <target name=":check" depends=":init" phase="verify" if="has.src.test.java"
+ description="fail the build if code coverage targets are not satisfied">
+ <cobertura-check branchrate="${coverage.required.branchrate}"
+ linerate="${coverage.required.linerate}"
+ packagebranchrate="${coverage.required.packagebranchrate}"
+ packagelinerate="${coverage.required.packagelinerate}"
+ totalbranchrate="${coverage.required.totalbranchrate}"
+ totallinerate="${coverage.required.totallinerate}"
+ datafile="${net.sourceforge.cobertura.datafile}"/>
+ </target>
+
+ <target name=":cobertura" depends="validate,test,report" description="generate cobertura covera report" />
+ <target name="doit" depends=":cobertura" />
+
</project>
Modified: incubator/easyant/plugins/trunk/default-version-strategy/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/default-version-strategy/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/default-version-strategy/module.ivy (original)
+++ incubator/easyant/plugins/trunk/default-version-strategy/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="default-version-strategy" revision="0.1">
- <description>This module provides the default version strategy. A version strategy is in charge to define the version for integrations (snapshot) and releases </description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="default-version-strategy" revision="0.1">
+ <description>This module provides the default version strategy. A version strategy is in charge to define the version for integrations (snapshot) and releases </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/default-version-strategy/src/main/resources/default-version-strategy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant (original)
+++ incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant Tue Feb 22 14:59:17 2011
@@ -15,84 +15,84 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#default-version-strategy"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- 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="generate-local-version"/>
- <ea:parameter phase="generate-shared-version"/>
- <ea:parameter phase="generate-release-version"/>
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ 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="generate-local-version"/>
+ <ea:parameter phase="generate-shared-version"/>
+ <ea:parameter phase="generate-release-version"/>
- <ea:parameter property="release.resolver" default="shared"
- description="the name of the resolver use for release publication"/>
- <ea:parameter property="shared.resolver" default="shared"
- description="the name of the share resolver"/>
- <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="default.build.number" default="1"
- description="default project version"/>
- <ea:parameter property="revision.separator" default="-dev-build"
- description="separator for version"/>
-
- <!-- is project ivy settings configured ? -->
- <ea:parameter property="project.ivy.settings.file" description="the ivysettings file used by your project" />
- <ea:parameter property="project.ivy.settings.url" description="the ivysettings url used by your project" />
-
- <ea:parameter property="fail.publication.if.no.revision" default="true" description="fail build if current module has no revision in 'info' tag of the module.ivy"/>
- <condition property="is.project.ivy.settings.configured">
- <isreference refid="${project.ivy.instance}"/>
- </condition>
- <fail unless="is.project.ivy.settings.configured" message="project ivy instance is not configured, at least one of the following property must be set : project.ivy.settings.file, project.ivy.settings.url"/>
+ <ea:parameter property="release.resolver" default="shared"
+ description="the name of the resolver use for release publication"/>
+ <ea:parameter property="shared.resolver" default="shared"
+ description="the name of the share resolver"/>
+ <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="default.build.number" default="1"
+ description="default project version"/>
+ <ea:parameter property="revision.separator" default="-dev-build"
+ description="separator for version"/>
+
+ <!-- is project ivy settings configured ? -->
+ <ea:parameter property="project.ivy.settings.file" description="the ivysettings file used by your project" />
+ <ea:parameter property="project.ivy.settings.url" description="the ivysettings url used by your project" />
+
+ <ea:parameter property="fail.publication.if.no.revision" default="true" description="fail build if current module has no revision in 'info' tag of the module.ivy"/>
+ <condition property="is.project.ivy.settings.configured">
+ <isreference refid="${project.ivy.instance}"/>
+ </condition>
+ <fail unless="is.project.ivy.settings.configured" message="project ivy instance is not configured, at least one of the following property must be set : project.ivy.settings.file, project.ivy.settings.url"/>
- </target>
-
- <macrodef name="check-version-number">
- <sequential>
- <property name="pub.no.revision.message" value="It seems that you did not specify the revision number of your project, we strongly recommend you to set it through the 'info' tag in your module ivy before any publication"/>
- <ac:if>
- <contains string="${ivy.revision}" substring="working@"/>
- <ac:then>
- <ac:if>
- <istrue value="${fail.publication.if.no.revision}"/>
- <ac:then>
- <fail message="${pub.no.revision.message}"/>
- </ac:then>
- <ac:else>
- <echo message="Warning : ${pub.no.revision.message}" level="warning"/>
- </ac:else>
- </ac:if>
- </ac:then>
- </ac:if>
- </sequential>
- </macrodef>
+ </target>
+
+ <macrodef name="check-version-number">
+ <sequential>
+ <property name="pub.no.revision.message" value="It seems that you did not specify the revision number of your project, we strongly recommend you to set it through the 'info' tag in your module ivy before any publication"/>
+ <ac:if>
+ <contains string="${ivy.revision}" substring="working@"/>
+ <ac:then>
+ <ac:if>
+ <istrue value="${fail.publication.if.no.revision}"/>
+ <ac:then>
+ <fail message="${pub.no.revision.message}"/>
+ </ac:then>
+ <ac:else>
+ <echo message="Warning : ${pub.no.revision.message}" level="warning"/>
+ </ac:else>
+ </ac:if>
+ </ac:then>
+ </ac:if>
+ </sequential>
+ </macrodef>
- <!-- version numbers -->
- <target name="-local" phase="generate-local-version">
- <check-version-number/>
- <tstamp>
- <format property="now" pattern="yyyyMMddHHmmss" />
- </tstamp>
- <property name="version" value="${ivy.revision}-local-${now}" />
- </target>
-
- <target name="-shared" phase="generate-shared-version" depends="validate" unless="ivy.new.revision">
- <ea:checkresolver resolver="shared.resolver" settingsRef="${project.ivy.instance}" description="name of the repository used to publish shared integration versions (snapshots)"/>
- <check-version-number/>
- <ivy:buildnumber organisation="${ivy.organisation}" module="${ivy.module}" revision="${ivy.revision}" defaultBuildNumber="${default.build.number}" revSep="${revision.separator}" settingsRef="${project.ivy.instance}" resolver="${shared.resolver}"/>
- <property name="version" value="${ivy.new.revision}" />
- </target>
+ <!-- version numbers -->
+ <target name="-local" phase="generate-local-version">
+ <check-version-number/>
+ <tstamp>
+ <format property="now" pattern="yyyyMMddHHmmss" />
+ </tstamp>
+ <property name="version" value="${ivy.revision}-local-${now}" />
+ </target>
+
+ <target name="-shared" phase="generate-shared-version" depends="validate" unless="ivy.new.revision">
+ <ea:checkresolver resolver="shared.resolver" settingsRef="${project.ivy.instance}" description="name of the repository used to publish shared integration versions (snapshots)"/>
+ <check-version-number/>
+ <ivy:buildnumber organisation="${ivy.organisation}" module="${ivy.module}" revision="${ivy.revision}" defaultBuildNumber="${default.build.number}" revSep="${revision.separator}" settingsRef="${project.ivy.instance}" resolver="${shared.resolver}"/>
+ <property name="version" value="${ivy.new.revision}" />
+ </target>
- <target name="-release" phase="generate-release-version" depends="validate" unless="ivy.new.revision">
- <check-version-number/>
- <property name="version" value="${ivy.revision}" />
- </target>
+ <target name="-release" phase="generate-release-version" depends="validate" unless="ivy.new.revision">
+ <check-version-number/>
+ <property name="version" value="${ivy.revision}" />
+ </target>
- <target name="doit" depends=":init" />
+ <target name="doit" depends=":init" />
</project>
Modified: incubator/easyant/plugins/trunk/deps-lib/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/deps-lib/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/deps-lib/module.ivy (original)
+++ incubator/easyant/plugins/trunk/deps-lib/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,14 +15,14 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="deps-lib" revision="0.2">
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="deps-lib" revision="0.2">
+ <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>
+ </configurations> <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant (original)
+++ incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant Tue Feb 22 14:59:17 2011
@@ -15,38 +15,38 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#deps-lib"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="provision" />
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="provision" />
- <ea:parameter property="lib.main" required="true"
- description="directory where main libraries are picked up" />
- <ea:parameter property="lib.test" required="true"
- description="directory where test libraries are picked up" />
-
- <fileset id="lib.main.fileset" dir="${lib.main}">
- <include name="*.jar" />
- </fileset>
-
- <fileset id="lib.test.fileset" dir="${lib.test}">
- <include name="*.jar" />
- </fileset>
- </target>
-
- <target name=":plugin" phase="provision">
- <ea:parameter path="compile.main.classpath"
- description="main compilation path" />
- <ea:parameter path="compile.test.classpath"
- description="test compilation path" />
- <ea:path pathid="compile.main.classpath" overwrite="append">
- <fileset refid="lib.main.fileset" />
- </ea:path>
- <ea:path pathid="compile.test.classpath" overwrite="append">
- <fileset refid="lib.test.fileset" />
- </ea:path>
- </target>
+ <ea:parameter property="lib.main" required="true"
+ description="directory where main libraries are picked up" />
+ <ea:parameter property="lib.test" required="true"
+ description="directory where test libraries are picked up" />
+
+ <fileset id="lib.main.fileset" dir="${lib.main}">
+ <include name="*.jar" />
+ </fileset>
+
+ <fileset id="lib.test.fileset" dir="${lib.test}">
+ <include name="*.jar" />
+ </fileset>
+ </target>
+
+ <target name=":plugin" phase="provision">
+ <ea:parameter path="compile.main.classpath"
+ description="main compilation path" />
+ <ea:parameter path="compile.test.classpath"
+ description="test compilation path" />
+ <ea:path pathid="compile.main.classpath" overwrite="append">
+ <fileset refid="lib.main.fileset" />
+ </ea:path>
+ <ea:path pathid="compile.test.classpath" overwrite="append">
+ <fileset refid="lib.test.fileset" />
+ </ea:path>
+ </target>
</project>
Modified: incubator/easyant/plugins/trunk/distribution/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/distribution/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/distribution/module.ivy (original)
+++ incubator/easyant/plugins/trunk/distribution/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,18 +15,18 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="distribution" revision="0.1">
- <description>This module allow you to make binary distributions of your project such as zip, tar.bz2, tar.gz, etc...
- It provides ready to use distributions like bin, with-dependencies, sources. It also comes with a macro that can be reused to make your own distribution.
- </description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="distribution" revision="0.1">
+ <description>This module allow you to make binary distributions of your project such as zip, tar.bz2, tar.gz, etc...
+ It provides ready to use distributions like bin, with-dependencies, sources. It also comes with a macro that can be reused to make your own distribution.
+ </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>