You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by hi...@apache.org on 2011/02/22 15:56:09 UTC
svn commit: r1073371 [2/28] - in /incubator/easyant/core/trunk: ./ bin/
example/build-configurations/
example/build-configurations/src/main/java/org/apache/easyant/example/
example/build-configurations/src/test/java/org/apache/easyant/example/
example/...
Modified: incubator/easyant/core/trunk/example/standard-scala-app/src/main/scala/org/apache/easyant/example/Example.scala
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/example/standard-scala-app/src/main/scala/org/apache/easyant/example/Example.scala?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/example/standard-scala-app/src/main/scala/org/apache/easyant/example/Example.scala (original)
+++ incubator/easyant/core/trunk/example/standard-scala-app/src/main/scala/org/apache/easyant/example/Example.scala Tue Feb 22 15:55:55 2011
@@ -32,4 +32,4 @@ object Example extends Application {
println(sayHello("EasyAnt"))
-}
\ No newline at end of file
+}
Modified: incubator/easyant/core/trunk/example/standard-scala-app/src/test/scala/org/apache/easyant/example/ExampleTest.scala
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/example/standard-scala-app/src/test/scala/org/apache/easyant/example/ExampleTest.scala?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/example/standard-scala-app/src/test/scala/org/apache/easyant/example/ExampleTest.scala (original)
+++ incubator/easyant/core/trunk/example/standard-scala-app/src/test/scala/org/apache/easyant/example/ExampleTest.scala Tue Feb 22 15:55:55 2011
@@ -24,13 +24,13 @@ import junit.Assert.assertEquals
class ExampleTest {
- @Test def testExample() {
- assertEquals("Hello EasyAnt!", Example.sayHello("EasyAnt"));
- }
+ @Test def testExample() {
+ assertEquals("Hello EasyAnt!", Example.sayHello("EasyAnt"));
+ }
- @Test def testTestResources() {
- val props = new Properties();
- props.load(this.getClass.getResourceAsStream("/test.properties"));
- assertEquals("Hello Test", props.getProperty("test.example"));
- }
-}
\ No newline at end of file
+ @Test def testTestResources() {
+ val props = new Properties();
+ props.load(this.getClass.getResourceAsStream("/test.properties"));
+ assertEquals("Hello Test", props.getProperty("test.example"));
+ }
+}
Modified: incubator/easyant/core/trunk/example/std-java-with-documentation/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/example/std-java-with-documentation/module.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/example/std-java-with-documentation/module.ivy (original)
+++ incubator/easyant/core/trunk/example/std-java-with-documentation/module.ivy Tue Feb 22 15:55:55 2011
@@ -15,35 +15,35 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant" module="std-java-with-documentation" revision="0.1" status="integration" >
- <description>
- this project is similar to standard-java-application example exept that it provide documentation examples
- </description>
- <!--
- This easyant section is equivalent to having a module.ant like this:
-
- <project name="org.apache.easyant#std-java-with-documentation"
- xmlns:ea="antlib:org.apache.easyant">
-
- <property name="run.main.classname" value="org.apache.easyant.example.Example"/>
-
- <ea:import organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.2" />
- <ea:include organisation="org.apache.easyant.plugins" module="run-java" revision="0.1" as="run"/>
- <ea:include organisation="org.apache.easyant.plugins" module="documentation" revision="0.1" as="doc"/>
- </project>
- -->
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.2">
- <ea:property name="run.main.classname" value="org.apache.easyant.example.Example" confs="plop"/>
- <ea:plugin organisation="org.apache.easyant.plugins" module="run-java" revision="0.1" as="run"/>
- <ea:plugin organisation="org.apache.easyant.plugins" module="documentation" revision="0.1" as="doc"/>
- </ea:build>
- </info>
- <configurations>
- <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
- <conf name="test" visibility="private" 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."/>
- </configurations>
- <dependencies>
- <dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" conf="default->default"/>
- <dependency org="junit" name="junit" rev="4.4" conf="test->default" />
- </dependencies>
+ <info organisation="org.apache.easyant" module="std-java-with-documentation" revision="0.1" status="integration" >
+ <description>
+ this project is similar to standard-java-application example exept that it provide documentation examples
+ </description>
+ <!--
+ This easyant section is equivalent to having a module.ant like this:
+
+ <project name="org.apache.easyant#std-java-with-documentation"
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <property name="run.main.classname" value="org.apache.easyant.example.Example"/>
+
+ <ea:import organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.2" />
+ <ea:include organisation="org.apache.easyant.plugins" module="run-java" revision="0.1" as="run"/>
+ <ea:include organisation="org.apache.easyant.plugins" module="documentation" revision="0.1" as="doc"/>
+ </project>
+ -->
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.2">
+ <ea:property name="run.main.classname" value="org.apache.easyant.example.Example" confs="plop"/>
+ <ea:plugin organisation="org.apache.easyant.plugins" module="run-java" revision="0.1" as="run"/>
+ <ea:plugin organisation="org.apache.easyant.plugins" module="documentation" revision="0.1" as="doc"/>
+ </ea:build>
+ </info>
+ <configurations>
+ <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
+ <conf name="test" visibility="private" 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."/>
+ </configurations>
+ <dependencies>
+ <dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" conf="default->default"/>
+ <dependency org="junit" name="junit" rev="4.4" conf="test->default" />
+ </dependencies>
</ivy-module>
Modified: incubator/easyant/core/trunk/example/std-java-with-documentation/src/main/java/org/apache/easyant/example/Example.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/example/std-java-with-documentation/src/main/java/org/apache/easyant/example/Example.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/example/std-java-with-documentation/src/main/java/org/apache/easyant/example/Example.java (original)
+++ incubator/easyant/core/trunk/example/std-java-with-documentation/src/main/java/org/apache/easyant/example/Example.java Tue Feb 22 15:55:55 2011
@@ -21,16 +21,16 @@ import java.io.IOException;
import java.util.Properties;
public class Example {
- public static void main(String[] args) throws IOException {
- System.out.println(new Example().sayHello("EasyAnt"));
- }
+ public static void main(String[] args) throws IOException {
+ System.out.println(new Example().sayHello("EasyAnt"));
+ }
- /*
- * @param who Who says hello
- */
- public String sayHello(String who) throws IOException {
- Properties props = new Properties();
- props.load(Example.class.getResourceAsStream("/main.properties"));
- return props.getProperty("example") + " " + who + "!";
- }
+ /*
+ * @param who Who says hello
+ */
+ public String sayHello(String who) throws IOException {
+ Properties props = new Properties();
+ props.load(Example.class.getResourceAsStream("/main.properties"));
+ return props.getProperty("example") + " " + who + "!";
+ }
}
Modified: incubator/easyant/core/trunk/example/std-java-with-documentation/src/test/java/org/apache/easyant/example/ExampleTest.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/example/std-java-with-documentation/src/test/java/org/apache/easyant/example/ExampleTest.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/example/std-java-with-documentation/src/test/java/org/apache/easyant/example/ExampleTest.java (original)
+++ incubator/easyant/core/trunk/example/std-java-with-documentation/src/test/java/org/apache/easyant/example/ExampleTest.java Tue Feb 22 15:55:55 2011
@@ -22,12 +22,12 @@ import java.util.Properties;
import junit.framework.TestCase;
public class ExampleTest extends TestCase {
- public void testExample() throws Exception {
- assertEquals("Hello EasyAnt!", new Example().sayHello("EasyAnt"));
- }
- public void testTestResources() throws Exception {
- Properties props = new Properties();
- props.load(Example.class.getResourceAsStream("/test.properties"));
- assertEquals("Hello Test", props.getProperty("test.example"));
- }
+ public void testExample() throws Exception {
+ assertEquals("Hello EasyAnt!", new Example().sayHello("EasyAnt"));
+ }
+ public void testTestResources() throws Exception {
+ Properties props = new Properties();
+ props.load(Example.class.getResourceAsStream("/test.properties"));
+ assertEquals("Hello Test", props.getProperty("test.example"));
+ }
}
Modified: incubator/easyant/core/trunk/example/webapp-java/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/example/webapp-java/module.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/example/webapp-java/module.ivy (original)
+++ incubator/easyant/core/trunk/example/webapp-java/module.ivy Tue Feb 22 15:55:55 2011
@@ -15,39 +15,39 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:e="http://ant.apache.org/ivy/extra" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant" module="webapp-java" revision="0.1" status="integration" >
- <description>
- This project is a sample of a java webapplication
- </description>
- <!--
- This easyant section is equivalent to having a module.ant like this:
-
- <project name="org.apache.easyant#webapp-java"
- xmlns:ea="antlib:org.apache.easyant">
-
- <property name="test.framework" value="testng"/>
-
- <ea:import organisation="org.apache.easyant.buildtypes" module="build-webapp-java" revision="0.1"/>
- <ea:include organisation="org.apache.easyant.plugins" module="jetty-deploy" revision="0.1" as="jetty"/>
- </project>
- This is a fake webapp application, it uses testng framework
- -->
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-webapp-java" revision="0.1">
- <ea:property name="test.framework" value="testng"/>
- <ea:plugin organisation="org.apache.easyant.plugins" module="jetty-deploy" revision="0.1" as="jetty"/>
- </ea:build>
- </info>
- <configurations>
- <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
- <conf name="test" visibility="private" 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."/>
- </configurations>
- <publications>
- <artifact type="war"/>
- </publications>
- <dependencies>
- <!-- here we should specify that we want to use the maven classifier concept to retrieve testng for jdk15 -->
- <dependency org="org.testng" name="testng" rev="5.7" conf="test->master">
- <artifact name="testng" type="jar" e:classifier="jdk15"/>
- </dependency>
- </dependencies>
+ <info organisation="org.apache.easyant" module="webapp-java" revision="0.1" status="integration" >
+ <description>
+ This project is a sample of a java webapplication
+ </description>
+ <!--
+ This easyant section is equivalent to having a module.ant like this:
+
+ <project name="org.apache.easyant#webapp-java"
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <property name="test.framework" value="testng"/>
+
+ <ea:import organisation="org.apache.easyant.buildtypes" module="build-webapp-java" revision="0.1"/>
+ <ea:include organisation="org.apache.easyant.plugins" module="jetty-deploy" revision="0.1" as="jetty"/>
+ </project>
+ This is a fake webapp application, it uses testng framework
+ -->
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-webapp-java" revision="0.1">
+ <ea:property name="test.framework" value="testng"/>
+ <ea:plugin organisation="org.apache.easyant.plugins" module="jetty-deploy" revision="0.1" as="jetty"/>
+ </ea:build>
+ </info>
+ <configurations>
+ <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
+ <conf name="test" visibility="private" 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."/>
+ </configurations>
+ <publications>
+ <artifact type="war"/>
+ </publications>
+ <dependencies>
+ <!-- here we should specify that we want to use the maven classifier concept to retrieve testng for jdk15 -->
+ <dependency org="org.testng" name="testng" rev="5.7" conf="test->master">
+ <artifact name="testng" type="jar" e:classifier="jdk15"/>
+ </dependency>
+ </dependencies>
</ivy-module>
Modified: incubator/easyant/core/trunk/example/webapp-java/src/main/java/org/apache/easyant/example/Example.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/example/webapp-java/src/main/java/org/apache/easyant/example/Example.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/example/webapp-java/src/main/java/org/apache/easyant/example/Example.java (original)
+++ incubator/easyant/core/trunk/example/webapp-java/src/main/java/org/apache/easyant/example/Example.java Tue Feb 22 15:55:55 2011
@@ -21,16 +21,16 @@ import java.io.IOException;
import java.util.Properties;
public class Example {
- public static void main(String[] args) throws IOException {
- System.out.println(new Example().sayHello("EasyAnt"));
- }
+ public static void main(String[] args) throws IOException {
+ System.out.println(new Example().sayHello("EasyAnt"));
+ }
- /*
- * @param who Who says hello
- */
- public String sayHello(String who) throws IOException {
- Properties props = new Properties();
- props.load(Example.class.getResourceAsStream("/main.properties"));
- return props.getProperty("example") + " " + who + "!";
- }
+ /*
+ * @param who Who says hello
+ */
+ public String sayHello(String who) throws IOException {
+ Properties props = new Properties();
+ props.load(Example.class.getResourceAsStream("/main.properties"));
+ return props.getProperty("example") + " " + who + "!";
+ }
}
Modified: incubator/easyant/core/trunk/example/webapp-java/src/test/java/org/apache/easyant/example/ExampleTest.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/example/webapp-java/src/test/java/org/apache/easyant/example/ExampleTest.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/example/webapp-java/src/test/java/org/apache/easyant/example/ExampleTest.java (original)
+++ incubator/easyant/core/trunk/example/webapp-java/src/test/java/org/apache/easyant/example/ExampleTest.java Tue Feb 22 15:55:55 2011
@@ -23,16 +23,16 @@ import org.testng.Assert;
import org.testng.annotations.Test;
public class ExampleTest {
-
- @Test
- public void testExample() throws Exception {
- Assert.assertEquals("Hello EasyAnt!", new Example().sayHello("EasyAnt"));
- }
+
+ @Test
+ public void testExample() throws Exception {
+ Assert.assertEquals("Hello EasyAnt!", new Example().sayHello("EasyAnt"));
+ }
- @Test
- public void testTestResources() throws Exception {
- Properties props = new Properties();
- props.load(Example.class.getResourceAsStream("/test.properties"));
- Assert.assertEquals("Hello Test", props.getProperty("test.example"));
- }
+ @Test
+ public void testTestResources() throws Exception {
+ Properties props = new Properties();
+ props.load(Example.class.getResourceAsStream("/test.properties"));
+ Assert.assertEquals("Hello Test", props.getProperty("test.example"));
+ }
}
Modified: incubator/easyant/core/trunk/example/webapp-java/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/example/webapp-java/src/test/resources/testng.xml?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/example/webapp-java/src/test/resources/testng.xml (original)
+++ incubator/easyant/core/trunk/example/webapp-java/src/test/resources/testng.xml Tue Feb 22 15:55:55 2011
@@ -16,9 +16,9 @@
limitations under the License.
-->
<suite name="Easyant example test suite">
- <test name="Easyant example test">
- <classes>
- <class name="org.apache.easyant.example.ExampleTest" />
- </classes>
- </test>
+ <test name="Easyant example test">
+ <classes>
+ <class name="org.apache.easyant.example.ExampleTest" />
+ </classes>
+ </test>
</suite>
Modified: incubator/easyant/core/trunk/ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/ivysettings.xml?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/ivysettings.xml (original)
+++ incubator/easyant/core/trunk/ivysettings.xml Tue Feb 22 15:55:55 2011
@@ -16,27 +16,27 @@
-->
<ivysettings>
<include file="${ivy.settings.dir}/repository/third-party-lib/third-party-ivysettings.xml"/>
- <include url="${easyant.extra.ivysettings.url}"/>
- <settings defaultResolver="main"/>
- <resolvers>
- <!--define your own easyant modules repository here
- <filesystem name="custom-easyant-modules">
- <ivy pattern="${ivy.settings.dir}/repository/shared/[organisation]/[module]/[revision]/[module].ivy"/>
- <artifact pattern="${ivy.settings.dir}/repository/shared/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
- </filesystem>
- -->
- <chain name="main" returnFirst="true">
- <!-- core modules provided by easyant full distribution -->
- <resolver ref="easyant-core-modules"/>
- <resolver ref="easyant-shared-modules"/>
- <!-- extra modules provided by easyant full distribution -->
- <resolver ref="easyant-extra-modules" />
- <resolver ref="third-party-lib" />
- <resolver ref="public-maven" />
- </chain>
- </resolvers>
+ <include url="${easyant.extra.ivysettings.url}"/>
+ <settings defaultResolver="main"/>
+ <resolvers>
+ <!--define your own easyant modules repository here
+ <filesystem name="custom-easyant-modules">
+ <ivy pattern="${ivy.settings.dir}/repository/shared/[organisation]/[module]/[revision]/[module].ivy"/>
+ <artifact pattern="${ivy.settings.dir}/repository/shared/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
+ </filesystem>
+ -->
+ <chain name="main" returnFirst="true">
+ <!-- core modules provided by easyant full distribution -->
+ <resolver ref="easyant-core-modules"/>
+ <resolver ref="easyant-shared-modules"/>
+ <!-- extra modules provided by easyant full distribution -->
+ <resolver ref="easyant-extra-modules" />
+ <resolver ref="third-party-lib" />
+ <resolver ref="public-maven" />
+ </chain>
+ </resolvers>
- <modules>
+ <modules>
<module organisation="*" name="*" resolver="main" />
</modules>
</ivysettings>
Modified: incubator/easyant/core/trunk/module.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/module.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/module.ant (original)
+++ incubator/easyant/core/trunk/module.ant Tue Feb 22 15:55:55 2011
@@ -18,64 +18,64 @@
xmlns:ea="antlib:org.apache.easyant"
xmlns:ivy="antlib:org.apache.ivy.ant">
- <!-- Force compatibility to java 1.5 -->
- <property name="compile.java.target.version" value="1.5" />
- <property name="compile.java.source.version" value="1.5" />
-
- <property name="target.documentation.dir" value="${basedir}/target/documentation" />
- <property name="xooki.temp.dir" value="${basedir}/target/temp-doc" />
- <property name="xooki.resources.include.pattern" value="style/**,images/**,sortable.js"/>
- <property name="eadoc.documentation.dir" value="${xooki.temp.dir}" />
-
-
- <property name="project.ivy.instance" value="easyant.ivy.instance" />
- <property name="release.resolver" value="easyant-shared-modules"/>
- <property name="shared.resolver" value="easyant-shared-modules"/>
-
- <property name="retrieve.dependencies" value="true"/>
-
- <property name="test.run.excludes.pattern" value="**/EasyAntBaseTest*,**/*AntTestListener*,**/*AntOutputStream*" />
- <!-- bind antunit output dir to the same directory of junit output dir
- this will allow hudson to take all the test files in the same directory -->
- <property name="target.antunit.xml" value="${basedir}/target/test/xml" />
-
- <!-- override main artifact retrieve pattern -->
- <property name="retrieve.pattern.lib.main" value="${basedir}/lib/main/[artifact].[ext]" />
-
-
- <!-- Load external properties
- /!\ This file will contains svn credentials so it should not be commited /!\
- -->
- <property file="module.properties" />
-
- <!--Loading build type -->
- <ea:build module="build-std-java" rev="0.2" />
-
- <!-- Loading plugins -->
- <ea:plugin module="xooki" rev="0.1" as="xooki" />
- <ea:plugin module="scm-svn" rev="0.1" as="svn" />
- <ea:plugin module="emma" rev="0.1" as="emma" />
- <ea:plugin module="eadoc" rev="0.1" as="eadoc" />
- <ea:plugin module="antunit" rev="0.1" as="antunit"/>
- <ea:plugin module="javadoc" rev="0.1" as="javadoc" />
- <ea:plugin module="package-test-jar" rev="0.1" as="test-jar" />
- <ea:plugin module="distribution" rev="0.1" as="distribution" />
+ <!-- Force compatibility to java 1.5 -->
+ <property name="compile.java.target.version" value="1.5" />
+ <property name="compile.java.source.version" value="1.5" />
+
+ <property name="target.documentation.dir" value="${basedir}/target/documentation" />
+ <property name="xooki.temp.dir" value="${basedir}/target/temp-doc" />
+ <property name="xooki.resources.include.pattern" value="style/**,images/**,sortable.js"/>
+ <property name="eadoc.documentation.dir" value="${xooki.temp.dir}" />
+
+
+ <property name="project.ivy.instance" value="easyant.ivy.instance" />
+ <property name="release.resolver" value="easyant-shared-modules"/>
+ <property name="shared.resolver" value="easyant-shared-modules"/>
+
+ <property name="retrieve.dependencies" value="true"/>
+
+ <property name="test.run.excludes.pattern" value="**/EasyAntBaseTest*,**/*AntTestListener*,**/*AntOutputStream*" />
+ <!-- bind antunit output dir to the same directory of junit output dir
+ this will allow hudson to take all the test files in the same directory -->
+ <property name="target.antunit.xml" value="${basedir}/target/test/xml" />
+
+ <!-- override main artifact retrieve pattern -->
+ <property name="retrieve.pattern.lib.main" value="${basedir}/lib/main/[artifact].[ext]" />
+
+
+ <!-- Load external properties
+ /!\ This file will contains svn credentials so it should not be commited /!\
+ -->
+ <property file="module.properties" />
+
+ <!--Loading build type -->
+ <ea:build module="build-std-java" rev="0.2" />
+
+ <!-- Loading plugins -->
+ <ea:plugin module="xooki" rev="0.1" as="xooki" />
+ <ea:plugin module="scm-svn" rev="0.1" as="svn" />
+ <ea:plugin module="emma" rev="0.1" as="emma" />
+ <ea:plugin module="eadoc" rev="0.1" as="eadoc" />
+ <ea:plugin module="antunit" rev="0.1" as="antunit"/>
+ <ea:plugin module="javadoc" rev="0.1" as="javadoc" />
+ <ea:plugin module="package-test-jar" rev="0.1" as="test-jar" />
+ <ea:plugin module="distribution" rev="0.1" as="distribution" />
<phase name="pre-integration-test" depends="package"/>
- <phase name="distribution" description="create a distribution package" depends="package" />
- <property name="target.dist" value="${target}/dist" />
- <property name="target.distribution" value="${target}/distribution" />
-
- <!-- override the default release phase -->
- <phase name="release" depends="generate-release-version, distribution, verify" description="done in an integration or release environment, copies the final package to the remote repository for sharing with other developers and projects" />
- <!-- override the default package phase -->
- <phase name="package" depends="prepare-package" description="take the compiled code and package it in its distributable format, such as a JAR." />
-
- <target name="package-extra-modules" phase="package" description="package easyant extra modules">
- <jar file="${target.artifacts}/easyant-extra-modules.jar">
- <zipfileset dir="repository/extra-modules" prefix="org/apache/easyant/repository/extra-modules" />
- </jar>
- </target>
+ <phase name="distribution" description="create a distribution package" depends="package" />
+ <property name="target.dist" value="${target}/dist" />
+ <property name="target.distribution" value="${target}/distribution" />
+
+ <!-- override the default release phase -->
+ <phase name="release" depends="generate-release-version, distribution, verify" description="done in an integration or release environment, copies the final package to the remote repository for sharing with other developers and projects" />
+ <!-- override the default package phase -->
+ <phase name="package" depends="prepare-package" description="take the compiled code and package it in its distributable format, such as a JAR." />
+
+ <target name="package-extra-modules" phase="package" description="package easyant extra modules">
+ <jar file="${target.artifacts}/easyant-extra-modules.jar">
+ <zipfileset dir="repository/extra-modules" prefix="org/apache/easyant/repository/extra-modules" />
+ </jar>
+ </target>
<target name="test-setup" phase="validate" depends="compile:init,test:init"
description="add extra information to classpath for unit tests">
@@ -92,7 +92,7 @@
</augment>
</target>
- <target name="prepare-distribution">
+ <target name="prepare-distribution">
<mkdir dir="${target.distribution}" />
@@ -120,9 +120,9 @@
<include name="bin/**"/>
</patternset>
- </target>
+ </target>
- <target name="dist" depends="jar:jar,test-jar:jar, package-extra-modules, prepare-distribution"
+ <target name="dist" depends="jar:jar,test-jar:jar, package-extra-modules, prepare-distribution"
description="update the dist directory (used for development and packaging)">
<mkdir dir="${target.dist}" />
@@ -181,15 +181,15 @@
<patternset refid="easyant-exec.patternset"/>
</fileset>
- </target>
+ </target>
<target name="setup-integration-environment" phase="pre-integration-test" depends="dist"/>
- <!-- Create a zip for distribution -->
- <target name="package-distribution" phase="distribution" depends="documentation, dist" description="package a distribution">
- <echo message="Packaging standard distribution." />
+ <!-- Create a zip for distribution -->
+ <target name="package-distribution" phase="distribution" depends="documentation, dist" description="package a distribution">
+ <echo message="Packaging standard distribution." />
<property name="root.dir" value="${ivy.module}-${ivy.revision}"/>
- <bundle destfile="${target.distribution}/${ivy.module}-${version}">
+ <bundle destfile="${target.distribution}/${ivy.module}-${version}">
<zipfileset dir="${target.dist}" prefix="${root.dir}">
<patternset refid="easyant-files.patternset"/>
</zipfileset>
@@ -197,24 +197,24 @@
<zipfileset dir="${target.dist}" prefix="${root.dir}" filemode="744">
<patternset refid="easyant-exec.patternset"/>
</zipfileset>
- <!-- ship the documentation -->
- <zipfileset dir="${target.documentation.dir}" prefix="${root.dir}/doc"/>
- </bundle>
-
- </target>
-
- <target name="package-documentation" phase="distribution" description="package the documentation" depends="documentation">
- <echo message="Packaging documentation distribution." />
- <bundle destfile="${target.distribution}/${ivy.module}-${version}-docs">
- <zipfileset dir="${target.documentation.dir}" prefix="${ivy.module}-${ivy.revision}-docs"/>
- </bundle>
- </target>
-
- <!-- Create a zip for full distribution -->
- <target name="package-full-distribution" phase="distribution" depends="documentation, dist" description="package a distribution (including includes sources)">
- <echo message="Packaging full distribution." />
+ <!-- ship the documentation -->
+ <zipfileset dir="${target.documentation.dir}" prefix="${root.dir}/doc"/>
+ </bundle>
+
+ </target>
+
+ <target name="package-documentation" phase="distribution" description="package the documentation" depends="documentation">
+ <echo message="Packaging documentation distribution." />
+ <bundle destfile="${target.distribution}/${ivy.module}-${version}-docs">
+ <zipfileset dir="${target.documentation.dir}" prefix="${ivy.module}-${ivy.revision}-docs"/>
+ </bundle>
+ </target>
+
+ <!-- Create a zip for full distribution -->
+ <target name="package-full-distribution" phase="distribution" depends="documentation, dist" description="package a distribution (including includes sources)">
+ <echo message="Packaging full distribution." />
<property name="full.root.dir" value="${ivy.module}-${ivy.revision}-full"/>
- <bundle destfile="${target.distribution}/${ivy.module}-${version}-full">
+ <bundle destfile="${target.distribution}/${ivy.module}-${version}-full">
<zipfileset dir="${target.dist}" prefix="${full.root.dir}">
<patternset refid="easyant-files.patternset"/>
</zipfileset>
@@ -224,10 +224,10 @@
</zipfileset>
<!-- ship the documentation -->
<zipfileset dir="${target.documentation.dir}" prefix="${full.root.dir}/doc"/>
- <!-- easyant sources -->
- <zipfileset dir="${basedir}" includes="src/**,module.ant, module.ivy,repository/extra-modules/**" prefix="${full.root.dir}"/>
- </bundle>
- </target>
+ <!-- easyant sources -->
+ <zipfileset dir="${basedir}" includes="src/**,module.ant, module.ivy,repository/extra-modules/**" prefix="${full.root.dir}"/>
+ </bundle>
+ </target>
<target name="reports">
<ea:repreport organisation="org.apache.easyant.plugins"
@@ -237,4 +237,3 @@
</target>
</project>
-
Modified: incubator/easyant/core/trunk/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/module.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/module.ivy (original)
+++ incubator/easyant/core/trunk/module.ivy Tue Feb 22 15:55:55 2011
@@ -15,26 +15,26 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant" module="easyant-core" revision="0.9" status="integration"/>
+ <info organisation="org.apache.easyant" module="easyant-core" revision="0.9" status="integration"/>
- <configurations>
- <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
- <conf name="test" visibility="private" 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="extra" extends="default" description="includes optional easyant modules"/>
- </configurations>
+ <configurations>
+ <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
+ <conf name="test" visibility="private" 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="extra" extends="default" description="includes optional easyant modules"/>
+ </configurations>
<publications>
<artifact name="easyant-core" type="jar" conf="default"/>
<artifact name="easyant-extra-modules" type="jar" conf="extra"/>
</publications>
- <dependencies>
- <dependency org="junit" name="junit" rev="4.4" conf="test->default"/>
- <dependency org="org.apache.ant" name="ant-testutil" rev="1.8.2" conf="test->default" transitive="false" />
+ <dependencies>
+ <dependency org="junit" name="junit" rev="4.4" conf="test->default"/>
+ <dependency org="org.apache.ant" name="ant-testutil" rev="1.8.2" conf="test->default" transitive="false" />
- <dependency org="org.apache.ant" name="ant" rev="1.8.2" conf="default->default"/>
- <dependency org="org.apache.ivy" name="ivy" rev="2.3.0-r1033912-patched" conf="default->core"/>
- <dependency org="ant-contrib" name="ant-contrib" rev="1.0b2" conf="default->default"/>
- <!-- ivy uses a different namespace to reference ant -->
- <exclude org="ant" module="*"/>
+ <dependency org="org.apache.ant" name="ant" rev="1.8.2" conf="default->default"/>
+ <dependency org="org.apache.ivy" name="ivy" rev="2.3.0-r1033912-patched" conf="default->core"/>
+ <dependency org="ant-contrib" name="ant-contrib" rev="1.0b2" conf="default->default"/>
+ <!-- ivy uses a different namespace to reference ant -->
+ <exclude org="ant" module="*"/>
- </dependencies>
+ </dependencies>
</ivy-module>
Modified: incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.buildtypes/build-osgi-bundle-java/0.1/build-osgi-bundle-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.buildtypes/build-osgi-bundle-java/0.1/build-osgi-bundle-java.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.buildtypes/build-osgi-bundle-java/0.1/build-osgi-bundle-java.ant (original)
+++ incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.buildtypes/build-osgi-bundle-java/0.1/build-osgi-bundle-java.ant Tue Feb 22 15:55:55 2011
@@ -15,38 +15,38 @@
limitations under the License.
-->
<project name="org.apache.easyant.buildtypes#build-osgi-bundle-java"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-osgi-bundle-java..."/>
-
- <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-osgi-bundle-java..."/>
+
+ <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
- <property file="${org.apache.easyant.buildtypes#build-osgi-bundle-java.properties.file}" />
-
- <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
- <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
- <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
+ <property file="${org.apache.easyant.buildtypes#build-osgi-bundle-java.properties.file}" />
+
+ <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
+ <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
+ <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
- <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
- <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
- <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
+ <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
+ <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
+ <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
-
- <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
-
- <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
- <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
- <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
- <ea:include mrid="org.apache.easyant.plugins#compile-java;0.1" as="compile" />
- <ea:include mrid="org.apache.easyant.plugins#compile-test-java;0.1" as="compile-test" />
- <ea:include mrid="${test.plugin.mrid}" as="test" />
-
- <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
- <ea:include mrid="org.apache.easyant.plugins#osgi-bundle;0.1" as="osgi" />
-
- <target name="doit" depends="verify" />
+
+ <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
+
+ <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
+ <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
+ <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-java;0.1" as="compile" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-test-java;0.1" as="compile-test" />
+ <ea:include mrid="${test.plugin.mrid}" as="test" />
+
+ <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
+ <ea:include mrid="org.apache.easyant.plugins#osgi-bundle;0.1" as="osgi" />
+
+ <target name="doit" depends="verify" />
</project>
Modified: incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.buildtypes/build-osgi-bundle-java/0.1/build-osgi-bundle-java.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.buildtypes/build-osgi-bundle-java/0.1/build-osgi-bundle-java.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.buildtypes/build-osgi-bundle-java/0.1/build-osgi-bundle-java.ivy (original)
+++ incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.buildtypes/build-osgi-bundle-java/0.1/build-osgi-bundle-java.ivy Tue Feb 22 15:55:55 2011
@@ -15,14 +15,14 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.easyant.buildtypes"
- module="build-osgi-bundle-java"
- status="milestone"
- revision="0.1">
- <description>A standard build for osgi bundle modules, relying on standard phases, and providing compilation, execution and unit tests</description>
- </info>
- <publications>
- <artifact type="ant" />
- <artifact type="properties" />
- </publications>
+ <info organisation="org.apache.easyant.buildtypes"
+ module="build-osgi-bundle-java"
+ status="milestone"
+ revision="0.1">
+ <description>A standard build for osgi bundle modules, relying on standard phases, and providing compilation, execution and unit tests</description>
+ </info>
+ <publications>
+ <artifact type="ant" />
+ <artifact type="properties" />
+ </publications>
</ivy-module>
Modified: incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.buildtypes/build-osgi-bundle-java/0.1/build-osgi-bundle-java.properties
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.buildtypes/build-osgi-bundle-java/0.1/build-osgi-bundle-java.properties?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.buildtypes/build-osgi-bundle-java/0.1/build-osgi-bundle-java.properties (original)
+++ incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.buildtypes/build-osgi-bundle-java/0.1/build-osgi-bundle-java.properties Tue Feb 22 15:55:55 2011
@@ -35,4 +35,4 @@ target.report=${target}/report
manifest.file=${target}/MANIFEST.MF
-test.framework=junit
\ No newline at end of file
+test.framework=junit
Modified: incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/coverage-cobertura/0.1/coverage-cobertura.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/coverage-cobertura/0.1/coverage-cobertura.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/coverage-cobertura/0.1/coverage-cobertura.ant (original)
+++ incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/coverage-cobertura/0.1/coverage-cobertura.ant Tue Feb 22 15:55:55 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/core/trunk/repository/extra-modules/org.apache.easyant.plugins/coverage-cobertura/0.1/coverage-cobertura.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/coverage-cobertura/0.1/coverage-cobertura.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/coverage-cobertura/0.1/coverage-cobertura.ivy (original)
+++ incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/coverage-cobertura/0.1/coverage-cobertura.ivy Tue Feb 22 15:55:55 2011
@@ -15,19 +15,19 @@
limitations under the License.
-->
<ivy-module version="2.0" >
- <info organisation="org.apache.easyant.plugins"
- module="coverage-cobertura"
- status="milestone"
- revision="0.1">
- <description>
+ <info organisation="org.apache.easyant.plugins"
+ module="coverage-cobertura"
+ status="milestone"
+ revision="0.1">
+ <description>
Provides test code coverage report using cobertura framework.
- </description>
- </info>
- <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>
+ </description>
+ </info>
+ <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/core/trunk/repository/extra-modules/org.apache.easyant.plugins/docbook/0.1/docbook.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/docbook/0.1/docbook.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/docbook/0.1/docbook.ant (original)
+++ incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/docbook/0.1/docbook.ant Tue Feb 22 15:55:55 2011
@@ -15,77 +15,77 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#docbook"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:m="http://ant.apache.org/ivy/maven"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
- <dirname file="${ant.file.org.apache.easyant.plugins#docbook}" property="docbook.module.dir" />
-
- <target name=":init" phase="validate">
-
- <ea:parameter phase="validate" />
- <ea:parameter phase="documentation" />
-
- <ea:parameter property="target.documentation.dir" description="directory where the documentation will be generated to"
- default="target/documentation"/>
- <ea:parameter property="src.documentation.dir" description="directory where documentation sources reside"
- default="src/documentation"/>
-
- <ea:parameter property="docbook.documentation.dir" description="directory where the documentation is stored in the project"
- default="${src.documentation.dir}/docbook"/>
-
- <ea:parameter property="docbook.index.file" description="the main docbook source file"
- default="${docbook.documentation.dir}/index.xml"/>
- <ea:parameter property="docbook.output.file" description="path of the HTML index file for generated documentation"
- default="${target.documentation.dir}/index.html"/>
-
- <ea:parameter property="docbook.parameters"
- description="whitespace-separated list of parameter values to pass to the DocBook XSL, for example 'param1=value1 param2=value2'"
- default=""/>
-
- </target>
-
- <target name=":generate" phase="documentation" depends=":init" unless="skip.documentation" description="generate documentation">
-
- <!-- unpack docbook xsl resources into the local module directory -->
- <mkdir dir="${docbook.module.dir}/docbook-xsl"/>
-
- <ivy:retrieve inline="true"
- organisation="org.apache.easyant.plugins"
- module="docbook"
- revision="0.1"
- conf="docbook_dist"
- pattern="${docbook.module.dir}/docbook-xsl/[artifact](-[classifier]).[ext]"
- settingsRef="easyant.ivy.instance"/>
-
- <echo>Unpacking docbook XSL distribution...</echo>
- <unzip src="${docbook.module.dir}/docbook-xsl/docbook-xsl-resources.zip"
- dest="${docbook.module.dir}" overwrite="false"/>
-
- <mkdir dir="${target.documentation.dir}/html" />
- <copy todir="${target.documentation.dir}/html">
- <fileset dir="${src.documentation.dir}/html" includes="**/*" erroronmissingdir="false"/>
- </copy>
-
- <!-- convert to absolute path -->
- <property name="docbook.index.path" location="${docbook.index.file}"/>
-
- <!-- TODO: support other transforms: PDF, html-single, manpage, slides -->
- <java classname="com.icl.saxon.StyleSheet" fork="true"
- failonerror="true" dir="${target.documentation.dir}/html"
- classpathref="org.apache.easyant.plugins#docbook.classpath">
- <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
- <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/>
- <sysproperty key="org.apache.xerces.xni.parser.XMLParserConfiguration" value="org.apache.xerces.parsers.XIncludeParserConfiguration"/>
- <jvmarg value="-Xmx256M"/>
- <arg value="${docbook.index.path}"/>
- <arg value="${docbook.module.dir}/docbook/html/chunk.xsl"/>
- <arg line="${docbook.parameters}"/>
- </java>
-
- </target>
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:m="http://ant.apache.org/ivy/maven"
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+ <dirname file="${ant.file.org.apache.easyant.plugins#docbook}" property="docbook.module.dir" />
+
+ <target name=":init" phase="validate">
+
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="documentation" />
+
+ <ea:parameter property="target.documentation.dir" description="directory where the documentation will be generated to"
+ default="target/documentation"/>
+ <ea:parameter property="src.documentation.dir" description="directory where documentation sources reside"
+ default="src/documentation"/>
+
+ <ea:parameter property="docbook.documentation.dir" description="directory where the documentation is stored in the project"
+ default="${src.documentation.dir}/docbook"/>
+
+ <ea:parameter property="docbook.index.file" description="the main docbook source file"
+ default="${docbook.documentation.dir}/index.xml"/>
+ <ea:parameter property="docbook.output.file" description="path of the HTML index file for generated documentation"
+ default="${target.documentation.dir}/index.html"/>
+
+ <ea:parameter property="docbook.parameters"
+ description="whitespace-separated list of parameter values to pass to the DocBook XSL, for example 'param1=value1 param2=value2'"
+ default=""/>
+
+ </target>
+
+ <target name=":generate" phase="documentation" depends=":init" unless="skip.documentation" description="generate documentation">
+
+ <!-- unpack docbook xsl resources into the local module directory -->
+ <mkdir dir="${docbook.module.dir}/docbook-xsl"/>
+
+ <ivy:retrieve inline="true"
+ organisation="org.apache.easyant.plugins"
+ module="docbook"
+ revision="0.1"
+ conf="docbook_dist"
+ pattern="${docbook.module.dir}/docbook-xsl/[artifact](-[classifier]).[ext]"
+ settingsRef="easyant.ivy.instance"/>
+
+ <echo>Unpacking docbook XSL distribution...</echo>
+ <unzip src="${docbook.module.dir}/docbook-xsl/docbook-xsl-resources.zip"
+ dest="${docbook.module.dir}" overwrite="false"/>
+
+ <mkdir dir="${target.documentation.dir}/html" />
+ <copy todir="${target.documentation.dir}/html">
+ <fileset dir="${src.documentation.dir}/html" includes="**/*" erroronmissingdir="false"/>
+ </copy>
+
+ <!-- convert to absolute path -->
+ <property name="docbook.index.path" location="${docbook.index.file}"/>
+
+ <!-- TODO: support other transforms: PDF, html-single, manpage, slides -->
+ <java classname="com.icl.saxon.StyleSheet" fork="true"
+ failonerror="true" dir="${target.documentation.dir}/html"
+ classpathref="org.apache.easyant.plugins#docbook.classpath">
+ <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
+ <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/>
+ <sysproperty key="org.apache.xerces.xni.parser.XMLParserConfiguration" value="org.apache.xerces.parsers.XIncludeParserConfiguration"/>
+ <jvmarg value="-Xmx256M"/>
+ <arg value="${docbook.index.path}"/>
+ <arg value="${docbook.module.dir}/docbook/html/chunk.xsl"/>
+ <arg line="${docbook.parameters}"/>
+ </java>
+
+ </target>
- <target name="doit" depends=":generate" />
-
+ <target name="doit" depends=":generate" />
+
</project>
Modified: incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/docbook/0.1/docbook.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/docbook/0.1/docbook.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/docbook/0.1/docbook.ivy (original)
+++ incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/docbook/0.1/docbook.ivy Tue Feb 22 15:55:55 2011
@@ -15,28 +15,28 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
- <info organisation="org.apache.easyant.plugins"
- module="docbook"
- status="milestone"
- revision="0.1">
- <description>Generates project documentation as HTML or PDF using docbook-xsl.
- See <a href="http://www.sagehill.net/docbookxsl">http://www.sagehill.net/docbookxsl</a>
- for instructions on writing DocBook documentation and configuring the DocBook generator.
- </description>
- </info>
- <configurations>
- <conf name="default"/>
- <conf name="docbook_dist"/>
- </configurations>
+ <info organisation="org.apache.easyant.plugins"
+ module="docbook"
+ status="milestone"
+ revision="0.1">
+ <description>Generates project documentation as HTML or PDF using docbook-xsl.
+ See <a href="http://www.sagehill.net/docbookxsl">http://www.sagehill.net/docbookxsl</a>
+ for instructions on writing DocBook documentation and configuring the DocBook generator.
+ </description>
+ </info>
+ <configurations>
+ <conf name="default"/>
+ <conf name="docbook_dist"/>
+ </configurations>
<publications>
<artifact type="ant" />
</publications>
- <dependencies>
- <dependency org="saxon" name="saxon" rev="6.5.3" conf="default"/>
- <dependency org="xerces" name="xercesImpl" rev="2.9.1" conf="default"/>
- <dependency org="net.sf.docbook" name="docbook-xsl-saxon" rev="1.0.0" conf="default"/>
- <dependency org="net.sf.docbook" name="docbook-xsl" rev="1.75.1" conf="docbook_dist->default">
- <artifact name="docbook-xsl" type="zip" m:classifier="resources" conf="docbook_dist"/>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency org="saxon" name="saxon" rev="6.5.3" conf="default"/>
+ <dependency org="xerces" name="xercesImpl" rev="2.9.1" conf="default"/>
+ <dependency org="net.sf.docbook" name="docbook-xsl-saxon" rev="1.0.0" conf="default"/>
+ <dependency org="net.sf.docbook" name="docbook-xsl" rev="1.75.1" conf="docbook_dist->default">
+ <artifact name="docbook-xsl" type="zip" m:classifier="resources" conf="docbook_dist"/>
+ </dependency>
+ </dependencies>
</ivy-module>
Modified: incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/emma/0.1/emma.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/emma/0.1/emma.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/emma/0.1/emma.ant (original)
+++ incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/emma/0.1/emma.ant Tue Feb 22 15:55:55 2011
@@ -15,77 +15,77 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#emma"
- 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 property="emma.metadata.path" description="location of emma metadata file"
- default="${target.coverage.report}/coverage.em"/>
- <ea:parameter property="emma.datafile.path" description="location of emma coverage data file"
- default="${target.coverage.report}/coverage.ec"/>
-
- <ea:parameter property="emma.overrides.file" default="${target.coverage.report}/emma-overrides.properties"/>
-
- <!-- add datafile to system properties during test run, if it isn't explicitly set elsewhere -->
- <property name="emma.properties" location="${emma.overrides.file}"/>
- <mkdir dir="${target.coverage.report}" />
-
- <!-- generate emma configuration file -->
- <propertyfile file="${emma.overrides.file}">
- <entry key="metadata.out.file" value="${emma.metadata.path}"/>
- <entry key="coverage.out.file" value="${emma.datafile.path}"/>
- </propertyfile>
-
- <ac:if>
- <not><contains string="${test.run.jvmargs}" substring="emma.properties"/></not>
- <ac:then>
- <ac:var name="test.run.jvmargs" value="-Demma.properties='${emma.properties}' ${test.run.jvmargs}"/>
- </ac:then>
- </ac:if>
-
- <available property="emma.available" classname="com.vladium.emma.emmaTask" classpathref="org.apache.easyant.plugins#emma.classpath"/>
- <fail unless="emma.available" message="Emma is unavailable!" />
- <taskdef resource="emma_ant.properties" classpathref="org.apache.easyant.plugins#emma.classpath" />
-
- </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#emma.classpath"/>
- </ea:path>
-
- <!-- Apply emma instrumentation to the classes in instrpath and copy to destdir -->
- <emma verbosity="${coverage.verbosity}" properties="${emma.properties}">
- <instr instrpath="${target.main.classes}" destdir="${target.coverage.classes}" mode="copy" merge="true">
- <filter excludes="${coverage.exclude.filter}" />
- </instr>
- </emma>
- </target>
-
- <target name=":report" depends=":init" phase="report" if="has.src.test.java">
-
- <!-- Generate code coverage report -->
- <emma>
- <report sourcepath="${src.main.java}">
- <fileset dir="${target.coverage.report}">
- <include name="*.em" />
- <include name="*.ec" />
- </fileset>
- <!--TODO: Find an easy way to choose report type -->
- <txt outfile="${target.coverage.report}/${coverage.report.name}.txt" />
- <xml outfile="${target.coverage.report}/${coverage.report.name}.xml" />
- <html outfile="${target.coverage.report}/${coverage.report.name}.html" />
- </report>
- </emma>
+ 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 property="emma.metadata.path" description="location of emma metadata file"
+ default="${target.coverage.report}/coverage.em"/>
+ <ea:parameter property="emma.datafile.path" description="location of emma coverage data file"
+ default="${target.coverage.report}/coverage.ec"/>
+
+ <ea:parameter property="emma.overrides.file" default="${target.coverage.report}/emma-overrides.properties"/>
+
+ <!-- add datafile to system properties during test run, if it isn't explicitly set elsewhere -->
+ <property name="emma.properties" location="${emma.overrides.file}"/>
+ <mkdir dir="${target.coverage.report}" />
+
+ <!-- generate emma configuration file -->
+ <propertyfile file="${emma.overrides.file}">
+ <entry key="metadata.out.file" value="${emma.metadata.path}"/>
+ <entry key="coverage.out.file" value="${emma.datafile.path}"/>
+ </propertyfile>
+
+ <ac:if>
+ <not><contains string="${test.run.jvmargs}" substring="emma.properties"/></not>
+ <ac:then>
+ <ac:var name="test.run.jvmargs" value="-Demma.properties='${emma.properties}' ${test.run.jvmargs}"/>
+ </ac:then>
+ </ac:if>
+
+ <available property="emma.available" classname="com.vladium.emma.emmaTask" classpathref="org.apache.easyant.plugins#emma.classpath"/>
+ <fail unless="emma.available" message="Emma is unavailable!" />
+ <taskdef resource="emma_ant.properties" classpathref="org.apache.easyant.plugins#emma.classpath" />
+
+ </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#emma.classpath"/>
+ </ea:path>
+
+ <!-- Apply emma instrumentation to the classes in instrpath and copy to destdir -->
+ <emma verbosity="${coverage.verbosity}" properties="${emma.properties}">
+ <instr instrpath="${target.main.classes}" destdir="${target.coverage.classes}" mode="copy" merge="true">
+ <filter excludes="${coverage.exclude.filter}" />
+ </instr>
+ </emma>
+ </target>
+
+ <target name=":report" depends=":init" phase="report" if="has.src.test.java">
+
+ <!-- Generate code coverage report -->
+ <emma>
+ <report sourcepath="${src.main.java}">
+ <fileset dir="${target.coverage.report}">
+ <include name="*.em" />
+ <include name="*.ec" />
+ </fileset>
+ <!--TODO: Find an easy way to choose report type -->
+ <txt outfile="${target.coverage.report}/${coverage.report.name}.txt" />
+ <xml outfile="${target.coverage.report}/${coverage.report.name}.xml" />
+ <html outfile="${target.coverage.report}/${coverage.report.name}.html" />
+ </report>
+ </emma>
- </target>
+ </target>
- <target name=":emma" depends="validate,test,report" description="generate emma covera report" />
- <target name="doit" depends=":emma" />
+ <target name=":emma" depends="validate,test,report" description="generate emma covera report" />
+ <target name="doit" depends=":emma" />
</project>
Modified: incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/emma/0.1/emma.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/emma/0.1/emma.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/emma/0.1/emma.ivy (original)
+++ incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/emma/0.1/emma.ivy Tue Feb 22 15:55:55 2011
@@ -15,20 +15,20 @@
limitations under the License.
-->
<ivy-module version="2.0" >
- <info organisation="org.apache.easyant.plugins"
- module="emma"
- status="milestone"
- revision="0.1">
- <description>
+ <info organisation="org.apache.easyant.plugins"
+ module="emma"
+ status="milestone"
+ revision="0.1">
+ <description>
This module provides coverage report using emma framework.<br/>
Emma library and instrumentation classes (classes used for coverage report) will be prepended at the begining of compile.test.classpath and lib.test.classpath.
- </description>
- </info>
- <publications>
- <artifact type="ant" />
- </publications>
- <dependencies>
- <dependency org="emma" name="emma" rev="2.0.5312"/>
- <dependency org="emma" name="emma_ant" rev="2.0.5312"/>
- </dependencies>
+ </description>
+ </info>
+ <publications>
+ <artifact type="ant" />
+ </publications>
+ <dependencies>
+ <dependency org="emma" name="emma" rev="2.0.5312"/>
+ <dependency org="emma" name="emma_ant" rev="2.0.5312"/>
+ </dependencies>
</ivy-module>
Modified: incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/jetty-deploy/0.1/jetty-deploy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/jetty-deploy/0.1/jetty-deploy.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/jetty-deploy/0.1/jetty-deploy.ant (original)
+++ incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/jetty-deploy/0.1/jetty-deploy.ant Tue Feb 22 15:55:55 2011
@@ -16,35 +16,35 @@
-->
<project name="org.apache.easyant.plugins#jetty-deploy" xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="package" />
- <ea:parameter property="jetty.temp.dir" default="${target}/jetty-temp" description="Jetty temporary directory. If unspecified, defaults to target/jetty-temp" />
- <ea:parameter property="jetty.xml" required="false" description="Jetty configuration XML. If unspecified, defaults to jetty.xml shipped with 6.1.4 jetty." />
- <ea:parameter property="jetty.context" default="/" description="Application context in jetty. If unspecified, defaults to root (/)." />
-
-
- <available property="jetty.available" classname="org.mortbay.jetty.ant.JettyRunTask" classpathref="org.apache.easyant.plugins#jetty-deploy.classpath" />
-
- <fail unless="jetty.available" message="Jetty is unavailable!" />
-
-
- <taskdef name="jetty" classname="org.mortbay.jetty.ant.JettyRunTask" classpathref="org.apache.easyant.plugins#jetty-deploy.classpath" />
- </target>
-
- <!-- default way jetty will be run:
- jetty temp directory: target/jetty-temp
- jetty configuration xml: jetty.xml shipped with this module (standard 6.1.4 jetty.xml shipped with jetty)
- webapplication context: root (/)
- -->
- <target name=":run" depends="package" description="run your webapp inside a jetty application server">
- <echo message="Deploying ${module.name} on Jetty .." />
- <jetty tempDirectory="${jetty.temp.dir}" jettyXml="${jetty.xml}">
- <webApp name="${module.name}" warfile="${target.artifacts}/${target.artifacts.main.war.name}" contextpath="${jetty.context}" />
- </jetty>
- </target>
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="package" />
+ <ea:parameter property="jetty.temp.dir" default="${target}/jetty-temp" description="Jetty temporary directory. If unspecified, defaults to target/jetty-temp" />
+ <ea:parameter property="jetty.xml" required="false" description="Jetty configuration XML. If unspecified, defaults to jetty.xml shipped with 6.1.4 jetty." />
+ <ea:parameter property="jetty.context" default="/" description="Application context in jetty. If unspecified, defaults to root (/)." />
+
+
+ <available property="jetty.available" classname="org.mortbay.jetty.ant.JettyRunTask" classpathref="org.apache.easyant.plugins#jetty-deploy.classpath" />
+
+ <fail unless="jetty.available" message="Jetty is unavailable!" />
+
+
+ <taskdef name="jetty" classname="org.mortbay.jetty.ant.JettyRunTask" classpathref="org.apache.easyant.plugins#jetty-deploy.classpath" />
+ </target>
+
+ <!-- default way jetty will be run:
+ jetty temp directory: target/jetty-temp
+ jetty configuration xml: jetty.xml shipped with this module (standard 6.1.4 jetty.xml shipped with jetty)
+ webapplication context: root (/)
+ -->
+ <target name=":run" depends="package" description="run your webapp inside a jetty application server">
+ <echo message="Deploying ${module.name} on Jetty .." />
+ <jetty tempDirectory="${jetty.temp.dir}" jettyXml="${jetty.xml}">
+ <webApp name="${module.name}" warfile="${target.artifacts}/${target.artifacts.main.war.name}" contextpath="${jetty.context}" />
+ </jetty>
+ </target>
- <target name="doit" depends=":run" />
+ <target name="doit" depends=":run" />
</project>
Modified: incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/jetty-deploy/0.1/jetty-deploy.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/jetty-deploy/0.1/jetty-deploy.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/jetty-deploy/0.1/jetty-deploy.ivy (original)
+++ incubator/easyant/core/trunk/repository/extra-modules/org.apache.easyant.plugins/jetty-deploy/0.1/jetty-deploy.ivy Tue Feb 22 15:55:55 2011
@@ -15,37 +15,37 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.easyant.plugins"
- module="jetty-deploy"
- status="milestone"
- revision="0.1">
- <description>
- A developer-convenience module for quick war-build-and-deploy with jetty (v 6.1.4). This module will
- build a webapplication (following same requirements as build-webapp-java module), launch
- jetty and deploy the built application. <br />
- The user can pass the following additional parameters for configuring the jetty run:
- <ol>
- <li>jetty.temp.dir: Jetty temp working directory. Defaults to: target/jetty-temp.</li>
- <li>jetty.xml: Jetty Configuration XML. If unspecified, defaults to standard jetty XML
- shipped with jetty 6.1.4.</li>
- <li>jetty.context: Context the webapplication should be deployed in. If unspecified,
- defaults to Root (/) context.</li>
- </ol><br />
- Each of these can be selectively overriden by the user. To override, in your module.ivy, include
- a property file in the module ivy description.
- </description>
- </info>
- <publications>
- <artifact type="ant" />
- </publications>
- <dependencies>
- <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.4"/>
- <dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.4"/>
- <dependency org="org.mortbay.jetty" name="jetty-plus" rev="6.1.4"/>
- <dependency org="org.mortbay.jetty" name="jetty-naming" rev="6.1.4"/>
- <dependency org="org.mortbay.jetty" name="jetty-ant" rev="6.1.4"/>
- <dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="6.1.4"/>
- <dependency org="org.mortbay.jetty" name="jsp-2.1" rev="6.1.4"/>
- <dependency org="org.mortbay.jetty" name="servlet-api-2.5" rev="6.1.4"/>
- </dependencies>
+ <info organisation="org.apache.easyant.plugins"
+ module="jetty-deploy"
+ status="milestone"
+ revision="0.1">
+ <description>
+ A developer-convenience module for quick war-build-and-deploy with jetty (v 6.1.4). This module will
+ build a webapplication (following same requirements as build-webapp-java module), launch
+ jetty and deploy the built application. <br />
+ The user can pass the following additional parameters for configuring the jetty run:
+ <ol>
+ <li>jetty.temp.dir: Jetty temp working directory. Defaults to: target/jetty-temp.</li>
+ <li>jetty.xml: Jetty Configuration XML. If unspecified, defaults to standard jetty XML
+ shipped with jetty 6.1.4.</li>
+ <li>jetty.context: Context the webapplication should be deployed in. If unspecified,
+ defaults to Root (/) context.</li>
+ </ol><br />
+ Each of these can be selectively overriden by the user. To override, in your module.ivy, include
+ a property file in the module ivy description.
+ </description>
+ </info>
+ <publications>
+ <artifact type="ant" />
+ </publications>
+ <dependencies>
+ <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.4"/>
+ <dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.4"/>
+ <dependency org="org.mortbay.jetty" name="jetty-plus" rev="6.1.4"/>
+ <dependency org="org.mortbay.jetty" name="jetty-naming" rev="6.1.4"/>
+ <dependency org="org.mortbay.jetty" name="jetty-ant" rev="6.1.4"/>
+ <dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="6.1.4"/>
+ <dependency org="org.mortbay.jetty" name="jsp-2.1" rev="6.1.4"/>
+ <dependency org="org.mortbay.jetty" name="servlet-api-2.5" rev="6.1.4"/>
+ </dependencies>
</ivy-module>