You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2007/04/10 14:30:25 UTC

svn commit: r527104 - /maven/maven-1/core/trunk/src/test/touchstone-build/maven.xml

Author: aheritier
Date: Tue Apr 10 05:30:24 2007
New Revision: 527104

URL: http://svn.apache.org/viewvc?view=rev&rev=527104
Log:
Reformat
replace deprecated maven:pluginVar by maven:get

Modified:
    maven/maven-1/core/trunk/src/test/touchstone-build/maven.xml

Modified: maven/maven-1/core/trunk/src/test/touchstone-build/maven.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/test/touchstone-build/maven.xml?view=diff&rev=527104&r1=527103&r2=527104
==============================================================================
--- maven/maven-1/core/trunk/src/test/touchstone-build/maven.xml (original)
+++ maven/maven-1/core/trunk/src/test/touchstone-build/maven.xml Tue Apr 10 05:30:24 2007
@@ -16,16 +16,7 @@
  * limitations under the License.
  */
  -->
-
-<project
-  xmlns:multiproject="multiproject"
-  xmlns:j="jelly:core"
-  xmlns:ant="jelly:ant"
-  xmlns:u="jelly:util"
-  xmlns:maven="jelly:maven"
-  xmlns:define="jelly:define"
-  xmlns:i="jelly:interaction">
-
+<project xmlns:multiproject="multiproject" xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util" xmlns:maven="jelly:maven" xmlns:define="jelly:define" xmlns:i="jelly:interaction">
   <!--
    | How the touchstone build works:
    |
@@ -61,50 +52,39 @@
    | make sure they don't crop up again.
    |
    -->
-
   <!--
    |
    | Run all the goals which contain tests and verify.
    |
    -->
-
   <goal name="touchstone-tests">
-    <attainGoal name="test-plugin-loading" />
-
+    <attainGoal name="test-plugin-loading"/>
     <attainGoal name="touchstone-goal-A"/>
-    <maven:pluginVar var="checkValue" plugin="maven-touchstone-plugin" property="touchstone_goal_A_from_plugin"/>
+    <maven:get var="checkValue" plugin="maven-touchstone-plugin" property="touchstone_goal_A_from_plugin"/>
     <j:if test="${checkValue == 'true'}">
-      <fail message="">
-        Goal should have been overridden. We have an internal error processing goals.
-      </fail>
+      <fail>Goal should have been overridden. We have an internal error processing goals.</fail>
     </j:if>
-
     <attainGoal name="touchstone-goal-B"/>
-    <maven:pluginVar var="checkValue" plugin="maven-touchstone-plugin" property="touchstone_goal_B_from_plugin"/>
+    <maven:get var="checkValue" plugin="maven-touchstone-plugin" property="touchstone_goal_B_from_plugin"/>
     <j:if test="${checkValue != 'true'}">
-      <fail message="">
-        Goal should be used from the touchstone plugin. We have an internal
-        error processing goals.
-      </fail>
+      <fail>Goal should be used from the touchstone plugin. We have an internal error processing goals.</fail>
     </j:if>
-
     <attainGoal name="test-addPath"/>
     <j:choose>
       <j:when test="${systemScope['os.name'].startsWith('Windows')}">
-        <property name="testPath1Prop" refid="testPath1" />
-        <property name="testPath2Prop" refid="testPath2" />
+        <property name="testPath1Prop" refid="testPath1"/>
+        <property name="testPath2Prop" refid="testPath2"/>
         <j:set var="resultantPath" value="${testPath1Prop}${systemScope['path.separator']}${testPath2Prop}"/>
       </j:when>
       <j:otherwise>
         <j:set var="resultantPath" value="/path1:/path2"/>
       </j:otherwise>
     </j:choose>
-
     <j:if test="${context.getAntProject().getReferences().get('testPath') != resultantPath}">
-      <property name="testPathProp" refid="testPath" />
-      <property name="testPath1Prop" refid="testPath1" />
-      <property name="testPath2Prop" refid="testPath2" />
-      <fail message="">
+      <property name="testPathProp" refid="testPath"/>
+      <property name="testPath1Prop" refid="testPath1"/>
+      <property name="testPath2Prop" refid="testPath2"/>
+      <fail>
         Paths were not correctly appended. Internal error in the maven:addPath tag.
         testPath = ${context.getAntProject().getReferences().get('testPath')}
         resultantPath = ${resultantPath}
@@ -112,168 +92,118 @@
         testPath2 = ${testPath2Prop}
       </fail>
     </j:if>
-
     <attainGoal name="test-plugin-property-override"/>
     <j:set var="mavenTouchstoneA" value="${maven.touchstone.A}"/>
     <j:if test="${mavenTouchstoneA != 'override.maven.touchstone.A'}">
       <echo>mavenTouchstoneA = ${mavenTouchstoneA}, should be override.maven.touchstone.A</echo>
-      <fail message="">
-
-        Plugin properties are not being correctly overridden.
-
-      </fail>
+      <fail>Plugin properties are not being correctly overridden.</fail>
     </j:if>
-
     <!--
      |
      | artifactId check.
      |
      -->
     <j:if test="${pom.artifactDirectory != 'touchstone'}">
-      <fail message="">
-
-        The artifactDirectory should be in legacy form which
-        contains no ":" character.
-
-      </fail>
+      <fail>The artifactDirectory should be in legacy form which contains no ":" character.</fail>
     </j:if>
-
     <!--
      |
      | Inter-plugin pre/postGoal tests.
      |
      -->
-
     <!--
      |
      | Touchstone partner has a pregoal and postGoal which sets a variable.
      |
      -->
     <attainGoal name="touchstone-goal-C"/>
-    <maven:pluginVar var="checkValue" plugin="maven-touchstone-partner-plugin" property="touchstone_partner_preGoal_C"/>
+    <maven:get var="checkValue" plugin="maven-touchstone-partner-plugin" property="touchstone_partner_preGoal_C"/>
     <echo>checkValue = ${checkValue}</echo>
     <j:if test="${checkValue != 'true'}">
-      <fail message="">
-
-        Inter-plugin preGoals are not being dealt with correctly.
-
-      </fail>
+      <fail>Inter-plugin preGoals are not being dealt with correctly.</fail>
     </j:if>
-    <maven:pluginVar var="checkValue" plugin="maven-touchstone-partner-plugin" property="touchstone_partner_postGoal_C"/>
+    <maven:get var="checkValue" plugin="maven-touchstone-partner-plugin" property="touchstone_partner_postGoal_C"/>
     <j:if test="${checkValue != 'true'}">
-      <fail message="">
-
-        Inter-plugin postGoals are not being dealt with correctly.
-
-      </fail>
+      <fail>Inter-plugin postGoals are not being dealt with correctly.</fail>
     </j:if>
-
     <!--
      |
      | Touchstone partner has a pregoal ant postGoal which attains a goal which sets a variable.
      |
      -->
     <attainGoal name="touchstone-goal-D"/>
-    <maven:pluginVar var="checkValue" plugin="maven-touchstone-partner-plugin" property="touchstone_partner_preGoal_D"/>
+    <maven:get var="checkValue" plugin="maven-touchstone-partner-plugin" property="touchstone_partner_preGoal_D"/>
     <echo>checkValue = ${checkValue}</echo>
     <j:if test="${checkValue != 'true'}">
-      <fail message="">
-
-        Inter-plugin preGoals are not being dealt with correctly.
-
-      </fail>
+      <fail>Inter-plugin preGoals are not being dealt with correctly.</fail>
     </j:if>
-    <maven:pluginVar var="checkValue" plugin="maven-touchstone-partner-plugin" property="touchstone_partner_postGoal_D"/>
+    <maven:get var="checkValue" plugin="maven-touchstone-partner-plugin" property="touchstone_partner_postGoal_D"/>
     <j:if test="${checkValue != 'true'}">
-      <fail message="">
-
-        Inter-plugin postGoals are not being dealt with correctly.
-
-      </fail>
+      <fail>Inter-plugin postGoals are not being dealt with correctly.</fail>
     </j:if>
-
     <attainGoal name="test-mavenjellyscope"/>
     <j:if test="${context.findVariable('test-mavenjellyscope') != 'success'}">
-       <fail>
+      <fail>
            Problem with scope factory method - $${test-mavenjellyscope} should have been set to 'success'
            but was set to '${test-mavenjellyscope}'.
-       </fail>    
+       </fail>
     </j:if>
-    
     <attainGoal name="test-reactor-failure-property"/>
     <attainGoal name="test-maven-failure-property"/>
     <attainGoal name="test-maven-unknown-failure-property"/>
-
-    <attainGoal name="test-make-absolute-path" />
-    <attainGoal name="test-make-relative-path" />
-
-    <attainGoal name="test-preGoal-counter" />
-    <attainGoal name="test-postGoal-counter" />
-
-    <attainGoal name="test-goal-trimming-reactor" />
-    <attainGoal name="test-reactor-resources" />
-    <attainGoal name="test-plugin-attainment-reactor" />
-    <attainGoal name="test-plugin-attainment-reactor-two-goals" />
-    <attainGoal name="test-reactor-run-twice" />
-    <attainGoal name="test-context-switch" />
-    <attainGoal name="test-defaults" />
-    <attainGoal name="test-inheritance" />
-    <attainGoal name="test-non-jar-dependency-path" />
-    <attainGoal name="test-plugin-getset" />
-    <attainGoal name="test-dot-property" />
-    <attainGoal name="test-overlappedCalls" />  <!-- MAVEN-1691 -->
-    <attainGoal name="test-entities-in-project" /> <!-- MAVEN-1755 -->
-    <attainGoal name="test-entities-in-maven" /> <!-- MAVEN-1756 -->
+    <attainGoal name="test-make-absolute-path"/>
+    <attainGoal name="test-make-relative-path"/>
+    <attainGoal name="test-preGoal-counter"/>
+    <attainGoal name="test-postGoal-counter"/>
+    <attainGoal name="test-goal-trimming-reactor"/>
+    <attainGoal name="test-reactor-resources"/>
+    <attainGoal name="test-plugin-attainment-reactor"/>
+    <attainGoal name="test-plugin-attainment-reactor-two-goals"/>
+    <attainGoal name="test-reactor-run-twice"/>
+    <attainGoal name="test-context-switch"/>
+    <attainGoal name="test-defaults"/>
+    <attainGoal name="test-inheritance"/>
+    <attainGoal name="test-non-jar-dependency-path"/>
+    <attainGoal name="test-plugin-getset"/>
+    <attainGoal name="test-dot-property"/>
+    <attainGoal name="test-overlappedCalls"/>
+    <!-- MAVEN-1691 -->
+    <attainGoal name="test-entities-in-project"/>
+    <!-- MAVEN-1755 -->
+    <attainGoal name="test-entities-in-maven"/>
+    <!-- MAVEN-1756 -->
     <!-- TODO - this is still broken (as in RC1)
     <attainGoal name="test-reactor-maven-username" />
     -->
     <echo>Touchstone complete</echo>
   </goal>
-
-   <!--
+  <!--
    |
    | T E S T S
    |
    -->
-
   <!--
    |
    | Check maven.build.failure is set properly by the reactor
    |
    -->
   <goal name="test-reactor-failure-property">
-    <j:set var="mavenBuildFailure" value="${maven.build.failure}" />
+    <j:set var="mavenBuildFailure" value="${maven.build.failure}"/>
     <j:if test="${mavenBuildFailure}">
       <fail>maven.build.failure already set</fail>
     </j:if>
-
     <!-- Test success -->
-    <maven:reactor
-      basedir="${basedir}"
-      includes="src/reactor-build/failProperty/success-*/project.xml"
-      goals="build"
-      banner="Testing"
-      ignoreFailures="true"
-    />
-    <j:set var="mavenBuildFailure" value="${maven.build.failure}" />
+    <maven:reactor basedir="${basedir}" includes="src/reactor-build/failProperty/success-*/project.xml" goals="build" banner="Testing" ignoreFailures="true"/>
+    <j:set var="mavenBuildFailure" value="${maven.build.failure}"/>
     <j:if test="${mavenBuildFailure}">
       <fail>maven.build.failure set incorrectly</fail>
     </j:if>
-
     <!-- Test failure -->
-    <maven:reactor
-      basedir="${basedir}"
-      includes="src/reactor-build/failProperty/failure-*/project.xml,src/reactor-build/failProperty/success-*/project.xml"
-      goals="build"
-      banner="Testing"
-      ignoreFailures="true"
-    />
-
-    <j:set var="mavenBuildFailure" value="${maven.build.failure}" />
+    <maven:reactor basedir="${basedir}" includes="src/reactor-build/failProperty/failure-*/project.xml,src/reactor-build/failProperty/success-*/project.xml" goals="build" banner="Testing" ignoreFailures="true"/>
+    <j:set var="mavenBuildFailure" value="${maven.build.failure}"/>
     <j:if test="${!mavenBuildFailure}">
       <fail>maven.build.failure not set</fail>
     </j:if>
-
     <j:choose>
       <j:when test="${size(failedProjects) != 2}">
         <fail>failedProjects is not length 2</fail>
@@ -294,15 +224,7 @@
         </j:forEach>
       </j:otherwise>
     </j:choose>
-
-    <maven:reactor
-      basedir="${basedir}"
-      includes="src/reactor-build/failProperty/extra-failure/project.xml"
-      goals="build"
-      banner="Testing"
-      ignoreFailures="true"
-    />
-
+    <maven:reactor basedir="${basedir}" includes="src/reactor-build/failProperty/extra-failure/project.xml" goals="build" banner="Testing" ignoreFailures="true"/>
     <j:choose>
       <j:when test="${size(failedProjects) != 3}">
         <fail>failedProjects is not length 3</fail>
@@ -326,48 +248,34 @@
         </j:forEach>
       </j:otherwise>
     </j:choose>
-
-    <j:remove var="maven.build.failure" />
-    <j:remove var="failedProjects" />
+    <j:remove var="maven.build.failure"/>
+    <j:remove var="failedProjects"/>
   </goal>
-
   <!--
    |
    | Check maven.build.failure is set properly by the maven:maven
    |
    -->
   <goal name="test-maven-failure-property">
-    <j:set var="mavenBuildFailure" value="${maven.build.failure}" />
+    <j:set var="mavenBuildFailure" value="${maven.build.failure}"/>
     <j:if test="${mavenBuildFailure}">
       <fail>maven.build.failure already set</fail>
     </j:if>
-
     <!-- Test success -->
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/failProperty/success-1/project.xml"
-      goals="build"
-      ignoreFailures="true"
-    />
-    <j:set var="mavenBuildFailure" value="${maven.build.failure}" />
+    <maven:maven descriptor="${basedir}/src/reactor-build/failProperty/success-1/project.xml" goals="build" ignoreFailures="true"/>
+    <j:set var="mavenBuildFailure" value="${maven.build.failure}"/>
     <j:if test="${mavenBuildFailure}">
       <fail>maven.build.failure set incorrectly</fail>
     </j:if>
-
     <!-- Test failure -->
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/failProperty/failure-1/project.xml"
-      goals="build"
-      ignoreFailures="true"
-    />
-    <j:set var="mavenBuildFailure" value="${maven.build.failure}" />
+    <maven:maven descriptor="${basedir}/src/reactor-build/failProperty/failure-1/project.xml" goals="build" ignoreFailures="true"/>
+    <j:set var="mavenBuildFailure" value="${maven.build.failure}"/>
     <j:if test="${!mavenBuildFailure}">
       <fail>maven.build.failure not set</fail>
     </j:if>
-
     <j:if test="${failedProjects.isEmpty()}">
       <fail>Empty failedProjects</fail>
     </j:if>
-
     <j:choose>
       <j:when test="${size(failedProjects) != 1}">
         <fail>failedProjects should only contain 1 element</fail>
@@ -385,13 +293,7 @@
         </j:forEach>
       </j:otherwise>
     </j:choose>
-
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/failProperty/extra-failure/project.xml"
-      goals="build"
-      ignoreFailures="true"
-    />
-
+    <maven:maven descriptor="${basedir}/src/reactor-build/failProperty/extra-failure/project.xml" goals="build" ignoreFailures="true"/>
     <j:choose>
       <j:when test="${size(failedProjects) != 2}">
         <fail>failedProjects is not length 2</fail>
@@ -412,35 +314,26 @@
         </j:forEach>
       </j:otherwise>
     </j:choose>
-
-    <j:remove var="maven.build.failure" />
-    <j:remove var="failedProjects" />
+    <j:remove var="maven.build.failure"/>
+    <j:remove var="failedProjects"/>
   </goal>
-
   <!--
    |
    | Check maven.build.failure is set properly by maven:maven for an unknown project in the list.
    |
    -->
   <goal name="test-maven-unknown-failure-property">
-    <j:set var="mavenBuildFailure" value="${maven.build.failure}" />
+    <j:set var="mavenBuildFailure" value="${maven.build.failure}"/>
     <j:if test="${mavenBuildFailure}">
       <fail>maven.build.failure already set</fail>
     </j:if>
-
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/failProperty/unknown/project.xml"
-      goals="build"
-      ignoreFailures="true"
-    />
-    <j:set var="mavenBuildFailure" value="${maven.build.failure}" />
+    <maven:maven descriptor="${basedir}/src/reactor-build/failProperty/unknown/project.xml" goals="build" ignoreFailures="true"/>
+    <j:set var="mavenBuildFailure" value="${maven.build.failure}"/>
     <j:if test="${!mavenBuildFailure}">
       <fail>maven.build.failure not set for unknown project</fail>
     </j:if>
-
-    <j:remove var="maven.build.failure" />
+    <j:remove var="maven.build.failure"/>
   </goal>
-
   <!--
    |
    | maven.username from within reactor test.
@@ -448,28 +341,18 @@
    |
    -->
   <goal name="test-reactor-maven-username">
-    <j:set var="mavenUsername" value="${maven.username}" />
+    <j:set var="mavenUsername" value="${maven.username}"/>
     <j:if test="${mavenUsername != 'maven'}">
       <fail>maven.username should be 'maven', but it is '${maven.username}'</fail>
     </j:if>
-    <j:remove var="mavenUsername" />
-
-    <maven:reactor
-      basedir="${basedir}"
-      includes="src/reactor-build/username_test/project.xml"
-      goals="run"
-      banner="Testing"
-      ignoreFailures="false"
-    />
- 
+    <j:remove var="mavenUsername"/>
+    <maven:reactor basedir="${basedir}" includes="src/reactor-build/username_test/project.xml" goals="run" banner="Testing" ignoreFailures="false"/>
   </goal>
-
   <!--
    |
    | Tests for the MavenTagLibrary.
    |
    -->
-
   <!--
    |
    | <maven:concat/> test.
@@ -481,30 +364,23 @@
       <maven:input file="${maven.src.dir}/test-data/maven.tar.gz"/>
     </maven:concat>
   </goal>
-
   <!--
    |
    | <maven:addPath/> test.
    |
    -->
   <goal name="test-addPath">
-
     <path id="testPath1">
       <pathelement location="/path1"/>
     </path>
-
     <path id="testPath2">
       <pathelement location="/path2"/>
     </path>
-
     <path id="testPath">
     </path>
-
     <maven:addPath id="testPath" refid="testPath1"/>
     <maven:addPath id="testPath" refid="testPath2"/>
-
   </goal>
-
   <!--
    |
    | Local goal overriding test.
@@ -513,7 +389,6 @@
   <goal name="touchstone-goal-A">
     <echo>Overriding touchstone-goal-A</echo>
   </goal>
-
   <!--
    |
    | Plugin property override test.
@@ -522,19 +397,15 @@
   <goal name="test-plugin-property-override">
     <echo>maven.touchstone.A = ${maven.touchstone.A}</echo>
   </goal>
-
   <goal name="pom-props">
     <echo>propertyA = ${pom.getProperty('propertyA')}</echo>
   </goal>
-
   <goal name="dep-props">
     <echo>propertyA = ${pom.getDependency('a').getProperty('propertyA')}</echo>
   </goal>
-
   <!--
    |
    -->
-
   <!--
    | Test to see if Jelly interaction taglib is loaded into the
    | classpath when the maven.xml file is executed.
@@ -548,12 +419,8 @@
       After the interaction tag (answer was ${answer})
     </echo>
   </goal>
-
-  <goal 
-    xmlns:testmavenjellyscope="test-mavenjellyscope"
-    name="test-mavenjellyscope"
-    description="throws a ClassCastException when loading the jelly script from a nested maven session.">
-     <!-- 
+  <goal xmlns:testmavenjellyscope="test-mavenjellyscope" name="test-mavenjellyscope" description="throws a ClassCastException when loading the jelly script from a nested maven session.">
+    <!-- 
       |
       | The purpose of this defined tag is to get jelly to create a new scope 
       | from the one it has. 
@@ -562,47 +429,43 @@
       | ClassCastException.
       |
       -->
-     <define:taglib uri="test-mavenjellyscope">
-       <define:tag name="runmaven">
-         <maven:maven descriptor="${basedir}/project.xml" goals="test-mavenjellyscope-helper" />			
-       </define:tag>	
-     </define:taglib>		
-     <testmavenjellyscope:runmaven/>
+    <define:taglib uri="test-mavenjellyscope">
+      <define:tag name="runmaven">
+        <maven:maven descriptor="${basedir}/project.xml" goals="test-mavenjellyscope-helper"/>
+      </define:tag>
+    </define:taglib>
+    <testmavenjellyscope:runmaven/>
   </goal>
-
   <goal name="test-mavenjellyscope-helper">
     <j:set var="test-mavenjellyscope" scope="parent" value="success"/>
   </goal>
-  
   <!--
    | property wrongly treated as == null
    | This test will fail until jexl(?) is fixed.
    | @todo fix
    |-->
   <goal name="test-dot-property">
-    <property name="dot.property" value="true" />
-    <j:if test="${dot.property == null}" >
+    <property name="dot.property" value="true"/>
+    <j:if test="${dot.property == null}">
       <fail>
         A defined property with dots in the name is wrongly treated as null
         even though the value is ${dot.property} 
       </fail>
     </j:if>
   </goal>
-
   <!--
    | Test the makeAbsolutePath tag
    |-->
   <goal name="test-make-absolute-path">
-    <maven:makeAbsolutePath var="testVar" basedir="${basedir}" path="project.xml" />
-    <u:file var="testVar2" name="${basedir}/project.xml" />
+    <maven:makeAbsolutePath var="testVar" basedir="${basedir}" path="project.xml"/>
+    <u:file var="testVar2" name="${basedir}/project.xml"/>
     <j:if test="${testVar != testVar2.canonicalPath}">
       <ant:fail>
         makeAbsolutePath:
         testVar = '${testVar}'; should be: '${testVar2}'
       </ant:fail>
     </j:if>
-
-    <maven:makeAbsolutePath var="testVar" basedir="${basedir}" path="src/main" />
+    <maven:makeAbsolutePath var="testVar" basedir="${basedir}" path="src/main"/>
     <u:file var="testVar2" name="${basedir}/src/main"/>
     <j:if test="${testVar != testVar2.canonicalPath}">
       <ant:fail>
@@ -611,20 +474,18 @@
       </ant:fail>
     </j:if>
   </goal>
-
   <!--
    | Test the makeRelativePath tag
    |-->
   <goal name="test-make-relative-path">
-    <maven:makeRelativePath var="testVar" basedir="${basedir}" path="${basedir}/project.xml" />
+    <maven:makeRelativePath var="testVar" basedir="${basedir}" path="${basedir}/project.xml"/>
     <j:if test="${testVar != 'project.xml'}">
       <ant:fail>
         makeRelativePath:
         testVar = '${testVar}'; should be: 'project.xml'
       </ant:fail>
     </j:if>
-
-    <maven:makeRelativePath var="testVar" basedir="${basedir}" path="${basedir}/src/main" />
+    <maven:makeRelativePath var="testVar" basedir="${basedir}" path="${basedir}/src/main"/>
     <j:set var="testVar2" value="src${file.separator}main"/>
     <j:if test="${testVar != testVar2}">
       <ant:fail>
@@ -632,8 +493,7 @@
         testVar = '${testVar}'; should be: '${testVar2}'
       </ant:fail>
     </j:if>
-
-    <maven:makeRelativePath var="testVar" basedir="${basedir}" path="${basedir}/src\main/1\2" separator="/" />
+    <maven:makeRelativePath var="testVar" basedir="${basedir}" path="${basedir}/src\main/1\2" separator="/"/>
     <j:set var="testVar2" value="src/main/1/2"/>
     <j:if test="${testVar != testVar2}">
       <ant:fail>
@@ -642,23 +502,15 @@
       </ant:fail>
     </j:if>
   </goal>
-
   <!--
    |
    | This is a simple pregoal that allows us to see what the dependency
    | classpath in plain site as a visual check.
    |
    -->
-
   <preGoal name="java:compile">
-
     <!-- Display maven.dependency.classpath in a nice format. -->
-
-    <property
-      name="mavenDependencyClasspath"
-      refid="maven.dependency.classpath"
-    />
-
+    <property name="mavenDependencyClasspath" refid="maven.dependency.classpath"/>
     <j:choose>
       <j:when test="${systemScope['os.name'].startsWith('Windows')}">
         <u:tokenize var="classpath" delim=";">${mavenDependencyClasspath}</u:tokenize>
@@ -667,240 +519,145 @@
         <u:tokenize var="classpath" delim=":">${mavenDependencyClasspath}</u:tokenize>
       </j:otherwise>
     </j:choose>
-
     <echo>
     maven.dependency.classpath:
     <j:forEach var="entry" items="${classpath}">${entry}
     </j:forEach>
     </echo>
-
   </preGoal>
-
   <goal name="test-preGoal-counter">
-    <j:set var="counterPre" scope="parent" value="0" />
+    <j:set var="counterPre" scope="parent" value="0"/>
     <attainGoal name="counter-pre"/>
     <j:if test="${counterPre != 1}">
       <fail>counterPre should be '1', but is '${counterPre}'</fail>
     </j:if>
   </goal>
-
   <preGoal name="counter-pre">
     <echo>Counter PreGoal</echo>
-    <j:set var="counterPre" scope="parent" value="${counterPre + 1}" />
+    <j:set var="counterPre" scope="parent" value="${counterPre + 1}"/>
   </preGoal>
-
   <goal name="counter-pre">
     <echo>counter-pre</echo>
   </goal>
-
   <goal name="test-postGoal-counter">
-    <j:set var="counterPost" scope="parent" value="0" />
+    <j:set var="counterPost" scope="parent" value="0"/>
     <attainGoal name="counter-post"/>
     <j:if test="${counterPost != 1}">
       <fail>counterPost should be '1', but is '${counterPost}'</fail>
     </j:if>
   </goal>
-
   <postGoal name="counter-post">
     <echo>Counter PostGoal</echo>
-    <j:set var="counterPost" scope="parent" value="${counterPost + 1}" />
+    <j:set var="counterPost" scope="parent" value="${counterPost + 1}"/>
   </postGoal>
-
   <goal name="counter-post">
     <echo>counter-post</echo>
   </goal>
-
   <goal name="test-context-switch">
-    <attainGoal name="touchstone-partner:test-context-switch" />
+    <attainGoal name="touchstone-partner:test-context-switch"/>
   </goal>
-
   <goal name="test-goal-trimming-reactor">
-    <maven:reactor
-      basedir="${basedir}"
-      includes="src/reactor-build/failProperty/success-1/project.xml"
-      goals="touchstone-goal-A, build:start"
-      banner="Testing"
-      ignoreFailures="false"
-    />
+    <maven:reactor basedir="${basedir}" includes="src/reactor-build/failProperty/success-1/project.xml" goals="touchstone-goal-A, build:start" banner="Testing" ignoreFailures="false"/>
   </goal>
-
   <goal name="test-plugin-attainment-reactor">
     <ant:echo>Testing goal attainment in a plugin via the reactor</ant:echo>
-    <maven:reactor
-      basedir="${basedir}"
-      includes="src/reactor-build/failProperty/success-1/project.xml"
-      goals="touchstone-goal-A"
-      banner="Testing"
-      ignoreFailures="false"
-    />
+    <maven:reactor basedir="${basedir}" includes="src/reactor-build/failProperty/success-1/project.xml" goals="touchstone-goal-A" banner="Testing" ignoreFailures="false"/>
     <ant:echo>Testing goal attainment in a plugin via the maven tag</ant:echo>
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/failProperty/success-1/project.xml"
-      goals="touchstone-goal-A"
-      ignoreFailures="false"
-    />
+    <maven:maven descriptor="${basedir}/src/reactor-build/failProperty/success-1/project.xml" goals="touchstone-goal-A" ignoreFailures="false"/>
   </goal>
-
   <goal name="test-plugin-attainment-reactor-two-goals">
     <ant:echo>Testing two goal attainments in a plugin via the reactor</ant:echo>
-    <maven:reactor
-      basedir="${basedir}"
-      includes="src/reactor-build/failProperty/success-1/project.xml"
-      goals="touchstone-goal-B,touchstone-goal-A"
-      banner="Testing"
-      ignoreFailures="false"
-    />
+    <maven:reactor basedir="${basedir}" includes="src/reactor-build/failProperty/success-1/project.xml" goals="touchstone-goal-B,touchstone-goal-A" banner="Testing" ignoreFailures="false"/>
     <ant:echo>Testing two goal attainments in a plugin via the maven tag</ant:echo>
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/failProperty/success-1/project.xml"
-      goals="touchstone-goal-B,touchstone-goal-A"
-      ignoreFailures="false"
-    />
+    <maven:maven descriptor="${basedir}/src/reactor-build/failProperty/success-1/project.xml" goals="touchstone-goal-B,touchstone-goal-A" ignoreFailures="false"/>
   </goal>
-
   <goal name="test-reactor-resources">
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/resources/project.xml"
-      goals="run"
-      ignoreFailures="false"
-    />
+    <maven:maven descriptor="${basedir}/src/reactor-build/resources/project.xml" goals="run" ignoreFailures="false"/>
   </goal>
-
   <goal name="test-reactor-run-twice">
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/run_twice/project.xml"
-      goals="run_twice"
-      ignoreFailures="false"
-    />
+    <maven:maven descriptor="${basedir}/src/reactor-build/run_twice/project.xml" goals="run_twice" ignoreFailures="false"/>
   </goal>
-
   <goal name="test-inheritance">
     <ant:echo>Testing 0 level</ant:echo>
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/inheritence/project.xml"
-      goals="runTest"
-      ignoreFailures="false"
-    />
+    <maven:maven descriptor="${basedir}/src/reactor-build/inheritence/project.xml" goals="runTest" ignoreFailures="false"/>
     <ant:echo>Testing 1 level</ant:echo>
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/inheritence/subproject/project.xml"
-      goals="runTest"
-      ignoreFailures="false"
-    />
+    <maven:maven descriptor="${basedir}/src/reactor-build/inheritence/subproject/project.xml" goals="runTest" ignoreFailures="false"/>
     <ant:echo>Testing 2 levels</ant:echo>
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/inheritence/subproject/subproject2/project.xml"
-      goals="runTest"
-      ignoreFailures="false"
-    />
+    <maven:maven descriptor="${basedir}/src/reactor-build/inheritence/subproject/subproject2/project.xml" goals="runTest" ignoreFailures="false"/>
   </goal>
-
   <goal name="test-defaults">
-    <j:remove var="ranDefault" />
-
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/default/subproject/project.xml"
-      goals=""
-      ignoreFailures="false"
-    />
+    <j:remove var="ranDefault"/>
+    <maven:maven descriptor="${basedir}/src/reactor-build/default/subproject/project.xml" goals="" ignoreFailures="false"/>
     <j:if test="${ranDefault != 'subproject-default'}">
       <ant:fail>Default goal in subproject is not overriding parent project</ant:fail>
     </j:if>
-
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/default/project.xml"
-      goals=""
-      ignoreFailures="false"
-    />
+    <maven:maven descriptor="${basedir}/src/reactor-build/default/project.xml" goals="" ignoreFailures="false"/>
     <j:if test="${ranDefault != 'base-default'}">
       <ant:fail>Default goal in base project is not honouring property</ant:fail>
     </j:if>
   </goal>
-
   <goal name="test-non-jar-dependency-path">
-    <u:replace oldChar="\" newChar="/" var="jarPath" value="${pom.getDependencyPath('touchstone:touchstone')}" />
-    <u:replace oldChar="\" newChar="/" var="jarRepoPath" value="${maven.repo.local}/touchstone/jars/touchstone-SNAPSHOT.jar" />
+    <u:replace oldChar="\" newChar="/" var="jarPath" value="${pom.getDependencyPath('touchstone:touchstone')}"/>
+    <u:replace oldChar="\" newChar="/" var="jarRepoPath" value="${maven.repo.local}/touchstone/jars/touchstone-SNAPSHOT.jar"/>
     <j:if test="${jarPath != jarRepoPath}">
       <ant:fail>path = ${jarPath}, expected ${jarRepoPath}</ant:fail>
     </j:if>
-  
-    <u:replace oldChar="\" newChar="/" var="warPath" value="${pom.getDependencyPath('touchstone:test:war')}" />
-    <u:replace oldChar="\" newChar="/" var="warRepoPath" value="${maven.repo.local}/touchstone/wars/test-SNAPSHOT.war" />
+    <u:replace oldChar="\" newChar="/" var="warPath" value="${pom.getDependencyPath('touchstone:test:war')}"/>
+    <u:replace oldChar="\" newChar="/" var="warRepoPath" value="${maven.repo.local}/touchstone/wars/test-SNAPSHOT.war"/>
     <j:if test="${warPath != warRepoPath}">
       <ant:fail>path = ${warPath}, expected ${warRepoPath}</ant:fail>
     </j:if>
   </goal>
-
   <goal name="test-plugin-getset">
     <attainGoal name="touchstone-goal-B"/>
     <echo>test maven:get</echo>
     <maven:get var="checkValue" plugin="maven-touchstone-plugin" property="touchstone_goal_B_from_plugin"/>
     <j:if test="${checkValue != 'true'}">
-      <fail message=""> maven:get failed </fail>
+      <fail> maven:get failed </fail>
     </j:if>
-    <echo>test maven:pluginVar (deprecated)</echo>
-    <maven:pluginVar var="checkValue" plugin="maven-touchstone-plugin" property="touchstone_goal_B_from_plugin"/>
+    <echo>test maven:get (deprecated)</echo>
+    <maven:get var="checkValue" plugin="maven-touchstone-plugin" property="touchstone_goal_B_from_plugin"/>
     <j:if test="${checkValue != 'true'}">
-      <fail message=""> maven:pluginVar failed </fail>
+      <fail> maven:get failed </fail>
     </j:if>
     <echo>test maven:set</echo>
     <maven:set plugin="maven-touchstone-plugin" property="touchstone_goal_B_from_plugin" value="blah"/>
     <maven:get var="checkValue" plugin="maven-touchstone-plugin" property="touchstone_goal_B_from_plugin"/>
     <j:if test="${checkValue != 'blah'}">
-      <fail message=""> maven:set failed </fail>
+      <fail> maven:set failed </fail>
     </j:if>
   </goal>
-
   <goal name="test-plugin-loading" prereqs="xdoc:init">
     <!-- test prereq -->
-    <maven:get plugin="maven-xdoc-plugin" property="maven.xdoc.theme" var="d" />
+    <maven:get plugin="maven-xdoc-plugin" property="maven.xdoc.theme" var="d"/>
     <j:if test="${d != 'stylus'}">
       <fail>maven.xdoc.theme in xdoc plugin is not 'stylus', is '${d}'</fail>
     </j:if>
     <!-- test handle -->
-    <multiproject:dependency-handle />
-    <maven:get plugin="maven-multiproject-plugin" property="maven.multiproject.includes" var="d" />
+    <multiproject:dependency-handle/>
+    <maven:get plugin="maven-multiproject-plugin" property="maven.multiproject.includes" var="d"/>
     <j:if test="${d != '*/project.xml'}">
       <fail>maven.multiproject.includes in multiproject plugin is not '*/project.xml', is '${d}'</fail>
     </j:if>
     <!-- test get -->
-    <maven:get plugin="maven-multichanges-plugin" property="maven.multichanges.report" var="d" />
+    <maven:get plugin="maven-multichanges-plugin" property="maven.multichanges.report" var="d"/>
     <j:if test="${d != 'multichanges-report'}">
       <fail>maven.dist.bin.artifact in dist plugin is not 'multichanges-report', is '${d}'</fail>
     </j:if>
-
     <!-- test set -->
-    <maven:set plugin="maven-javadoc-plugin" property="maven.javadoc.debug" value="foo" />
-    <maven:get plugin="maven-javadoc-plugin" property="maven.javadoc.debug" var="d" />
+    <maven:set plugin="maven-javadoc-plugin" property="maven.javadoc.debug" value="foo"/>
+    <maven:get plugin="maven-javadoc-plugin" property="maven.javadoc.debug" var="d"/>
     <j:if test="${d != 'foo'}">
       <fail>maven.javadoc.debug in javadoc plugin is not 'foo', is '${d}'</fail>
     </j:if>
   </goal>
-  
   <goal name="test-overlappedCalls">
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/overlappedCalls/project.xml"
-      goals="testOverlappedCalls"
-      ignoreFailures="false"
-    />
+    <maven:maven descriptor="${basedir}/src/reactor-build/overlappedCalls/project.xml" goals="testOverlappedCalls" ignoreFailures="false"/>
   </goal>
-  
   <goal name="test-entities-in-project">
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/entities-in-project.xml/project.xml"
-      goals="jar"
-      ignoreFailures="false"
-    />
+    <maven:maven descriptor="${basedir}/src/reactor-build/entities-in-project.xml/project.xml" goals="jar" ignoreFailures="false"/>
   </goal>
-  
   <goal name="test-entities-in-maven">
-    <maven:maven
-      descriptor="${basedir}/src/reactor-build/entities-in-maven.xml/project.xml"
-      goals="testGoals"
-      ignoreFailures="false"
-    />
+    <maven:maven descriptor="${basedir}/src/reactor-build/entities-in-maven.xml/project.xml" goals="testGoals" ignoreFailures="false"/>
   </goal>
-
 </project>
-
-