vmassol 2004/05/14 06:28:47
Modified: framework project.xml project.properties
. default-project.xml
Log:
- Fixed tests: now all tests are run, including J2EE API specific ones
- Added Jetty jar as dependency as it's required for J2EE 1.3 tests
Note: We should work towards having 3 frameworks projects instead: one for shared/
one for j2ee12/ and one for j2ee13/. It seems this fits better with Maven. Quite some
work is involved though...
Revision Changes Path
1.14 +6 -0 jakarta-cactus/framework/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 13 May 2004 11:55:21 -0000 1.13
+++ project.xml 14 May 2004 13:28:47 -0000 1.14
@@ -48,6 +48,12 @@
<url>http://www.mockobjects.com</url>
</dependency>
<dependency>
+ <groupId>jetty</groupId>
+ <artifactId>org.mortbay.jetty</artifactId>
+ <version>4.2.17</version>
+ <url>http://jetty.mortbay.org/jetty/</url>
+ </dependency>
+ <dependency>
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
<version>1.5.4</version>
1.14 +11 -6 jakarta-cactus/framework/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/project.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.properties 9 Apr 2004 17:12:52 -0000 1.13
+++ project.properties 14 May 2004 13:28:47 -0000 1.14
@@ -38,14 +38,19 @@
maven.javadoc.windowtitle = ${pom.name} ${pom.currentVersion} API (J2EE
${cactus.j2ee.version.full})
# Display junit execution details on screen
-maven.junit.usefile=false
+maven.junit.usefile = false
# Do not display junit test suite summary information
-maven.junit.printSummary=false
+maven.junit.printSummary = false
+
+# Have the test plugin look for junit tests in .class files rather in .java
+# source files. We need this as we're aggreating test sources from different
+# places (share + J2EE API specific).
+maven.test.search.classdir = true
# Automatically weave aspects in the generated jar
-maven.aspectj.autoweave=true
+maven.aspectj.autoweave = true
# Jdiff plugin properties
-maven.jdiff.old.tag=CACTUS_15_RELEASE
-maven.jdiff.new.tag=HEAD
+maven.jdiff.old.tag = CACTUS_16_RELEASE
+maven.jdiff.new.tag = HEAD
1.16 +3 -2 jakarta-cactus/default-project.xml
Index: default-project.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/default-project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- default-project.xml 13 May 2004 12:09:41 -0000 1.15
+++ default-project.xml 14 May 2004 13:28:47 -0000 1.16
@@ -156,10 +156,11 @@
<unitTestSourceDirectory>src/test/share</unitTestSourceDirectory>
<unitTest>
<includes>
- <include>**/Test*.java</include>
+ <include>**/Test*.class</include>
</includes>
<excludes>
- <exclude>**/Test*All.java</exclude>
+ <exclude>**/Test*All.class</exclude>
+ <exclude>**/Test*$$*.class</exclude>
</excludes>
</unitTest>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
