vmassol     2002/09/30 03:10:01

  Modified:    src/plugins-build/test plugin.jelly
  Added:       src/plugins-build/test/xdocs changes.xml
  Log:
  The test plugin now works again if the project has not tests defined. The 
introduction of the <test:test-resources> goal had broken this feature.
  
  Revision  Changes    Path
  1.16      +18 -14    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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- plugin.jelly      25 Sep 2002 15:45:03 -0000      1.15
  +++ plugin.jelly      30 Sep 2002 10:10:01 -0000      1.16
  @@ -280,23 +280,27 @@
           description="Copy any resources that must be present for run tests"
           prereqs="test:prepare-filesystem">
   
  -    <j:if test="${maven.has.test.resource.patterns}">
  +    <j:if test="${unitTestSourcesPresent}">
   
  -      <!-- Copy any resources that must be present for run tests. -->
  +      <j:if test="${maven.has.test.resource.patterns}">
   
  -      <copy todir="${maven.test.dest}">
  -        <j:forEach var="res" items="${pom.build.testResources}">
  -          <fileset dir="${res.directory}">
  -            <j:forEach var="inc" items="${res.includes}">
  -              <include name="${inc}"/>
  -            </j:forEach>
  -            <j:forEach var="exc" items="${res.excludes}">
  -              <exclude name="${exc}"/>
  -            </j:forEach>
  -          </fileset>
  -        </j:forEach>
  -      </copy>
  +        <!-- Copy any resources that must be present for run tests. -->
  +
  +        <copy todir="${maven.test.dest}">
  +          <j:forEach var="res" items="${pom.build.testResources}">
  +            <fileset dir="${res.directory}">
  +              <j:forEach var="inc" items="${res.includes}">
  +                <include name="${inc}"/>
  +              </j:forEach>
  +              <j:forEach var="exc" items="${res.excludes}">
  +                <exclude name="${exc}"/>
  +              </j:forEach>
  +            </fileset>
  +          </j:forEach>
  +        </copy>
  +      </j:if>      
       </j:if>
  +
     </goal>
   
   </project>
  
  
  
  1.1                  jakarta-turbine-maven/src/plugins-build/test/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  <?xml version="1.0"?>
  <document>
    <properties>
      <title>Changes</title>
      <author email="[EMAIL PROTECTED]">dIon Gillard</author>
    </properties>
  
    <body>
      <release version="1.1" date="in CVS">
        <action dev="vmassol" type="fix">
          The test plugin now works again if the project has not
          tests defined. The introduction of the &lt;test:test-resources&gt;
          goal had broken this feature.
        </action>
      </release>
    </body>
  </document>
  
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to