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 jl...@apache.org on 2012/10/16 21:33:21 UTC
svn commit: r1398999 [1/4] - in /incubator/easyant/plugins/trunk: javadoc/
javadoc/src/main/resources/ javadoc/src/test/antunit/ jetty-deploy/
jetty-deploy/src/main/resources/ jetty-deploy/src/test/antunit/ manifest/
manifest/src/main/resources/ manife...
Author: jlboudart
Date: Tue Oct 16 21:33:19 2012
New Revision: 1398999
URL: http://svn.apache.org/viewvc?rev=1398999&view=rev
Log:
Format plugin sources reference parent module (part3 final one :))
Modified:
incubator/easyant/plugins/trunk/javadoc/module.ivy
incubator/easyant/plugins/trunk/javadoc/src/main/resources/javadoc.ant
incubator/easyant/plugins/trunk/javadoc/src/test/antunit/javadoc-test.xml
incubator/easyant/plugins/trunk/javadoc/src/test/antunit/sample-module.ivy
incubator/easyant/plugins/trunk/jetty-deploy/module.ivy
incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant
incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/jetty-deploy-test.xml
incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/sample-module.ivy
incubator/easyant/plugins/trunk/manifest/module.ivy
incubator/easyant/plugins/trunk/manifest/src/main/resources/manifest.ant
incubator/easyant/plugins/trunk/manifest/src/test/antunit/manifest-test.xml
incubator/easyant/plugins/trunk/maven-publication/module.ivy
incubator/easyant/plugins/trunk/maven-publication/src/main/resources/maven-publication.ant
incubator/easyant/plugins/trunk/maven-version-strategy/module.ivy
incubator/easyant/plugins/trunk/maven-version-strategy/src/main/resources/maven-version-strategy.ant
incubator/easyant/plugins/trunk/maven-version-strategy/src/test/antunit/maven-version-strategy-test.xml
incubator/easyant/plugins/trunk/meta-build-autoactivator/module.ivy
incubator/easyant/plugins/trunk/meta-build-autoactivator/src/main/resources/meta-build-autoactivator.ant
incubator/easyant/plugins/trunk/meta-build-autoactivator/src/test/antunit/meta-build-autoactivator-test.xml
incubator/easyant/plugins/trunk/meta-build-autoactivator/src/test/antunit/submodule/module.ivy
incubator/easyant/plugins/trunk/offline/module.ivy
incubator/easyant/plugins/trunk/offline/src/main/resources/offline.ant
incubator/easyant/plugins/trunk/offline/src/test/antunit/offline-test.xml
incubator/easyant/plugins/trunk/offline/src/test/antunit/sample-module.ivy
incubator/easyant/plugins/trunk/osgi-bundle/module.ivy
incubator/easyant/plugins/trunk/osgi-bundle/src/main/resources/osgi-bundle.ant
incubator/easyant/plugins/trunk/package-jar/module.ivy
incubator/easyant/plugins/trunk/package-jar/src/main/resources/package-jar.ant
incubator/easyant/plugins/trunk/package-jar/src/test/antunit/package-jar-test.xml
incubator/easyant/plugins/trunk/package-war/module.ivy
incubator/easyant/plugins/trunk/package-war/src/main/resources/package-war.ant
incubator/easyant/plugins/trunk/package-war/src/test/antunit/package-war-test.xml
incubator/easyant/plugins/trunk/phases-std/module.ivy
incubator/easyant/plugins/trunk/phases-std/src/main/resources/phases-std.ant
incubator/easyant/plugins/trunk/rat/module.ivy
incubator/easyant/plugins/trunk/rat/src/main/resources/rat.ant
incubator/easyant/plugins/trunk/rat/src/test/antunit/rat-test.xml
incubator/easyant/plugins/trunk/resources-std/module.ivy
incubator/easyant/plugins/trunk/resources-std/src/main/resources/resources-std.ant
incubator/easyant/plugins/trunk/resources-std/src/test/antunit/resources-std-test.xml
incubator/easyant/plugins/trunk/run-java/module.ivy
incubator/easyant/plugins/trunk/run-java/src/main/resources/run-java.ant
incubator/easyant/plugins/trunk/run-java/src/test/antunit/run-java-test.xml
incubator/easyant/plugins/trunk/scaladoc/module.ivy
incubator/easyant/plugins/trunk/scaladoc/src/main/resources/scaladoc.ant
incubator/easyant/plugins/trunk/scm-svn/module.ivy
incubator/easyant/plugins/trunk/scm-svn/src/main/resources/scm-svn.ant
incubator/easyant/plugins/trunk/scm-svn/src/test/antunit/scm-svn-test.xml
incubator/easyant/plugins/trunk/skeleton/module.ivy
incubator/easyant/plugins/trunk/skeleton/src/main/resources/ivy.xml.tpl
incubator/easyant/plugins/trunk/skeleton/src/main/resources/skeleton.ant
incubator/easyant/plugins/trunk/skeleton/src/test/antunit/skeleton-test.xml
incubator/easyant/plugins/trunk/source-jar/module.ivy
incubator/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant
incubator/easyant/plugins/trunk/source-jar/src/test/antunit/sample-module.ivy
incubator/easyant/plugins/trunk/source-jar/src/test/antunit/source-jar-test.xml
incubator/easyant/plugins/trunk/test-junit/module.ivy
incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant
incubator/easyant/plugins/trunk/test-junit/src/test/antunit/sample-module.ivy
incubator/easyant/plugins/trunk/test-junit/src/test/antunit/test-junit-test.xml
incubator/easyant/plugins/trunk/test-testng/module.ivy
incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant
incubator/easyant/plugins/trunk/test-testng/src/test/antunit/sample-module.ivy
incubator/easyant/plugins/trunk/test-testng/src/test/antunit/test-testng-test.xml
incubator/easyant/plugins/trunk/webstart/module.ivy
incubator/easyant/plugins/trunk/webstart/src/main/resources/webstart.ant
incubator/easyant/plugins/trunk/webstart/src/test/antunit/webstart-test.xml
incubator/easyant/plugins/trunk/xooki/module.ivy
incubator/easyant/plugins/trunk/xooki/src/main/resources/xooki.ant
Modified: incubator/easyant/plugins/trunk/javadoc/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/javadoc/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/javadoc/module.ivy (original)
+++ incubator/easyant/plugins/trunk/javadoc/module.ivy Tue Oct 16 21:33:19 2012
@@ -14,34 +14,38 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.plugins" module="javadoc" revision="0.9">
- <description>
- <p>This module provides javadoc feature.</p>
- <p>
- You can bind targets of this plugin to package phase by using bindtarget element in your module.ivy file.
- Example :
- <code type="xml">
- <plugin name="javadoc" rev="0.1" as="javadoc"/>
- <bindtarget target="javadoc:package" tophase="package"/>
- </code>
- Or as a nested element of the plugin
- <code type="xml">
- <plugin name="javadoc" rev="0.1" as="javadoc">
+ <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
+ <description>
+ <p>This module provides javadoc feature.</p>
+ <p>
+ You can bind targets of this plugin to package phase by using bindtarget element in your module.ivy
+ file.
+ Example :
+ <code type="xml">
+ <plugin name="javadoc" rev="0.1" as="javadoc" />
+ <bindtarget target="javadoc:package" tophase="package" />
+ </code>
+ Or as a nested element of the plugin
+ <code type="xml">
+ <plugin name="javadoc" rev="0.1" as="javadoc">
<!-- here, the target prefix is not mandatory as easyant can determine it from plugin element -->
- <bindtarget target=":package" tophase="package"/>
- </plugin>
- </code>
- </p>
- </description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
- </info>
- <configurations>
- <conf name="default" description="runtime dependencies artifact can be used with this conf"/>
- <conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
- <conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
- </configurations>
+ <bindtarget target=":package" tophase="package" />
+ </plugin>
+ </code>
+ </p>
+ </description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+ </info>
+ <configurations>
+ <conf name="default" description="runtime dependencies artifact can be used with this conf" />
+ <conf name="test"
+ description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+ <conf name="provided"
+ description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
+ </configurations>
<publications>
- <artifact type="ant"/>
+ <artifact type="ant" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/javadoc/src/main/resources/javadoc.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/javadoc/src/main/resources/javadoc.ant?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/javadoc/src/main/resources/javadoc.ant (original)
+++ incubator/easyant/plugins/trunk/javadoc/src/main/resources/javadoc.ant Tue Oct 16 21:33:19 2012
@@ -15,18 +15,18 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#javadoc" xmlns:ea="antlib:org.apache.easyant">
-
<ea:core-version requiredrevision="[0.8,+]" />
<target name="javadoc:init">
<ea:parameter property="src.main.java" default="${basedir}/src/main/java" description="directory where sources to be compiled are" />
<ea:parameter property="src.test.java" default="${basedir}/src/test/java" description="directory where test sources to be compiled are" />
- <ea:parameter property="javadoc.file.encoding" default="UTF-8" description="encoding used for generated javadoc" />
-
- <ea:parameter property="target.reports" default="${target}/reports" description="base directory for reports"/>
+ <ea:parameter property="javadoc.file.encoding" default="UTF-8" description="encoding used for generated javadoc" />
+
+ <ea:parameter property="target.reports" default="${target}/reports" description="base directory for reports" />
<ea:parameter property="target.javadoc" default="${target.reports}/javadoc" description="base directory where javadoc will be generated" />
<ea:parameter property="target.javadoc.main" default="${target.javadoc}/main" description="directory where javadoc will be generated" />
- <ea:parameter property="target.javadoc.test" default="${target.javadoc}/test" description="directory where javadoc for tests will be generated" />
+ <ea:parameter property="target.javadoc.test" default="${target.javadoc}/test"
+ description="directory where javadoc for tests will be generated" />
<ea:parameter property="javadoc.publish.conf" default="documentation" description="default configuration for javadoc artifacts" />
@@ -35,12 +35,12 @@
<condition property="empty.src.test.java.dir">
<or>
<not>
- <available file="${src.test.java}"/>
+ <available file="${src.test.java}" />
</not>
- <length length="0" >
- <fileset dir="${src.test.java}"/>
+ <length length="0">
+ <fileset dir="${src.test.java}" />
</length>
- </or>
+ </or>
</condition>
<!-- if src.main.java does not exit OR is an empty dir we set the empty.src.main.java.dir property that will skip the javadoc generation -->
<condition property="empty.src.main.java.dir">
@@ -48,8 +48,8 @@
<not>
<available file="${src.main.java}" />
</not>
- <length length="0" >
- <fileset dir="${src.main.java}"/>
+ <length length="0">
+ <fileset dir="${src.main.java}" />
</length>
</or>
</condition>
@@ -59,26 +59,30 @@
<path id="java.main.source.path">
<dirset dir="${src.main.java}" />
</path>
- <javadoc encoding="${javadoc.file.encoding}" docencoding="${javadoc.file.encoding}" destdir="${target.javadoc.main}" sourcepathref="java.main.source.path" />
+ <javadoc encoding="${javadoc.file.encoding}" docencoding="${javadoc.file.encoding}" destdir="${target.javadoc.main}"
+ sourcepathref="java.main.source.path" />
</target>
<target name="-javadoc:test" depends="javadoc:init" unless="empty.src.test.java.dir">
<path id="java.test.source.path">
<dirset dir="${src.test.java}" />
</path>
- <javadoc encoding="${javadoc.file.encoding}" docencoding="${javadoc.file.encoding}" destdir="${target.javadoc.test}" sourcepathref="java.test.source.path" />
+ <javadoc encoding="${javadoc.file.encoding}" docencoding="${javadoc.file.encoding}" destdir="${target.javadoc.test}"
+ sourcepathref="java.test.source.path" />
</target>
- <target name="javadoc:package" depends="javadoc:javadoc" description="generate a package containing javadoc" unless="skip.javadoc.package">
- <ea:parameter property="target.artifacts" default="${target}/artifacts" description="destination directory for target artifacts"/>
+ <target name="javadoc:package" depends="javadoc:javadoc" description="generate a package containing javadoc"
+ unless="skip.javadoc.package">
+ <ea:parameter property="target.artifacts" default="${target}/artifacts" description="destination directory for target artifacts" />
<ea:parameter property="project.ivy.instance" default="project.ivy.instance" description="the ivy instance name for your project" />
- <mkdir dir="${target.artifacts}"/>
+ <mkdir dir="${target.artifacts}" />
<zip destfile="${target.artifacts}/${ivy.module}-javadoc.zip">
- <fileset dir="${target.javadoc}" erroronmissingdir="false"/>
+ <fileset dir="${target.javadoc}" erroronmissingdir="false" />
</zip>
- <ea:registerartifact type="javadoc" ext="zip" classifier="javadoc" settingsRef="${project.ivy.instance}" confs="${javadoc.publish.conf}"/>
+ <ea:registerartifact type="javadoc" ext="zip" classifier="javadoc" settingsRef="${project.ivy.instance}"
+ confs="${javadoc.publish.conf}" />
</target>
<target name="javadoc:javadoc" depends="-javadoc:main,-javadoc:test" description="generate javadoc report for main classes and test classes" />
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/javadoc/src/test/antunit/javadoc-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/javadoc/src/test/antunit/javadoc-test.xml?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/javadoc/src/test/antunit/javadoc-test.xml (original)
+++ incubator/easyant/plugins/trunk/javadoc/src/test/antunit/javadoc-test.xml Tue Oct 16 21:33:19 2012
@@ -14,55 +14,53 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;javadoc-test"
- xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:ivy="antlib:org.apache.ivy.ant"
+<project name="org.apache.easyant.plugins;javadoc-test" xmlns:au="antlib:org.apache.ant.antunit" xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:ea="antlib:org.apache.easyant">
- <!-- Import your plugin -->
- <property name="target" value="${basedir}/target/test-antunit"/>
+ <!-- Import your plugin -->
+ <property name="target" value="${basedir}/target/test-antunit" />
<!-- configure easyant in current project -->
<ea:configure-easyant-ivy-instance />
<!-- import our local plugin -->
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources" />
- <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
+ <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
<target name="clean" description="remove stale build artifacts before / after each test">
<delete dir="${basedir}" includeemptydirs="true">
- <include name="**/target/**"/>
- <include name="**/lib/**"/>
+ <include name="**/target/**" />
+ <include name="**/lib/**" />
</delete>
</target>
-
+
<target name="setUp" depends="clean">
- <ivy:settings id="project.ivy.instance"/>
- <ivy:resolve file="sample-module.ivy" settingsRef="project.ivy.instance"/>
+ <ivy:settings id="project.ivy.instance" />
+ <ivy:resolve file="sample-module.ivy" settingsRef="project.ivy.instance" />
</target>
- <target name="tearDown" depends="clean"/>
-
+ <target name="tearDown" depends="clean" />
+
<target name="test-javadoc:init" depends="javadoc:init">
- <au:assertPropertyEquals name="src.main.java" value="${basedir}/src/main/java"/>
- <au:assertPropertyEquals name="src.test.java" value="${basedir}/src/test/java"/>
- <au:assertPropertyEquals name="javadoc.file.encoding" value="UTF-8"/>
- <au:assertPropertyEquals name="target.reports" value="${target}/reports"/>
- <au:assertPropertyEquals name="target.javadoc" value="${target.reports}/javadoc"/>
- <au:assertPropertyEquals name="target.javadoc.main" value="${target.javadoc}/main"/>
- <au:assertPropertyEquals name="target.javadoc.test" value="${target.javadoc}/test"/>
- <au:assertPropertyEquals name="javadoc.publish.conf" value="documentation"/>
+ <au:assertPropertyEquals name="src.main.java" value="${basedir}/src/main/java" />
+ <au:assertPropertyEquals name="src.test.java" value="${basedir}/src/test/java" />
+ <au:assertPropertyEquals name="javadoc.file.encoding" value="UTF-8" />
+ <au:assertPropertyEquals name="target.reports" value="${target}/reports" />
+ <au:assertPropertyEquals name="target.javadoc" value="${target.reports}/javadoc" />
+ <au:assertPropertyEquals name="target.javadoc.main" value="${target.javadoc}/main" />
+ <au:assertPropertyEquals name="target.javadoc.test" value="${target.javadoc}/test" />
+ <au:assertPropertyEquals name="javadoc.publish.conf" value="documentation" />
</target>
<target name="test-javadoc:main" depends="-javadoc:main">
- <au:assertReferenceSet refid="java.main.source.path"/>
- <au:assertFileExists file="${target.javadoc.main}"/>
+ <au:assertReferenceSet refid="java.main.source.path" />
+ <au:assertFileExists file="${target.javadoc.main}" />
</target>
<target name="test-javadoc:test" depends="-javadoc:test">
- <au:assertReferenceSet refid="java.test.source.path"/>
- <au:assertFileExists file="${target.javadoc.test}"/>
+ <au:assertReferenceSet refid="java.test.source.path" />
+ <au:assertFileExists file="${target.javadoc.test}" />
</target>
<target name="test-javadoc:package" depends="javadoc:package">
- <au:assertFileExists file="${target.artifacts}"/>
- <au:assertFileExists file="${target.artifacts}/${ivy.module}-javadoc.zip"/>
+ <au:assertFileExists file="${target.artifacts}" />
+ <au:assertFileExists file="${target.artifacts}/${ivy.module}-javadoc.zip" />
</target>
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/javadoc/src/test/antunit/sample-module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/javadoc/src/test/antunit/sample-module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/javadoc/src/test/antunit/sample-module.ivy (original)
+++ incubator/easyant/plugins/trunk/javadoc/src/test/antunit/sample-module.ivy Tue Oct 16 21:33:19 2012
@@ -15,15 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration"/>
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+ <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration" />
<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."/>
+ <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>
<dependencies>
- <dependency org="junit" name="junit" rev="4.4" conf="*->default"/>
+ <dependency org="junit" name="junit" rev="4.4" conf="*->default" />
</dependencies>
-
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/jetty-deploy/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/jetty-deploy/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/jetty-deploy/module.ivy (original)
+++ incubator/easyant/plugins/trunk/jetty-deploy/module.ivy Tue Oct 16 21:33:19 2012
@@ -14,41 +14,47 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.plugins" module="jetty-deploy" revision="0.9">
- <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/>
+ <extends organisation="org.apache.easyant.plugins" module="parent-plugin" 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
+ <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
+ 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>
- <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>
+ </description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+ </info>
+ <configurations>
+ <conf name="default" description="runtime dependencies artifact can be used with this conf" />
+ <conf name="test"
+ description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+ <conf name="provided"
+ description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
+ </configurations>
<publications>
- <artifact type="ant"/>
+ <artifact 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"/>
+ <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>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant (original)
+++ incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant Tue Oct 16 21:33:19 2012
@@ -15,21 +15,23 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#jetty-deploy" xmlns:ea="antlib:org.apache.easyant">
-
<ea:core-version requiredrevision="[0.9,+]" />
<ea:import mrid="org.apache.easyant.plugins#package-war;0.9" />
<target name="jetty-deploy:init">
- <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 (/)." />
+ <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 resource="tasks.properties" classpathref="org.apache.easyant.plugins#jetty-deploy.classpath" loaderref="jetty.loader"/>
+ <taskdef resource="tasks.properties" classpathref="org.apache.easyant.plugins#jetty-deploy.classpath"
+ loaderref="jetty.loader" />
</target>
<!-- default way jetty will be run:
@@ -40,8 +42,8 @@
<target name="jetty-deploy:run" depends="jetty-deploy:init,package-war:war" 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}" />
+ <webApp name="${module.name}" warfile="${target.artifacts}/${target.artifacts.main.war.name}"
+ contextpath="${jetty.context}" />
</jetty>
</target>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/jetty-deploy-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/jetty-deploy-test.xml?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/jetty-deploy-test.xml (original)
+++ incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/jetty-deploy-test.xml Tue Oct 16 21:33:19 2012
@@ -14,54 +14,50 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;jetty-deploy-test"
- xmlns:ac="antlib:net.sf.antcontrib"
- xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ea="antlib:org.apache.easyant">
+<project name="org.apache.easyant.plugins;jetty-deploy-test" xmlns:ac="antlib:net.sf.antcontrib" xmlns:au="antlib:org.apache.ant.antunit"
+ xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ea="antlib:org.apache.easyant">
- <!-- Import your plugin -->
- <property name="target" value="${basedir}/target/test-antunit"/>
+ <!-- Import your plugin -->
+ <property name="target" value="${basedir}/target/test-antunit" />
<!-- configure easyant in current project -->
<ea:configure-easyant-ivy-instance />
<!-- import our local plugin -->
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources" />
- <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
+ <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
<target name="clean" description="remove stale build artifacts before / after each test">
<delete dir="${basedir}" includeemptydirs="true">
- <include name="**/target/**"/>
- <include name="**/lib/**"/>
+ <include name="**/target/**" />
+ <include name="**/lib/**" />
</delete>
</target>
-
- <target name="setUp" depends="clean">
- <property name="ivy.local.default.root" value="${target}/local-repo"/>
- <property name="ivy.shared.default.root" value="${target}/shared-repo"/>
- <property name="project.ivy.file" value="sample-module.ivy"/>
- <ivy:settings id="project.ivy.instance"/>
- <ivy:resolve file="${project.ivy.file}" settingsRef="project.ivy.instance"/>
- <mkdir dir="${target}/artifacts"/>
- <echo file="${target}/artifacts/standard-java-app.jar"/>
- <property name="manifest.file" value="${target}/MANIFEST.MF"/>
- <echo file="${manifest.file}"/>
+ <target name="setUp" depends="clean">
+ <property name="ivy.local.default.root" value="${target}/local-repo" />
+ <property name="ivy.shared.default.root" value="${target}/shared-repo" />
+ <property name="project.ivy.file" value="sample-module.ivy" />
+ <ivy:settings id="project.ivy.instance" />
+ <ivy:resolve file="${project.ivy.file}" settingsRef="project.ivy.instance" />
+ <mkdir dir="${target}/artifacts" />
+ <echo file="${target}/artifacts/standard-java-app.jar" />
+ <property name="manifest.file" value="${target}/MANIFEST.MF" />
+ <echo file="${manifest.file}" />
</target>
- <target name="tearDown" depends="clean"/>
-
+ <target name="tearDown" depends="clean" />
+
<target name="test-jetty-deploy:init" depends="jetty-deploy:init">
- <au:assertPropertyEquals name="jetty.temp.dir" value="${target}/jetty-temp"/>
+ <au:assertPropertyEquals name="jetty.temp.dir" value="${target}/jetty-temp" />
<au:assertFalse>
<isset property="jetty.xml" />
</au:assertFalse>
- <au:assertPropertyEquals name="jetty.context" value="/"/>
- <au:assertPropertyEquals name="jetty.available" value="true"/>
- </target>
+ <au:assertPropertyEquals name="jetty.context" value="/" />
+ <au:assertPropertyEquals name="jetty.available" value="true" />
+ </target>
- <target name="test-jetty-deploy:run">
+ <target name="test-jetty-deploy:run">
<!--TODO : don't know yet how to test this target -->
<!--
<antcall target="jetty-deploy:run"/>
-->
- </target>
-</project>
+ </target>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/sample-module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/sample-module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/sample-module.ivy (original)
+++ incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/sample-module.ivy Tue Oct 16 21:33:19 2012
@@ -15,7 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration"/>
-
-</ivy-module>
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+ <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration" />
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/manifest/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/manifest/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/manifest/module.ivy (original)
+++ incubator/easyant/plugins/trunk/manifest/module.ivy Tue Oct 16 21:33:19 2012
@@ -14,19 +14,25 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.plugins" module="manifest" revision="0.9">
- <description>This module provides manifest generation feature.<br/>
-This module also provide a target to make an executable jar. This features requires to have dependencies in your project directory. This can be done by setting the retrieve.dependencies to true.
+ <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
+ <description>
+ This module provides manifest generation feature.
+ <br />
+ This module also provide a target to make an executable jar. This features requires to have dependencies in
+ your project directory. This can be done by setting the retrieve.dependencies to true.
</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>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+ </info>
+ <configurations>
+ <conf name="default" description="runtime dependencies artifact can be used with this conf" />
+ <conf name="test"
+ description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+ <conf name="provided"
+ description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
+ </configurations>
<publications>
- <artifact type="ant"/>
+ <artifact type="ant" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/manifest/src/main/resources/manifest.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/manifest/src/main/resources/manifest.ant?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/manifest/src/main/resources/manifest.ant (original)
+++ incubator/easyant/plugins/trunk/manifest/src/main/resources/manifest.ant Tue Oct 16 21:33:19 2012
@@ -15,34 +15,39 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#manifest" xmlns:ea="antlib:org.apache.easyant">
-
<ea:core-version requiredrevision="[0.9,+]" />
<ea:import mrid="org.apache.easyant.plugins#abstract-provisioning;0.9" />
<target name="manifest:init">
- <ea:parameter property="project.main.classname" description="Used to define the project main class. The mainclass will then be used by many plugins (manifest, run-java, etc...)"/>
+ <ea:parameter property="project.main.classname"
+ description="Used to define the project main class. The mainclass will then be used by many plugins (manifest, run-java, etc...)" />
<ea:parameter property="manifest.main.classname" default="${project.main.classname}">
- If defined, Main-Class and Class-Path attributes are added to produce an executable jar file.
- By default this property take the same value as 'project.main.classname' property.
- If you are looking for a way to reference your mainclass one time for all plugins you should set project.main.classname instead.
+ If defined, Main-Class and Class-Path attributes are added to produce an executable jar file.
+ By default this property take the same value as 'project.main.classname' property.
+ If you are looking for a way to reference your mainclass one time for all plugins you should set project.main.classname
+ instead.
</ea:parameter>
- <ea:parameter property="manifest.classpath" required="false" description="If manifest.main.classname is defined, this will be used for the Class-Path attribute. by default this will be automatically computed from the Ivy dependencies of the target artifact." />
- <ea:parameter property="target.main.classes" default="${target}/main/classes"
- description="destination directory for compiled classes" />
- <mkdir dir="${target.main.classes}/META-INF"/>
+ <ea:parameter property="manifest.classpath" required="false"
+ description="If manifest.main.classname is defined, this will be used for the Class-Path attribute. by default this will be automatically computed from the Ivy dependencies of the target artifact." />
+ <ea:parameter property="target.main.classes" default="${target}/main/classes" description="destination directory for compiled classes" />
+ <mkdir dir="${target.main.classes}/META-INF" />
<ea:parameter property="manifest.file" default="${target}/MANIFEST.MF" description="the manifest-file to create/update." />
- <ea:parameter property="version.properties.file" default="${target.main.classes}/META-INF/version.properties" description="the version.properties file to create/update." />
+ <ea:parameter property="version.properties.file" default="${target.main.classes}/META-INF/version.properties"
+ description="the version.properties file to create/update." />
<!--TODO: maybe it will be more generic if we doesn't use ivy.* properties -->
- <ea:parameter property="ivy.module" description="the name of the project, used to fill the Specification-Title and Implementation-Title in the manifest" />
- <ea:parameter property="ivy.organisation" description="the name of the organisation that is the owner of this module, used to fill the Specification-Vendor and Implementation-Vendor in the manifest" />
- <ea:parameter property="ivy.revision" description="the revision of the project, used to fill the Specification-Version and Implementation-Version in the manifest" />
+ <ea:parameter property="ivy.module"
+ description="the name of the project, used to fill the Specification-Title and Implementation-Title in the manifest" />
+ <ea:parameter property="ivy.organisation"
+ description="the name of the organisation that is the owner of this module, used to fill the Specification-Vendor and Implementation-Vendor in the manifest" />
+ <ea:parameter property="ivy.revision"
+ description="the revision of the project, used to fill the Specification-Version and Implementation-Version in the manifest" />
<ea:parameter property="version" description="the full version of the project" />
<condition property="is.manifest.runnable">
<and>
- <isset property="manifest.main.classname"/>
+ <isset property="manifest.main.classname" />
<not>
- <equals arg1="${manifest.main.classname}" arg2="$${project.main.classname}"/>
+ <equals arg1="${manifest.main.classname}" arg2="$${project.main.classname}" />
</not>
</and>
</condition>
@@ -52,7 +57,6 @@
<tstamp>
<format property="now" pattern="yyyyMMddHHmmss" />
</tstamp>
-
<property name="version" value="${ivy.revision}-build-${now}" />
</target>
@@ -77,11 +81,13 @@
</target>
<!-- currently this target is only available if we use retrieve.dependencies=true because manifestclasspath is excepting a relative based structure which is not really usable using the ivy cache for example -->
- <target name="manifest:manifest-runnable" depends="manifest:manifest" description="add manifest attributes required for an executable jar" if="is.manifest.runnable">
+ <target name="manifest:manifest-runnable" depends="manifest:manifest" description="add manifest attributes required for an executable jar"
+ if="is.manifest.runnable">
<condition property="is.retrieve.dependencies.enabled">
- <istrue value="${retrieve.dependencies}"/>
+ <istrue value="${retrieve.dependencies}" />
</condition>
- <fail unless="is.retrieve.dependencies.enabled" message="manifest runnable feature can only be used if your the property retrieve.dependencies is enabled"/>
+ <fail unless="is.retrieve.dependencies.enabled"
+ message="manifest runnable feature can only be used if your the property retrieve.dependencies is enabled" />
<path id="manifest.main.classpath">
<fileset id="lib.main.fileset" dir="${lib.main}">
<include name="*.jar" />
@@ -89,15 +95,14 @@
</path>
<!-- create the target artifact dir if it does not exists -->
- <dirname file="${target.main.artifact}" property="target.artifacts"/>
- <mkdir dir="${target.artifacts}"/>
+ <dirname file="${target.main.artifact}" property="target.artifacts" />
+ <mkdir dir="${target.artifacts}" />
<manifestclasspath property="manifest.classpath" jarfile="${target.main.artifact}">
- <classpath refid="manifest.main.classpath"/>
+ <classpath refid="manifest.main.classpath" />
</manifestclasspath>
<manifest file="${manifest.file}" mode="update">
<attribute name="Main-Class" value="${manifest.main.classname}" />
<attribute name="Class-Path" value="${manifest.classpath}" />
</manifest>
</target>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/manifest/src/test/antunit/manifest-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/manifest/src/test/antunit/manifest-test.xml?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/manifest/src/test/antunit/manifest-test.xml (original)
+++ incubator/easyant/plugins/trunk/manifest/src/test/antunit/manifest-test.xml Tue Oct 16 21:33:19 2012
@@ -14,67 +14,65 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;manifest-test"
- xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:ivy="antlib:org.apache.ivy.ant"
+<project name="org.apache.easyant.plugins;manifest-test" xmlns:au="antlib:org.apache.ant.antunit" xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:ea="antlib:org.apache.easyant">
- <!-- Import your plugin -->
- <property name="target" value="target/test-antunit"/>
+ <!-- Import your plugin -->
+ <property name="target" value="target/test-antunit" />
<!-- configure easyant in current project -->
<ea:configure-easyant-ivy-instance />
<!-- import our local plugin -->
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources" />
- <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
+ <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
<target name="clean" description="remove stale build artifacts before / after each test">
<delete dir="${basedir}" includeemptydirs="true">
- <include name="**/target/**"/>
- <include name="**/lib/**"/>
+ <include name="**/target/**" />
+ <include name="**/lib/**" />
</delete>
</target>
-
+
<target name="setUp" depends="clean">
- <property name="ivy.module" value="mytest"/>
- <property name="ivy.organisation" value="myorg"/>
- <property name="ivy.revision" value="1.0"/>
+ <property name="ivy.module" value="mytest" />
+ <property name="ivy.organisation" value="myorg" />
+ <property name="ivy.revision" value="1.0" />
<!--
<property name="version" value="1.0"/>
-->
</target>
- <target name="tearDown" depends="clean"/>
-
+ <target name="tearDown" depends="clean" />
+
<target name="test-manifest:init" depends="manifest:init">
<!-- FIXME: check unset properties
<au:assertPropertyNotSet name="project.main.classname" />
<au:assertPropertyNotSet name="manifest.main.classname" />
<au:assertPropertyNotSet name="manifest.classpath" />
-->
- <au:assertPropertyEquals name="target.main.classes" value="${target}/main/classes"/>
- <au:assertFileExists file="${target.main.classes}/META-INF"/>
- <au:assertPropertyEquals name="manifest.file" value="${target}/MANIFEST.MF"/>
- <au:assertPropertyEquals name="version.properties.file" value="${target.main.classes}/META-INF/version.properties"/>
+ <au:assertPropertyEquals name="target.main.classes" value="${target}/main/classes" />
+ <au:assertFileExists file="${target.main.classes}/META-INF" />
+ <au:assertPropertyEquals name="manifest.file" value="${target}/MANIFEST.MF" />
+ <au:assertPropertyEquals name="version.properties.file" value="${target.main.classes}/META-INF/version.properties" />
</target>
<target name="test-manifest:generate-version-number" depends="-manifest:generate-version-number">
- <au:assertPropertyEquals name="version" value="${ivy.revision}-build-${now}"/>
+ <au:assertPropertyEquals name="version" value="${ivy.revision}-build-${now}" />
</target>
<target name="test-manifest:manifest" depends="manifest:manifest">
- <au:assertFileExists file="${manifest.file}"/>
- <au:assertFileExists file="${version.properties.file}"/>
- </target>
+ <au:assertFileExists file="${manifest.file}" />
+ <au:assertFileExists file="${version.properties.file}" />
+ </target>
<target name="prepare-manifest-runnable">
- <property name="retrieve.dependencies" value="true"/>
- <property name="project.main.classname" value="foobar"/>
- <mkdir dir="${lib.main}"/>
- <echo file="${lib.main}/myjar.jar"/>
+ <property name="retrieve.dependencies" value="true" />
+ <property name="project.main.classname" value="foobar" />
+ <mkdir dir="${lib.main}" />
+ <echo file="${lib.main}/myjar.jar" />
</target>
+
<target name="test-manifest:manifest-runnable" depends="prepare-manifest-runnable, manifest:manifest-runnable">
<!--FIXME: manifest-runable fails if ${lib.main} doesn't exists -->
- <au:assertReferenceSet refid="manifest.main.classpath"/>
- <au:assertPropertyEquals name="manifest.classpath" value="lib/main/myjar.jar"/>
-
+ <au:assertReferenceSet refid="manifest.main.classpath" />
+ <au:assertPropertyEquals name="manifest.classpath" value="lib/main/myjar.jar" />
</target>
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/maven-publication/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/maven-publication/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/maven-publication/module.ivy (original)
+++ incubator/easyant/plugins/trunk/maven-publication/module.ivy Tue Oct 16 21:33:19 2012
@@ -14,34 +14,43 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.plugins" module="maven-publication" revision="0.9">
+ <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
<description>
<p>
- This module provides functionalities to publish a pom.xml.
+ This module provides functionalities to publish a pom.xml.
This is really usefull if some maven based projects wants to reuse your artifacts.
</p>
<p>
- In some cases we may want to define a different repository url for easyant (or ivy based) artifacts (published by ivy-publication plugin),
- and another one for maven artifacts (published through maven-publication plugin) this can be done by setting "maven.remote.repo.url" property.
- If this property is unset, artifacts will be republished with maven descriptor on the
+ In some cases we may want to define a different repository url for easyant (or ivy based) artifacts
+ (published by ivy-publication plugin),
+ and another one for maven artifacts (published through maven-publication plugin) this can be done by setting
+ "maven.remote.repo.url" property.
+ If this property is unset, artifacts will be republished with maven
+ descriptor on the
same repository as ivy-publication module (artifacts will be overwritten).
</p>
<p>
- This plugin is based on <a href="http://easyant.org/projects/mavenivy-adapters">mavenivy-adapters tasks</a>.
+ This plugin is based on
+ <a href="http://easyant.org/projects/mavenivy-adapters">mavenivy-adapters tasks</a>
+ .
</p>
<p>
- It uses a TypeMapping to define the mapping between ivy world and maven world (like type, ext, mavenPackaging, mavenClassifier).
+ It uses a TypeMapping to define the mapping between ivy world and maven world (like type, ext,
+ mavenPackaging, mavenClassifier).
Example :
<code type="xml">
<typeMappings id="maven.type.mappings.ref">
- <mapping type="myType" mvnPackaging="jar"/>
+ <mapping type="myType" mvnPackaging="jar" />
</typeMappings>
</code>
- You can override the default typeMappings by using <a href="">AugmentTask</a> like this :
+ You can override the default typeMappings by using
+ <a href="">AugmentTask</a>
+ like this :
<code type="xml">
<augment id="maven.type.mappings.ref">
- <mapping type="myType" mvnPackaging="jar"/>
+ <mapping type="myType" mvnPackaging="jar" />
</augment>
</code>
</p>
@@ -50,29 +59,32 @@
Example :
<code type="xml">
<scopeMappings id="maven.scope.mappings.ref">
- <mapping scope="compile" conf="myIvyConfiguration"/>
- </scopeMappings>
+ <mapping scope="compile" conf="myIvyConfiguration" />
+ </scopeMappings>
</code>
- You can override the default scopeMappings by using <a href="">AugmentTask</a> like this :
+ You can override the default scopeMappings by using
+ <a href="">AugmentTask</a>
+ like this :
<code type="xml">
<augment id="maven.scope.mappings.ref">
- <mapping scope="compile" conf="myIvyConfiguration"/>
- </augment>
+ <mapping scope="compile" conf="myIvyConfiguration" />
+ </augment>
</code>
</p>
-
</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
- </info>
- <configurations>
- <conf name="default" description="runtime dependencies artifact can be used with this conf"/>
- <conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
- <conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
- </configurations>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+ </info>
+ <configurations>
+ <conf name="default" description="runtime dependencies artifact can be used with this conf" />
+ <conf name="test"
+ description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+ <conf name="provided"
+ description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
+ </configurations>
<publications>
- <artifact type="ant"/>
+ <artifact type="ant" />
</publications>
<dependencies>
- <dependency org="org.apache.easyant.tasks" name="mavenivy-adapters" rev="0.1"/>
+ <dependency org="org.apache.easyant.tasks" name="mavenivy-adapters" rev="0.1" />
</dependencies>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/maven-publication/src/main/resources/maven-publication.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/maven-publication/src/main/resources/maven-publication.ant?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/maven-publication/src/main/resources/maven-publication.ant (original)
+++ incubator/easyant/plugins/trunk/maven-publication/src/main/resources/maven-publication.ant Tue Oct 16 21:33:19 2012
@@ -14,37 +14,37 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;maven-publication" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:mvn="antlib:org.apache.maven.artifact.ant" xmlns:mavenivy="antlib:org.apache.easyant.tasks.adapters" xmlns:ea="antlib:org.apache.easyant">
-
+<project name="org.apache.easyant.plugins;maven-publication" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:mvn="antlib:org.apache.maven.artifact.ant"
+ xmlns:mavenivy="antlib:org.apache.easyant.tasks.adapters" xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.8,+]" />
<target name="maven-publication:init">
<ea:parameter property="target.artifacts" default="${basedir}/target/artifacts" description="destination directory for target artifacts" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant"
+ loaderref="maven-publication.loader" classpathref="org.apache.easyant.plugins#maven-publication.classpath" />
-
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" loaderref="maven-publication.loader" classpathref="org.apache.easyant.plugins#maven-publication.classpath" />
-
- <taskdef resource="org/apache/easyant/tasks/adapters/antlib.xml" uri="antlib:org.apache.easyant.tasks.adapters" loaderref="maven-publication.loader" classpathref="org.apache.easyant.plugins#maven-publication.classpath" />
+ <taskdef resource="org/apache/easyant/tasks/adapters/antlib.xml" uri="antlib:org.apache.easyant.tasks.adapters"
+ loaderref="maven-publication.loader" classpathref="org.apache.easyant.plugins#maven-publication.classpath" />
<!--Create a POM in memory referenced by "maven.instance" id -->
<mvn:pom id="maven.instance" />
- <ea:parameter property="maven.remote.repo.url" default="" description="maven url where artifact will be published, if no one is specified the same url as ivy-publication will be used" />
+ <ea:parameter property="maven.remote.repo.url" default=""
+ description="maven url where artifact will be published, if no one is specified the same url as ivy-publication will be used" />
<mvn:remoteRepository id="maven.remote.repository" url="${maven.remote.repo.url}" />
-
- <mavenivy:typeMappings id="maven.type.mappings.ref" useDefault="true"/>
- <mavenivy:scopeMappings id="maven.scope.mappings.ref" useDefault="true"/>
-
+
+ <mavenivy:typeMappings id="maven.type.mappings.ref" useDefault="true" />
+ <mavenivy:scopeMappings id="maven.scope.mappings.ref" useDefault="true" />
</target>
<target name="maven-publication:make-pom" depends="provision" phase="prepare-publication">
<!--ask MavenIvy Adapters to convert global information (groupId,artifactId,version, packaging) and to inject them in the POM instance referenced by "maven.instance" id -->
<mavenivy:infoAdapter pomRefId="maven.instance" settingsRef="${project.ivy.instance}">
- <scopeMappings refid="maven.scope.mappings.ref"/>
+ <scopeMappings refid="maven.scope.mappings.ref" />
</mavenivy:infoAdapter>
<!--ask MavenIvy Adapters to convert dependencies and to inject them in the POM instance referenced by "maven.instance" id -->
<mavenivy:dependencyAdapter pomRefId="maven.instance" settingsRef="${project.ivy.instance}">
- <typeMappings refid="maven.type.mappings.ref"/>
+ <typeMappings refid="maven.type.mappings.ref" />
</mavenivy:dependencyAdapter>
<mkdir dir="${target.artifacts}" />
@@ -52,8 +52,8 @@
<mvn:writepom pomRefId="maven.instance" file="${target.artifacts}/pom.xml" />
<mvn:pom id="maven.instance" file="${target.artifacts}/pom.xml" />
- <mavenivy:registertrigger classname="org.apache.easyant.ivy.MavenPublishTrigger" event="post-publish-artifact" classpathref="org.apache.easyant.plugins#maven-publication.classpath" settingsRef="${project.ivy.instance}" />
-
+ <mavenivy:registertrigger classname="org.apache.easyant.ivy.MavenPublishTrigger" event="post-publish-artifact"
+ classpathref="org.apache.easyant.plugins#maven-publication.classpath" settingsRef="${project.ivy.instance}" />
</target>
<target name="-maven-publication:trigger-publish-shared" phase="generate-shared-version">
@@ -67,8 +67,7 @@
<target name="-maven-publication:publish-shared" phase="publish-shared">
<mavenivy:deploy pomRefId="maven.instance">
<remoteRepository refid="maven.remote.repository" />
- <typeMappings refid="maven.type.mappings.ref"/>
+ <typeMappings refid="maven.type.mappings.ref" />
</mavenivy:deploy>
</target>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/maven-version-strategy/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/maven-version-strategy/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/maven-version-strategy/module.ivy (original)
+++ incubator/easyant/plugins/trunk/maven-version-strategy/module.ivy Tue Oct 16 21:33:19 2012
@@ -14,17 +14,21 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.plugins" module="maven-version-strategy" revision="0.9">
- <description>This module provides the maven 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>
+ <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
+ <description>This module provides the maven 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"/>
+ <artifact type="ant" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/maven-version-strategy/src/main/resources/maven-version-strategy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/maven-version-strategy/src/main/resources/maven-version-strategy.ant?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/maven-version-strategy/src/main/resources/maven-version-strategy.ant (original)
+++ incubator/easyant/plugins/trunk/maven-version-strategy/src/main/resources/maven-version-strategy.ant Tue Oct 16 21:33:19 2012
@@ -14,19 +14,15 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins#maven-version-strategy"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ac="antlib:net.sf.antcontrib"
- xmlns:ea="antlib:org.apache.easyant">
-
+<project name="org.apache.easyant.plugins#maven-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.9,+]" />
<ea:import mrid="org.apache.easyant.plugins#ivy-publication;0.9" />
-
<target name="maven-version-strategy:init">
<ea:parameter property="publish.overwrite" default="false"
- description="specify if publish should overwrite existing artifacts or not"/>
+ description="specify if publish should overwrite existing artifacts or not" />
</target>
@@ -35,18 +31,17 @@
<!-- override version as if it was a SNAPSHOT -->
<ac:var name="version" value="${ivy.revision}-SNAPSHOT" />
<!-- SNAPSHOT need to be overwritten -->
- <ac:var name="publish.overwrite" value="true"/>
+ <ac:var name="publish.overwrite" value="true" />
</target>
-
+
<target name="maven-version-strategy:shared" depends="maven-version-strategy:init" extensionOf="ivy-publication:generate-shared-version">
<!-- override version as if it was a SNAPSHOT -->
<ac:var name="version" value="${ivy.revision}-SNAPSHOT" />
<!-- SNAPSHOT need to be overwritten -->
- <ac:var name="publish.overwrite" value="true"/>
+ <ac:var name="publish.overwrite" value="true" />
</target>
<target name="maven-version-strategy:release" depends="maven-version-strategy:init" extensionOf="ivy-publication:generate-release-version">
<ac:var name="version" value="${ivy.revision}" />
</target>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/maven-version-strategy/src/test/antunit/maven-version-strategy-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/maven-version-strategy/src/test/antunit/maven-version-strategy-test.xml?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/maven-version-strategy/src/test/antunit/maven-version-strategy-test.xml (original)
+++ incubator/easyant/plugins/trunk/maven-version-strategy/src/test/antunit/maven-version-strategy-test.xml Tue Oct 16 21:33:19 2012
@@ -14,50 +14,47 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;maven-version-strategy-test"
- xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ea="antlib:org.apache.easyant">
+<project name="org.apache.easyant.plugins;maven-version-strategy-test" xmlns:au="antlib:org.apache.ant.antunit"
+ xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ea="antlib:org.apache.easyant">
- <!-- Import your plugin -->
- <property name="target" value="target/test-antunit"/>
+ <!-- Import your plugin -->
+ <property name="target" value="target/test-antunit" />
<!-- configure easyant in current project -->
<ea:configure-easyant-ivy-instance />
<!-- import our local plugin -->
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources" />
- <property name="src.main.java" value="${basedir}/src/main/java"/>
- <property name="javac.debug.mode" value="false"/>
+ <property name="src.main.java" value="${basedir}/src/main/java" />
+ <property name="javac.debug.mode" value="false" />
- <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
+ <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
<target name="clean" description="remove stale build artifacts before / after each test">
<delete dir="${basedir}" includeemptydirs="true">
- <include name="**/target/**"/>
- <include name="**/lib/**"/>
+ <include name="**/target/**" />
+ <include name="**/lib/**" />
</delete>
</target>
-
+
<target name="setUp" depends="clean">
- <property name="ivy.revision" value="1.0"/>
+ <property name="ivy.revision" value="1.0" />
</target>
- <target name="tearDown" depends="clean"/>
-
+ <target name="tearDown" depends="clean" />
+
<target name="test-maven-version-strategy:init" depends="maven-version-strategy:init">
- <au:assertPropertyEquals name="publish.overwrite" value="false"/>
+ <au:assertPropertyEquals name="publish.overwrite" value="false" />
</target>
<target name="test-maven-version-strategy:local" depends="maven-version-strategy:local">
- <au:assertPropertyEquals name="publish.overwrite" value="true"/>
- <au:assertPropertyEquals name="version" value="${ivy.revision}-SNAPSHOT"/>
+ <au:assertPropertyEquals name="publish.overwrite" value="true" />
+ <au:assertPropertyEquals name="version" value="${ivy.revision}-SNAPSHOT" />
</target>
<target name="test-maven-version-strategy:shared" depends="maven-version-strategy:shared">
- <au:assertPropertyEquals name="publish.overwrite" value="true"/>
- <au:assertPropertyEquals name="version" value="${ivy.revision}-SNAPSHOT"/>
+ <au:assertPropertyEquals name="publish.overwrite" value="true" />
+ <au:assertPropertyEquals name="version" value="${ivy.revision}-SNAPSHOT" />
</target>
<target name="test-maven-version-strategy:release" depends="maven-version-strategy:release">
- <au:assertPropertyEquals name="version" value="${ivy.revision}"/>
+ <au:assertPropertyEquals name="version" value="${ivy.revision}" />
</target>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/meta-build-autoactivator/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/meta-build-autoactivator/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/meta-build-autoactivator/module.ivy (original)
+++ incubator/easyant/plugins/trunk/meta-build-autoactivator/module.ivy Tue Oct 16 21:33:19 2012
@@ -14,17 +14,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.plugins" module="meta-build-autoactivator" revision="0.9">
- <description>This module is a build tools for multi-module projects.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
- </info>
- <configurations>
- <conf name="default" description="runtime dependencies artifact can be used with this conf"/>
- <conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
- <conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
- </configurations>
+ <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
+ <description>This module is a build tools for multi-module projects.</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+ </info>
+ <configurations>
+ <conf name="default" description="runtime dependencies artifact can be used with this conf" />
+ <conf name="test"
+ description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+ <conf name="provided"
+ description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
+ </configurations>
<publications>
- <artifact type="ant"/>
+ <artifact type="ant" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/meta-build-autoactivator/src/main/resources/meta-build-autoactivator.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/meta-build-autoactivator/src/main/resources/meta-build-autoactivator.ant?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/meta-build-autoactivator/src/main/resources/meta-build-autoactivator.ant (original)
+++ incubator/easyant/plugins/trunk/meta-build-autoactivator/src/main/resources/meta-build-autoactivator.ant Tue Oct 16 21:33:19 2012
@@ -14,52 +14,52 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins#meta-build-autoactivator"
- xmlns:ac="antlib:net.sf.antcontrib"
- xmlns:ea="antlib:org.apache.easyant"
- xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="org.apache.easyant.plugins#meta-build-autoactivator" xmlns:ac="antlib:net.sf.antcontrib"
+ xmlns:ea="antlib:org.apache.easyant" xmlns:ivy="antlib:org.apache.ivy.ant">
<ea:core-version requiredrevision="[0.9,+]" />
- <ea:parameter property="metabuild.root" description="root directory level of a metabuild project" default="."/>
- <ea:parameter property="metabuild.excludes" description="Pattern describing modules to exclude in a metabuild" default="**/src/ **/lib/ **/target/ **/bin module.ivy"/>
+ <ea:parameter property="metabuild.root" description="root directory level of a metabuild project"
+ default="." />
+ <ea:parameter property="metabuild.excludes" description="Pattern describing modules to exclude in a metabuild"
+ default="**/src/ **/lib/ **/target/ **/bin module.ivy" />
- <ea:parameter property="metabuild.mode" description="defines execution mode of metabuild feature (all,dependents,dependencies)" default="all"/>
+ <ea:parameter property="metabuild.mode" description="defines execution mode of metabuild feature (all,dependents,dependencies)"
+ default="all" />
<ac:if>
- <or>
- <equals arg1="dependents" arg2="${metabuild.mode}"/>
- <equals arg1="dependencies" arg2="${metabuild.mode}"/>
- </or>
- <then>
+ <or>
+ <equals arg1="dependents" arg2="${metabuild.mode}" />
+ <equals arg1="dependencies" arg2="${metabuild.mode}" />
+ </or>
+ <then>
<!-- locate the first module.ivy we assume that a user can be in a subdirectory of the project -->
- <ea:findparentdir filename="module.ivy" property="first.parent.directory" haltonfirstfound="true"/>
+ <ea:findparentdir filename="module.ivy" property="first.parent.directory" haltonfirstfound="true" />
<!-- locate the highest module.ivy" -->
- <ea:findparentdir filename="module.ivy" property="parent.directory"/>
-
- <ivy:info file="${first.parent.directory}/module.ivy" settingsRef="easyant.ivy.instance"/>
+ <ea:findparentdir filename="module.ivy" property="parent.directory" />
- <echo message="Setting basedir to ${parent.directory}" level="verbose"/>
- <property name="project.basedir" value="${parent.directory}" />
- <property name="current-module" value="${ivy.module}"/>
- </then>
- <else>
- <ac:if>
- <and>
- <not>
- <available file="module.ivy"/>
-
- </not>
- <available file="module.ivy">
- <filepath>
- <fileset dir="${metabuild.root}" includes="*/module.ivy" excludes="${metabuild.excludes}"/>
- </filepath>
- </available>
- </and>
- <ac:then>
- <echo>Multimodule project detected !</echo>
- <ea:build module="meta-build" revision="0.9"/>
- </ac:then>
- </ac:if>
+ <ivy:info file="${first.parent.directory}/module.ivy" settingsRef="easyant.ivy.instance" />
- </else>
+ <echo message="Setting basedir to ${parent.directory}" level="verbose" />
+ <property name="project.basedir" value="${parent.directory}" />
+ <property name="current-module" value="${ivy.module}" />
+ </then>
+ <else>
+ <ac:if>
+ <and>
+ <not>
+ <available file="module.ivy" />
+ </not>
+ <available file="module.ivy">
+ <filepath>
+ <fileset dir="${metabuild.root}" includes="*/module.ivy" excludes="${metabuild.excludes}" />
+ </filepath>
+ </available>
+ </and>
+ <ac:then>
+ <echo>Multimodule project detected !</echo>
+ <ea:build module="meta-build" revision="0.9" />
+ </ac:then>
+ </ac:if>
+
+ </else>
</ac:if>
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/meta-build-autoactivator/src/test/antunit/meta-build-autoactivator-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/meta-build-autoactivator/src/test/antunit/meta-build-autoactivator-test.xml?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/meta-build-autoactivator/src/test/antunit/meta-build-autoactivator-test.xml (original)
+++ incubator/easyant/plugins/trunk/meta-build-autoactivator/src/test/antunit/meta-build-autoactivator-test.xml Tue Oct 16 21:33:19 2012
@@ -14,35 +14,32 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;meta-build-autoactivator-test"
- xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ea="antlib:org.apache.easyant">
+<project name="org.apache.easyant.plugins;meta-build-autoactivator-test" xmlns:au="antlib:org.apache.ant.antunit"
+ xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ea="antlib:org.apache.easyant">
- <!-- Import your plugin -->
- <property name="target" value="target/test-antunit"/>
+ <!-- Import your plugin -->
+ <property name="target" value="target/test-antunit" />
<!-- configure easyant in current project -->
<ea:configure-easyant-ivy-instance />
- <property name="skip.org.apache.easyant.buildtypes#meta-build;0.2" value="true"/>
+ <property name="skip.org.apache.easyant.buildtypes#meta-build;0.2" value="true" />
<!-- import our local plugin -->
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources" />
- <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
+ <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
<target name="clean" description="remove stale build artifacts before / after each test">
<delete dir="${basedir}" includeemptydirs="true">
- <include name="**/target/**"/>
- <include name="**/lib/**"/>
+ <include name="**/target/**" />
+ <include name="**/lib/**" />
</delete>
</target>
-
+
<target name="setUp" depends="clean">
</target>
- <target name="tearDown" depends="clean"/>
-
+ <target name="tearDown" depends="clean" />
+
<target name="test-meta-build-autoactivator">
- <au:assertPropertyEquals name="metabuild.root" value="."/>
- <au:assertPropertyEquals name="metabuild.excludes" value="**/src/ **/lib/ **/target/ **/bin module.ivy"/>
- <au:assertPropertyEquals name="metabuild.mode" value="all"/>
+ <au:assertPropertyEquals name="metabuild.root" value="." />
+ <au:assertPropertyEquals name="metabuild.excludes" value="**/src/ **/lib/ **/target/ **/bin module.ivy" />
+ <au:assertPropertyEquals name="metabuild.mode" value="all" />
</target>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/meta-build-autoactivator/src/test/antunit/submodule/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/meta-build-autoactivator/src/test/antunit/submodule/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/meta-build-autoactivator/src/test/antunit/submodule/module.ivy (original)
+++ incubator/easyant/plugins/trunk/meta-build-autoactivator/src/test/antunit/submodule/module.ivy Tue Oct 16 21:33:19 2012
@@ -15,7 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration"/>
-
-</ivy-module>
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+ <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration" />
+</ivy-module>
\ No newline at end of file