werken 2002/06/26 12:51:52
Modified: src/java/org/apache/maven/app Maven.java
src/templates/build/plugins/test plugin.jelly
Log:
Hack to almost get junit working. ball is back in strachan's court now.
Revision Changes Path
1.22 +10 -1 jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Maven.java 26 Jun 2002 19:13:25 -0000 1.21
+++ Maven.java 26 Jun 2002 19:51:52 -0000 1.22
@@ -646,7 +646,16 @@
GrantProject project = getAntProject();
- project.addBuildListener(new JellyBuildListener(output));
+ JellyBuildListener listener = new JellyBuildListener(output);
+
+ if ( getCli().hasOption( 'x' )
+ ||
+ getCli().hasOption( 'X' ) )
+ {
+ listener.isDebug(true);
+ }
+
+ project.addBuildListener(listener);
PrintStream demuxOut = new PrintStream(new DemuxOutputStream(project,
false));
1.7 +6 -1
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 26 Jun 2002 19:16:03 -0000 1.6
+++ plugin.jelly 26 Jun 2002 19:51:52 -0000 1.7
@@ -1,10 +1,15 @@
<project xmlns:j="jelly:core">
- <patternset id="maven.unit.test.set">
+ <patternset id="maven.unit.test.set"
+ includes="${pom.build.unitTestPatterns.get(0)}">
+<!--
+ <include name="${pom.build.unitTestPatterns.get(0)}"/>
<j:forEach var="pat" items="${pom.build.unitTestPatterns}">
+ <echo message="pat: ${pat}"/>
<include name="${pat}"/>
</j:forEach>
+-->
</patternset>
<goal name="maven:test.prepare-filesystem">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
