From 6801d9ed6285f6c83a298a70b663a1f3e26387a9 Mon Sep 17 00:00:00 2001
From: jvanzyl <jvanzyl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 27 Jul 2003 23:34:00 +0000
Subject: [PATCH] o RC1 Refactoring PR: Obtained from: Submitted by: Reviewed
 by:

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113732 13f79535-47bb-0310-9956-ffa450edef68
---
 clean/clean/plugin.jelly        |  12 +++
 clean/plugin.jelly              |  12 +++
 jar/plugin.jelly                |  44 +++++++-
 jar/project.xml                 |   5 +-
 java/plugin.jelly               |  61 ++++-------
 java/plugin.properties          |   5 +-
 java/project.xml                |  58 -----------
 license/plugin.jelly            |  19 ++--
 license/project.xml             |  11 +-
 plugin/plugin.jelly             |   5 +-
 test/plugin.jelly               | 178 +++++++++++++++++---------------
 test/plugin.properties          |  11 +-
 test/project.xml                |   2 +-
 touchstone-partner/plugin.jelly |   1 +
 touchstone/plugin.properties    |   8 +-
 15 files changed, 221 insertions(+), 211 deletions(-)

diff --git a/clean/clean/plugin.jelly b/clean/clean/plugin.jelly
index ca5ff76f..6a98b3c0 100644
--- a/clean/clean/plugin.jelly
+++ b/clean/clean/plugin.jelly
@@ -13,4 +13,16 @@
     <ant:delete file="${basedir}/velocity.log" quiet="true" failonerror="false"/>
   </goal>
   
+  <goal name="clean:classes"
+         description="Remove all build and test classes">
+    <ant:delete dir="${maven.build.dest}"/>
+    <ant:delete dir="${maven.test.dest}"/>
+  </goal>
+  
+  <goal name="clean:docs"
+         description="Remove all docs and generated xdocs">
+    <ant:delete dir="${maven.gen.docs}"/>
+    <ant:delete dir="${maven.docs.dest}"/>
+  </goal>
+
 </project>
diff --git a/clean/plugin.jelly b/clean/plugin.jelly
index ca5ff76f..6a98b3c0 100644
--- a/clean/plugin.jelly
+++ b/clean/plugin.jelly
@@ -13,4 +13,16 @@
     <ant:delete file="${basedir}/velocity.log" quiet="true" failonerror="false"/>
   </goal>
   
+  <goal name="clean:classes"
+         description="Remove all build and test classes">
+    <ant:delete dir="${maven.build.dest}"/>
+    <ant:delete dir="${maven.test.dest}"/>
+  </goal>
+  
+  <goal name="clean:docs"
+         description="Remove all docs and generated xdocs">
+    <ant:delete dir="${maven.gen.docs}"/>
+    <ant:delete dir="${maven.docs.dest}"/>
+  </goal>
+
 </project>
diff --git a/jar/plugin.jelly b/jar/plugin.jelly
index ee2f12ff..1bbbdbae 100644
--- a/jar/plugin.jelly
+++ b/jar/plugin.jelly
@@ -9,7 +9,47 @@
   xmlns:resources="resources"
   xmlns:util="jelly:util"
   xmlns:doc="doc"
-  xmlns:m="maven">
+  xmlns:m="maven"
+  xmlns:define="jelly:define"
+  xmlns:velocity="jelly:velocity"
+  >
+
+
+ 
+  
+  <define:taglib uri="manifest">
+  
+  <!--
+     |    
+     | @destFile
+     |
+     -->
+    <define:tag name="create-file">                  
+    
+    <j:set 
+        var="templatePath" 
+        value="${pom.getPluginContext('maven-jar-plugin').getVariable('plugin.dir')}/plugin-resources/templates"/>
+      
+    <j:set 
+        var="mainclass" 
+        value="${$pom.getPluginContext('maven-java-plugin').getVariable('maven.jar.mainclass')}"/>
+    
+    <j:set 
+        var="addExtension" 
+        value="${pom.getPluginContext('maven-jar-plugin').getVariable('${maven.jar.manifest.extensions.add')}"/>
+    
+       
+    
+      <ant:echo>Creating MANIFEST file:${destFile}</ant:echo>
+
+      <velocity:merge
+        name="${destFile}"
+        basedir="${templatePath}"
+        template="manifest.vm"/>
+    </define:tag> 
+    
+  </define:taglib>
+ 
 
   <!-- ================================================================== -->
   <!-- J A R                                                              -->
@@ -36,11 +76,13 @@
         <ant:setProperty name="manifest" value="${maven.jar.manifest}" />
       </j:if>
 
+      <!--
       <j:set var="licenseFileName"><license:fileName/></j:set>
       <util:file name="${licenseFileName}" var="licenseFile"/>
       <ant:metainf dir="${licenseFile.canonicalFile.parent}">
         <ant:include name="${licenseFile.canonicalFile.name}"/>
       </ant:metainf>
+      -->
       <ant:manifest>
         <ant:attribute name="Built-By" value="${user.name}"/>
         <ant:attribute name="Created-By" value="Apache Jakarta Maven"/>
diff --git a/jar/project.xml b/jar/project.xml
index b1b976df..86b531ac 100644
--- a/jar/project.xml
+++ b/jar/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jar-plugin</id>
   <name>Maven Jar Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jar/</url>
@@ -28,8 +28,9 @@
     
     <dependency>
       <id>velocity</id>
-      <version>1.4-dev</version>
+      <version>1.3</version>
     </dependency>
     
   </dependencies>
+
 </project>
diff --git a/java/plugin.jelly b/java/plugin.jelly
index fada81b2..df68103a 100644
--- a/java/plugin.jelly
+++ b/java/plugin.jelly
@@ -4,28 +4,8 @@
   xmlns:j="jelly:core"
   xmlns:ant="jelly:ant"
   xmlns:define="jelly:define"
-  xmlns:resources="resources">
-
-  <j:choose>
-    <j:when test="${!pom.build.resources.includes.isEmpty()}">
-      <ant:property name="maven.has.jar.resource.patterns" value="true"/>
-    </j:when>
-    <j:when test="${!pom.build.resources.excludes.isEmpty()}">
-      <ant:property name="maven.has.jar.resource.patterns" value="true"/>
-    </j:when>
-    <j:otherwise>
-      <ant:property name="maven.has.jar.resource.patterns" value="false"/>
-    </j:otherwise>
-  </j:choose>
-
-  <ant:patternset id="maven.jar.resources.set">
-    <j:forEach var="res" items="${pom.build.resources.includes}">
-      <ant:include name="${res}"/>
-    </j:forEach>
-    <j:forEach var="res" items="${pom.build.resources.excludes}">
-      <ant:exclude name="${res}"/>
-    </j:forEach>
-  </ant:patternset>
+  xmlns:resources="resources"
+  xmlns:maven="jelly:maven">
 
   <!-- ================================================================== -->
   <!-- P R E P A R E  F I L E  S Y S T E M                                -->
@@ -45,24 +25,25 @@
         prereqs="java:prepare-filesystem">
     <echo>Compiling to ${maven.build.dest}</echo>
     <j:choose>
-      <j:when test="${sourcesPresent == 'true'}">
-      	<ant:javac
+      <j:when test="${sourcesPresent}">
+        <ant:javac
           destdir="${maven.build.dest}"
           excludes="**/package.html"
-          debug="${maven.compile.debug}"
-          deprecation="${maven.compile.deprecation}"
-          target="${maven.compile.target}"
-          optimize="${maven.compile.optimize}">
-          <ant:src>
-            <ant:path refid="maven.compile.src.set"/>
-          </ant:src>
-      
+          debug="${plugins.java.compileDebug}"
+          deprecation="${plugins.java.compileDeprecation}"
+          target="${plugins.java.compileTarget}"
+          optimize="${plugins.java.compileOptimize}">
+          
+          <j:forEach var="path" items="${pom.compileSourceRootsList}">
+            <ant:src path="${path}"/>
+          </j:forEach>
+          
           <!--
            | 
            | Source Modifications.
            |
           -->
-      
+          
           <j:forEach var="sm" items="${pom.build.sourceModifications}">
             <ant:available property="classPresent" classname="${sm.className}"/>
             <j:if test="${classPresent != 'true'}">
@@ -102,6 +83,7 @@
           <j:if test="${context.getVariable('maven.compile.verbose') != null}">
             <ant:setProperty name="verbose" value="${maven.compile.verbose}" />
           </j:if>
+
         </ant:javac>
       </j:when>
       <j:otherwise>
@@ -122,14 +104,11 @@
 
   <goal name="java:jar-resources"
         description="Copy any resources that must be present in the deployed JAR file">
-    <j:set var="build" value="${pom.build}"/>
-    <j:if test="${!empty(build)}">
-      <j:if test="${!pom.build.resources.isEmpty()}">
-        <resources:copy 
-          resources="${pom.build.resources}"
-          todir="${maven.build.dest}"
-        />
-      </j:if>
+        
+    <j:if test="${!pom.build.resources.isEmpty()}">
+      <resources:copy 
+        resources="${pom.build.resources}"
+        todir="${maven.build.dest}"/>
     </j:if>
   </goal>
   
diff --git a/java/plugin.properties b/java/plugin.properties
index b16dad0c..e9a7ad7a 100644
--- a/java/plugin.properties
+++ b/java/plugin.properties
@@ -4,4 +4,7 @@
 
 maven.jar.manifest = ${maven.conf.dir}/Manifest.mf
 maven.jar.mainclass = 
-maven.compile.target = 1.1
\ No newline at end of file
+compileTarget = 1.1
+compileDebug = on
+compileOptimize = off
+compileDeprecation = off
diff --git a/java/project.xml b/java/project.xml
index d0cf475a..1c4a60bb 100644
--- a/java/project.xml
+++ b/java/project.xml
@@ -14,62 +14,4 @@
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/java/</connection>
     <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/java/</url>
   </repository>
-  <developers>
-    <developer>
-      <name>dIon Gillard</name>
-      <id>dion</id>
-      <email>dion@multitask.com.au</email>
-      <organization>Multitask Consulting</organization>
-      <roles>
-        <role>Documentation</role>
-        <role>Jelly Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <name>Bob McWhirter</name>
-      <id>werken</id>
-      <email>bob@werken.com</email>
-      <organization>The Werken Company</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <name>Vincent Massol</name>
-      <id>vmassol</id>
-      <email>vmassol@octo.com</email>
-      <organization>Octo Technology</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <name>St?phane Mor</name>
-      <id>smor</id>
-      <email>stephanemor@yahoo.fr</email>
-      <organization>Hasgard Syst?mes et R?seaux</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <name>Kurt Schrader</name>
-      <id>kschrader</id>
-      <email>kschrader@karmalab.org</email>
-      <organization>University of Michigan</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <name>Jason van Zyl</name>
-      <id>jvanzyl</id>
-      <email>jason@zenplex.com</email>
-      <organization>Zenplex</organization>
-      <roles>
-        <role>Architect</role>
-        <role>Release Manager</role>
-      </roles>
-    </developer>
-  </developers>
 </project>
diff --git a/license/plugin.jelly b/license/plugin.jelly
index 08dbdc10..6f921c70 100644
--- a/license/plugin.jelly
+++ b/license/plugin.jelly
@@ -28,7 +28,7 @@
        <util:replace var="forwardSlashFile" oldChar="\" newChar="/" trim="yes">
          <license:fileName />
        </util:replace>
-       <!-- change basedir to have forward slashes too -->
+       <!-- change bsaedir to have forward slashes too -->
        <util:replace var="forwardSlashBaseDir" value="${basedir}"
          oldChar="\" newChar="/" />
        <j:if test="${!forwardSlashBaseDir.endsWith('/')}">
@@ -46,18 +46,11 @@
   <!-- L I C E N S E                                                      -->
   <!-- ================================================================== -->
   <goal name="maven-license-plugin:register">
-      <j:set var="licenseFile"><license:fileName /></j:set>
-    <util:available file="${licenseFile}">
-      <j:set var="licensePresent" value="true"/>
-    </util:available>
-    
-    <j:if test="${licensePresent == 'true'}">
-      <doc:registerReport 
-        name="Project License" 
-        pluginName="maven-license-plugin"
-        link="license"
-        description="Displays the primary license for the project."/>
-    </j:if>
+    <doc:registerReport 
+      name="Project License" 
+      pluginName="maven-license-plugin"
+      link="license"
+      description="Displays the primary license for the project."/>
   </goal>
   
   <goal name="maven-license-plugin:deregister">
diff --git a/license/project.xml b/license/project.xml
index b94aaab9..a8079f37 100644
--- a/license/project.xml
+++ b/license/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-license-plugin</id>
   <name>Maven License Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/license/</url>
@@ -24,15 +24,6 @@
         <role>Java Developer</role>
       </roles>
     </developer>
-    <developer>
-      <name>Emmanuel Venisse</name>
-      <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
     <developer>
       <name>dIon Gillard</name>
       <id>dion</id>
diff --git a/plugin/plugin.jelly b/plugin/plugin.jelly
index b9e6242d..3e55825b 100644
--- a/plugin/plugin.jelly
+++ b/plugin/plugin.jelly
@@ -7,7 +7,10 @@
 
   <goal name="plugin" description="Build a plugin jar and install to the maven.local.repo">
 
-    <!-- Plugins are just a jar. -->
+    <!-- big change. Most plugins are just a jar and have
+        copied the maven.xml to tweak the resources
+        Now it is up to the plugin to define the resources.
+      -->
     <attainGoal name="jar:jar"/>
 
     <copy file="${maven.build.dir}/${maven.final.name}.jar"
diff --git a/test/plugin.jelly b/test/plugin.jelly
index f83dfdd9..412eb51b 100644
--- a/test/plugin.jelly
+++ b/test/plugin.jelly
@@ -1,64 +1,76 @@
 <?xml version="1.0"?>
 
-<project xmlns:j="jelly:core" 
-         xmlns:u="jelly:util" 
-         xmlns:resources="resources"
-         xmlns:define="jelly:define">
-  
-  <goal name="test" 
+<project 
+  xmlns:j="jelly:core"
+  xmlns:u="jelly:util"
+  xmlns:resources="resources"
+  xmlns:ant="jelly:ant"
+  xmlns:define="jelly:define">
+
+  <goal name="test"
         description="Test the application"
         prereqs="test:test"/>
 
   <goal name="test:prepare-filesystem"
         description="Create the needed directory structure">
-    <mkdir dir="${maven.test.dest}"/>
-    <mkdir dir="${maven.test.reportsDirectory}"/>
+    <mkdir dir="${plugins.test.testDest}"/>
+    <mkdir dir="${plugins.test.reportsDirectory}"/>
   </goal>
- 
+
   <goal name="test:compile"
         description="Compile the TestCases and TestSuites"
         prereqs="java:compile,java:jar-resources,test:prepare-filesystem,test:test-resources">
 
-    <j:if test="${unitTestSourcesPresent == 'true'}">
+    <j:choose>
+      <j:when test="${unitTestSourcesPresent}">
       
-      <javac 
-        destdir="${maven.test.dest}"
-        excludes="**/package.html"
-        debug="${maven.compile.debug}"
-        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>
-        <classpath>
-          <pathelement path="${maven.build.dest}"/>
-          <path refid="maven.dependency.classpath"/>
-          <pathelement path="${plugin.getDependencyPath('junit')}"/>
-        </classpath>
-        <src>
-          <path refid="maven.test.compile.src.set"/>
-        </src>
-      </javac>
-    </j:if>
+         <echo>Compiling test sources ...</echo>
+          
+         <ant:javac
+          destdir="${plugins.test.testDest}"
+          excludes="**/package.html"
+          debug="${plugins.test.compileDebug}"
+          deprecation="${plugins.test.compileDeprecation}"
+          optimize="${plugins.test.compileOptimize}">
 
-    <j:if test="${!unitTestSourcesPresent}">
-      <echo>No test source files to compile.</echo>
-    </j:if>
-      
+          <j:forEach var="path" items="${pom.testCompileSourceRootsList}">
+            <src path="${path}"/>
+          </j:forEach>
+
+          <j:if test="${context.getVariable('maven.test.source') != null}">
+            <setProperty name="source" value="${maven.test.source}" />
+          </j:if>
+
+          <classpath>
+            <pathelement path="${maven.build.dest}"/>
+            <path refid="maven.dependency.classpath"/>
+            <pathelement path="${plugin.getDependencyPath('junit')}"/>
+          </classpath>
+        </ant:javac>
+      </j:when>
+      <j:otherwise>
+        <echo>No test sources to compile.</echo>
+      </j:otherwise>
+    </j:choose>
   </goal>
 
   <goal name="test:test"
         description="Test the application"
         prereqs="test:compile">
-      
-    <j:if test="${unitTestSourcesPresent == 'true' and context.getVariable('maven.test.skip') != 'true'}">
-      
+        
+        <!--
+        
+    <j:choose>
+    
+    <j:when test="${unitTestSourcesPresent}">
+
+      <j:if test="${!plugins.test.skipTests}">
+
       <taskdef
         name="junit"
-        classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"
-      />
-      
-      <junit printSummary="yes" 
+        classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
+
+      <junit printSummary="yes"
              failureProperty="maven.test.failure"
              fork="${maven.junit.fork}"
              dir="${maven.junit.dir}">
@@ -87,7 +99,6 @@
             <j:forEach var="pat" items="${pom.build.unitTest.excludes}">
               <exclude name="${pat}"/>
             </j:forEach>
-              <!-- KEEP ALL ABSTRACT TESTS FROM BEING RUN! -->
               <exclude name="**/*AbstractTestCase.java"/>
           </fileset>
         </batchtest>
@@ -99,19 +110,24 @@
           <fail message="There were test failures."/>
         </j:if>
       </j:if>
+      
+      </j:if>
+      
+    </j:when>
 
-    </j:if>
-    
-    <j:if test="${!unitTestSourcesPresent}">
+    <j:otherwise>
       <echo>No tests to run.</echo>
-    </j:if>
+    </j:otherwise>
+    </j:choose>
+    
+    -->
 
   </goal>
 
   <goal name="test:ui"
         description="Starts the Swing TestRunner front end"
         prereqs="test:compile">
-        
+
     <java classname="junit.swingui.TestRunner" fork="yes">
       <sysproperty key="basedir" value="${basedir}"/>
       <u:tokenize var="listOfProperties" delim=" ">${maven.junit.sysproperties}</u:tokenize>
@@ -130,7 +146,7 @@
       </classpath>
       <arg value="-noloading"/>
     </java>
-        
+
   </goal>
 
 
@@ -138,29 +154,29 @@
         description="Execute a single test defined using the 'testcase' variable"
         prereqs="test:compile">
 
-    <j:if test="${unitTestSourcesPresent == 'true'}">
-    
+    <j:if test="${unitTestSourcesPresent}">
+
       <j:choose>
         <j:when test="${empty(testcase)}">
         <echo>
           You must define the test case to run via -Dtestcase=classname
-          Example: maven -Dtestcase=MyTest test:single
+          Example: maven -Dtestcase=MyTest test:single-test
         </echo>
         </j:when>
-        
+
         <j:otherwise>
-    
+
           <taskdef
             name="junit"
             classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"
           />
 
-          <junit printSummary="yes" 
-                 haltonfailure="yes" 
-                 haltonerror="yes" 
+          <junit printSummary="yes"
+                 haltonfailure="yes"
+                 haltonerror="yes"
                  fork="${maven.junit.fork}"
                  dir="${maven.junit.dir}">
- 
+
             <sysproperty key="basedir" value="${basedir}"/>
             <u:tokenize var="listOfProperties" delim=" ">${maven.junit.sysproperties}</u:tokenize>
             <j:forEach var="someProperty" items="${listOfProperties}">
@@ -182,13 +198,13 @@
             </classpath>
 
             <test name="${testcase}" todir="${maven.test.reportsDirectory}"/>
-            
+
           </junit>
-        
+
         </j:otherwise>
       </j:choose>
     </j:if>
-    
+
     <j:if test="${!unitTestSourcesPresent}">
       <echo>No tests to run.</echo>
     </j:if>
@@ -200,29 +216,29 @@
         description="Execute all the tests matching the given 'testmatch' variable"
         prereqs="test:compile">
 
-    <j:if test="${unitTestSourcesPresent == 'true'}">
-    
+    <j:if test="${unitTestSourcesPresent}">
+
       <j:choose>
         <j:when test="${empty(testmatch)}">
         <echo>
           You must define the test case to run via -Dtestmatch=pattern
-          Example: maven -Dtestmatch=*Foo* test:match
+          Example: maven -Dtestmatch=*Foo* test:match-test
         </echo>
         </j:when>
-        
+
         <j:otherwise>
-    
+
           <taskdef
             name="junit"
             classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"
           />
-    
-          <junit printSummary="yes" 
-                 haltonfailure="yes" 
-                 haltonerror="yes" 
+
+          <junit printSummary="yes"
+                 haltonfailure="yes"
+                 haltonerror="yes"
                  fork="${maven.junit.fork}"
                  dir="${maven.junit.dir}">
- 
+
             <sysproperty key="basedir" value="${basedir}"/>
             <u:tokenize var="listOfProperties" delim=" ">${maven.junit.sysproperties}</u:tokenize>
             <j:forEach var="someProperty" items="${listOfProperties}">
@@ -249,13 +265,13 @@
                 <include name="**/${testmatch}.java"/>
               </fileset>
             </batchtest>
-            
+
           </junit>
-        
+
         </j:otherwise>
       </j:choose>
     </j:if>
-    
+
     <j:if test="${!unitTestSourcesPresent}">
       <echo>No tests to run.</echo>
     </j:if>
@@ -264,9 +280,9 @@
 
   <goal name="test:single-test"
         description="[deprecated] please use the test:single goal instead">
-        
+
     <echo>[deprecated] please use the test:single goal instead</echo>
-            
+
     <attainGoal name="test:single"/>
   </goal>
 
@@ -274,14 +290,14 @@
         description="[deprecated] please use the test:match goal instead">
 
     <echo>[deprecated] please use the test:match goal instead</echo>
-    
+
     <attainGoal name="test:match"/>
   </goal>
-  
+
   <goal name="test:eclipse">
       <echo>Used by eclipse to drag in test plugin context</echo>
   </goal>
-            
+
   <!-- ================================================================== -->
   <!-- T E S T  R E S O U R C E S                                         -->
   <!-- ================================================================== -->
@@ -291,16 +307,16 @@
         prereqs="test:prepare-filesystem"
         xmlns:resources="resources">
 
-    <j:if test="${unitTestSourcesPresent == 'true'}">
+    <j:if test="${unitTestSourcesPresent}">
       <j:if test="${!pom.build.unitTest.resources.isEmpty()}">
-        <resources:copy 
+        <resources:copy
           resources="${pom.build.unitTest.resources}"
-          todir="${maven.test.dest}" 
+          todir="${maven.test.dest}"
         />
       </j:if>
     </j:if>
   </goal>
-  
+
   <define:taglib uri="test">
     <define:tag name="dependency-handle">
       <!-- XXX Use this tag to allow this plugin to be loaded into another -->
diff --git a/test/plugin.properties b/test/plugin.properties
index ed13ce25..89ec4e93 100644
--- a/test/plugin.properties
+++ b/test/plugin.properties
@@ -10,4 +10,13 @@ maven.junit.usefile = true
 maven.test.dest = ${maven.build.dir}/test-classes
 maven.test.reportsDirectory = ${maven.build.dir}/test-reports
 maven.test.skip = false
-maven.junit.jvmargs=
\ No newline at end of file
+maven.junit.jvmargs=
+
+skipTests = false
+
+compileDebug = on
+compileDeprecation = on
+compileOptimize = off
+
+testDest = ${basedir}/target/test-classes
+reportsDirectory = ${basedir}/target/test-reports
diff --git a/test/project.xml b/test/project.xml
index 98194a17..28f18f6d 100644
--- a/test/project.xml
+++ b/test/project.xml
@@ -33,7 +33,7 @@
     </dependency>
     <dependency>
       <id>xerces</id>
-      <version>2.4.0</version>
+      <version>2.0.2</version>
       <url>http://xml.apache.org/xerces2-j/</url>
       <properties>
         <classloader>root</classloader>
diff --git a/touchstone-partner/plugin.jelly b/touchstone-partner/plugin.jelly
index d49b1302..ca2cd731 100644
--- a/touchstone-partner/plugin.jelly
+++ b/touchstone-partner/plugin.jelly
@@ -6,6 +6,7 @@
   <preGoal name="touchstone-goal-C">
     <echo>preGoal for touchstone-goal-C is running ...</echo>
     <j:set var="touchstone_partner_preGoal_C" value="true"/>
+    <echo>inside touchstone-partner : ${plugin.id}</echo>
   </preGoal>
   
   <preGoal name="touchstone-goal-D">
diff --git a/touchstone/plugin.properties b/touchstone/plugin.properties
index 257e5552..9f1fa64c 100644
--- a/touchstone/plugin.properties
+++ b/touchstone/plugin.properties
@@ -6,7 +6,13 @@
 # -------------------------------------------------------------------
 
 maven.touchstone.A = A
-maven.touchstone.B = C
+maven.touchstone.B = B
 maven.touchstone.C = C
 maven.touchstone.D = D
 maven.touchstone.E = E
+
+touchstoneA = A
+touchstoneB = B
+touchstoneC = C
+touchstoneD = D
+touchstoneE = E