werken 2002/06/27 12:46:04
Modified: . project-ng.xml
src/templates/build/plugins/test plugin.jelly
Log:
* Removed aweful hack for junit patternset stuff. Requires a change
to project(-ng).xml <unitTestPattern> element content.
Revision Changes Path
1.9 +2 -2 jakarta-turbine-maven/project-ng.xml
Index: project-ng.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project-ng.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project-ng.xml 27 Jun 2002 19:31:19 -0000 1.8
+++ project-ng.xml 27 Jun 2002 19:46:03 -0000 1.9
@@ -509,14 +509,14 @@
<sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<integrationUnitTestSourceDirectory/>
<aspectSourceDirectory></aspectSourceDirectory>
<!-- Unit test classes -->
<unitTestPatterns>
- <unitTestPattern>include = **/*Test.java</unitTestPattern>
+ <unitTestPattern>**/*Test.java</unitTestPattern>
</unitTestPatterns>
<!-- Integration unit test classes -->
1.9 +8 -7
jakarta-turbine-maven/src/templates/build/plugins/test/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/test/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 27 Jun 2002 16:04:51 -0000 1.8
+++ plugin.jelly 27 Jun 2002 19:46:04 -0000 1.9
@@ -1,15 +1,15 @@
<project xmlns:j="jelly:core">
- <patternset id="maven.unit.test.set"
- includes="${pom.build.unitTestPatterns.get(0)}">
<!--
- <include name="${pom.build.unitTestPatterns.get(0)}"/>
+ <patternset id="maven.unit.test.set"
+ includes="${pom.build.unitTestPatterns.get(0)}"/>
+-->
+
+ <patternset id="maven.unit.test.set">
<j:forEach var="pat" items="${pom.build.unitTestPatterns}">
- <echo message="pat: ${pat}"/>
<include name="${pat}"/>
</j:forEach>
--->
</patternset>
<goal name="maven:test.prepare-filesystem">
@@ -39,10 +39,11 @@
<goal name="maven:test"
prereqs="maven:compile-test">
+<!--
<echo>
- Running all JUnit tests in ${maven.junit.dir}
+ Running all JUnit tests in ${pom.build.unitTestSourceDirectory}
</echo>
-
+-->
<junit printSummary="yes"
failureProperty="maven.test.failure"
fork="${maven.junit.fork}"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
