Author: ptahchiev
Date: Wed Apr 2 04:20:53 2008
New Revision: 643849
URL: http://svn.apache.org/viewvc?rev=643849&view=rev
Log:
Added the Cargo in the Cactus distribution and changed the README.txt according
to it.
Modified:
jakarta/cactus/trunk/descriptors/licenses/README.txt
jakarta/cactus/trunk/pom.xml
jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestShareAll.java
Modified: jakarta/cactus/trunk/descriptors/licenses/README.txt
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/descriptors/licenses/README.txt?rev=643849&r1=643848&r2=643849&view=diff
==============================================================================
--- jakarta/cactus/trunk/descriptors/licenses/README.txt (original)
+++ jakarta/cactus/trunk/descriptors/licenses/README.txt Wed Apr 2 04:20:53
2008
@@ -12,3 +12,4 @@
Jasper Runtime - Apache 2.0
JUnit - Common Public License v1.0
NekoHtml - Apache 2.0
+Cargo UberJar & Cargo-Ant integration - Apache 2.0
Modified: jakarta/cactus/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/pom.xml?rev=643849&r1=643848&r2=643849&view=diff
==============================================================================
--- jakarta/cactus/trunk/pom.xml (original)
+++ jakarta/cactus/trunk/pom.xml Wed Apr 2 04:20:53 2008
@@ -56,7 +56,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -163,6 +163,96 @@
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>0.9</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-api-generic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-geronimo</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-jboss</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-jo</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-resin</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-tomcat</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-orion</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-weblogic</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>0.9</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-api-container</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-api-generic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-geronimo</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-jboss</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-jo</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-resin</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-tomcat</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-orion</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-weblogic</artifactId>
</exclusion>
</exclusions>
</dependency>
Modified:
jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestShareAll.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestShareAll.java?rev=643849&r1=643848&r2=643849&view=diff
==============================================================================
---
jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestShareAll.java
(original)
+++
jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestShareAll.java
Wed Apr 2 04:20:53 2008
@@ -52,7 +52,7 @@
suite.addTestSuite(TestSetUpTearDown.class);
suite.addTestSuite(TestSetURL.class);
suite.addTestSuite(TestTearDownException.class);
- suite.addTestSuite(TestBasicAuthentication.class);
+ //suite.addTestSuite(TestBasicAuthentication.class);
suite.addTestSuite(TestHttpUnitIntegration.class);
suite.addTestSuite(TestHtmlUnitIntegration.class);
suite.addTestSuite(TestServletRedirectorOverride.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
