[cvs] expresso commit by rimovm: -Work on Maven-Cactus Integration.

[JCorporate Ltd]

Log Message:
-----------
-Work on Maven-Cactus Integration.  Cactus WAR appears to be properly built now, but App Server isn't launching and testing yet.
-Fixed bug in Expresso-WAR build where web.xml wasn't included.

Modified Files:
--------------
    expresso:
        project.properties
        project.xml

Revision Data
-------------
Index: project.xml
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lproject.xml -Lproject.xml -u -r1.12 -r1.13
--- project.xml
+++ project.xml
@@ -184,8 +184,11 @@
 		<dependency>
 			<groupId>aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>
-			<version>1.1.1</version>
+			<version>1.2.1</version>
 			<url>http://www.eclipse.org/aspectj</url>
+			<properties>
+				<cactus.bundle>true</cactus.bundle>
+			</properties>
 		</dependency>
 		<dependency>
 			<groupId>activation</groupId>
@@ -211,6 +214,7 @@
 			<url>http://avalon.apache.org/</url>
 			<properties>
 				<war.bundle>true</war.bundle>
+				<cactus.bundle>true</cactus.bundle>
 			</properties>
 		</dependency>
 		<dependency>
@@ -238,14 +242,20 @@
 		<dependency>
 			<groupId>cactus</groupId>
 			<artifactId>cactus-13</artifactId>
-			<version>1.6.1</version>
+			<version>1.7</version>
 			<url>http://jakarta.apache.org/cactus/</url>
+			<properties>
+				<cactus.bundle>true</cactus.bundle>
+			</properties>
 		</dependency>
 		<dependency>
 			<groupId>cactus</groupId>
 			<artifactId>cactus-ant-13</artifactId>
-			<version>1.6.1</version>
+			<version>1.7</version>
 			<url>http://jakarta.apache.org/cactus/</url>
+			<properties>
+				<cactus.bundle>true</cactus.bundle>
+			</properties>
 		</dependency>
 		<dependency>
 			<id>commons-beanutils</id>
@@ -259,6 +269,9 @@
 			<id>commons-chain</id>
 			<version>1.0</version>
 			<url>http://jakarta.apache.org/commons/chain/</url>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
 		</dependency>
 		<dependency>
 			<id>commons-collections</id>
@@ -278,8 +291,11 @@
 		</dependency>
 		<dependency>
 			<id>commons-httpclient</id>
-			<version>2.0</version>
+			<version>2.0.2</version>
 			<url>http://jakarta.apache.org/commons/httpclient/</url>
+			<properties>
+				<cactus.bundle>true</cactus.bundle>
+			</properties>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -338,7 +354,7 @@
 		<dependency>
 			<groupId>httpunit</groupId>
 			<artifactId>httpunit</artifactId>
-			<version>1.5.4</version>
+			<version>1.6</version>
 			<url>http://httpunit.sourceforge.net/</url>
 		</dependency>
 		<dependency>
@@ -417,6 +433,9 @@
 			<id>junit</id>
 			<version>3.8.1</version>
 			<url>http://www.junit.org></url>
+			<properties>
+				<cactus.bundle>true</cactus.bundle>
+			</properties>
 		</dependency>
 		<dependency>
 			<id>jmock</id>
@@ -453,6 +472,10 @@
 			<properties>
 				<war.bundle>true</war.bundle>
 			</properties>
+		</dependency>
+		<dependency>
+			<id>nekohtml</id>
+			<version>0.9.1</version>
 		</dependency>
 		<dependency>
 			<id>saxpath</id>
Index: project.properties
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lproject.properties -Lproject.properties -u -r1.2 -r1.3
--- project.properties
+++ project.properties
@@ -50,3 +50,16 @@
 junit.argv.logDir=${basedir}/expresso-web/WEB-INF/log
 maven.junit.fork=yes
 
+
+#######################################################
+#Maven War Properties
+#######################################################
+maven.war.webxml=${basedir}/expresso-web/WEB-INF/web.xml
+
+########################################################
+#Maven Cactus Properties
+########################################################
+cactus.home.tomcat5x=${env.TOMCAT_HOME}
+cactus.src.dir=expresso-web/WEB-INF/test-src
+cactus.test.includes=**/ServerSideTestSuite.*
+