cvs commit: jakarta-turbine-maven/src/plugins-build/test plugin.jelly

[evenisse]

evenisse    2002/10/29 22:07:28

  Modified:    src/plugins-build/test plugin.jelly
  Log:
  Update classpath of junit tasks
  
  Revision  Changes    Path
  1.21      +13 -5     jakarta-turbine-maven/src/plugins-build/test/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/test/plugin.jelly,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- plugin.jelly      24 Oct 2002 22:15:03 -0000      1.20
  +++ plugin.jelly      30 Oct 2002 06:07:28 -0000      1.21
  @@ -103,11 +103,17 @@
           prereqs="test:compile">
           
       <java classname="junit.swingui.TestRunner" fork="yes">
  -        <classpath>
  -          <path refid="maven.dependency.classpath"/>
  -          <pathelement location="${maven.build.dest}"/>
  -          <pathelement location="${maven.test.dest}"/>
  -        </classpath>
  +      <sysproperty key="basedir" value="${basedir}"/>
  +      <u:tokenize var="listOfProperties" delim=" 
">${maven.junit.sysproperties}</u:tokenize>
  +      <j:forEach var="someProperty" items="${listOfProperties}">
  +        <sysproperty key="${someProperty}" 
value="${context.findVariable(someProperty)}"/>
  +      </j:forEach>
  +      <classpath>
  +        <path refid="maven.dependency.classpath"/>
  +        <pathelement location="${maven.build.dest}"/>
  +        <pathelement location="${maven.test.dest}"/>
  +        <pathelement path="${plugin.getDependencyPath('junit')}"/>
  +      </classpath>
         <arg value="-noloading"/>
       </java>
           
  @@ -154,6 +160,7 @@
                 <path refid="maven.dependency.classpath"/>
                 <pathelement location="${maven.build.dest}"/>
                 <pathelement location="${maven.test.dest}"/>
  +              <pathelement path="${plugin.getDependencyPath('junit')}"/>
               </classpath>
   
               <test name="${testcase}" todir="${maven.test.reportsDirectory}"/>
  @@ -211,6 +218,7 @@
                 <path refid="maven.dependency.classpath"/>
                 <pathelement location="${maven.build.dest}"/>
                 <pathelement location="${maven.test.dest}"/>
  +              <pathelement path="${plugin.getDependencyPath('junit')}"/>
               </classpath>
   
               <batchtest todir="${maven.test.reportsDirectory}">
  
  
  

--
To unsubscribe, e-mail:   <mailto:turbine-maven-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:turbine-maven-dev-help@;jakarta.apache.org>