detab

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113229 13f79535-47bb-0310-9956-ffa450edef68
2003-03-30 16:18:05 +00:00 · 2003-03-30 16:18:05 +00:00 · 230698d6ee
commit 230698d6ee
parent 8acb775a1d
23 changed files with 267 additions and 265 deletions
--- a/ashkelon/plugin.jelly
+++ b/ashkelon/plugin.jelly
@ -18,7 +18,7 @@
      pluginName="maven-ashkelon-plugin"
      link="ashkelon"
      description="Report on the validity of all links in the documentation."/>
-  	<!--doc:registerReport 
+    <!--doc:registerReport 
      name="Ashkelon Deploy Report" 
      pluginName="maven-ashkelon-plugin"
      link="ashkelon-output"
@ -40,11 +40,11 @@
  </goal>
  
  <goal name="ashkelon:generate-xml">
-  	<j:new var="packageTool" className="org.apache.maven.ashkelon.PackageTool"/>
-  	<u:file var="src" name="${pom.build.sourceDirectory}"/>
+    <j:new var="packageTool" className="org.apache.maven.ashkelon.PackageTool"/>
+    <u:file var="src" name="${pom.build.sourceDirectory}"/>
    <j:set var="packages" value="${packageTool.findPackages(src)}"/>
    ${packages}
-  	<echo>${basedir}/${pom.artifactId}-ashkelon.xml</echo>
+    <echo>${basedir}/${pom.artifactId}-ashkelon.xml</echo>
    <j:file name="${basedir}/${pom.artifactId}-ashkelon.xml" prettyPrint="true" xmlns="dummy">
      <api>
        <name>${pom.name}</name>
@ -55,11 +55,11 @@
        <release_date>2000-01-01T00:00:00.000</release_date>
        <version>${pom.currentVersion}</version>
        <j:forEach var="package" items="${packages}">
-        	<package>${package}</package>
+          <package>${package}</package>
        </j:forEach>

      </api>
-	</j:file>  	
+  </j:file>    
  </goal>
        

--- a/aspectj/plugin.jelly
+++ b/aspectj/plugin.jelly
@ -64,7 +64,7 @@

      </j:if>

-	</j:if>
+  </j:if>
      
  </goal>

--- a/cactus/plugin.jelly
+++ b/cactus/plugin.jelly
@ -78,8 +78,8 @@
    description="Run all Cactus Test Cases">

    <!-- Find all the scripts in ${maven.cactus.antintegration.dir}/scripts
-    	 and try to start the tests for all the corresponding containers
-    	 which have a home directory set -->
+       and try to start the tests for all the corresponding containers
+       which have a home directory set -->

    <fileScanner var="scanner">
      <fileset dir="${maven.cactus.antintegration.dir}/scripts" 
--- a/changes/plugin.jelly
+++ b/changes/plugin.jelly
@ -10,14 +10,14 @@
  <goal name="maven-changes-plugin:register">
    <ant:property name="maven.docs.src"
      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
-  	<util:file var="changes" name="${maven.docs.src}/changes.xml"/>
-  	<j:if test="${changes.exists()}">
-    	<doc:registerReport 
-    	  name="Changes" 
-    	  pluginName="maven-changes-plugin"
-    	  link="changes-report"
-    	  description="Report on the project changes."/>
-   	</j:if>
+    <util:file var="changes" name="${maven.docs.src}/changes.xml"/>
+    <j:if test="${changes.exists()}">
+      <doc:registerReport 
+        name="Changes" 
+        pluginName="maven-changes-plugin"
+        link="changes-report"
+        description="Report on the project changes."/>
+     </j:if>
  </goal>
  
  <goal name="maven-changes-plugin:deregister">
@ -31,10 +31,10 @@
  <goal
    name="maven-changes-plugin:report"
    description="Generate a changes report">
-	<ant:property name="maven.docs.src"
-	  value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
+  <ant:property name="maven.docs.src"
+    value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
    
-	<doc:jsl
+  <doc:jsl
        input="${maven.docs.src}/changes.xml"
        output="changes-report.xml"
        stylesheet="${plugin.resources}/changes.jsl"
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@ -110,7 +110,7 @@
     -->
    <ant:mkdir dir="${cloverReportDirectory}"/>
  
-	<ant:java classname="com.cortexeb.tools.clover.reporters.html.HtmlReporter"
+  <ant:java classname="com.cortexeb.tools.clover.reporters.html.HtmlReporter"
      fork="true">
      <ant:arg line="-o ${cloverReportDirectory}"/>
      <ant:arg line="-i ${clover.initstring}"/>
--- a/console/plugin.jelly
+++ b/console/plugin.jelly
@ -36,7 +36,7 @@
            <j:set var="lastGoal" value="${goal}"/>
          </j:catch>
          <j:if test="${ex != null}">
-          	${pom.getContext().removeVariable("maven.test.failure")}
+            ${pom.getContext().removeVariable("maven.test.failure")}
 <log:info>${ex}</log:info>
          </j:if>
        </j:otherwise>
--- a/ear/plugin.jelly
+++ b/ear/plugin.jelly
@ -1,10 +1,10 @@
 <?xml version="1.0"?>

 <project 
-	xmlns:j="jelly:core"
-	xmlns:ant="jelly:ant"
-	xmlns:license="license"
-    xmlns:util="jelly:util">
+  xmlns:j="jelly:core"
+  xmlns:ant="jelly:ant"
+  xmlns:license="license"
+  xmlns:util="jelly:util">

  <!--==================================================================-->
  <!-- Default goal : Builds a ear file                                 -->
--- a/java/plugin.jelly
+++ b/java/plugin.jelly
@ -183,7 +183,7 @@
        <ant:attribute name="Implementation-Vendor" value="${pom.organization.name}"/>
        <ant:attribute name="Implementation-Vendor-Id" value="${pom.organization.identifier}"/>
        <j:set var="mainclass" value="${pom.getPluginContext('maven-java-plugin').getVariable('maven.jar.mainclass')}"/>
- 		<j:if test="${!empty(mainclass)}">
+        <j:if test="${!empty(mainclass)}">
            <ant:attribute name="Main-Class" value="${mainclass}"/>
        </j:if>        
      </ant:manifest>
--- a/jbuilder/plugin.jelly
+++ b/jbuilder/plugin.jelly
@ -16,9 +16,9 @@
    description="Generate JBuilder [id_project].library file">

    <ant:echo>Creating ${basedir}/${pom.artifactId}.library ...</ant:echo>
-	  <j:file name="${basedir}/${pom.artifactId}.library" prettyPrint="true" xmlns="dummy">
+    <j:file name="${basedir}/${pom.artifactId}.library" prettyPrint="true" xmlns="dummy">
    
-	  <library>
+    <library>
      <x:comment>JBuilder Library Definition File</x:comment>
      <fullname>${pom.artifactId}</fullname>
      <class>
@ -40,7 +40,7 @@
      </class>
      <required>${pom.artifactId}</required>
    </library>
-  	</j:file>	
+    </j:file>  
    
  </goal>
  
@ -48,30 +48,30 @@
    description="Generate JBuilder [id_project].jpx file">
    
    <ant:echo>Creating ${basedir}/${pom.artifactId}.jpx ...</ant:echo>
-	  <j:file name="${basedir}/${pom.artifactId}.jpx" prettyPrint="true" xmlns="dummy">
-  	  <x:comment>Project XML JBuilder</x:comment>
-  	  <project>
-    	<property category="sys" name="AuthorLabel" value="@author"/>
-  	    <property category="sys" name="BackupPath" value="bak"/>
-    	<property category="sys" name="Company" value=""/>
-    	<property category="sys" name="CompanyLabel" value="Company :"/>
-    	<property category="sys" name="Copyright" value="Copyright (c) ${pom.inceptionYear} - ${pom.organization.name}"/>
-    	<property category="sys" name="CopyrightLabel" value="Copyright :"/>
-  	    <property category="sys" name="DefaultPath" value="${pom.build.sourceDirectory}"/>
-    	<property category="sys" name="Description" value=""/>
-    	<property category="sys" name="DescriptionLabel" value="Description :"/>
-    	<property category="sys" name="DocPath" value="doc"/>
-    	<property category="sys" name="IncludeTestPath" value="1"/>
-    	<property category="sys" name="OutPath" value="target/classes"/>
-    	<property category="sys" name="SourcePath" value="${pom.build.sourceDirectory};${pom.build.unitTestSourceDirectory}"/>
-    	<property category="sys" name="TestPath" value="${pom.build.unitTestSourceDirectory}"/>
-  	    <property category="sys" name="Title" value=""/>
-    	<property category="sys" name="TitleLabel" value="Title :"/>
-    	<property category="sys" name="Version" value="${pom.currentVersion}"/>
-    	<property category="sys" name="VersionLabel" value="@version"/>
-  	    <property category="sys" name="WorkingDirectory" value="."/>
-  	  </project>
-  	</j:file>	
+    <j:file name="${basedir}/${pom.artifactId}.jpx" prettyPrint="true" xmlns="dummy">
+      <x:comment>Project XML JBuilder</x:comment>
+      <project>
+      <property category="sys" name="AuthorLabel" value="@author"/>
+        <property category="sys" name="BackupPath" value="bak"/>
+      <property category="sys" name="Company" value=""/>
+      <property category="sys" name="CompanyLabel" value="Company :"/>
+      <property category="sys" name="Copyright" value="Copyright (c) ${pom.inceptionYear} - ${pom.organization.name}"/>
+      <property category="sys" name="CopyrightLabel" value="Copyright :"/>
+        <property category="sys" name="DefaultPath" value="${pom.build.sourceDirectory}"/>
+      <property category="sys" name="Description" value=""/>
+      <property category="sys" name="DescriptionLabel" value="Description :"/>
+      <property category="sys" name="DocPath" value="doc"/>
+      <property category="sys" name="IncludeTestPath" value="1"/>
+      <property category="sys" name="OutPath" value="target/classes"/>
+      <property category="sys" name="SourcePath" value="${pom.build.sourceDirectory};${pom.build.unitTestSourceDirectory}"/>
+      <property category="sys" name="TestPath" value="${pom.build.unitTestSourceDirectory}"/>
+        <property category="sys" name="Title" value=""/>
+      <property category="sys" name="TitleLabel" value="Title :"/>
+      <property category="sys" name="Version" value="${pom.currentVersion}"/>
+      <property category="sys" name="VersionLabel" value="@version"/>
+        <property category="sys" name="WorkingDirectory" value="."/>
+      </project>
+    </j:file>  

  </goal>

--- a/jdiff/plugin.jelly
+++ b/jdiff/plugin.jelly
@ -1,6 +1,8 @@
 <?xml version="1.0"?>

-<project xmlns:j="jelly:core">
+<project
+  xmlns:j="jelly:core"
+  xmlns:ant="jelly:ant">

  <!-- ================================================================== -->
  <!-- P R O J E C T  D O C U M E N T A T I O N                           -->
--- a/jxr/plugin.jelly
+++ b/jxr/plugin.jelly
@ -15,7 +15,7 @@
        link="xref/index"
        description="A set of browsable cross-referenced sources."/>
      <j:if test="${unitTestSourcesPresent}">
-    	<doc:registerReport 
+      <doc:registerReport 
          name="Test Xref" 
          pluginName="maven-jxr-plugin" 
          link="xref-test/index"
@ -76,7 +76,7 @@
    <util:file var="sourceDirFile" name="${sourceDir}"/>
    
    <j:if test="${!sourceDirFile.isAbsolute()}">
-    	<j:set var="sourceDir" value="${basedir}/${sourceDir}"/>
+      <j:set var="sourceDir" value="${basedir}/${sourceDir}"/>
    </j:if>
    
    <jxr:jxr
@ -95,7 +95,7 @@
      <util:file var="testSourceDirFile" name="${testSourceDir}"/>
    
      <j:if test="${!testSourceDirFile.isAbsolute()}">
-    	<j:set var="testSourceDir" value="${basedir}/${testSourceDir}"/>
+      <j:set var="testSourceDir" value="${basedir}/${testSourceDir}"/>
      </j:if>
      
      <jxr:jxr
--- a/license/plugin.jelly
+++ b/license/plugin.jelly
@ -80,8 +80,8 @@
      </util:available>
          
      <j:if test="${licensePresent != 'true'}">
-      	<echo>
-  	  ======================================================================
+        <echo>
+      ======================================================================
      =                             W A R N I N G                          =
      ======================================================================
      =  Your project doesn't contain a header file specified as:          =
@ -95,9 +95,9 @@
        <j:set var="licenseFile" value='${plugin.resources}/LICENSE.txt'/>
      </j:if>
      
-	  <doc:text-xdoc
-	    title="Project License"
-	    section="Project License"
+    <doc:text-xdoc
+      title="Project License"
+      section="Project License"
        output="${genDocs}/license.xml"
        inputFile="${licenseFile}"/>

--- a/native/plugin.jelly
+++ b/native/plugin.jelly
@ -1,91 +1,91 @@
 <?xml version="1.0"?>
 <project xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
-	<!--==================================================================-->
-	<!-- Compile all source code                                      -->
-	<!--==================================================================-->
-	<goal name="native" description="Native compiler" prereqs="native:compile"/>
-	<goal name="native:compile" description="Compile the native compiler" prereqs="native:jniheader">
-		<taskdef name="cc" classname="net.sf.antcontrib.cpptasks.CCTask"/>
-		<typedef name="linker" classname="net.sf.antcontrib.cpptasks.LinkerDef"/>
-		<typedef name="compiler" classname="net.sf.antcontrib.cpptasks.CompilerDef"/>
-		<ant:echo> Real Java Home = '${java.home}/..' 
-		artifactId = '${pom.artifactId}' </ant:echo>
-		<mkdir dir="${maven.build.dir}/native"/>
-		<!-- for some reason '.' aren't allow as parameter for outfile-->
-		<cc outfile="${maven.build.dir}/native/_" link="shared" debug="true">
-			<compiler name="gcc"/>
+  <!--==================================================================-->
+  <!-- Compile all source code                                      -->
+  <!--==================================================================-->
+  <goal name="native" description="Native compiler" prereqs="native:compile"/>
+  <goal name="native:compile" description="Compile the native compiler" prereqs="native:jniheader">
+    <taskdef name="cc" classname="net.sf.antcontrib.cpptasks.CCTask"/>
+    <typedef name="linker" classname="net.sf.antcontrib.cpptasks.LinkerDef"/>
+    <typedef name="compiler" classname="net.sf.antcontrib.cpptasks.CompilerDef"/>
+    <ant:echo> Real Java Home = '${java.home}/..' 
+    artifactId = '${pom.artifactId}' </ant:echo>
+    <mkdir dir="${maven.build.dir}/native"/>
+    <!-- for some reason '.' aren't allow as parameter for outfile-->
+    <cc outfile="${maven.build.dir}/native/_" link="shared" debug="true">
+      <compiler name="gcc"/>
      
-			<fileset dir="src/unix"/>
-			<includepath location="${java.home}/../include"/>
-			<includepath location="${java.home}/../include/linux"/>
-			<includepath location="${java.home}/../include/linux"/>
-			<includepath location="${maven.build.dir}/native/jni"/>
-		</cc>
-		<!-- just copy the file don't move because we don't want the compiler to compile if for no reason -->
-		<ant:copy file="${maven.build.dir}/native/lib_.so" 
-		tofile="${maven.build.dir}/native/lib${pom.artifactId}-${pom.currentVersion}.so" overwrite="true"/>
+      <fileset dir="src/unix"/>
+      <includepath location="${java.home}/../include"/>
+      <includepath location="${java.home}/../include/linux"/>
+      <includepath location="${java.home}/../include/linux"/>
+      <includepath location="${maven.build.dir}/native/jni"/>
+    </cc>
+    <!-- just copy the file don't move because we don't want the compiler to compile if for no reason -->
+    <ant:copy file="${maven.build.dir}/native/lib_.so" 
+    tofile="${maven.build.dir}/native/lib${pom.artifactId}-${pom.currentVersion}.so" overwrite="true"/>
    
    
-	</goal>
-	<!-- ================================================================== -->
-	<!-- I N S T A L L   J A R                                              -->
-	<!-- ================================================================== -->
-	<goal name="native:install" prereqs="native:compile" description="Install the lib in the local repository">
-		<ant:echo>
+  </goal>
+  <!-- ================================================================== -->
+  <!-- I N S T A L L   J A R                                              -->
+  <!-- ================================================================== -->
+  <goal name="native:install" prereqs="native:compile" description="Install the lib in the local repository">
+    <ant:echo>
    id = '${pom.artifactId}'
    groupId = '${pom.groupId}'
    artifactDirectory = '${pom.artifactDirectory}'
    </ant:echo>
-		<ant:property name="libdir__" value="${maven.repo.local}/${pom.artifactDirectory}/so"/>
-		<ant:mkdir dir="${libdir__}"/>
-		<ant:copy file="${maven.build.dir}/native/lib${pom.artifactId}-${pom.currentVersion}.so" tofile="${libdir__}/lib${pom.artifactId}-${pom.currentVersion}.so" overwrite="true"/>
-	</goal>
-	<goal name="native:test" description="Install the lib in the local repository">
-		<ant:echo>
+    <ant:property name="libdir__" value="${maven.repo.local}/${pom.artifactDirectory}/so"/>
+    <ant:mkdir dir="${libdir__}"/>
+    <ant:copy file="${maven.build.dir}/native/lib${pom.artifactId}-${pom.currentVersion}.so" tofile="${libdir__}/lib${pom.artifactId}-${pom.currentVersion}.so" overwrite="true"/>
+  </goal>
+  <goal name="native:test" description="Install the lib in the local repository">
+    <ant:echo>
    id = '${pom.artifactId}'
    groupId = '${pom.groupId}'
    artifactDirectory = '${pom.artifactDirectory}'
    </ant:echo>
-	</goal>
-	<goal name="native:jniheader" description="make jniheaders for classes" prereqs="java:compile">
-		<fileScanner var="classFiles">
-			<fileset dir="${maven.build.dest}">
-				<patternset>
-					<include name="**/*.class"/>
-				</patternset>
-			</fileset>
-		</fileScanner>
+  </goal>
+  <goal name="native:jniheader" description="make jniheaders for classes" prereqs="java:compile">
+    <fileScanner var="classFiles">
+      <fileset dir="${maven.build.dest}">
+        <patternset>
+          <include name="**/*.class"/>
+        </patternset>
+      </fileset>
+    </fileScanner>

-  		    <j:set var="compileJNI" value="false"/>
-			<j:forEach var="file" items="${classFiles.iterator()}">
-				<j:set var="clazz" value="${javaSourceTool.getBcelClass(file.toString())}"/>
-				<j:forEach var="method" items="${clazz.getMethods()}">
-					<j:if test="${method.isNative() == 'true'}">
-						<j:set var="compileJNI" value="true"/>
-					</j:if>
-				</j:forEach>
-			</j:forEach>
+          <j:set var="compileJNI" value="false"/>
+      <j:forEach var="file" items="${classFiles.iterator()}">
+        <j:set var="clazz" value="${javaSourceTool.getBcelClass(file.toString())}"/>
+        <j:forEach var="method" items="${clazz.getMethods()}">
+          <j:if test="${method.isNative() == 'true'}">
+            <j:set var="compileJNI" value="true"/>
+          </j:if>
+        </j:forEach>
+      </j:forEach>

-	<j:if test="${compileJNI == 'true'}">
-		<mkdir dir="${maven.build.dir}/native/jni"/>
-		<javah destdir="${maven.build.dir}/native/jni">
-			<classpath>
-				<pathelement location="${maven.build.dest}"/>
-			</classpath>
-			<j:useBean var="javaSourceTool" class="org.apache.maven.natives.util.JavaSourceTool"/>
-			<j:forEach var="file" items="${classFiles.iterator()}">
-				<j:set var="isNative" value="false"/>
-				<j:set var="clazz" value="${javaSourceTool.getBcelClass(file.toString())}"/>
-				<j:forEach var="method" items="${clazz.getMethods()}">
-					<j:if test="${method.isNative() == 'true'}">
-						<j:set var="isNative" value="true"/>
-					</j:if>
-				</j:forEach>
-				<j:if test="${isNative == 'true'}">
-					<class name="${clazz.className}"/>
-				</j:if>
-			</j:forEach>
-		</javah>
+  <j:if test="${compileJNI == 'true'}">
+    <mkdir dir="${maven.build.dir}/native/jni"/>
+    <javah destdir="${maven.build.dir}/native/jni">
+      <classpath>
+        <pathelement location="${maven.build.dest}"/>
+      </classpath>
+      <j:useBean var="javaSourceTool" class="org.apache.maven.natives.util.JavaSourceTool"/>
+      <j:forEach var="file" items="${classFiles.iterator()}">
+        <j:set var="isNative" value="false"/>
+        <j:set var="clazz" value="${javaSourceTool.getBcelClass(file.toString())}"/>
+        <j:forEach var="method" items="${clazz.getMethods()}">
+          <j:if test="${method.isNative() == 'true'}">
+            <j:set var="isNative" value="true"/>
+          </j:if>
+        </j:forEach>
+        <j:if test="${isNative == 'true'}">
+          <class name="${clazz.className}"/>
+        </j:if>
+      </j:forEach>
+    </javah>
      </j:if>
-	</goal>
+  </goal>
 </project>
--- a/pom/plugin.jelly
+++ b/pom/plugin.jelly
@ -50,13 +50,13 @@
  <goal
    name="pom:contentvalidate"
    description="Validate the content of the Maven POM">
-	<j:new className="org.apache.maven.ContentValidator" var="contentvalidator"/>
-	<j:setProperties object="${contentvalidator}" project="${pom}"/>
+  <j:new className="org.apache.maven.ContentValidator" var="contentvalidator"/>
+  <j:setProperties object="${contentvalidator}" project="${pom}"/>
    
    <j:set var="notices" value="${contentvalidator.execute()}"/>
     
-	<j:forEach var="notice" items="${notices}">
-		<echo>${notice.Level} : ${notice.Section} : ${notice.Message}</echo>
+  <j:forEach var="notice" items="${notices}">
+    <echo>${notice.Level} : ${notice.Section} : ${notice.Message}</echo>
    </j:forEach>

  </goal>
--- a/repository/plugin.jelly
+++ b/repository/plugin.jelly
@ -105,11 +105,11 @@
      <j:set var="${var}" value="${snapAndJar[0]}.${snapAndJar[1]}" scope="parent"/>
    </define:tag>
          
-	<!--
-	 ! @name     the name of the value being checked
-	 ! @value    the value that musn't be empty
-	 ! @message  the message to be displayed when value is empty
-	 !-->
+  <!--
+   ! @name     the name of the value being checked
+   ! @value    the value that musn't be empty
+   ! @message  the message to be displayed when value is empty
+   !-->
    <define:tag name="required">
      <j:if test="${empty(message)}">
        <j:set var="message">'${name}' must be specified</j:set>
--- a/shell/plugin.jelly
+++ b/shell/plugin.jelly
@ -1,7 +1,7 @@
 <?xml version="1.0"?>

 <project xmlns:j="jelly:core"
-	xmlns:test="test">
+  xmlns:test="test">

  <!--==================================================================-->
  <!-- Generate Eclipse .project and .classpath files                   -->
@ -13,13 +13,13 @@
  <goal name="shell:zsh"
    description="Generate Zsh files">

-		<j:set var="outputDir" value="${maven.shell.zsh.dir}"/>
-		<j:if test="${empty outputDir}">
-			<j:set var="outputDir" value="${maven.build.dir}"/>
-		</j:if>
+    <j:set var="outputDir" value="${maven.shell.zsh.dir}"/>
+    <j:if test="${empty outputDir}">
+      <j:set var="outputDir" value="${maven.build.dir}"/>
+    </j:if>

-	<j:file name="${maven.build.dir}/_mavenzsh.tmp" omitXmlDeclaration="true" xmlns="dummy">
-	<![CDATA[
+  <j:file name="${maven.build.dir}/_mavenzsh.tmp" omitXmlDeclaration="true" xmlns="dummy">
+  <![CDATA[
       #compdef maven
       case "$service" in
       
@ -51,10 +51,10 @@ case "$state" in
  
  ]]>
  
-	<j:set var="mavenSession" value="${context.getMavenSession()}"/>
-	<j:set var="allGoals" value="${mavenSession.getAllGoalNames()}"/>
-	<j:new var="modList" className="java.util.ArrayList"/>
-	<j:set var="dummy" value="${modList.addAll(allGoals)}"/>
+  <j:set var="mavenSession" value="${context.getMavenSession()}"/>
+  <j:set var="allGoals" value="${mavenSession.getAllGoalNames()}"/>
+  <j:new var="modList" className="java.util.ArrayList"/>
+  <j:set var="dummy" value="${modList.addAll(allGoals)}"/>
        <j:invokeStatic method="sort" className="java.util.Collections" var="dummy">
            <j:arg type="java.util.List" value="${modList}" />
        </j:invokeStatic>
@ -87,7 +87,7 @@ case "$state" in
  ]]>
   </j:file>
   
-	<echo>Now start a new zsh shell</echo>
+  <echo>Now start a new zsh shell</echo>
  
    <filter token="AMBERSAND" value="&amp;"/>
    <filter token="LESSER_THAN" value="&lt;"/>
--- a/site/plugin.jelly
+++ b/site/plugin.jelly
@ -27,10 +27,10 @@
  </goal>
  
  <goal name="site:run-reports" prereqs="xdoc:register-reports">
-  	<j:set var="reports" 
-  		   value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
+    <j:set var="reports" 
+         value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
  
-  	<j:forEach var="report" items="${reports}">
+    <j:forEach var="report" items="${reports}">
      <echo>Generating the ${report.get('name')}...</echo>
      <attainGoal name="${report.get('pluginName')}:report"/>
    </j:forEach>
--- a/statcvs/plugin.jelly
+++ b/statcvs/plugin.jelly
@ -30,7 +30,7 @@
  </goal>
  
  <goal name="maven-statcvs-plugin:report">
-  	<attainGoal name="statcvs"/>
+    <attainGoal name="statcvs"/>
  </goal>
  
  <goal name="statcvs" prereqs="statcvs:generate"
@ -48,7 +48,7 @@

        <cvs command="-q log" output="${statcvs.logfile}"/>

-		<property name="maven.docs.dest" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
+    <property name="maven.docs.dest" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
  
        <java jar="${plugin.getDependencyPath('statcvs')}" fork="true">
          <arg value="${pom.name}"/>
--- a/test/plugin.jelly
+++ b/test/plugin.jelly
@ -7,9 +7,9 @@
  
  <define:taglib uri="test">
    <define:tag name="eclipse">
-    	<!-- The eclipse plugin requires access to the test plugin.
-    		 Using this tag forces the test plugin to be loaded into the
-    		 eclipse plugin -->
+      <!-- The eclipse plugin requires access to the test plugin.
+         Using this tag forces the test plugin to be loaded into the
+         eclipse plugin -->
    </define:tag>
  </define:taglib>
  
@ -37,8 +37,8 @@
        deprecation="${maven.compile.deprecation}"
        optimize="${maven.compile.optimize}">
        <j:if test="${context.getVariable('maven.test.source') != null}">
-		    <setProperty name="source" value="${maven.test.source}" />
-		</j:if>
+        <setProperty name="source" value="${maven.test.source}" />
+    </j:if>
        <classpath>
          <pathelement path="${maven.build.dest}"/>
          <path refid="maven.dependency.classpath"/>
@ -274,21 +274,21 @@
  <goal name="test:single-test"
        description="[deprecated] please use the test:single goal instead">
        
-		<echo>[deprecated] please use the test:single goal instead</echo>
+    <echo>[deprecated] please use the test:single goal instead</echo>
            
-		<attainGoal name="test:single"/>
+    <attainGoal name="test:single"/>
  </goal>

  <goal name="test:match-test"
        description="[deprecated] please use the test:match goal instead">

-		<echo>[deprecated] please use the test:match goal instead</echo>
+    <echo>[deprecated] please use the test:match goal instead</echo>
    
-		<attainGoal name="test:match"/>
+    <attainGoal name="test:match"/>
  </goal>
  
  <goal name="test:eclipse">
-  		<echo>Used by eclipse to drag in test plugin context</echo>
+      <echo>Used by eclipse to drag in test plugin context</echo>
  </goal>
            
  <!-- ================================================================== -->
--- a/war/plugin.jelly
+++ b/war/plugin.jelly
@ -50,9 +50,9 @@

      <j:if test="${webSourcesPresent == 'true'}">
        <fileset dir="${maven.war.src}">
-        	<exclude name="WEB-INF/web.xml"/>
-        	<exclude name="WEB-INF/classes/**/*.class"/>
-        	<exclude name="WEB-INF/lib/*.jar"/>
+          <exclude name="WEB-INF/web.xml"/>
+          <exclude name="WEB-INF/classes/**/*.class"/>
+          <exclude name="WEB-INF/lib/*.jar"/>
        </fileset>
      </j:if>
      
@ -147,7 +147,7 @@
        description="Install the war in the local repository">

    <property name="maven.war.install.dir" 
-    	value="${maven.repo.local}/${pom.artifactDirectory}/wars"/>
+      value="${maven.repo.local}/${pom.artifactDirectory}/wars"/>
    <mkdir dir="${maven.war.install.dir}"/>
    <copy file="${maven.war.build.dir}/${maven.war.final.name}"
      tofile="${maven.war.install.dir}/${maven.war.final.name}"/>
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@ -15,7 +15,7 @@

  <define:taglib uri="doc">
    <define:tag name="deregisterReport">
-    	<!-- @name : Report to deregister, must be same as name used to register -->
+      <!-- @name : Report to deregister, must be same as name used to register -->
      
      <j:set 
        var="reports" 
@ -23,31 +23,31 @@
      
      <j:set var="removeRpt" value="null"/>
      <j:forEach var="rpt" items="${reports}">
-      	<j:if test="${rpt.get('name').equals(name)}">
-      		<j:set var="removeRpt" value="${rpt}"/>	
-      	</j:if>
+        <j:if test="${rpt.get('name').equals(name)}">
+          <j:set var="removeRpt" value="${rpt}"/>  
+        </j:if>
      </j:forEach>
      <j:if test="${removeRpt != null}">
-      	<j:set var="dummy" value="${reports.remove(removeRpt)}"/>
+        <j:set var="dummy" value="${reports.remove(removeRpt)}"/>
      </j:if>
    </define:tag>
    
    <define:tag name="registerReport">
      <!--
-    	@name the name of this report. Used for navigation items
-    	@plugin-name the name of the plugin.  @plugin:report goal must exist
-    	@description text description of report
-    	@link the nav-bar link for this report
-    	-->
+      @name the name of this report. Used for navigation items
+      @plugin-name the name of the plugin.  @plugin:report goal must exist
+      @description text description of report
+      @link the nav-bar link for this report
+      -->
      <j:set 
        var="reports" 
        value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
      
      <j:set var="add" value="true"/>
      <j:forEach var="rpt" items="${reports}">
-      	<j:if test="${rpt.get('name').equals(name)}">
-      		<j:set var="add" value="false"/>	
-      	</j:if>
+        <j:if test="${rpt.get('name').equals(name)}">
+          <j:set var="add" value="false"/>  
+        </j:if>
      </j:forEach>
      
      <j:if test="${add.equals('true')}">
@ -76,9 +76,9 @@
    </define:tag>

    <define:tag name="jslFile">
-  	  <!--
-  	   | Basic tag for performing arbitrary jsl transformations
-  	   | on arbitrary jsl inputs.
+      <!--
+       | Basic tag for performing arbitrary jsl transformations
+       | on arbitrary jsl inputs.
       | @input
       | @output
       | @stylesheet
@ -159,54 +159,54 @@
    </define:tag>

    <define:tag name="itemLink">
-    	<!--
-    		@link
-    		@relativePath
-    		@name
-    		@img
-    	  -->
-    	<a href="${pathTool.calculateLink(link,relativePath)}">
-    		<j:if test="${empty(img)}">${name}</j:if>
-    		<j:if test="${!empty(img)}"><img style="border: 1px" src="${img}" title="${name}" alt="${name}"/></j:if>
-   		</a>
+      <!--
+        @link
+        @relativePath
+        @name
+        @img
+        -->
+      <a href="${pathTool.calculateLink(link,relativePath)}">
+        <j:if test="${empty(img)}">${name}</j:if>
+        <j:if test="${!empty(img)}"><img style="border: 1px" src="${img}" title="${name}" alt="${name}"/></j:if>
+       </a>
    </define:tag>
    
    <define:tag name="text-xdoc">
-    	<!--
-    		@output - The output file
-    		@title - Title for page
-    		@section - Section heading
-    		@encoding - The XML encoding
-    		@preamble - Placed in paragraph block prior to text
-    		@inputText - Will be wrapped in a CDATA, will not escape CDATA tags (as yet)
-    		@inputFile - Will be read in and wrapped in CDATA. Overrides inputText if set
-    	  -->
-    	<j:set var="inputFile">${inputFile}</j:set>
-    	<j:if test="${inputFile != ''}">
-    		<util:file name="${inputFile}" var="inputFileObject"/>
-    		<util:loadText var="inputText" file="${inputFileObject}"/>
-   		</j:if>
+      <!--
+        @output - The output file
+        @title - Title for page
+        @section - Section heading
+        @encoding - The XML encoding
+        @preamble - Placed in paragraph block prior to text
+        @inputText - Will be wrapped in a CDATA, will not escape CDATA tags (as yet)
+        @inputFile - Will be read in and wrapped in CDATA. Overrides inputText if set
+        -->
+      <j:set var="inputFile">${inputFile}</j:set>
+      <j:if test="${inputFile != ''}">
+        <util:file name="${inputFile}" var="inputFileObject"/>
+        <util:loadText var="inputText" file="${inputFileObject}"/>
+       </j:if>
        
-    	<!-- Set default encoding if not set. -->
+      <!-- Set default encoding if not set. -->
        <j:if test="${encoding == null}">
          <j:set var="encoding" 
                 value="${plugin.getVariable('maven.docs.outputencoding')}"/>
        </j:if>
      
      
-    	<j:file name="${output}" prettyPrint="false" encoding="ISO-8859-1">         
+      <j:file name="${output}" prettyPrint="false" encoding="ISO-8859-1">         
            <document>
              <properties><title>${title}</title></properties>
              <body>
                <section name="${section}">
-	              <p>${preamble}</p>
+                <p>${preamble}</p>
                  <source>
-                  	<![CDATA[${inputText}]]>
+                    <![CDATA[${inputText}]]>
                  </source>
                </section>
              </body>
            </document>
-		</j:file>	
+    </j:file>  
    </define:tag>

    <!-- Alternator for row style in a table -->
@ -271,7 +271,7 @@

      <j:forEach var="file" items="${docFiles.iterator()}">

-		<util:replace var="inDirForward" oldChar="\" newChar="/" value="${file.parent}"/>
+    <util:replace var="inDirForward" oldChar="\" newChar="/" value="${file.parent}"/>
        <j:set var="outDir" value="${dirMapper.mapFileName(inDirForward).0}"/>
        <mkdir dir="${outDir}"/>

@ -533,14 +533,14 @@
     |-->
     
    <j:if test="${!pom.reports.isEmpty()}">
-  	  <j:forEach var="report" items="${pom.reports}">
+      <j:forEach var="report" items="${pom.reports}">
        <attainGoal name="${report}:register"/>
      </j:forEach>
    </j:if>
    
    <!-- If the descriptor is empty, use these as defaults -->
    <j:if test="${pom.reports.isEmpty()}">
-  		<attainGoal name="maven-jdepend-plugin:register"/>
+      <attainGoal name="maven-jdepend-plugin:register"/>
        <attainGoal name="maven-checkstyle-plugin:register"/>
        <attainGoal name="maven-changes-plugin:register"/>
        <attainGoal name="maven-changelog-plugin:register"/>
@ -552,7 +552,7 @@
        <attainGoal name="maven-junit-report-plugin:register"/>
        <attainGoal name="maven-linkcheck-plugin:register"/>
        <attainGoal name="maven-tasklist-plugin:register"/>
-  	</j:if>
+    </j:if>
  </goal>

  <goal name="xdoc:jelly-transform" 
@ -605,21 +605,21 @@
  <!-- This is required as the linkchecker runs as a final pass over the generated
       document tree -->
  <goal name="xdoc:performJSL"
-  		description="Allows the LinkCheck plugin to xdoc a single directory">
-	<j:set var="maven.xdoc.src" value="${pom.getPluginContext('maven-linkcheck-plugin').getVariable('maven.xdoc.src')}"/>
+      description="Allows the LinkCheck plugin to xdoc a single directory">
+  <j:set var="maven.xdoc.src" value="${pom.getPluginContext('maven-linkcheck-plugin').getVariable('maven.xdoc.src')}"/>
    <doc:performJSL 
-    	srcdir="${maven.xdoc.src}" 
-    	destdir="${maven.docs.dest}"/>
+      srcdir="${maven.xdoc.src}" 
+      destdir="${maven.docs.dest}"/>
  </goal>
  
  <goal name="xdoc:dump-report-settings">
-  	<echo>Dumping report settings</echo>
+    <echo>Dumping report settings</echo>
    <j:set 
       var="reports" 
       value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
       
    <j:forEach var="report" items="${reports}">
-    	<echo>Report: ${report}</echo>	
+      <echo>Report: ${report}</echo>  
    </j:forEach>
  </goal>