svn commit: r388684 - in /maven/maven-1/plugins/trunk/test: plugin.jelly plugin.properties xdocs/changes.xml xdocs/properties.xml

[ltheussl]

Author: ltheussl
Date: Fri Mar 24 16:57:00 2006
New Revision: 388684

URL: http://svn.apache.org/viewcvs?rev=388684&view=rev
Log:
PR: MPTEST-47
Submitted by: Henning Schmiedehausen
Allow to add additional elements to the test classpath,
new property maven.test.classpath.

Modified:
    maven/maven-1/plugins/trunk/test/plugin.jelly
    maven/maven-1/plugins/trunk/test/plugin.properties
    maven/maven-1/plugins/trunk/test/xdocs/changes.xml
    maven/maven-1/plugins/trunk/test/xdocs/properties.xml

Modified: maven/maven-1/plugins/trunk/test/plugin.jelly
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/plugin.jelly?rev=388684&r1=388683&r2=388684&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/test/plugin.jelly Fri Mar 24 16:57:00 2006
@@ -179,6 +179,9 @@
             <pathelement 
path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
             <pathelement 
path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
           </j:if>
+          <j:if test="${not 
empty(context.getVariable('maven.test.classpath'))}">
+            <pathelement path="${maven.test.classpath}"/>
+          </j:if>
         </classpath>
         <batchtest todir="${maven.test.reportsDirectory}">
           <fileset dir="${maven.test.searchdir}">
@@ -239,6 +242,9 @@
           <pathelement 
path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
           <pathelement 
path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
         </j:if>
+        <j:if test="${not empty(context.getVariable('maven.test.classpath'))}">
+          <pathelement path="${maven.test.classpath}"/>
+        </j:if>
       </classpath>
       <arg value="-noloading"/>
     </java>
@@ -321,6 +327,9 @@
                 <pathelement 
path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
                 <pathelement 
path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
               </j:if>
+              <j:if test="${not 
empty(context.getVariable('maven.test.classpath'))}">
+                <pathelement path="${maven.test.classpath}"/>
+              </j:if>
             </classpath>
 
             <test name="${testcase}" todir="${maven.test.reportsDirectory}"/>
@@ -424,6 +433,9 @@
               <j:if 
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')
 and 
!context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes')
 }">
                 <pathelement 
path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
                 <pathelement 
path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
+              </j:if>
+              <j:if test="${not 
empty(context.getVariable('maven.test.classpath'))}">
+                <pathelement path="${maven.test.classpath}"/>
               </j:if>
             </classpath>
 

Modified: maven/maven-1/plugins/trunk/test/plugin.properties
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/plugin.properties?rev=388684&r1=388683&r2=388684&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/test/plugin.properties Fri Mar 24 16:57:00 2006
@@ -35,3 +35,4 @@
 maven.test.reportsDirectory = ${maven.build.dir}/test-reports
 maven.test.skip = false
 maven.test.excludeXmlApis = no
+maven.test.classpath =

Modified: maven/maven-1/plugins/trunk/test/xdocs/changes.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/xdocs/changes.xml?rev=388684&r1=388683&r2=388684&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/test/xdocs/changes.xml Fri Mar 24 16:57:00 2006
@@ -24,6 +24,7 @@
   </properties>
   <body>
     <release version="1.8-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="add" issue="MPTEST-47" due-to="Henning 
Schmiedehausen">Allow to add additional elements to the test classpath, new 
property <code>maven.test.classpath</code>.</action>
       <action dev="ltheussl" type="add" issue="MPTEST-36">Display a warning if 
some tests do not pass (and 
<code>maven.test.failure.ignore=true</code>).</action>
       <action dev="ltheussl" type="add" issue="MPTEST-10">Add timeouts to the 
test plugin, new property <code>maven.junit.timeout</code>.</action>
       <action dev="ltheussl" type="add" issue="MPTEST-58" due-to="Mauro 
Botelho">Add ability to fail the build on test errors, new property 
<code>maven.test.error.ignore</code>.</action>

Modified: maven/maven-1/plugins/trunk/test/xdocs/properties.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/xdocs/properties.xml?rev=388684&r1=388683&r2=388684&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/test/xdocs/properties.xml Fri Mar 24 16:57:00 
2006
@@ -165,6 +165,16 @@
           </td>
         </tr>
         <tr>
+          <td>maven.test.classpath</td>
+          <td>Yes</td>
+          <td>
+            Specifies one or more locations that will be added to
+            the classpath when the tests are run. Multiple values
+            can be used; the rules of the ant &lt;pathelement 
path=&quot;...&quot;&gt;
+            directive apply.
+          </td>
+        </tr>
+        <tr>
           <td>maven.junit.jvmargs</td>
           <td>Yes</td>
           <td>