incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1073371 [26/28] - in /incubator/easyant/core/trunk: ./ bin/ example/build-configurations/ example/build-configurations/src/main/java/org/apache/easyant/example/ example/build-configurations/src/test/java/org/apache/easyant/example/ example...
Date Tue, 22 Feb 2011 15:56:09 GMT
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-utils/0.1/ivy-utils.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-utils/0.1/ivy-utils.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-utils/0.1/ivy-utils.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-utils/0.1/ivy-utils.ant Tue Feb 22 15:55:55 2011
@@ -16,57 +16,57 @@
 -->
 <project name="org.apache.easyant.plugins#ivy-utils" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ea="antlib:org.apache.easyant">
 
-	<ea:core-version requiredrevision="[0.8,+]" />
+    <ea:core-version requiredrevision="[0.8,+]" />
 
-	<target name=":init" phase="validate">
-		<ea:parameter phase="validate" />
-		<ea:parameter property="project.ivy.instance" default="project.ivy.instance" 
-			description="the ivy instance name for your project" />
-		<ea:parameter property="target.report.ivy" default="${target.report}/deps-report" 
-			description="the directory where ivy report will be generated" />
-
-		<!-- 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" />
-		
-		<condition property="is.project.ivy.settings.configured">
-			<isreference refid="${project.ivy.instance}"/>
-		</condition>
-		<fail unless="is.project.ivy.settings.configured" message="project ivy instance is not configured, at least one of the following property must be set : project.ivy.settings.file, project.ivy.settings.url"/>
-
-	</target>
-
-
-	<!-- ================================= 
-	          target: clean-report              
-	     ================================= -->
-	<target name=":report" depends="provision" phase="report" description="generate dependencies report">
-		<ivy:report todir="${target.report.ivy}" settingsRef="${project.ivy.instance}" />
-	</target>
+    <target name=":init" phase="validate">
+        <ea:parameter phase="validate" />
+        <ea:parameter property="project.ivy.instance" default="project.ivy.instance" 
+            description="the ivy instance name for your project" />
+        <ea:parameter property="target.report.ivy" default="${target.report}/deps-report" 
+            description="the directory where ivy report will be generated" />
+
+        <!-- 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" />
+        
+        <condition property="is.project.ivy.settings.configured">
+            <isreference refid="${project.ivy.instance}"/>
+        </condition>
+        <fail unless="is.project.ivy.settings.configured" message="project ivy instance is not configured, at least one of the following property must be set : project.ivy.settings.file, project.ivy.settings.url"/>
 
-	<!-- ================================= 
+    </target>
+
+
+    <!-- ================================= 
+              target: clean-report              
+         ================================= -->
+    <target name=":report" depends="provision" phase="report" description="generate dependencies report">
+        <ivy:report todir="${target.report.ivy}" settingsRef="${project.ivy.instance}" />
+    </target>
+
+    <!-- ================================= 
           target: clean-cache              
          ================================= -->
-	<target name=":clean-cache" depends=":init" description="clean the ivy cache used to resolve project dependencies">
-		<ivy:cleancache settingsRef="${project.ivy.instance}"/>
-	</target>
-	
-	
-	<!-- ================================= 
-	          target: clean-eacache              
+    <target name=":clean-cache" depends=":init" description="clean the ivy cache used to resolve project dependencies">
+        <ivy:cleancache settingsRef="${project.ivy.instance}"/>
+    </target>
+    
+    
+    <!-- ================================= 
+              target: clean-eacache              
          ================================= -->
-	<target name=":clean-eacache" description="clean the ivy cache used by easyant to resolve plugins/ buildtypes">
-		<!-- clean easyant cache -->
-		<ivy:cleancache settingsRef="easyant.ivy.instance"/>
-	</target>
+    <target name=":clean-eacache" description="clean the ivy cache used by easyant to resolve plugins/ buildtypes">
+        <!-- clean easyant cache -->
+        <ivy:cleancache settingsRef="easyant.ivy.instance"/>
+    </target>
 
 
-	<!-- ================================= 
+    <!-- ================================= 
           target: clean-lib              
          ================================= -->
-	<target name=":clean-lib" description="clean the project libraries directory">
-		<delete includeemptydirs="true" dir="${lib.dir}" />
-	</target>
+    <target name=":clean-lib" description="clean the project libraries directory">
+        <delete includeemptydirs="true" dir="${lib.dir}" />
+    </target>
 
-	<target name="doit" depends=":report" />
+    <target name="doit" depends=":report" />
 </project>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-utils/0.1/ivy-utils.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-utils/0.1/ivy-utils.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-utils/0.1/ivy-utils.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-utils/0.1/ivy-utils.ivy Tue Feb 22 15:55:55 2011
@@ -15,15 +15,15 @@
    limitations under the License.
 -->
 <ivy-module version="2.0"> 
-	<info organisation="org.apache.easyant.plugins"
-	       module="ivy-utils"
-	       status="milestone"
-	       revision="0.1">
-	       <description>
-		       This module provides utilitaries target related to ivy (clean-cache / dependencies report)
-	       </description>
-	</info>
-	<publications>
-		<artifact type="ant" />
-	</publications>
+    <info organisation="org.apache.easyant.plugins"
+           module="ivy-utils"
+           status="milestone"
+           revision="0.1">
+           <description>
+               This module provides utilitaries target related to ivy (clean-cache / dependencies report)
+           </description>
+    </info>
+    <publications>
+        <artifact type="ant" />
+    </publications>
 </ivy-module>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/javadoc/0.1/javadoc.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/javadoc/0.1/javadoc.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/javadoc/0.1/javadoc.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/javadoc/0.1/javadoc.ant Tue Feb 22 15:55:55 2011
@@ -16,70 +16,70 @@
 -->
 <project name="org.apache.easyant.plugins#javadoc" xmlns:ea="antlib:org.apache.easyant">
 
-	<ea:core-version requiredrevision="[0.8,+]" />
+    <ea:core-version requiredrevision="[0.8,+]" />
 
-	<target name=":init" phase="validate">
-		<ea:parameter phase="validate" />
-		<ea:parameter phase="report" />
-
-		<ea:parameter property="src.main.java" required="true" description="directory where sources to be compiled are" />
-		<ea:parameter property="src.test.java" required="true" description="directory where test sources to be compiled are" />
-		<ea:parameter path="compile.main.classpath" required="true" description="path used to compile main sources" />
-		<ea:parameter path="compile.test.classpath" required="true" description="path used to compile test sources" />
-		<ea:parameter property="javadoc.file.encoding" default="UTF-8" description="encoding used for generated javadoc" />
-	
-		<ea:parameter property="target.report" default="${target}/report" description="base directory for reports"/>
-		<ea:parameter property="target.javadoc" default="${target.report}/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" />
-
-		<!-- javadoc task seems to be sensible to empty directory -->
-		<!-- if src.test.java does not exit OR is an empty dir we set the empty.src.test.java.dir property that will skip the javadoc generation -->
-		<condition property="empty.src.test.java.dir">
-			<or>
-				<not>
-					<available file="${src.test.java}"/>
-				</not>
-				<length length="0" >
-					<fileset dir="${src.test.java}"/> 
-				</length>
-			</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">
-			<or>
-				<not>
-					<available file="${src.main.java}" />
-				</not>
-				<length length="0" >
-					<fileset dir="${src.main.java}"/> 
-				</length>
-			</or>
-		</condition>
-	</target>
-
-	<target name="-main" unless="empty.src.main.java.dir">
-		<path id="java.source.path">
-			<dirset dir="${src.main.java}" />
-		</path>
-		<javadoc encoding="${javadoc.file.encoding}" docencoding="${javadoc.file.encoding}" destdir="${target.javadoc.main}" sourcepathref="java.source.path" classpathref="compile.main.classpath" />
-	</target>
-
-	<target name="-test" unless="empty.src.test.java.dir">
-		<path id="java.source.path">
-			<dirset dir="${src.test.java}" />
-		</path>
-		<javadoc encoding="${javadoc.file.encoding}" docencoding="${javadoc.file.encoding}" destdir="${target.javadoc.test}" sourcepathref="java.source.path" classpathref="compile.test.classpath" />
-	</target>
-
-	<target name=":package" depends=":javadoc" description="generate a package containing javadoc" unless="skip.javadoc.package">
-		<mkdir dir="${target.artifacts}"/>
-		<zip destfile="${target.artifacts}/${ivy.module}-javadoc.zip">
-			<fileset dir="${target.javadoc}" erroronmissingdir="false"/>
-		</zip>
-		<ea:registerartifact type="javadoc" ext="zip" classifier="javadoc" settingsRef="${project.ivy.instance}"/>
-	</target>
+    <target name=":init" phase="validate">
+        <ea:parameter phase="validate" />
+        <ea:parameter phase="report" />
+
+        <ea:parameter property="src.main.java" required="true" description="directory where sources to be compiled are" />
+        <ea:parameter property="src.test.java" required="true" description="directory where test sources to be compiled are" />
+        <ea:parameter path="compile.main.classpath" required="true" description="path used to compile main sources" />
+        <ea:parameter path="compile.test.classpath" required="true" description="path used to compile test sources" />
+        <ea:parameter property="javadoc.file.encoding" default="UTF-8" description="encoding used for generated javadoc" />
+    
+        <ea:parameter property="target.report" default="${target}/report" description="base directory for reports"/>
+        <ea:parameter property="target.javadoc" default="${target.report}/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" />
+
+        <!-- javadoc task seems to be sensible to empty directory -->
+        <!-- if src.test.java does not exit OR is an empty dir we set the empty.src.test.java.dir property that will skip the javadoc generation -->
+        <condition property="empty.src.test.java.dir">
+            <or>
+                <not>
+                    <available file="${src.test.java}"/>
+                </not>
+                <length length="0" >
+                    <fileset dir="${src.test.java}"/> 
+                </length>
+            </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">
+            <or>
+                <not>
+                    <available file="${src.main.java}" />
+                </not>
+                <length length="0" >
+                    <fileset dir="${src.main.java}"/> 
+                </length>
+            </or>
+        </condition>
+    </target>
+
+    <target name="-main" unless="empty.src.main.java.dir">
+        <path id="java.source.path">
+            <dirset dir="${src.main.java}" />
+        </path>
+        <javadoc encoding="${javadoc.file.encoding}" docencoding="${javadoc.file.encoding}" destdir="${target.javadoc.main}" sourcepathref="java.source.path" classpathref="compile.main.classpath" />
+    </target>
+
+    <target name="-test" unless="empty.src.test.java.dir">
+        <path id="java.source.path">
+            <dirset dir="${src.test.java}" />
+        </path>
+        <javadoc encoding="${javadoc.file.encoding}" docencoding="${javadoc.file.encoding}" destdir="${target.javadoc.test}" sourcepathref="java.source.path" classpathref="compile.test.classpath" />
+    </target>
+
+    <target name=":package" depends=":javadoc" description="generate a package containing javadoc" unless="skip.javadoc.package">
+        <mkdir dir="${target.artifacts}"/>
+        <zip destfile="${target.artifacts}/${ivy.module}-javadoc.zip">
+            <fileset dir="${target.javadoc}" erroronmissingdir="false"/>
+        </zip>
+        <ea:registerartifact type="javadoc" ext="zip" classifier="javadoc" settingsRef="${project.ivy.instance}"/>
+    </target>
 
-	<target name=":javadoc" depends="validate,-main,-test" phase="report" description="generate javadoc report for main classes and test classes" />
-	<target name="doit" depends=":javadoc" />
+    <target name=":javadoc" depends="validate,-main,-test" phase="report" description="generate javadoc report for main classes and test classes" />
+    <target name="doit" depends=":javadoc" />
 </project>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/javadoc/0.1/javadoc.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/javadoc/0.1/javadoc.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/javadoc/0.1/javadoc.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/javadoc/0.1/javadoc.ivy Tue Feb 22 15:55:55 2011
@@ -15,30 +15,30 @@
    limitations under the License.
 -->
 <ivy-module version="2.0"> 
-	<info organisation="org.apache.easyant.plugins"
-	       module="javadoc"
-	       status="milestone"
-	       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>
-	</info>
-	<publications>
-		<artifact type="ant" />
-	</publications>
+    <info organisation="org.apache.easyant.plugins"
+           module="javadoc"
+           status="milestone"
+           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>
+    </info>
+    <publications>
+        <artifact type="ant" />
+    </publications>
 </ivy-module>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/manifest/0.1/manifest.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/manifest/0.1/manifest.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/manifest/0.1/manifest.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/manifest/0.1/manifest.ant Tue Feb 22 15:55:55 2011
@@ -16,83 +16,83 @@
 -->
 <project name="org.apache.easyant.plugins#manifest" xmlns:ea="antlib:org.apache.easyant">
 
-	<ea:core-version requiredrevision="[0.8,+]" />
+    <ea:core-version requiredrevision="[0.8,+]" />
 
-	<target name=":init" phase="validate">
-		<ea:parameter phase="validate" />
-		<ea:parameter phase="prepare-package" />
-
-		<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.
-		</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." />
-		<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." />
-
-		<!--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="version" description="the full version of the project" />
-		<condition property="is.manifest.runnable">
-			<and>
-				<isset property="manifest.main.classname"/>
-				<not>
-				<equals arg1="${manifest.main.classname}" arg2="$${project.main.classname}"/>
-				</not>
-			</and>
-		</condition>
-	</target>
-
-	<target name="-generate-version-number" depends="validate" unless="version">
-		<tstamp>
-			<format property="now" pattern="yyyyMMddHHmmss" />
-		</tstamp>
-
-		<property name="version" value="${ivy.revision}-build-${now}" />
-	</target>
-
-	<target name=":manifest" depends="validate,-generate-version-number" phase="prepare-package" description="generate manifest file">
-		<manifest file="${manifest.file}">
-			<attribute name="Specification-Title" value="${ivy.module}" />
-			<attribute name="Specification-Version" value="${ivy.revision}" />
-			<attribute name="Specification-Vendor" value="${ivy.organisation}" />
-			<attribute name="Implementation-Title" value="${ivy.module}" />
-			<attribute name="Implementation-Version" value="${version}" />
-			<attribute name="Implementation-Vendor" value="${ivy.organisation}" />
-		</manifest>
-
-		<!--generate a version.properties file -->
-		<propertyfile file="${version.properties.file}" comment="Generated by easyant">
-			<entry key="APPLICATION-NAME" value="${ivy.module}" />
-			<entry key="SPEC-VERSION" value="${ivy.revision}" />
-			<entry key="APPLICATION_ORG" value="${ivy.organisation}" />
-			<entry key="VERSION" value="${version}" />
-			<entry key="DATE" type="date" value="now" />
-		</propertyfile>
-	</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-runnable" depends=":manifest" phase="prepare-package" description="add manifest attributes required for an executable jar" if="is.manifest.runnable">
-		<condition property="is.retrieve.dependencies.enabled">
-			<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"/>
-
-		<!-- create the target artifact dir if it does not exists -->
-		<dirname file="${target.main.artifact}" property="target.artifacts"/>
-		<mkdir dir="${target.artifacts}"/>
-		<manifestclasspath property="manifest.classpath" jarfile="${target.main.artifact}">
-			<classpath refid="project.lib.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>
+    <target name=":init" phase="validate">
+        <ea:parameter phase="validate" />
+        <ea:parameter phase="prepare-package" />
+
+        <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.
+        </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." />
+        <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." />
+
+        <!--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="version" description="the full version of the project" />
+        <condition property="is.manifest.runnable">
+            <and>
+                <isset property="manifest.main.classname"/>
+                <not>
+                <equals arg1="${manifest.main.classname}" arg2="$${project.main.classname}"/>
+                </not>
+            </and>
+        </condition>
+    </target>
+
+    <target name="-generate-version-number" depends="validate" unless="version">
+        <tstamp>
+            <format property="now" pattern="yyyyMMddHHmmss" />
+        </tstamp>
+
+        <property name="version" value="${ivy.revision}-build-${now}" />
+    </target>
+
+    <target name=":manifest" depends="validate,-generate-version-number" phase="prepare-package" description="generate manifest file">
+        <manifest file="${manifest.file}">
+            <attribute name="Specification-Title" value="${ivy.module}" />
+            <attribute name="Specification-Version" value="${ivy.revision}" />
+            <attribute name="Specification-Vendor" value="${ivy.organisation}" />
+            <attribute name="Implementation-Title" value="${ivy.module}" />
+            <attribute name="Implementation-Version" value="${version}" />
+            <attribute name="Implementation-Vendor" value="${ivy.organisation}" />
+        </manifest>
+
+        <!--generate a version.properties file -->
+        <propertyfile file="${version.properties.file}" comment="Generated by easyant">
+            <entry key="APPLICATION-NAME" value="${ivy.module}" />
+            <entry key="SPEC-VERSION" value="${ivy.revision}" />
+            <entry key="APPLICATION_ORG" value="${ivy.organisation}" />
+            <entry key="VERSION" value="${version}" />
+            <entry key="DATE" type="date" value="now" />
+        </propertyfile>
+    </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-runnable" depends=":manifest" phase="prepare-package" description="add manifest attributes required for an executable jar" if="is.manifest.runnable">
+        <condition property="is.retrieve.dependencies.enabled">
+            <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"/>
+
+        <!-- create the target artifact dir if it does not exists -->
+        <dirname file="${target.main.artifact}" property="target.artifacts"/>
+        <mkdir dir="${target.artifacts}"/>
+        <manifestclasspath property="manifest.classpath" jarfile="${target.main.artifact}">
+            <classpath refid="project.lib.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>
 
-	<target name="doit" depends=":manifest-runnable,:manifest" />
+    <target name="doit" depends=":manifest-runnable,:manifest" />
 </project>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/manifest/0.1/manifest.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/manifest/0.1/manifest.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/manifest/0.1/manifest.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/manifest/0.1/manifest.ivy Tue Feb 22 15:55:55 2011
@@ -15,15 +15,15 @@
    limitations under the License.
 -->
 <ivy-module version="2.0"> 
-	<info organisation="org.apache.easyant.plugins"
-	       module="manifest"
-	       status="milestone"
-	       revision="0.1">
-	       <description>This module provides manifest generation feature.<br/>
+    <info organisation="org.apache.easyant.plugins"
+           module="manifest"
+           status="milestone"
+           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>
-	</info>
-	<publications>
-		<artifact type="ant" />
-	</publications>
+    </info>
+    <publications>
+        <artifact type="ant" />
+    </publications>
 </ivy-module>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-jar/0.1/package-jar.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-jar/0.1/package-jar.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-jar/0.1/package-jar.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-jar/0.1/package-jar.ant Tue Feb 22 15:55:55 2011
@@ -15,54 +15,54 @@
    limitations under the License.
 -->
 <project name="org.apache.easyant.plugins#package-jar"
-	xmlns:ea="antlib:org.apache.easyant">
-			
-	<ea:core-version requiredrevision="[0.8,+]" />
-	
-	<target name=":init" phase="validate">
-		<ea:parameter phase="validate" />
-		<ea:parameter phase="compile" />
-		<ea:parameter phase="package" />
-		
-		<ea:parameter property="target.artifacts.main.jar.name" required="true"
-		    description="main artifact file name" />
+    xmlns:ea="antlib:org.apache.easyant">
+            
+    <ea:core-version requiredrevision="[0.8,+]" />
+    
+    <target name=":init" phase="validate">
+        <ea:parameter phase="validate" />
+        <ea:parameter phase="compile" />
+        <ea:parameter phase="package" />
+        
+        <ea:parameter property="target.artifacts.main.jar.name" required="true"
+            description="main artifact file name" />
 
-		<ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
-		
-		<ea:parameter property="target.main.artifact" required="false" description="the location of the main artifact" 
-			default="${target.artifacts}/${target.artifacts.main.jar.name}"/>
+        <ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
+        
+        <ea:parameter property="target.main.artifact" required="false" description="the location of the main artifact" 
+            default="${target.artifacts}/${target.artifacts.main.jar.name}"/>
 
-		<ea:parameter property="target.main.classes" required="true" 
-			description="directory where compiled classes that should be packaged are" />
-		
-		<ea:parameter property="manifest.file" required="true"
-			description="the file used to generate manifest" />
-		
-		<ea:parameter property="package.jar.includes.pattern" default="**/*" 
-			description="Pattern describing files included in the output jar" />
-		<ea:parameter property="package.jar.excludes.pattern" default="" 
-			description="Pattern describing files excluded in the output jar" />
+        <ea:parameter property="target.main.classes" required="true" 
+            description="directory where compiled classes that should be packaged are" />
+        
+        <ea:parameter property="manifest.file" required="true"
+            description="the file used to generate manifest" />
+        
+        <ea:parameter property="package.jar.includes.pattern" default="**/*" 
+            description="Pattern describing files included in the output jar" />
+        <ea:parameter property="package.jar.excludes.pattern" default="" 
+            description="Pattern describing files excluded in the output jar" />
 
-		<ea:parameter property="package.metainf.basedir" default="${basedir}" 
-				description="basedir of the metainf fileset"/>
-		<ea:parameter property="package.metainf.includes.pattern" default="NOTICE,LICENSE" 
-				description="Pattern describing files included in the META-INF of the package"/>
-		<ea:parameter property="package.metainf.excludes.pattern" default="" 
-				description="Pattern describing files excluded in the META-INF of the package"/>
+        <ea:parameter property="package.metainf.basedir" default="${basedir}" 
+                description="basedir of the metainf fileset"/>
+        <ea:parameter property="package.metainf.includes.pattern" default="NOTICE,LICENSE" 
+                description="Pattern describing files included in the META-INF of the package"/>
+        <ea:parameter property="package.metainf.excludes.pattern" default="" 
+                description="Pattern describing files excluded in the META-INF of the package"/>
 
-		<fileset id="package.metainf.fileset" dir="${package.metainf.basedir}" includes="${package.metainf.includes.pattern}" excludes="${package.metainf.excludes.pattern}"/>
-		
-	</target>	
-	
-	<target name=":jar" depends="validate, compile,prepare-package" description="package project as a JAR"
-			phase="package" unless="skip.jar.package">
-		<mkdir dir="${target.artifacts}" />
-		<jar destfile="${target.main.artifact}" manifest="${manifest.file}" 
-			basedir="${target.main.classes}" includes="${package.jar.includes.pattern}"
-			excludes="${package.jar.excludes.pattern}">
-			<metainf refid="package.metainf.fileset"/>
-		</jar>
-	</target>	
+        <fileset id="package.metainf.fileset" dir="${package.metainf.basedir}" includes="${package.metainf.includes.pattern}" excludes="${package.metainf.excludes.pattern}"/>
+        
+    </target>   
+    
+    <target name=":jar" depends="validate, compile,prepare-package" description="package project as a JAR"
+            phase="package" unless="skip.jar.package">
+        <mkdir dir="${target.artifacts}" />
+        <jar destfile="${target.main.artifact}" manifest="${manifest.file}" 
+            basedir="${target.main.classes}" includes="${package.jar.includes.pattern}"
+            excludes="${package.jar.excludes.pattern}">
+            <metainf refid="package.metainf.fileset"/>
+        </jar>
+    </target>   
 
-	<target name="doit" depends=":jar" />
+    <target name="doit" depends=":jar" />
 </project>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-jar/0.1/package-jar.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-jar/0.1/package-jar.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-jar/0.1/package-jar.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-jar/0.1/package-jar.ivy Tue Feb 22 15:55:55 2011
@@ -15,13 +15,13 @@
    limitations under the License.
 -->
 <ivy-module version="2.0"> 
-	<info organisation="org.apache.easyant.plugins"
-	       module="package-jar"
-	       status="milestone"
-	       revision="0.1">
-	       <description>This module provides jar packaging feature. </description>
-	</info>
-	<publications>
-		<artifact type="ant" />
-	</publications>
+    <info organisation="org.apache.easyant.plugins"
+           module="package-jar"
+           status="milestone"
+           revision="0.1">
+           <description>This module provides jar packaging feature. </description>
+    </info>
+    <publications>
+        <artifact type="ant" />
+    </publications>
 </ivy-module>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-test-jar/0.1/package-test-jar.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-test-jar/0.1/package-test-jar.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-test-jar/0.1/package-test-jar.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-test-jar/0.1/package-test-jar.ant Tue Feb 22 15:55:55 2011
@@ -15,62 +15,62 @@
    limitations under the License.
 -->
 <project name="org.apache.easyant.plugins#package-test-jar"
-	xmlns:ea="antlib:org.apache.easyant">
-			
-	<ea:core-version requiredrevision="[0.8,+]" />
-	
-	<target name=":init" phase="validate">
-		<ea:parameter phase="validate" />
-		<ea:parameter phase="compile" />
-		<ea:parameter phase="package" />
-		
-		<ea:parameter property="target.artifacts.test.jar.name" required="true"
-		    description="test artifact file name" />
-
-		<ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
-		
-		<ea:parameter property="test.jar.file" required="false" description="the location of the test jar file" 
-			default="${target.artifacts}/${target.artifacts.test.jar.name}"/>
-
-		<ea:parameter property="target.test.classes" required="true" 
-			description="directory where compiled classes that should be packaged are" />
-		
-		<ea:parameter property="manifest.file" required="true"
-			description="the file used to generate manifest" />
-
-		<ea:parameter property="test.jar.includes.pattern" default="**/*" 
-			description="Pattern describing files included in the test jar" />
-		<ea:parameter property="test.jar.excludes.pattern" default="" 
-			description="Pattern describing files excluded in the test jar" />
-
-		<ea:parameter property="package.metainf.basedir" default="${basedir}" 
-				description="basedir of the metainf fileset"/>
-		<ea:parameter property="package.metainf.includes.pattern" default="NOTICE,LICENSE" 
-				description="Pattern describing files included in the META-INF of the package"/>
-		<ea:parameter property="package.metainf.excludes.pattern" default="" 
-				description="Pattern describing files excluded in the META-INF of the package"/>
-
-		<fileset id="package.metainf.fileset" dir="${package.metainf.basedir}" includes="${package.metainf.includes.pattern}" excludes="${package.metainf.excludes.pattern}"/>
-
-		<condition property="has.src.test">
-			<or>
-				<available file="${src.test.java}" />
-				<available file="${src.test.resources}" />
-			</or>
-		</condition>
-		
-	</target>	
-	
-	<target name=":jar" depends="validate, test-compile" description="package test classes as a JAR" 
-			phase="package" if="has.src.test" unless="skip.test.package">
-		<mkdir dir="${target.artifacts}" />
-		<jar destfile="${test.jar.file}" manifest="${manifest.file}" 
-			basedir="${target.test.classes}" includes="${test.jar.includes.pattern}"
-			excludes="${test.jar.excludes.pattern}">
-			<metainf refid="package.metainf.fileset"/>
-		</jar>
-		<ea:registerartifact ext="jar" type="test-jar" classifier="test" settingsRef="${project.ivy.instance}"/>
-	</target>
+    xmlns:ea="antlib:org.apache.easyant">
+            
+    <ea:core-version requiredrevision="[0.8,+]" />
+    
+    <target name=":init" phase="validate">
+        <ea:parameter phase="validate" />
+        <ea:parameter phase="compile" />
+        <ea:parameter phase="package" />
+        
+        <ea:parameter property="target.artifacts.test.jar.name" required="true"
+            description="test artifact file name" />
+
+        <ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
+        
+        <ea:parameter property="test.jar.file" required="false" description="the location of the test jar file" 
+            default="${target.artifacts}/${target.artifacts.test.jar.name}"/>
+
+        <ea:parameter property="target.test.classes" required="true" 
+            description="directory where compiled classes that should be packaged are" />
+        
+        <ea:parameter property="manifest.file" required="true"
+            description="the file used to generate manifest" />
+
+        <ea:parameter property="test.jar.includes.pattern" default="**/*" 
+            description="Pattern describing files included in the test jar" />
+        <ea:parameter property="test.jar.excludes.pattern" default="" 
+            description="Pattern describing files excluded in the test jar" />
+
+        <ea:parameter property="package.metainf.basedir" default="${basedir}" 
+                description="basedir of the metainf fileset"/>
+        <ea:parameter property="package.metainf.includes.pattern" default="NOTICE,LICENSE" 
+                description="Pattern describing files included in the META-INF of the package"/>
+        <ea:parameter property="package.metainf.excludes.pattern" default="" 
+                description="Pattern describing files excluded in the META-INF of the package"/>
+
+        <fileset id="package.metainf.fileset" dir="${package.metainf.basedir}" includes="${package.metainf.includes.pattern}" excludes="${package.metainf.excludes.pattern}"/>
+
+        <condition property="has.src.test">
+            <or>
+                <available file="${src.test.java}" />
+                <available file="${src.test.resources}" />
+            </or>
+        </condition>
+        
+    </target>   
+    
+    <target name=":jar" depends="validate, test-compile" description="package test classes as a JAR" 
+            phase="package" if="has.src.test" unless="skip.test.package">
+        <mkdir dir="${target.artifacts}" />
+        <jar destfile="${test.jar.file}" manifest="${manifest.file}" 
+            basedir="${target.test.classes}" includes="${test.jar.includes.pattern}"
+            excludes="${test.jar.excludes.pattern}">
+            <metainf refid="package.metainf.fileset"/>
+        </jar>
+        <ea:registerartifact ext="jar" type="test-jar" classifier="test" settingsRef="${project.ivy.instance}"/>
+    </target>
 
-	<target name="doit" depends=":jar" />
+    <target name="doit" depends=":jar" />
 </project>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-test-jar/0.1/package-test-jar.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-test-jar/0.1/package-test-jar.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-test-jar/0.1/package-test-jar.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-test-jar/0.1/package-test-jar.ivy Tue Feb 22 15:55:55 2011
@@ -15,32 +15,32 @@
    limitations under the License.
 -->
 <ivy-module version="2.0"> 
-	<info organisation="org.apache.easyant.plugins"
-	       module="package-test-jar"
-	       status="milestone"
-	       revision="0.1">
-	       <description>
-	       		<p>This module provides jar packaging feature for tests.</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="package-test-jar" rev="0.1" as="test-jar"/>
-		       			<bindtarget target="test-jar:jar" tophase="package"/>
-		       		</code>
-		       		Or as a nested element of the plugin
-		       		<code type="xml">
-	       				<plugin name="package-test-jar" rev="0.1" as="test-jar">
-	       					<!-- here, the target prefix is not mandatory as easyant can determine it from plugin element -->
-	       					<bindtarget target=":jar" tophase="package"/>
-	       				</plugin>
-		       		</code>
-		       		
-	       		</p>
-	       		 
-	       </description>
-	</info>
-	<publications>
-		<artifact type="ant" />
-	</publications>
+    <info organisation="org.apache.easyant.plugins"
+           module="package-test-jar"
+           status="milestone"
+           revision="0.1">
+           <description>
+                <p>This module provides jar packaging feature for tests.</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="package-test-jar" rev="0.1" as="test-jar"/>
+                        <bindtarget target="test-jar:jar" tophase="package"/>
+                    </code>
+                    Or as a nested element of the plugin
+                    <code type="xml">
+                        <plugin name="package-test-jar" rev="0.1" as="test-jar">
+                            <!-- here, the target prefix is not mandatory as easyant can determine it from plugin element -->
+                            <bindtarget target=":jar" tophase="package"/>
+                        </plugin>
+                    </code>
+                    
+                </p>
+                 
+           </description>
+    </info>
+    <publications>
+        <artifact type="ant" />
+    </publications>
 </ivy-module>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-war/0.1/package-war.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-war/0.1/package-war.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-war/0.1/package-war.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-war/0.1/package-war.ant Tue Feb 22 15:55:55 2011
@@ -15,84 +15,84 @@
    limitations under the License.
 -->
 <project name="org.apache.easyant.plugins#package-war"
-	xmlns:ea="antlib:org.apache.easyant">
-	
-	<ea:core-version requiredrevision="[0.8,+]" />
-			
-	<target name=":init" phase="validate">
-		<ea:parameter phase="validate" />
-		<ea:parameter phase="compile" />
-		<ea:parameter phase="package" />
-		
-		<ea:parameter property="target.artifacts.main.war.name" required="true"
-		    description="main artifact file name" />
-		<ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
-
-
-		<ea:parameter property="target.main.classes" required="true" 
-			description="directory where compiled classes that should be packaged are" />
-		
-		<ea:parameter property="manifest.file" required="true"
-			description="the file used to generate manifest" />
-		
-		<ea:parameter property="package.war.includes.pattern" default="**/*" 
-			description="Pattern describing files included in the output war" />
-		<ea:parameter property="package.war.excludes.pattern" default="" 
-			description="Pattern describing files excluded in the output war" />
-		
-		<ea:parameter property="package.war.needxmlfile" default="false"
-			description="Flag to indicate whether or not the web.xml file is needed. Iit should be set to false when generating servlet 2.5+ WAR files without a web.xml file."/>
-		
-		<ea:parameter property="src.main.webapp" required="true"
-			description="directory where web resources files are stored (like pages, images, etc...)"/>
-	
-		<ea:parameter property="package.war.webxml.file" required="${package.war.needxmlfile}" 
-			description="The servlet configuration descriptor to use (WEB-INF/web.xml)."/>
-		
-		<ea:parameter property="package.metainf.basedir" default="${basedir}" 
-				description="basedir of the metainf fileset"/>
-		<ea:parameter property="package.metainf.includes.pattern" default="NOTICE,LICENSE" 
-				description="Pattern describing files included in the META-INF of the package"/>
-		<ea:parameter property="package.metainf.excludes.pattern" default="" 
-				description="Pattern describing files excluded in the META-INF of the package"/>
-	
-		<ea:parameter property="target.webinf.lib.dir" default="${target}/war/WEB-INF/lib" 
-				description="temp directory used to store artifacts that will be included in the WEB-INF lib directory"/>
-		<ea:parameter property="target.main.artifact" required="false" description="the location of the main artifact" 
-			default="${target.artifacts}/${target.artifacts.main.war.name}"/>
-
-		<fileset id="package.metainf.fileset" dir="${package.metainf.basedir}" includes="${package.metainf.includes.pattern}" excludes="${package.metainf.excludes.pattern}"/>
-
-		<mkdir dir="${target.artifacts}" />
-		
-	</target>
-	
-	<target name="-prepare-war" depends="validate" phase="prepare-package">
-		<!-- copy cache main classpath to a temp directory and build the corresponding fileset -->
-		<mkdir dir="${target.webinf.lib.dir}"/>
-		<copy todir="${target.webinf.lib.dir}" flatten="true">
-			<path refid="cache.main.classpath"/>
-		</copy>
-		<fileset id="webinf.lib.fileset" dir="${target.webinf.lib.dir}"/>
-	</target>
-	
-	<target name=":war" depends="validate, compile, prepare-package" description="package project as a WAR"
-			phase="package">
-		<ea:parameter phase="package" />
-
-		<war destfile="${target.main.artifact}"
-				manifest="${manifest.file}"
-				needxmlfile="false"
-				includes="${package.war.includes.pattern}"
-				excludes="${package.war.excludes.pattern}">
-			<fileset dir="${src.main.webapp}" includes="**/*" erroronmissingdir="false"/>
-			<lib refid="webinf.lib.fileset" erroronmissingdir="false"/>
-			<classes dir="${target.main.classes}" includes="**/*" erroronmissingdir="false"/> 
-			<metainf refid="package.metainf.fileset"/>
-		</war>
-		<ea:registerartifact type="war" settingsRef="${project.ivy.instance}"/>		
+    xmlns:ea="antlib:org.apache.easyant">
+    
+    <ea:core-version requiredrevision="[0.8,+]" />
+            
+    <target name=":init" phase="validate">
+        <ea:parameter phase="validate" />
+        <ea:parameter phase="compile" />
+        <ea:parameter phase="package" />
+        
+        <ea:parameter property="target.artifacts.main.war.name" required="true"
+            description="main artifact file name" />
+        <ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
+
+
+        <ea:parameter property="target.main.classes" required="true" 
+            description="directory where compiled classes that should be packaged are" />
+        
+        <ea:parameter property="manifest.file" required="true"
+            description="the file used to generate manifest" />
+        
+        <ea:parameter property="package.war.includes.pattern" default="**/*" 
+            description="Pattern describing files included in the output war" />
+        <ea:parameter property="package.war.excludes.pattern" default="" 
+            description="Pattern describing files excluded in the output war" />
+        
+        <ea:parameter property="package.war.needxmlfile" default="false"
+            description="Flag to indicate whether or not the web.xml file is needed. Iit should be set to false when generating servlet 2.5+ WAR files without a web.xml file."/>
+        
+        <ea:parameter property="src.main.webapp" required="true"
+            description="directory where web resources files are stored (like pages, images, etc...)"/>
+    
+        <ea:parameter property="package.war.webxml.file" required="${package.war.needxmlfile}" 
+            description="The servlet configuration descriptor to use (WEB-INF/web.xml)."/>
+        
+        <ea:parameter property="package.metainf.basedir" default="${basedir}" 
+                description="basedir of the metainf fileset"/>
+        <ea:parameter property="package.metainf.includes.pattern" default="NOTICE,LICENSE" 
+                description="Pattern describing files included in the META-INF of the package"/>
+        <ea:parameter property="package.metainf.excludes.pattern" default="" 
+                description="Pattern describing files excluded in the META-INF of the package"/>
+    
+        <ea:parameter property="target.webinf.lib.dir" default="${target}/war/WEB-INF/lib" 
+                description="temp directory used to store artifacts that will be included in the WEB-INF lib directory"/>
+        <ea:parameter property="target.main.artifact" required="false" description="the location of the main artifact" 
+            default="${target.artifacts}/${target.artifacts.main.war.name}"/>
+
+        <fileset id="package.metainf.fileset" dir="${package.metainf.basedir}" includes="${package.metainf.includes.pattern}" excludes="${package.metainf.excludes.pattern}"/>
+
+        <mkdir dir="${target.artifacts}" />
+        
+    </target>
+    
+    <target name="-prepare-war" depends="validate" phase="prepare-package">
+        <!-- copy cache main classpath to a temp directory and build the corresponding fileset -->
+        <mkdir dir="${target.webinf.lib.dir}"/>
+        <copy todir="${target.webinf.lib.dir}" flatten="true">
+            <path refid="cache.main.classpath"/>
+        </copy>
+        <fileset id="webinf.lib.fileset" dir="${target.webinf.lib.dir}"/>
+    </target>
+    
+    <target name=":war" depends="validate, compile, prepare-package" description="package project as a WAR"
+            phase="package">
+        <ea:parameter phase="package" />
+
+        <war destfile="${target.main.artifact}"
+                manifest="${manifest.file}"
+                needxmlfile="false"
+                includes="${package.war.includes.pattern}"
+                excludes="${package.war.excludes.pattern}">
+            <fileset dir="${src.main.webapp}" includes="**/*" erroronmissingdir="false"/>
+            <lib refid="webinf.lib.fileset" erroronmissingdir="false"/>
+            <classes dir="${target.main.classes}" includes="**/*" erroronmissingdir="false"/> 
+            <metainf refid="package.metainf.fileset"/>
+        </war>
+        <ea:registerartifact type="war" settingsRef="${project.ivy.instance}"/>     
 
-	</target>	
+    </target>   
 
-	<target name="doit" depends=":war" />
+    <target name="doit" depends=":war" />
 </project>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-war/0.1/package-war.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-war/0.1/package-war.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-war/0.1/package-war.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-war/0.1/package-war.ivy Tue Feb 22 15:55:55 2011
@@ -15,13 +15,13 @@
    limitations under the License.
 -->
 <ivy-module version="2.0"> 
-	<info organisation="org.apache.easyant.plugins"
-	       module="package-war"
-	       status="milestone"
-	       revision="0.1">
-	       <description>This module provides war packaging feature. </description>
-	</info>
-	<publications>
-		<artifact type="ant" />
-	</publications>
+    <info organisation="org.apache.easyant.plugins"
+           module="package-war"
+           status="milestone"
+           revision="0.1">
+           <description>This module provides war packaging feature. </description>
+    </info>
+    <publications>
+        <artifact type="ant" />
+    </publications>
 </ivy-module>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/phases-std/0.2/phases-std.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/phases-std/0.2/phases-std.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/phases-std/0.2/phases-std.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/phases-std/0.2/phases-std.ant Tue Feb 22 15:55:55 2011
@@ -14,103 +14,103 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins#phases-std" xmlns:ea="antlib:org.apache.easyant">	
-	
-	<ea:core-version requiredrevision="[0.8,+]" />
-	
-	<phase name="clean"
-			description="delete any artifacts from previous builds"/>
-	
-	<phase name="validate" 
-			description="validate the project is correct and all necessary information is available" />
-	
-	<phase name="provision" depends="validate"
-			description="supply provision required by this project" />
-	
-	<phase name="generate-sources" depends="validate"
-			description="generate any source code for inclusion in compilation" />
-	
-	<phase name="process-sources" depends="generate-sources"
-			description="process the source code, for example to filter any values" />
-	
-	<phase name="generate-resources" depends="validate"
-			description="generate resources for inclusion in the package" />
-	
-	<phase name="process-resources" depends="generate-resources"
-			description="copy and process the resources into the destination directory, ready for packaging" />
-	
-	<phase name="compile" depends="provision, process-sources"
-			description="compile the source code of the project" />
-	
-	<phase name="process-classes" depends="compile"
-			description="post-process the generated files from compilation, for example to do bytecode enhancement on Java classes" />
-	
-	<phase name="test-provision" depends="validate"
-			description="supply provision required to test this project" />
-	
-	<phase name="test-generate-sources" depends="validate"
-			description="generate any test source code for inclusion in compilation" />
-	
-	<phase name="test-process-sources" depends="test-generate-sources"
-			description="process the test source code, for example to filter any values" />
-	
-	<phase name="test-generate-resources" depends="validate"
-			description="create resources for testing" />
-	
-	<phase name="test-process-resources" depends="test-generate-resources"
-			description="copy and process the resources into the test destination directory" />
-	
-	<phase name="test-compile" depends="process-classes, test-provision, test-process-sources"
-			description="compile the test source code into the test destination directory" />
-	
-	<phase name="test" depends="test-compile, process-resources, test-process-resources" 
-			description="run tests using a suitable unit testing framework. These tests should not require the code be packaged or deployed" />
-	
-	<phase name="prepare-package" depends="process-classes, process-resources" 
-			description="perform any operations necessary to prepare a package before the actual packaging. This often results in an unpacked, processed version of the package" />
-	
-	<phase name="package" depends="prepare-package" 
-			description="take the compiled code and package it in its distributable format, such as a JAR." />
-	
-	<phase name="pre-integration-test" depends="package" 
-			description="perform actions required before integration tests are executed. This may involve things such as setting up the required environment" />
-	
-	<phase name="integration-test" depends="pre-integration-test" 
-			description="process and deploy the package if necessary into an environment where integration tests can be run" />
+<project name="org.apache.easyant.plugins#phases-std" xmlns:ea="antlib:org.apache.easyant"> 
+    
+    <ea:core-version requiredrevision="[0.8,+]" />
+    
+    <phase name="clean"
+            description="delete any artifacts from previous builds"/>
+    
+    <phase name="validate" 
+            description="validate the project is correct and all necessary information is available" />
+    
+    <phase name="provision" depends="validate"
+            description="supply provision required by this project" />
+    
+    <phase name="generate-sources" depends="validate"
+            description="generate any source code for inclusion in compilation" />
+    
+    <phase name="process-sources" depends="generate-sources"
+            description="process the source code, for example to filter any values" />
+    
+    <phase name="generate-resources" depends="validate"
+            description="generate resources for inclusion in the package" />
+    
+    <phase name="process-resources" depends="generate-resources"
+            description="copy and process the resources into the destination directory, ready for packaging" />
+    
+    <phase name="compile" depends="provision, process-sources"
+            description="compile the source code of the project" />
+    
+    <phase name="process-classes" depends="compile"
+            description="post-process the generated files from compilation, for example to do bytecode enhancement on Java classes" />
+    
+    <phase name="test-provision" depends="validate"
+            description="supply provision required to test this project" />
+    
+    <phase name="test-generate-sources" depends="validate"
+            description="generate any test source code for inclusion in compilation" />
+    
+    <phase name="test-process-sources" depends="test-generate-sources"
+            description="process the test source code, for example to filter any values" />
+    
+    <phase name="test-generate-resources" depends="validate"
+            description="create resources for testing" />
+    
+    <phase name="test-process-resources" depends="test-generate-resources"
+            description="copy and process the resources into the test destination directory" />
+    
+    <phase name="test-compile" depends="process-classes, test-provision, test-process-sources"
+            description="compile the test source code into the test destination directory" />
+    
+    <phase name="test" depends="test-compile, process-resources, test-process-resources" 
+            description="run tests using a suitable unit testing framework. These tests should not require the code be packaged or deployed" />
+    
+    <phase name="prepare-package" depends="process-classes, process-resources" 
+            description="perform any operations necessary to prepare a package before the actual packaging. This often results in an unpacked, processed version of the package" />
+    
+    <phase name="package" depends="prepare-package" 
+            description="take the compiled code and package it in its distributable format, such as a JAR." />
+    
+    <phase name="pre-integration-test" depends="package" 
+            description="perform actions required before integration tests are executed. This may involve things such as setting up the required environment" />
+    
+    <phase name="integration-test" depends="pre-integration-test" 
+            description="process and deploy the package if necessary into an environment where integration tests can be run" />
 
-	<phase name="post-integration-test" depends="integration-test" 
-			description="perform actions required after integration tests have been executed. This may including cleaning up the environment" />
-	
-	<phase name="verify" depends="test, post-integration-test" 
-			description="run any checks to verify the package is valid and meets quality criteria" />
-	
-	<phase name="generate-local-version" depends="validate"
-			description="generate a local version number"/>
-	
-	<phase name="generate-shared-version" depends="validate"
-			description="generate a version number for shared publication"/>
-	
-	<phase name="generate-release-version" depends="validate"
-			description="generate a version number for a release"/>
-	
-	<phase name="prepare-publication" depends="provision"
-			description="prepare publication"/>
-	
-	<phase name="publish-local" depends="generate-local-version, prepare-publication, package" 
-			description="publish the package into the local repository, for use as a dependency in other projects locally" />
+    <phase name="post-integration-test" depends="integration-test" 
+            description="perform actions required after integration tests have been executed. This may including cleaning up the environment" />
+    
+    <phase name="verify" depends="test, post-integration-test" 
+            description="run any checks to verify the package is valid and meets quality criteria" />
+    
+    <phase name="generate-local-version" depends="validate"
+            description="generate a local version number"/>
+    
+    <phase name="generate-shared-version" depends="validate"
+            description="generate a version number for shared publication"/>
+    
+    <phase name="generate-release-version" depends="validate"
+            description="generate a version number for a release"/>
+    
+    <phase name="prepare-publication" depends="provision"
+            description="prepare publication"/>
+    
+    <phase name="publish-local" depends="generate-local-version, prepare-publication, package" 
+            description="publish the package into the local repository, for use as a dependency in other projects locally" />
 
-	<phase name="publish-shared" depends="generate-shared-version, prepare-publication, package" 
-				description="done in an integration environment, copies the final package to the remote repository for sharing with other developers and projects" />
-	
-	<phase name="release" depends="generate-release-version, prepare-publication, verify" 
-			description="done in an integration or release environment, copies the final package to the remote repository for sharing with other developers and projects" />
+    <phase name="publish-shared" depends="generate-shared-version, prepare-publication, package" 
+                description="done in an integration environment, copies the final package to the remote repository for sharing with other developers and projects" />
+    
+    <phase name="release" depends="generate-release-version, prepare-publication, verify" 
+            description="done in an integration or release environment, copies the final package to the remote repository for sharing with other developers and projects" />
 
-	<phase name="report" description="generate report" />
-	
-	<!-- Documentation related phases -->
-	<phase name="process-documentation-resources" 
-			description="copy and process the documentation resources into the destination directory"/>
-	
-	<phase name="documentation" depends="process-documentation-resources" 
-			description="generate documentation" />
+    <phase name="report" description="generate report" />
+    
+    <!-- Documentation related phases -->
+    <phase name="process-documentation-resources" 
+            description="copy and process the documentation resources into the destination directory"/>
+    
+    <phase name="documentation" depends="process-documentation-resources" 
+            description="generate documentation" />
 </project>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/phases-std/0.2/phases-std.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/phases-std/0.2/phases-std.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/phases-std/0.2/phases-std.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/phases-std/0.2/phases-std.ivy Tue Feb 22 15:55:55 2011
@@ -15,13 +15,13 @@
    limitations under the License.
 -->
 <ivy-module version="2.0"> 
-	<info organisation="org.apache.easyant.plugins"
-	       module="phases-std"
-	       status="milestone"
-	       revision="0.2">
-	       <description>Describes the standard phases of a build. These phase are directly inspired by maven 2 standard phases.</description>
-	</info>
-	<publications>
-		<artifact type="ant" />
-	</publications>
+    <info organisation="org.apache.easyant.plugins"
+           module="phases-std"
+           status="milestone"
+           revision="0.2">
+           <description>Describes the standard phases of a build. These phase are directly inspired by maven 2 standard phases.</description>
+    </info>
+    <publications>
+        <artifact type="ant" />
+    </publications>
 </ivy-module>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/resources-std/0.1/resources-std.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/resources-std/0.1/resources-std.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/resources-std/0.1/resources-std.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/resources-std/0.1/resources-std.ant Tue Feb 22 15:55:55 2011
@@ -15,86 +15,86 @@
    limitations under the License.
 -->
 <project name="org.apache.easyant.plugins#resources-std"
-	xmlns:ea="antlib:org.apache.easyant">
-	
-	<ea:core-version requiredrevision="[0.8,+]" />
-	
-	<target name=":init" phase="validate">
-		<ea:parameter phase="validate" />
-		<ea:parameter phase="process-resources" />
-		<ea:parameter phase="test-process-resources" />
-		
-		<ea:parameter property="src.main.resources" default="${basedir}/src/main/resources"
-				description="directory where main resources files are stored" />
+    xmlns:ea="antlib:org.apache.easyant">
+    
+    <ea:core-version requiredrevision="[0.8,+]" />
+    
+    <target name=":init" phase="validate">
+        <ea:parameter phase="validate" />
+        <ea:parameter phase="process-resources" />
+        <ea:parameter phase="test-process-resources" />
+        
+        <ea:parameter property="src.main.resources" default="${basedir}/src/main/resources"
+                description="directory where main resources files are stored" />
         <ea:parameter property="src.test.resources" default="${basedir}/src/test/resources"
             description="directory with unit test resource files (configuration files, data files, etc)" />
         <ea:parameter property="src.test.integration.resources" default="${basedir}/src/integration-test/resources"
                 description="directory for integration test resources (configuration files, data files, etc)"/>
 
-		<ea:parameter property="target.main.classes" required="true" 
-				description="destination directory where main resources should be put" />
-		<ea:parameter property="target.test.classes" required="true" 
-				description="destination directory where test resources should be put" />
-	
-		<ea:parameter property="target.test.integration.classes" default="${basedir}/target/integration-test/classes"
-				description="destination directory where integration test resources should be put" />
-		
-		
-		<ea:parameter property="resources.std.includes.pattern" default="**/*" 
-				description="Pattern describing files included in compilation process" />
-		<ea:parameter property="resources.std.excludes.pattern" default="" 
-				description="Pattern describing files excluded in compilation process" />
-		<ea:parameter property="resources.std.include.emptydir" default="true"
-				description="Specify if empty directory should be copied as resources"/>
-		
-		<ea:parameter property="resources.std.test.includes.pattern" default="**/*" 
-				description="Pattern describing files included in test compilation process" />
-		<ea:parameter property="resources.std.test.excludes.pattern" default="" 
-				description="Pattern describing files excluded in test compilation process" />
-	
-		<ea:parameter property="resources.std.test.integration.includes.pattern" default="**/*" 
-				description="Pattern describing files included in integration test compilation process" />
-		<ea:parameter property="resources.std.test.integration.excludes.pattern" default="" 
-				description="Pattern describing files excluded in integration test compilation process" />
-		
-		<filterset id="src.main.resources.filter"/>
-		<filterset id="src.test.resources.filter"/>
-		<filterset id="src.test.integration.resources.filter"/>
-	</target>
+        <ea:parameter property="target.main.classes" required="true" 
+                description="destination directory where main resources should be put" />
+        <ea:parameter property="target.test.classes" required="true" 
+                description="destination directory where test resources should be put" />
+    
+        <ea:parameter property="target.test.integration.classes" default="${basedir}/target/integration-test/classes"
+                description="destination directory where integration test resources should be put" />
+        
+        
+        <ea:parameter property="resources.std.includes.pattern" default="**/*" 
+                description="Pattern describing files included in compilation process" />
+        <ea:parameter property="resources.std.excludes.pattern" default="" 
+                description="Pattern describing files excluded in compilation process" />
+        <ea:parameter property="resources.std.include.emptydir" default="true"
+                description="Specify if empty directory should be copied as resources"/>
+        
+        <ea:parameter property="resources.std.test.includes.pattern" default="**/*" 
+                description="Pattern describing files included in test compilation process" />
+        <ea:parameter property="resources.std.test.excludes.pattern" default="" 
+                description="Pattern describing files excluded in test compilation process" />
+    
+        <ea:parameter property="resources.std.test.integration.includes.pattern" default="**/*" 
+                description="Pattern describing files included in integration test compilation process" />
+        <ea:parameter property="resources.std.test.integration.excludes.pattern" default="" 
+                description="Pattern describing files excluded in integration test compilation process" />
+        
+        <filterset id="src.main.resources.filter"/>
+        <filterset id="src.test.resources.filter"/>
+        <filterset id="src.test.integration.resources.filter"/>
+    </target>
 
     <target name="-check-resources">
         <available file="${src.main.resources}" property="has.src.main.resources" />
         <available file="${src.test.resources}" property="has.src.test.resources" />
         <available file="${src.test.integration.resources}" property="has.src.test.integration.resources" />
     </target>
-	
-	<target name=":copy-resources" depends="validate,-check-resources" if="has.src.main.resources"
-		phase="process-resources">
-		<mkdir dir="${target.main.classes}" />
+    
+    <target name=":copy-resources" depends="validate,-check-resources" if="has.src.main.resources"
+        phase="process-resources">
+        <mkdir dir="${target.main.classes}" />
         <copy todir="${target.main.classes}" includeEmptyDirs="${resources.std.include.emptydir}">
             <fileset dir="${src.main.resources}" includes="${resources.std.includes.pattern}" excludes="${resources.std.excludes.pattern}"/>
-        	<filterset refid="src.main.resources.filter"/>
+            <filterset refid="src.main.resources.filter"/>
         </copy>
-	</target>	
-	
-	<target name=":copy-test-resources" depends="validate,-check-resources" if="has.src.test.resources"
-		phase="test-process-resources">
-		<mkdir dir="${target.test.classes}" />
+    </target>   
+    
+    <target name=":copy-test-resources" depends="validate,-check-resources" if="has.src.test.resources"
+        phase="test-process-resources">
+        <mkdir dir="${target.test.classes}" />
         <copy todir="${target.test.classes}" includeEmptyDirs="${resources.std.include.emptydir}">
             <fileset dir="${src.test.resources}" includes="${resources.std.test.includes.pattern}" excludes="${resources.std.test.excludes.pattern}"/>
-        	<filterset refid="src.test.resources.filter"/>
+            <filterset refid="src.test.resources.filter"/>
         </copy>
-	</target>
-	
-	<target name=":copy-test-integration-resources" depends="validate,-check-resources" if="has.src.test.integration.resources"
-		phase="test-process-resources">
-		<mkdir dir="${target.test.integration.classes}" />
+    </target>
+    
+    <target name=":copy-test-integration-resources" depends="validate,-check-resources" if="has.src.test.integration.resources"
+        phase="test-process-resources">
+        <mkdir dir="${target.test.integration.classes}" />
         <copy todir="${target.test.integration.classes}" includeEmptyDirs="${resources.std.include.emptydir}">
             <fileset dir="${src.test.integration.resources}" includes="${resources.std.test.integration.includes.pattern}" excludes="${resources.std.test.integration.excludes.pattern}"/>
-        	<filterset refid="src.test.integration.resources.filter"/>
+            <filterset refid="src.test.integration.resources.filter"/>
         </copy>
-	</target>	
+    </target>   
 
-	
-	<target name="doit" depends=":copy-resources, :copy-test-resources, :copy-test-integration-resources" />
+    
+    <target name="doit" depends=":copy-resources, :copy-test-resources, :copy-test-integration-resources" />
 </project>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/resources-std/0.1/resources-std.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/resources-std/0.1/resources-std.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/resources-std/0.1/resources-std.ivy (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/resources-std/0.1/resources-std.ivy Tue Feb 22 15:55:55 2011
@@ -15,13 +15,13 @@
    limitations under the License.
 -->
 <ivy-module version="2.0"> 
-	<info organisation="org.apache.easyant.plugins"
-	       module="resources-std"
-	       status="milestone"
-	       revision="0.1">
-	       <description>This module provides basic resources management, a la maven.</description>
-	</info>
-	<publications>
-		<artifact type="ant" />
-	</publications>
+    <info organisation="org.apache.easyant.plugins"
+           module="resources-std"
+           status="milestone"
+           revision="0.1">
+           <description>This module provides basic resources management, a la maven.</description>
+    </info>
+    <publications>
+        <artifact type="ant" />
+    </publications>
 </ivy-module>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/run-java/0.1/run-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/run-java/0.1/run-java.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/run-java/0.1/run-java.ant (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/run-java/0.1/run-java.ant Tue Feb 22 15:55:55 2011
@@ -16,36 +16,36 @@
 -->
 <project name="org.apache.easyant.plugins#run-java" xmlns:ea="antlib:org.apache.easyant">
 
-	<ea:core-version requiredrevision="[0.8,+]" />
+    <ea:core-version requiredrevision="[0.8,+]" />
 
-	<target name=":init" phase="validate">
-		<ea:parameter phase="validate" />
-		<ea:parameter phase="compile" />
+    <target name=":init" phase="validate">
+        <ea:parameter phase="validate" />
+        <ea:parameter phase="compile" />
 
-		<ea:parameter property="target.main.classes" required="true" description="directory where main compiled classes are" />
+        <ea:parameter property="target.main.classes" required="true" description="directory where main compiled classes are" />
 
-		<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="run.main.classname" required="true" default="${project.main.classname}">
+        <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="run.main.classname" required="true" default="${project.main.classname}">
 Name of the main class to run.
 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>
 
-		<ea:parameter path="compile.main.classpath" required="true" description="path used to compile main sources" />
+        <ea:parameter path="compile.main.classpath" required="true" description="path used to compile main sources" />
 
-		<path id="run.main.classpath">
-			<pathelement location="${target.main.classes}" />
-			<path refid="compile.main.classpath" />
-		</path>
+        <path id="run.main.classpath">
+            <pathelement location="${target.main.classes}" />
+            <path refid="compile.main.classpath" />
+        </path>
 
-	</target>
+    </target>
 
-	<target name=":run" depends="validate, compile, process-resources" description="run the application">
-		<available classname="${run.main.classname}" property="is.run.main.classname.configured" classpathref="run.main.classpath"/>
-		<fail unless="is.run.main.classname.configured" message="the 'run.main.classname' property is not properly configured. By default this property take the same value as 'project.main.classname'  property. If you're looking for a way to reference your mainclass one time for all plugins you should set project.main.classname instead."/>
+    <target name=":run" depends="validate, compile, process-resources" description="run the application">
+        <available classname="${run.main.classname}" property="is.run.main.classname.configured" classpathref="run.main.classpath"/>
+        <fail unless="is.run.main.classname.configured" message="the 'run.main.classname' property is not properly configured. By default this property take the same value as 'project.main.classname'  property. If you're looking for a way to reference your mainclass one time for all plugins you should set project.main.classname instead."/>
 
-		<java classpathref="run.main.classpath" classname="${run.main.classname}" />
-	</target>
+        <java classpathref="run.main.classpath" classname="${run.main.classname}" />
+    </target>
 
-	<target name=":doit" depends=":init, :run" />
+    <target name=":doit" depends=":init, :run" />
 </project>



Mime
View raw message