incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlboud...@apache.org
Subject svn commit: r1398938 [3/4] - in /incubator/easyant/plugins/trunk: ./ abstract-compile/ abstract-compile/src/main/resources/ abstract-compile/src/test/antunit/ abstract-package/ abstract-package/src/main/resources/ abstract-package/src/test/antunit/ abs...
Date Tue, 16 Oct 2012 19:27:46 GMT
Modified: incubator/easyant/plugins/trunk/compile-test-java/src/test/antunit/compile-test-java-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-java/src/test/antunit/compile-test-java-test.xml?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-java/src/test/antunit/compile-test-java-test.xml (original)
+++ incubator/easyant/plugins/trunk/compile-test-java/src/test/antunit/compile-test-java-test.xml Tue Oct 16 19:27:43 2012
@@ -14,55 +14,50 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins;compile-test-java-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;compile-test-java-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"/>
-    <target name="tearDown" depends="clean"/>
-    
+
+    <target name="setUp" depends="clean" />
+    <target name="tearDown" depends="clean" />
+
     <target name="test-compile-test-java">
-        <au:assertPropertyEquals name="src.test.java" value="${basedir}/src/test/java"/>
-        <au:assertPropertyEquals name="src.test.integration.java" value="${basedir}/src/integration-test/java"/>
-        <au:assertPropertyEquals name="javac.debug.mode" value="true"/>
-        <au:assertPropertyEquals name="has.src.test.java" value="true"/>
-        <au:assertPropertyEquals name="has.src.test.integration.java" value="true"/>
+        <au:assertPropertyEquals name="src.test.java" value="${basedir}/src/test/java" />
+        <au:assertPropertyEquals name="src.test.integration.java" value="${basedir}/src/integration-test/java" />
+        <au:assertPropertyEquals name="javac.debug.mode" value="true" />
+        <au:assertPropertyEquals name="has.src.test.java" value="true" />
+        <au:assertPropertyEquals name="has.src.test.integration.java" value="true" />
     </target>
 
     <target name="test-compile-test-java:compile" depends="compile-test-java:compile">
-        <au:assertPropertyEquals name="test.compile.includes.pattern" value="**/*.java"/>
-        <au:assertPropertyEquals name="test.compile.excludes.pattern" value=""/>
-        <au:assertPropertyEquals name="test.compile.java.target.version" value="${ant.java.version}"/>
-        <au:assertPropertyEquals name="test.compile.java.source.version" value="${ant.java.version}"/>
- 
-        <au:assertFileExists file="${target.test.classes}"/>
-        <au:assertFileExists file="${target.test.classes}/org/apache/easyant/example/Example.class"/>
+        <au:assertPropertyEquals name="test.compile.includes.pattern" value="**/*.java" />
+        <au:assertPropertyEquals name="test.compile.excludes.pattern" value="" />
+        <au:assertPropertyEquals name="test.compile.java.target.version" value="${ant.java.version}" />
+        <au:assertPropertyEquals name="test.compile.java.source.version" value="${ant.java.version}" />
+        <au:assertFileExists file="${target.test.classes}" />
+        <au:assertFileExists file="${target.test.classes}/org/apache/easyant/example/Example.class" />
     </target>
 
     <target name="test-compile-test-java:compile-integration" depends="compile-test-java:compile-integration">
-        <au:assertPropertyEquals name="test.integration.compile.includes.pattern" value="**/*.java"/>
-        <au:assertPropertyEquals name="test.integration.compile.excludes.pattern" value=""/>
-        <au:assertPropertyEquals name="test.integration.compile.java.target.version" value="${ant.java.version}"/>
-        <au:assertPropertyEquals name="test.integration.compile.java.source.version" value="${ant.java.version}"/>
- 
-        <au:assertFileExists file="${target.test.integration.classes}"/>
-        <au:assertFileExists file="${target.test.integration.classes}/org/apache/easyant/example/Example2.class"/>
+        <au:assertPropertyEquals name="test.integration.compile.includes.pattern" value="**/*.java" />
+        <au:assertPropertyEquals name="test.integration.compile.excludes.pattern" value="" />
+        <au:assertPropertyEquals name="test.integration.compile.java.target.version" value="${ant.java.version}" />
+        <au:assertPropertyEquals name="test.integration.compile.java.source.version" value="${ant.java.version}" />
+        <au:assertFileExists file="${target.test.integration.classes}" />
+        <au:assertFileExists file="${target.test.integration.classes}/org/apache/easyant/example/Example2.class" />
     </target>
-
-</project>
+</project>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/compile-test-scala/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-scala/module.ivy?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-scala/module.ivy (original)
+++ incubator/easyant/plugins/trunk/compile-test-scala/module.ivy Tue Oct 16 19:27:43 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="compile-test-scala" revision="0.9">
-           <description>This module provides scala compilation feature for tests.</description>
-           <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
-        </info>
-        <configurations>
-                <conf name="default" description="runtime dependencies artifact can be used with this conf"/>
-                <conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
-                <conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
-        </configurations>
+        <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
+        <description>This module provides scala compilation feature for tests.</description>
+        <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+    </info>
+    <configurations>
+        <conf name="default" description="runtime dependencies artifact can be used with this conf" />
+        <conf name="test"
+            description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+        <conf name="provided"
+            description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
+    </configurations>
     <publications>
-        <artifact type="ant"/>
+        <artifact type="ant" />
     </publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant (original)
+++ incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant Tue Oct 16 19:27:43 2012
@@ -14,66 +14,59 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins#compile-test-scala"
-    xmlns:ea="antlib:org.apache.easyant">
-
+<project name="org.apache.easyant.plugins#compile-test-scala" xmlns:ea="antlib:org.apache.easyant">
     <ea:core-version requiredrevision="[0.9,+]" />
 
-	<ea:import mrid="org.apache.easyant.plugins#abstract-compile;0.9" />
+    <ea:import mrid="org.apache.easyant.plugins#abstract-compile;0.9" />
 
-    <ea:parameter property="src.test.scala" default="${basedir}/src/test/scala"
-        description="directory where test sources to be compiled are" />
+    <ea:parameter property="src.test.scala" default="${basedir}/src/test/scala" description="directory where test sources to be compiled are" />
     <ea:parameter property="src.test.integration.scala" default="${basedir}/src/integration-test/scala"
         description="directory where integration test sources to be compiled are" />
-
     <available file="${src.test.scala}" property="has.src.test.scala" />
     <available file="${src.test.integration.scala}" property="has.src.test.integration.scala" />
 
     <target name="compile-test-scala:configure" depends="abstract-compile:compile-ready">
-        <ea:findclasspath pathid="resolved.scala.classpath" organisation="org.scala-lang" module="scala-compiler" revision="2.9.2">
+        <ea:findclasspath pathid="resolved.scala.classpath" organisation="org.scala-lang" module="scala-compiler"
+            revision="2.9.2">
             <ea:project-dependency-strategy />
-            <ea:environment-strategy env="SCALA_HOME"/>
+            <ea:environment-strategy env="SCALA_HOME" />
             <ea:basic-configuration-strategy />
         </ea:findclasspath>
-        <taskdef resource="scala/tools/ant/antlib.xml" classpathref="resolved.scala.classpath"/>
+        <taskdef resource="scala/tools/ant/antlib.xml" classpathref="resolved.scala.classpath" />
         <!-- when you specify classpath parameter to <scalac /> task it overrides class path 
         defined inside <taskdef /> rather then adds to it. So just add scala jars to your own class path.
             source http://www.softwaresecretweapons.com/jspwiki/scalatoolsnscfatalerror-object-scala-not-found -->
         <ea:path pathid="compile.test.classpath" overwrite="prepend">
-            <path refid="resolved.scala.classpath"/>
+            <path refid="resolved.scala.classpath" />
         </ea:path>
     </target>
 
     <macrodef name="compile-scala-tests">
-        <attribute name="prefix"/>
+        <attribute name="prefix" />
         <sequential>
             <mkdir dir="${target.@{prefix}.classes}" />
-            <scalac  srcdir="${src.@{prefix}.scala}"
-                    destdir="${target.@{prefix}.classes}"
-                    classpathref="compile.test.classpath"
-                    includes="${@{prefix}.compile.includes.pattern}"
-                    excludes="${@{prefix}.compile.excludes.pattern}"
-                    scalacdebugging="${scalac.debug.mode}">
+            <scalac srcdir="${src.@{prefix}.scala}" destdir="${target.@{prefix}.classes}" classpathref="compile.test.classpath"
+                includes="${@{prefix}.compile.includes.pattern}" excludes="${@{prefix}.compile.excludes.pattern}"
+                scalacdebugging="${scalac.debug.mode}">
             </scalac>
         </sequential>
     </macrodef>
 
-    <target name="compile-test-scala:compile" depends="compile-test-scala:configure" if="has.src.test.scala" extensionOf="abstract-compile:compile">
-        <ea:parameter property="test.compile.includes.pattern" default="**/*.scala" 
+    <target name="compile-test-scala:compile" depends="compile-test-scala:configure" if="has.src.test.scala"
+        extensionOf="abstract-compile:compile">
+        <ea:parameter property="test.compile.includes.pattern" default="**/*.scala"
             description="Pattern describing files included in test compilation process" />
-        <ea:parameter property="test.compile.excludes.pattern" default="" 
+        <ea:parameter property="test.compile.excludes.pattern" default=""
             description="Pattern describing files excluded in test compilation process" />
-
-    	<compile-scala-tests prefix="test"/>
+        <compile-scala-tests prefix="test" />
     </target>
 
-    <target name="compile-test-scala:compile-integration" depends="compile-test-scala:configure" if="has.src.test.integration.scala" extensionOf="abstract-compile:compile">
-        <ea:parameter property="test.integration.compile.includes.pattern" default="**/*.scala" 
+    <target name="compile-test-scala:compile-integration" depends="compile-test-scala:configure" if="has.src.test.integration.scala"
+        extensionOf="abstract-compile:compile">
+        <ea:parameter property="test.integration.compile.includes.pattern" default="**/*.scala"
             description="Pattern describing files included in integration test compilation process" />
-        <ea:parameter property="test.integration.compile.excludes.pattern" default="" 
+        <ea:parameter property="test.integration.compile.excludes.pattern" default=""
             description="Pattern describing files excluded in integration test compilation process" />
-
-    	<compile-scala-tests prefix="test.integration"/>
+        <compile-scala-tests prefix="test.integration" />
     </target>
-
-</project>
+</project>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/compile-test-scala/src/test/antunit/compile-test-scala-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-scala/src/test/antunit/compile-test-scala-test.xml?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-scala/src/test/antunit/compile-test-scala-test.xml (original)
+++ incubator/easyant/plugins/trunk/compile-test-scala/src/test/antunit/compile-test-scala-test.xml Tue Oct 16 19:27:43 2012
@@ -14,58 +14,53 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins;compile-test.scala-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;compile-test.scala-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">
         <!--FIXME: findclasspath requires project.ivy.instance and a resolved module -->
-        <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-compile-test-scala">
-        <au:assertPropertyEquals name="src.test.scala" value="${basedir}/src/test/scala"/>
-        <au:assertPropertyEquals name="src.test.integration.scala" value="${basedir}/src/integration-test/scala"/>
-        <au:assertPropertyEquals name="has.src.test.scala" value="true"/>
-        <au:assertPropertyEquals name="has.src.test.integration.scala" value="true"/>
+        <au:assertPropertyEquals name="src.test.scala" value="${basedir}/src/test/scala" />
+        <au:assertPropertyEquals name="src.test.integration.scala" value="${basedir}/src/integration-test/scala" />
+        <au:assertPropertyEquals name="has.src.test.scala" value="true" />
+        <au:assertPropertyEquals name="has.src.test.integration.scala" value="true" />
     </target>
-    
+
     <target name="test-compile-test-scala:configure" depends="compile-test-scala:configure">
-         <au:assertReferenceSet refid="resolved.scala.classpath"/>
+        <au:assertReferenceSet refid="resolved.scala.classpath" />
     </target>
 
     <target name="test-compile-test-scala:compile" depends="compile-test-scala:compile">
-        <au:assertPropertyEquals name="test.compile.includes.pattern" value="**/*.scala"/>
-        <au:assertPropertyEquals name="test.compile.excludes.pattern" value=""/>
-
-        <au:assertFileExists file="${target.test.classes}"/>	
-        <au:assertFileExists file="${target.test.classes}/org/apache/easyant/example/Example.class"/>
+        <au:assertPropertyEquals name="test.compile.includes.pattern" value="**/*.scala" />
+        <au:assertPropertyEquals name="test.compile.excludes.pattern" value="" />
+        <au:assertFileExists file="${target.test.classes}" />
+        <au:assertFileExists file="${target.test.classes}/org/apache/easyant/example/Example.class" />
     </target>
 
     <target name="test-compile-test-scala:compile-integration" depends="compile-test-scala:compile-integration">
-        <au:assertPropertyEquals name="test.integration.compile.includes.pattern" value="**/*.scala"/>
-        <au:assertPropertyEquals name="test.integration.compile.excludes.pattern" value=""/>
-
-        <au:assertFileExists file="${target.test.integration.classes}"/>	
-        <au:assertFileExists file="${target.test.integration.classes}/org/apache/easyant/example/Example2.class"/>
+        <au:assertPropertyEquals name="test.integration.compile.includes.pattern" value="**/*.scala" />
+        <au:assertPropertyEquals name="test.integration.compile.excludes.pattern" value="" />
+        <au:assertFileExists file="${target.test.integration.classes}" />
+        <au:assertFileExists file="${target.test.integration.classes}/org/apache/easyant/example/Example2.class" />
     </target>
-
-</project>
+</project>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/compile-test-scala/src/test/antunit/sample-module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-scala/src/test/antunit/sample-module.ivy?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-scala/src/test/antunit/sample-module.ivy (original)
+++ incubator/easyant/plugins/trunk/compile-test-scala/src/test/antunit/sample-module.ivy Tue Oct 16 19:27:43 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/default-version-strategy/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/default-version-strategy/module.ivy?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/default-version-strategy/module.ivy (original)
+++ incubator/easyant/plugins/trunk/default-version-strategy/module.ivy Tue Oct 16 19:27:43 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="default-version-strategy" revision="0.9">
-           <description>This module provides the default version strategy. A version strategy is in charge to define the version for integrations (snapshot) and releases </description>
-           <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
-        </info>
-        <configurations>
-                <conf name="default" description="runtime dependencies artifact can be used with this conf"/>
-                <conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
-                <conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
-        </configurations>
+        <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
+        <description>This module provides the default version strategy. A version strategy is in charge to define the
+            version for integrations (snapshot) and releases </description>
+        <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+    </info>
+    <configurations>
+        <conf name="default" description="runtime dependencies artifact can be used with this conf" />
+        <conf name="test"
+            description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+        <conf name="provided"
+            description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
+    </configurations>
     <publications>
-        <artifact type="ant"/>
+        <artifact type="ant" />
     </publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant (original)
+++ incubator/easyant/plugins/trunk/default-version-strategy/src/main/resources/default-version-strategy.ant Tue Oct 16 19:27:43 2012
@@ -14,55 +14,48 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins#default-version-strategy"
-    xmlns:ivy="antlib:org.apache.ivy.ant"
-    xmlns:ac="antlib:net.sf.antcontrib"
-    xmlns:ea="antlib:org.apache.easyant">
-
+<project name="org.apache.easyant.plugins#default-version-strategy" xmlns:ivy="antlib:org.apache.ivy.ant"
+    xmlns:ac="antlib:net.sf.antcontrib" xmlns:ea="antlib:org.apache.easyant">
     <ea:core-version requiredrevision="[0.9,+]" />
 
     <ea:import mrid="org.apache.easyant.plugins#ivy-publication;0.9" />
 
     <target name="default-version-strategy:init">
-        <ea:parameter property="release.resolver" default="shared" 
-                description="the name of the resolver use for release publication"/>
-        <ea:parameter property="shared.resolver" default="shared" 
-                description="the name of the share resolver"/>
-        <ea:parameter property="project.ivy.instance" default="project.ivy.instance" 
-                description="ivy instance name"/>
-        <ea:parameter property="project.ivy.file" required="true" 
-                description="ivy file (use to resolve dependencies for the project)"/>
-
-        <ea:parameter property="default.build.number" default="1" 
-                description="default project version"/>
-        <ea:parameter property="revision.separator" default="-dev-build" 
-                description="separator for version"/>
-
+        <ea:parameter property="release.resolver" default="shared"
+            description="the name of the resolver use for release publication" />
+        <ea:parameter property="shared.resolver" default="shared" description="the name of the share resolver" />
+        <ea:parameter property="project.ivy.instance" default="project.ivy.instance" description="ivy instance name" />
+        <ea:parameter property="project.ivy.file" required="true"
+            description="ivy file (use to resolve dependencies for the project)" />
+        <ea:parameter property="default.build.number" default="1" description="default project version" />
+        <ea:parameter property="revision.separator" default="-dev-build" description="separator for version" />
         <!-- is project ivy settings configured ? -->
         <ea:parameter property="project.ivy.settings.file" description="the ivysettings file used by your project" />
         <ea:parameter property="project.ivy.settings.url" description="the ivysettings url used by your project" />
 
-        <ea:parameter property="fail.publication.if.no.revision" default="true" description="fail build if current module has no revision in 'info' tag of the module.ivy"/>
+        <ea:parameter property="fail.publication.if.no.revision" default="true"
+            description="fail build if current module has no revision in 'info' tag of the module.ivy" />
         <condition property="is.project.ivy.settings.configured">
-            <isreference refid="${project.ivy.instance}"/>
+            <isreference refid="${project.ivy.instance}" />
         </condition>
-        <fail unless="is.project.ivy.settings.configured" message="project ivy instance is not configured, at least one of the following property must be set : project.ivy.settings.file, project.ivy.settings.url"/>
-
+        <fail unless="is.project.ivy.settings.configured"
+            message="project ivy instance is not configured, at least one of the following property must be set : project.ivy.settings.file, project.ivy.settings.url" />
     </target>
 
     <macrodef name="check-version-number">
         <sequential>
-            <property name="pub.no.revision.message" value="It seems that you did not specify the revision number of your project, we strongly recommend you to set it through the 'info' tag in your module ivy before any publication"/>
+            <property name="pub.no.revision.message"
+                value="It seems that you did not specify the revision number of your project, we strongly recommend you to set it through the 'info' tag in your module ivy before any publication" />
             <ac:if>
-                <contains string="${ivy.revision}" substring="working@"/>
+                <contains string="${ivy.revision}" substring="working@" />
                 <ac:then>
                     <ac:if>
-                        <istrue value="${fail.publication.if.no.revision}"/>
+                        <istrue value="${fail.publication.if.no.revision}" />
                         <ac:then>
-                            <fail message="${pub.no.revision.message}"/>
+                            <fail message="${pub.no.revision.message}" />
                         </ac:then>
                         <ac:else>
-                            <echo message="Warning : ${pub.no.revision.message}" level="warning"/>
+                            <echo message="Warning : ${pub.no.revision.message}" level="warning" />
                         </ac:else>
                     </ac:if>
                 </ac:then>
@@ -72,23 +65,27 @@
 
     <!-- version numbers -->
     <target name="default-version-strategy:local" depends="default-version-strategy:init" extensionOf="ivy-publication:generate-local-version">
-        <check-version-number/>
+        <check-version-number />
         <tstamp>
             <format property="now" pattern="yyyyMMddHHmmss" />
         </tstamp>
         <property name="version" value="${ivy.revision}-local-${now}" />
     </target>
 
-    <target name="default-version-strategy:shared" depends="default-version-strategy:init" unless="ivy.new.revision" extensionOf="ivy-publication:generate-shared-version">
-        <ea:checkresolver resolver="shared.resolver" settingsRef="${project.ivy.instance}" description="name of the repository used to publish shared integration versions (snapshots)"/>
-        <check-version-number/>
-        <ivy:buildnumber organisation="${ivy.organisation}" module="${ivy.module}" revision="${ivy.revision}" defaultBuildNumber="${default.build.number}" revSep="${revision.separator}" settingsRef="${project.ivy.instance}" resolver="${shared.resolver}"/>
+    <target name="default-version-strategy:shared" depends="default-version-strategy:init" unless="ivy.new.revision"
+        extensionOf="ivy-publication:generate-shared-version">
+        <ea:checkresolver resolver="shared.resolver" settingsRef="${project.ivy.instance}"
+            description="name of the repository used to publish shared integration versions (snapshots)" />
+        <check-version-number />
+        <ivy:buildnumber organisation="${ivy.organisation}" module="${ivy.module}" revision="${ivy.revision}"
+            defaultBuildNumber="${default.build.number}" revSep="${revision.separator}" settingsRef="${project.ivy.instance}"
+            resolver="${shared.resolver}" />
         <property name="version" value="${ivy.new.revision}" />
     </target>
 
-    <target name="default-version-strategy:release" depends="default-version-strategy:init" unless="ivy.new.revision" extensionOf="ivy-publication:generate-release-version">
-        <check-version-number/>
+    <target name="default-version-strategy:release" depends="default-version-strategy:init" unless="ivy.new.revision"
+        extensionOf="ivy-publication:generate-release-version">
+        <check-version-number />
         <property name="version" value="${ivy.revision}" />
     </target>
-
-</project>
+</project>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/default-version-strategy/src/test/antunit/default-version-strategy-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/default-version-strategy/src/test/antunit/default-version-strategy-test.xml?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/default-version-strategy/src/test/antunit/default-version-strategy-test.xml (original)
+++ incubator/easyant/plugins/trunk/default-version-strategy/src/test/antunit/default-version-strategy-test.xml Tue Oct 16 19:27:43 2012
@@ -14,44 +14,41 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins;default-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;default-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" />
 
-    <!-- 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,configure-ivy-project"/>
-    <target name="tearDown" depends="clean"/>
+
+    <target name="setUp" depends="clean,configure-ivy-project" />
+    <target name="tearDown" depends="clean" />
 
     <target name="configure-ivy-project">
-       <property name="project.ivy.file" value="sample-module.ivy"/>
-       <ivy:settings id="project.ivy.instance"/>
-       <ivy:info file="sample-module.ivy" settingsRef="project.ivy.instance"/>
+        <property name="project.ivy.file" value="sample-module.ivy" />
+        <ivy:settings id="project.ivy.instance" />
+        <ivy:info file="sample-module.ivy" settingsRef="project.ivy.instance" />
     </target>
     <target name="test-default-version-strategy:init" depends="default-version-strategy:init">
-        <au:assertPropertyEquals name="release.resolver" value="shared"/>
-        <au:assertPropertyEquals name="shared.resolver" value="shared"/>
-        <au:assertPropertyEquals name="project.ivy.instance" value="project.ivy.instance"/>
-        <au:assertPropertyEquals name="project.ivy.file" value="sample-module.ivy"/>
-        <au:assertPropertyEquals name="default.build.number" value="1"/>
-        <au:assertPropertyEquals name="revision.separator" value="-dev-build"/>
-        <au:assertPropertyEquals name="fail.publication.if.no.revision" value="true"/>
-        <au:assertPropertyEquals name="is.project.ivy.settings.configured" value="true"/>
-
+        <au:assertPropertyEquals name="release.resolver" value="shared" />
+        <au:assertPropertyEquals name="shared.resolver" value="shared" />
+        <au:assertPropertyEquals name="project.ivy.instance" value="project.ivy.instance" />
+        <au:assertPropertyEquals name="project.ivy.file" value="sample-module.ivy" />
+        <au:assertPropertyEquals name="default.build.number" value="1" />
+        <au:assertPropertyEquals name="revision.separator" value="-dev-build" />
+        <au:assertPropertyEquals name="fail.publication.if.no.revision" value="true" />
+        <au:assertPropertyEquals name="is.project.ivy.settings.configured" value="true" />
     </target>
 
     <target name="test-default-version-strategy:local" depends="default-version-strategy:local">
@@ -65,5 +62,4 @@
     <target name="test-default-version-strategy:release" depends="default-version-strategy:release">
         <au:assertPropertyEquals name="version" value="${ivy.revision}" />
     </target>
-
-</project>
+</project>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/default-version-strategy/src/test/antunit/sample-module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/default-version-strategy/src/test/antunit/sample-module.ivy?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/default-version-strategy/src/test/antunit/sample-module.ivy (original)
+++ incubator/easyant/plugins/trunk/default-version-strategy/src/test/antunit/sample-module.ivy Tue Oct 16 19:27:43 2012
@@ -15,6 +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/deps-lib/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/deps-lib/module.ivy?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/deps-lib/module.ivy (original)
+++ incubator/easyant/plugins/trunk/deps-lib/module.ivy Tue Oct 16 19:27:43 2012
@@ -14,15 +14,19 @@
    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="deps-lib" revision="0.9">
-           <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"/>
+        <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
+        <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+    </info>
+    <configurations>
+        <conf name="default" description="runtime dependencies artifact can be used with this conf" />
+        <conf name="test"
+            description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+        <conf name="provided"
+            description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
+    </configurations>
+    <publications>
+        <artifact type="ant" />
     </publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant (original)
+++ incubator/easyant/plugins/trunk/deps-lib/src/main/resources/deps-lib.ant Tue Oct 16 19:27:43 2012
@@ -14,17 +14,13 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins#deps-lib"
-    xmlns:ea="antlib:org.apache.easyant">
-    
+<project name="org.apache.easyant.plugins#deps-lib" 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="deps-lib:plugin">
-        <ea:parameter path="compile.main.classpath"  
-            description="main compilation path" />
-        <ea:parameter path="compile.test.classpath"  
-            description="test compilation path" />
+        <ea:parameter path="compile.main.classpath" description="main compilation path" />
+        <ea:parameter path="compile.test.classpath" description="test compilation path" />
         <ea:path pathid="compile.main.classpath" overwrite="append">
             <fileset refid="lib.main.fileset" />
             <fileset refid="lib.provided.fileset" />
@@ -32,5 +28,5 @@
         <ea:path pathid="compile.test.classpath" overwrite="append">
             <fileset refid="lib.test.fileset" />
         </ea:path>
-    </target>   
-</project>
+    </target>
+</project>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/deps-lib/src/test/antunit/deps-lib-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/deps-lib/src/test/antunit/deps-lib-test.xml?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/deps-lib/src/test/antunit/deps-lib-test.xml (original)
+++ incubator/easyant/plugins/trunk/deps-lib/src/test/antunit/deps-lib-test.xml Tue Oct 16 19:27:43 2012
@@ -14,43 +14,40 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins;deps-lib-test" 
-    xmlns:au="antlib:org.apache.ant.antunit" 
-    xmlns:ivy="antlib:org.apache.ivy.ant"
+<project name="org.apache.easyant.plugins;deps-lib-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">
-      <path id="compile.main.classpath"/>
-      <path id="compile.test.classpath"/>
-      <mkdir dir="lib/main"/>
-      <mkdir dir="lib/test"/>
-      <echo file="lib/main/foobar.jar"/>
-      <echo file="lib/test/foobar-test.jar"/>
+        <path id="compile.main.classpath" />
+        <path id="compile.test.classpath" />
+        <mkdir dir="lib/main" />
+        <mkdir dir="lib/test" />
+        <echo file="lib/main/foobar.jar" />
+        <echo file="lib/test/foobar-test.jar" />
     </target>
-    <target name="tearDown" depends="clean"/>
+    <target name="tearDown" depends="clean" />
 
     <target name="test-deps-lib:plugin" depends="deps-lib:plugin">
-        <property name="main.classpath" refid="compile.main.classpath"/>
-        <property name="test.classpath" refid="compile.test.classpath"/>
-        <au:assertPropertyEquals name="main.classpath" value="${basedir}/lib/main/foobar.jar"/>
-        <au:assertPropertyEquals name="test.classpath" value="${basedir}/lib/test/foobar-test.jar"/>
-
-        <au:assertReferenceSet refid="compile.main.classpath"/>
-        <au:assertReferenceSet refid="compile.test.classpath"/>
+        <property name="main.classpath" refid="compile.main.classpath" />
+        <property name="test.classpath" refid="compile.test.classpath" />
+        <au:assertPropertyEquals name="main.classpath" value="${basedir}/lib/main/foobar.jar" />
+        <au:assertPropertyEquals name="test.classpath" value="${basedir}/lib/test/foobar-test.jar" />
+        <au:assertReferenceSet refid="compile.main.classpath" />
+        <au:assertReferenceSet refid="compile.test.classpath" />
     </target>
-</project>
+</project>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/distribution/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/distribution/module.ivy?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/distribution/module.ivy (original)
+++ incubator/easyant/plugins/trunk/distribution/module.ivy Tue Oct 16 19:27:43 2012
@@ -14,19 +14,24 @@
    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="distribution" revision="0.9">
-           <description>This module allow you to make binary distributions of your project such as zip, tar.bz2, tar.gz, etc...
-            It provides ready to use distributions like bin, with-dependencies, sources. It also comes with a macro that can be reused to make your own distribution.
+        <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
+        <description>This module allow you to make binary distributions of your project such as zip, tar.bz2, tar.gz,
+            etc...
+            It provides ready to use distributions like bin, with-dependencies, sources. It also comes with a
+            macro that can be reused to make your own distribution.
            </description>
-           <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
-        </info>
-        <configurations>
-                <conf name="default" description="runtime dependencies artifact can be used with this conf"/>
-                <conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
-                <conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
-        </configurations>
+        <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/distribution/src/main/resources/distribution.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/distribution/src/main/resources/distribution.ant?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/distribution/src/main/resources/distribution.ant (original)
+++ incubator/easyant/plugins/trunk/distribution/src/main/resources/distribution.ant Tue Oct 16 19:27:43 2012
@@ -14,14 +14,15 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins;distribution" xmlns:ac="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ea="antlib:org.apache.easyant">
-
+<project name="org.apache.easyant.plugins;distribution" xmlns:ac="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant"
+    xmlns:ea="antlib:org.apache.easyant">
     <ea:core-version requiredrevision="[0.9,+]" />
 
     <macrodef name="generate-bundle-checksum" description="generate checksum files for a given file">
         <attribute name="usechecksum" description="Defines if checksum files need to be generated" default="true" />
         <attribute name="file" description="The file to generate checksum for." />
-        <attribute name="algorithm" default="MD5" description="Specifies the algorithm to be used to compute the checksum. Defaults to 'MD5'. Other popular algorithms like 'SHA' or 'SHA-512' may be used as well. " />
+        <attribute name="algorithm" default="MD5"
+            description="Specifies the algorithm to be used to compute the checksum. Defaults to 'MD5'. Other popular algorithms like 'SHA' or 'SHA-512' may be used as well. " />
         <sequential>
             <ac:if>
                 <istrue value="@{usechecksum}" />
@@ -34,14 +35,13 @@
 
     <!-- macro for generating distribution zip -->
     <macrodef name="bundle" description="Generate tar.gz, tar.bz2, zip, and corresponding MD5 hash files for a release directory">
-
         <attribute name="destfile" description="Destination file for the generated archives, without extensions" />
-        <attribute name="archivetype" description="Defines the archivetype to generate (zip, tar.gz, tar.bz2)" default="zip" />
+        <attribute name="archivetype" description="Defines the archivetype to generate (zip, tar.gz, tar.bz2)"
+            default="zip" />
         <attribute name="usechecksum" description="Defines if checksum files need to be generated" default="true" />
-        <element name="contents" description="nested include, exclude, or pattern directives" implicit="true" optional="true" />
-
+        <element name="contents" description="nested include, exclude, or pattern directives" implicit="true"
+            optional="true" />
         <sequential>
-
             <ac:if>
                 <contains string="@{archivetype}" substring="zip" />
                 <ac:then>
@@ -79,51 +79,56 @@
                 </ac:then>
             </ac:if>
         </sequential>
-
     </macrodef>
 
     <target name="distribution:init">
-        <ea:parameter property="target.distributions" default="${target}/distributions" description="directory where distribution packages will be generated" />
+        <ea:parameter property="target.distributions" default="${target}/distributions"
+            description="directory where distribution packages will be generated" />
         <ea:parameter property="project.basedir" default="${basedir}" description="defines the project base directory" />
-        <ea:parameter property="project.prefix" default="" description="defines the project prefix, used as distribution root directory" />
-        <ea:parameter property="target.artifacts" default="${target}/artifacts" description="destination directory for target artifacts"/>
-        <ea:parameter property="project.bin.dir" default="${basedir}/bin" description="directory of project binaries (scripts, executables, etc...)"/>
+        <ea:parameter property="project.prefix" default=""
+            description="defines the project prefix, used as distribution root directory" />
+        <ea:parameter property="target.artifacts" default="${target}/artifacts" description="destination directory for target artifacts" />
+        <ea:parameter property="project.bin.dir" default="${basedir}/bin"
+            description="directory of project binaries (scripts, executables, etc...)" />
         <ea:parameter property="lib.main" default="${basedir}/lib/main" description="directory where main libraries are picked up" />       
 
         <!-- project artifacts -->
         <zipfileset id="project.artifacts.zipfileset" dir="${target.artifacts}" prefix="${project.prefix}/lib">
-            <exclude name="**/*-test.jar"/>
+            <exclude name="**/*-test.jar" />
         </zipfileset>
         <!-- project dependencies -->
-        <zipfileset id ="project.dependencies.zipfileset" dir="${lib.main}" prefix="${project.prefix}/lib" erroronmissingdir="false"/>
+        <zipfileset id="project.dependencies.zipfileset" dir="${lib.main}" prefix="${project.prefix}/lib"
+            erroronmissingdir="false" />
         <!-- make scripts executable -->
-        <zipfileset id="project.executables.zipfileset" dir="${project.bin.dir}" prefix="${project.prefix}/bin" filemode="744" erroronmissingdir="false"/>
+        <zipfileset id="project.executables.zipfileset" dir="${project.bin.dir}" prefix="${project.prefix}/bin"
+            filemode="744" erroronmissingdir="false" />
         <!-- ship the documentation -->
-        <zipfileset id="project.documentation.zipfileset" dir="${target.documentation.dir}" prefix="${project.prefix}/doc" erroronmissingdir="false"/>
+        <zipfileset id="project.documentation.zipfileset" dir="${target.documentation.dir}" prefix="${project.prefix}/doc"
+            erroronmissingdir="false" />
         <!--additional files -->
-        <zipfileset id="project.additionalfiles.zipfileset" dir="${project.basedir}" prefix="${project.prefix}" >
+        <zipfileset id="project.additionalfiles.zipfileset" dir="${project.basedir}" prefix="${project.prefix}">
             <include name="README" />
             <include name="NOTICE" />
             <include name="LICENSE" />
         </zipfileset>
 
         <!-- all project files -->
-        <zipfileset id="project.allfiles.zipfileset" dir="${project.basedir}" prefix="${project.prefix}" >
-            <exclude name="**/target/**"/>
-            <exclude name="${project.bin.dir}/**"/>
-            <exclude name="**/lib/**"/>
-            <exclude name="**/.git/**"/>
+        <zipfileset id="project.allfiles.zipfileset" dir="${project.basedir}" prefix="${project.prefix}">
+            <exclude name="**/target/**" />
+            <exclude name="${project.bin.dir}/**" />
+            <exclude name="**/lib/**" />
+            <exclude name="**/.git/**" />
         </zipfileset>
 
         <mkdir dir="${target.distributions}" />
     </target>
 
     <target name="distribution:clean" description="clean distribution dir">
-        <delete dir="${target.distributions}"/>
+        <delete dir="${target.distributions}" />
     </target>
 
     <target name="-distribution:force-retrieve" depends="distribution:init">
-        <property name="retrieve.dependencies" value="true"/>
+        <property name="retrieve.dependencies" value="true" />
     </target>
 
     <target name="distribution:bin" depends="distribution:init,-distribution:force-retrieve" description="create a binary distribution">
@@ -131,27 +136,28 @@
             <!-- project artifacts -->
             <zipfileset refid="project.artifacts.zipfileset" />
             <!-- project dependencies -->
-            <zipfileset refid="project.dependencies.zipfileset"/>
+            <zipfileset refid="project.dependencies.zipfileset" />
             <!-- make scripts executable -->
-            <zipfileset refid="project.executables.zipfileset"/>
+            <zipfileset refid="project.executables.zipfileset" />
             <!-- ship the documentation -->
-            <zipfileset refid="project.documentation.zipfileset"/>
+            <zipfileset refid="project.documentation.zipfileset" />
             <!--additional files -->
-            <zipfileset refid="project.additionalfiles.zipfileset"/>
+            <zipfileset refid="project.additionalfiles.zipfileset" />
         </bundle>
     </target>
 
-    <target name="distribution:jar-with-dependencies" depends="distribution:init,-distribution:force-retrieve" description="create a jar archive which contains the binary output of your project, along its the unpacked dependencies (only works on jar projects)">
-        <ea:parameter property="target.main.artifact" required="true" description="location of main artifact"/>
+    <target name="distribution:jar-with-dependencies" depends="distribution:init,-distribution:force-retrieve"
+        description="create a jar archive which contains the binary output of your project, along its the unpacked dependencies (only works on jar projects)">
+        <ea:parameter property="target.main.artifact" required="true" description="location of main artifact" />
         <condition property="target.main.artifact.exist">
-            <available file="${target.main.artifact}"/>
+            <available file="${target.main.artifact}" />
         </condition>
-        <fail unless="${target.main.artifact.exist}" message="${target.main.artifact} not found"/>
-        <ea:parameter property="bundle.withdependencies.excludes.pattern" default="META-INF/MANIFEST.MF" 
-                    description="Pattern describing files excluded in the bundle jar with dependencies" />
+        <fail unless="${target.main.artifact.exist}" message="${target.main.artifact} not found" />
+        <ea:parameter property="bundle.withdependencies.excludes.pattern" default="META-INF/MANIFEST.MF"
+            description="Pattern describing files excluded in the bundle jar with dependencies" />
         <bundle destfile="${target.distributions}/${module.name}-with-dependencies" archivetype="jar">
-            <zipgroupfileset dir="${lib.main}" includes="**/*.jar"/>
-            <zipgroupfileset file="${target.main.artifact}"/>
+            <zipgroupfileset dir="${lib.main}" includes="**/*.jar" />
+            <zipgroupfileset file="${target.main.artifact}" />
         </bundle>
     </target>
 
@@ -160,14 +166,13 @@
             <!-- project artifacts -->
             <zipfileset refid="project.artifacts.zipfileset" />
             <!-- project dependencies -->
-            <zipfileset refid="project.dependencies.zipfileset"/>
+            <zipfileset refid="project.dependencies.zipfileset" />
             <!-- make scripts executable -->
-            <zipfileset refid="project.executables.zipfileset"/>
+            <zipfileset refid="project.executables.zipfileset" />
             <!-- ship the documentation -->
-            <zipfileset refid="project.documentation.zipfileset"/>
+            <zipfileset refid="project.documentation.zipfileset" />
             <!-- all project files -->
             <zipfileset refid="project.allfiles.zipfileset" />
         </bundle>
     </target>
-
-</project>
+</project>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/distribution/src/test/antunit/distribution-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/distribution/src/test/antunit/distribution-test.xml?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/distribution/src/test/antunit/distribution-test.xml (original)
+++ incubator/easyant/plugins/trunk/distribution/src/test/antunit/distribution-test.xml Tue Oct 16 19:27:43 2012
@@ -14,77 +14,73 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins;distribution-test" 
-    xmlns:au="antlib:org.apache.ant.antunit" 
-    xmlns:ivy="antlib:org.apache.ivy.ant"
+<project name="org.apache.easyant.plugins;distribution-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="target.main.artifact" value="${target}/artifacts/foobar.jar"/>
-       <mkdir dir="${target}/artifacts"/>
-       <jar destfile="${target.main.artifact}"/>
-       <mkdir dir="lib/main"/>
+        <property name="target.main.artifact" value="${target}/artifacts/foobar.jar" />
+        <mkdir dir="${target}/artifacts" />
+        <jar destfile="${target.main.artifact}" />
+        <mkdir dir="lib/main" />
     </target>
 
-    <target name="tearDown" depends="clean"/>
-    
+    <target name="tearDown" depends="clean" />
+
     <target name="test-distribution:init" depends="distribution:init">
-        <au:assertPropertyEquals name="target.distributions" value="${target}/distributions"/>
-        <au:assertPropertyEquals name="project.basedir" value="${basedir}"/>
-        <au:assertPropertyEquals name="project.prefix" value=""/>
-        <au:assertPropertyEquals name="target.artifacts" value="${target}/artifacts"/>
-        <au:assertPropertyEquals name="project.bin.dir" value="${basedir}/bin"/>
-        <au:assertPropertyEquals name="lib.main" value="${basedir}/lib/main"/>
-        <au:assertReferenceSet refid="project.artifacts.zipfileset"/>
-        <au:assertReferenceSet refid="project.dependencies.zipfileset"/>
-        <au:assertReferenceSet refid="project.executables.zipfileset"/>
-        <au:assertReferenceSet refid="project.documentation.zipfileset"/>
-        <au:assertReferenceSet refid="project.additionalfiles.zipfileset"/>
-        <au:assertReferenceSet refid="project.allfiles.zipfileset"/>
-        <au:assertFileExists file="${target.distributions}"/>
+        <au:assertPropertyEquals name="target.distributions" value="${target}/distributions" />
+        <au:assertPropertyEquals name="project.basedir" value="${basedir}" />
+        <au:assertPropertyEquals name="project.prefix" value="" />
+        <au:assertPropertyEquals name="target.artifacts" value="${target}/artifacts" />
+        <au:assertPropertyEquals name="project.bin.dir" value="${basedir}/bin" />
+        <au:assertPropertyEquals name="lib.main" value="${basedir}/lib/main" />
+        <au:assertReferenceSet refid="project.artifacts.zipfileset" />
+        <au:assertReferenceSet refid="project.dependencies.zipfileset" />
+        <au:assertReferenceSet refid="project.executables.zipfileset" />
+        <au:assertReferenceSet refid="project.documentation.zipfileset" />
+        <au:assertReferenceSet refid="project.additionalfiles.zipfileset" />
+        <au:assertReferenceSet refid="project.allfiles.zipfileset" />
+        <au:assertFileExists file="${target.distributions}" />
     </target>
 
     <target name="prepare-clean" depends="distribution:init">
-        <mkdir dir="${target.distributions}"/>
+        <mkdir dir="${target.distributions}" />
     </target>
 
     <target name="test-distribution:clean" depends="prepare-clean,distribution:clean">
-        <au:assertFileDoesntExist file="${target.distributions}"/>
+        <au:assertFileDoesntExist file="${target.distributions}" />
     </target>
-    
+
     <target name="test-distribution:force-retrieve" depends="-distribution:force-retrieve">
-        <au:assertPropertyEquals name="retrieve.dependencies" value="true"/>
+        <au:assertPropertyEquals name="retrieve.dependencies" value="true" />
     </target>
-    
+
     <target name="test-distribution:bin" depends="distribution:bin">
-        <au:assertFileExists file="${target.distributions}/${module.name}-bin.zip"/>
-        <au:assertFileExists file="${target.distributions}/${module.name}-bin.zip.MD5"/>
+        <au:assertFileExists file="${target.distributions}/${module.name}-bin.zip" />
+        <au:assertFileExists file="${target.distributions}/${module.name}-bin.zip.MD5" />
     </target>
 
     <target name="test-distribution:jar-with-dependencies" depends="distribution:jar-with-dependencies">
-        <au:assertFileExists file="${target.distributions}/${module.name}-with-dependencies.jar"/>
-        <au:assertFileExists file="${target.distributions}/${module.name}-with-dependencies.jar.MD5"/>
- 
+        <au:assertFileExists file="${target.distributions}/${module.name}-with-dependencies.jar" />
+        <au:assertFileExists file="${target.distributions}/${module.name}-with-dependencies.jar.MD5" />
     </target>
 
     <target name="test-distribution:source" depends="distribution:source">
-        <au:assertFileExists file="${target.distributions}/${module.name}-source.zip"/>
-        <au:assertFileExists file="${target.distributions}/${module.name}-source.zip.MD5"/>
+        <au:assertFileExists file="${target.distributions}/${module.name}-source.zip" />
+        <au:assertFileExists file="${target.distributions}/${module.name}-source.zip.MD5" />
     </target>
-
-</project>
+</project>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/documentation/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/documentation/module.ivy?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/documentation/module.ivy (original)
+++ incubator/easyant/plugins/trunk/documentation/module.ivy Tue Oct 16 19:27:43 2012
@@ -14,28 +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="documentation" revision="0.9">
-           <description><p>This module is used to generate documentation (out of XDOC files).<br/>
-            Your project must have the following structure:<br/>
-                src--<br/>
-                    |documentation ($src.documentation.dir)<br/>
-                    --menu.xml ($documentation.menu.file)<br/>
-                The documentation itself, must follow the XDOC-Guideline (see http://maven.apache.org/doxia/references/xdoc-format.html).<br/>
-                You can provide a CSS-Stylesheet for the format of the page ($documentation.css.dir), furthermore, you can provide your <br/>
-                own XSL-Stylesheet for the conversion of the XDOC-Documents to HTML.</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>
+        <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
+        <description>
+            <p>
+                This module is used to generate documentation (out of XDOC files).
+                <br />
+                Your project must have the following structure:
+                <br />
+                src--
+                <br />
+                |documentation ($src.documentation.dir)
+                <br />
+                --menu.xml ($documentation.menu.file)
+                <br />
+                The documentation itself, must follow the XDOC-Guideline (see
+                http://maven.apache.org/doxia/references/xdoc-format.html).
+                <br />
+                You can provide a CSS-Stylesheet for the format of the page ($documentation.css.dir), furthermore, you
+                can provide your
+                <br />
+                own XSL-Stylesheet for the conversion of the XDOC-Documents to HTML.
+            </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="xsl" name="site"/>
-        <artifact type="css" name="style"/>
+        <artifact type="ant" />
+        <artifact type="xsl" name="site" />
+        <artifact type="css" name="style" />
     </publications>
-    <dependencies/>
-</ivy-module>
+    <dependencies />
+</ivy-module>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/documentation/src/main/resources/documentation.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/documentation/src/main/resources/documentation.ant?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/documentation/src/main/resources/documentation.ant (original)
+++ incubator/easyant/plugins/trunk/documentation/src/main/resources/documentation.ant Tue Oct 16 19:27:43 2012
@@ -15,18 +15,22 @@
    limitations under the License.
 -->
 <project name="org.apache.easyant.plugins#documentation" xmlns:ea="antlib:org.apache.easyant">
-
     <ea:core-version requiredrevision="[0.9,+]" />
 
     <dirname file="${org.apache.easyant.plugins#documentation.style.css.file}" property="org.apache.easyant.plugins#documentation.style.css.dir" />
 
     <target name="documentation:init">
-        <ea:parameter property="documentation.xsl.file" default="${org.apache.easyant.plugins#documentation.site.xsl.file}" description="xsl, used to transform XML -> HTML" />
-        <ea:parameter property="documentation.css.dir" default="{org.apache.easyant.plugins#documentation.style.css.dir}" description="path where the css are stored, used for nice looking HTML" />
-        <ea:parameter property="target.documentation.dir" default="${target}/documentation" description="directory where the documentation will be generated to" />
+        <ea:parameter property="documentation.xsl.file" default="${org.apache.easyant.plugins#documentation.site.xsl.file}"
+            description="xsl, used to transform XML -> HTML" />
+        <ea:parameter property="documentation.css.dir" default="{org.apache.easyant.plugins#documentation.style.css.dir}"
+            description="path where the css are stored, used for nice looking HTML" />
+        <ea:parameter property="target.documentation.dir" default="${target}/documentation"
+            description="directory where the documentation will be generated to" />
         <ea:parameter property="src.dir" default="${user.dir}/src" description="directory containing projects sources" />
-        <ea:parameter property="src.documentation.dir" default="${src.dir}/documentation" description="directory where the documentation is stored in the project" />
-        <ea:parameter property="documentation.menu.file" default="${src.documentation.dir}/menu.xml" description="the file, which stores the navigation" />
+        <ea:parameter property="src.documentation.dir" default="${src.dir}/documentation"
+            description="directory where the documentation is stored in the project" />
+        <ea:parameter property="documentation.menu.file" default="${src.documentation.dir}/menu.xml"
+            description="the file, which stores the navigation" />
 
         <condition property="xslt.available">
             <available classname="org.apache.tools.ant.taskdefs.optional.TraXLiaison" />
@@ -38,29 +42,30 @@
 
         <available file="${src.documentation.dir}" property="has.src.documentation.dir" />
         <available file="${documentation.menu.file}" property="has.documentation.menu.file" />
-
         <available file="${documentation.css.dir}" property="has.documentation.css.dir" />
     </target>
 
     <target name="-documentation:warn-src.documentation.dir.missing" unless="has.src.documentation.dir">
         <echo>WARN: Your project doesn't match with documentation structure.</echo>
-        <echo>  If you want to use the documentation feature you must create ${src.documentation.dir} directory. This directory must have a menu.xml file</echo>
-        <echo>  If you want to have more information, you should look at the documentation of this module.</echo>
+        <echo> If you want to use the documentation feature you must create ${src.documentation.dir} directory. This
+            directory must have a menu.xml file</echo>
+        <echo> If you want to have more information, you should look at the documentation of this module.</echo>
         <property name="skip.documentation" value="true" />
     </target>
 
     <target name="-documentation:warn-documentation.menu.file.missing" unless="has.documentation.menu.file">
-        <echo>WARN: Your project doesn't match with documentation structure (documentation menu file is missing).</echo> 
-        <echo>  If you want to have more information, you should look at the documentation of this module.</echo>
+        <echo>WARN: Your project doesn't match with documentation structure (documentation menu file is missing).</echo>
+        <echo> If you want to have more information, you should look at the documentation of this module.</echo>
         <property name="skip.documentation" value="true" />
     </target>
 
-    <target name="-documentation:documentation" unless="skip.documentation" 
+    <target name="-documentation:documentation" unless="skip.documentation"
         depends="documentation:init, -documentation:warn-src.documentation.dir.missing, -documentation:warn-documentation.menu.file.missing, -documentation:copy-css">
         <mkdir dir="${target.documentation.dir}" />
 
         <echo message="Transforming the site documents..." />
-        <xslt basedir="${src.documentation.dir}" destdir="${target.documentation.dir}" extension=".html" style="${documentation.xsl.file}" excludes="${documentation.menu.file}" includes="*.xml">
+        <xslt basedir="${src.documentation.dir}" destdir="${target.documentation.dir}" extension=".html"
+            style="${documentation.xsl.file}" excludes="${documentation.menu.file}" includes="*.xml">
             <param name="relative-path" expression="." />
             <param name="menu-src-path" expression="${src.documentation.dir}" />
             <param name="menu-file" expression="${documentation.menu.file}" />
@@ -77,7 +82,6 @@
                 <include name="**/*.jpg" />
             </fileset>
         </copy>
-
     </target>
 
     <!-- Copy CSS stylesheets -->
@@ -90,8 +94,8 @@
         </copy>
     </target>
 
-    <target name="documentation:documentation" depends="-documentation:documentation" unless="skip.documentation" description="generate documentation">
+    <target name="documentation:documentation" depends="-documentation:documentation" unless="skip.documentation"
+        description="generate documentation">
         <fail if="documentation.failure" message="There are documentation violation(s)" />
     </target>
-
-</project>
+</project>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/easyant-plugin-documentation/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/easyant-plugin-documentation/module.ivy?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/easyant-plugin-documentation/module.ivy (original)
+++ incubator/easyant/plugins/trunk/easyant-plugin-documentation/module.ivy Tue Oct 16 19:27:43 2012
@@ -14,18 +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"> 
-    <info organisation="org.apache.easyant.plugins" module="easyant-plugin-documentation" status="integration" revision="0.9">
-        <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
-        <ea:plugin module="antunit" revision="0.9"/>
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+    <info organisation="org.apache.easyant.plugins" module="easyant-plugin-documentation" status="integration"
+        revision="0.9">
+        <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
+        <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
     </info>
     <configurations>
-        <conf name="default" visibility="public" description="runtime dependencies 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="provided" visibility="public" 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" visibility="public" description="runtime dependencies 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="provided" visibility="public"
+            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 name="easyant-plugin-documentation" type="ant"/>
+        <artifact type="ant" />
     </publications>
-
-</ivy-module>
+</ivy-module>
\ No newline at end of file

Modified: incubator/easyant/plugins/trunk/easyant-plugin-documentation/src/main/resources/easyant-plugin-documentation.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/easyant-plugin-documentation/src/main/resources/easyant-plugin-documentation.ant?rev=1398938&r1=1398937&r2=1398938&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/easyant-plugin-documentation/src/main/resources/easyant-plugin-documentation.ant (original)
+++ incubator/easyant/plugins/trunk/easyant-plugin-documentation/src/main/resources/easyant-plugin-documentation.ant Tue Oct 16 19:27:43 2012
@@ -14,27 +14,28 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins;easyant-plugin-documentation" 
-        xmlns:ivy="antlib:org.apache.ivy.ant" 
-        xmlns:ea="antlib:org.apache.easyant">
-
+<project name="org.apache.easyant.plugins;easyant-plugin-documentation" xmlns:ivy="antlib:org.apache.ivy.ant"
+    xmlns:ea="antlib:org.apache.easyant">
     <ea:core-version requiredrevision="[0.9,+]" />
 
     <target name="easyant-plugin-documentation:report">
-        <ea:parameter property="plugindoc.module.ivy" description="plugin's module ivy used to know dependencies" default="${basedir}/module.ivy"/>
-        <ea:parameter property="plugindoc.source.dir" description="plugin's source dirrectory used to know targets/extensionPoints etc..." required="true"/>
-        <ea:parameter property="plugindoc.main.confs" description="plugin's main conf" default="default"/>
-        <ea:parameter property="plugindoc.todir" description="target directory where plugin doc will be generated" required="true"/>
-        <ea:plugin-report moduleIvy="${plugindoc.module.ivy}" sourceDirectory="${plugindoc.source.dir}" conf="${plugindoc.main.confs}" todir="${plugindoc.todir}"/>
+        <ea:parameter property="plugindoc.module.ivy" description="plugin's module ivy used to know dependencies"
+            default="${basedir}/module.ivy" />
+        <ea:parameter property="plugindoc.source.dir" description="plugin's source dirrectory used to know targets/extensionPoints etc..."
+            required="true" />
+        <ea:parameter property="plugindoc.main.confs" description="plugin's main conf" default="default" />
+        <ea:parameter property="plugindoc.todir" description="target directory where plugin doc will be generated"
+            required="true" />
+        <ea:plugin-report moduleIvy="${plugindoc.module.ivy}" sourceDirectory="${plugindoc.source.dir}"
+            conf="${plugindoc.main.confs}" todir="${plugindoc.todir}" />
     </target>
 
     <target name="easyant-plugin-documentation:register-artifact" depends="easyant-plugin-documentation:report">
-        <ea:parameter property="plugindoc.publish.type" default="html" description="default type for plugin documentation artifacts"/>
-        <ea:parameter property="plugindoc.publish.confs" default="documentation" description="default configurations for plugin documentation artifacts"/>
-
-
-        <ea:registerartifact type="${plugindoc.publish.type}" confs="${publishdoc.publish.confs}" settingsRef="easyant.ivy.instance"/>
-
+        <ea:parameter property="plugindoc.publish.type" default="html"
+            description="default type for plugin documentation artifacts" />
+        <ea:parameter property="plugindoc.publish.confs" default="documentation"
+            description="default configurations for plugin documentation artifacts" />
+        <ea:registerartifact type="${plugindoc.publish.type}" confs="${publishdoc.publish.confs}"
+            settingsRef="easyant.ivy.instance" />
     </target>
-
-</project>
+</project>
\ No newline at end of file



Mime
View raw message