Author: ptahchiev
Date: Mon Jun 30 07:49:58 2008
New Revision: 672785
URL: http://svn.apache.org/viewvc?rev=672785&view=rev
Log:
Changed the version of Cargo we use.
Modified:
jakarta/cactus/trunk/.classpath
jakarta/cactus/trunk/pom.xml
jakarta/cactus/trunk/samples/ejb3/src/main/java/org/apache/cactus/sample/ejb3/TestConverterEJB.java
Modified: jakarta/cactus/trunk/.classpath
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/.classpath?rev=672785&r1=672784&r2=672785&view=diff
==============================================================================
--- jakarta/cactus/trunk/.classpath (original)
+++ jakarta/cactus/trunk/.classpath Mon Jun 30 07:49:58 2008
@@ -1,47 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
- <classpathentry kind="var"
path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/codehaus/cargo/cargo-ant/0.9/cargo-ant-0.9.jar"/>
- <classpathentry kind="src"
path="framework/framework-12-13-14/src/main/java"/>
- <classpathentry kind="src" path="integration/maven2/src/main/java"/>
- <classpathentry kind="var"
path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/>
- <classpathentry kind="var"
path="M2_REPO/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="src"
path="framework/framework-13-14/src/main/java"/>
- <classpathentry kind="src"
path="framework/framework-12-13-14/src/test/java"/>
- <classpathentry kind="var"
path="M2_REPO/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/maven/shared/file-management/1.1/file-management-1.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/mockobjects/mockobjects-core/0.09/mockobjects-core-0.09.jar"/>
- <classpathentry kind="var"
path="M2_REPO/commons-jelly/commons-jelly/20030902.160215/commons-jelly-20030902.160215.jar"/>
- <classpathentry kind="var"
path="M2_REPO/commons-jelly/commons-jelly-tags-ant/20030625.032346/commons-jelly-tags-ant-20030625.032346.jar"/>
- <classpathentry kind="var"
path="M2_REPO/commons-jelly/commons-jelly-tags-xml/20030211.142705/commons-jelly-tags-xml-20030211.142705.jar"/>
- <classpathentry kind="var"
path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
- <classpathentry kind="var"
path="M2_REPO/httpunit/httpunit/1.6/httpunit-1.6.jar"/>
- <classpathentry kind="var"
path="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar"/>
- <classpathentry kind="src" path="samples/servlet/src/main/java"/>
- <classpathentry kind="var"
path="M2_REPO/htmlunit/htmlunit/1.10/htmlunit-1.10.jar"/>
- <classpathentry kind="src" path="integration/ant/src/main/java"/>
- <classpathentry kind="src"
path="integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java"/>
- <classpathentry kind="src" path="samples/jetty/src/main/cactus"/>
- <classpathentry kind="var"
path="M2_REPO/org/codehaus/cargo/cargo-core-uberjar/1.0-SNAPSHOT/cargo-core-uberjar-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="src" path="integration/ant/src/test/java"/>
- <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
- <classpathentry kind="var"
path="M2_REPO/jmock/jmock/1.0.1/jmock-1.0.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/cactus/cactus.integration.shared.api/1.8.1-SNAPSHOT/cactus.integration.shared.api-1.8.1-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/tomcat/jasper-compiler/5.5.9/jasper-compiler-5.5.9.jar"/>
- <classpathentry kind="var"
path="M2_REPO/tomcat/jasper-runtime/5.5.9/jasper-runtime-5.5.9.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_2.1_spec/1.0/geronimo-ejb_2.1_spec-1.0.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.0/geronimo-jms_1.1_spec-1.0.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/codehaus/cargo/cargo-ant/0.9/cargo-ant-0.9.jar"/>
+ <classpathentry kind="src"
path="framework/framework-12-13-14/src/main/java"/>
+ <classpathentry kind="src" path="integration/maven2/src/main/java"/>
+ <classpathentry kind="src" path="samples/ejb/src/main/java"/>
+ <classpathentry kind="src" path="samples/ejb3/src/main/java"/>
+ <classpathentry kind="var"
path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
+ <classpathentry kind="src"
path="framework/framework-13-14/src/main/java"/>
+ <classpathentry kind="src"
path="framework/framework-12-13-14/src/test/java"/>
+ <classpathentry kind="var"
path="M2_REPO/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/maven/shared/file-management/1.1/file-management-1.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/mockobjects/mockobjects-core/0.09/mockobjects-core-0.09.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-jelly/commons-jelly/20030902.160215/commons-jelly-20030902.160215.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-jelly/commons-jelly-tags-ant/20030625.032346/commons-jelly-tags-ant-20030625.032346.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-jelly/commons-jelly-tags-xml/20030211.142705/commons-jelly-tags-xml-20030211.142705.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/httpunit/httpunit/1.6/httpunit-1.6.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar"/>
+ <classpathentry kind="src" path="samples/servlet/src/main/java"/>
+ <classpathentry kind="var"
path="M2_REPO/htmlunit/htmlunit/1.10/htmlunit-1.10.jar"/>
+ <classpathentry kind="src" path="integration/ant/src/main/java"/>
+ <classpathentry kind="src"
path="integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java"/>
+ <classpathentry kind="src" path="samples/jetty/src/main/cactus"/>
+ <classpathentry kind="var"
path="M2_REPO/org/codehaus/cargo/cargo-core-uberjar/1.0-SNAPSHOT/cargo-core-uberjar-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="src" path="integration/ant/src/test/java"/>
+ <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/jmock/jmock/1.0.1/jmock-1.0.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/cactus/cactus.integration.shared.api/1.8.1-SNAPSHOT/cactus.integration.shared.api-1.8.1-SNAPSHOT.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/tomcat/jasper-compiler/5.5.9/jasper-compiler-5.5.9.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/tomcat/jasper-runtime/5.5.9/jasper-runtime-5.5.9.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_2.1_spec/1.0/geronimo-ejb_2.1_spec-1.0.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.0/geronimo-jms_1.1_spec-1.0.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_3.0_spec/1.0/geronimo-ejb_3.0_spec-1.0.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: jakarta/cactus/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/pom.xml?rev=672785&r1=672784&r2=672785&view=diff
==============================================================================
--- jakarta/cactus/trunk/pom.xml (original)
+++ jakarta/cactus/trunk/pom.xml Mon Jun 30 07:49:58 2008
@@ -169,7 +169,7 @@
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-alpha-4</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.cargo</groupId>
@@ -212,7 +212,7 @@
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-ant</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-alpha-4</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.cargo</groupId>
@@ -279,17 +279,17 @@
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-alpha-4</version>
</dependency>
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-alpha-4</version>
</dependency>
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-ant</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-alpha-4</version>
</dependency>
<dependency>
<groupId>ant</groupId>
@@ -435,8 +435,8 @@
</ciManagement>
<properties>
- <maven.compile.source>1.4</maven.compile.source>
- <maven.compile.target>1.4</maven.compile.target>
+ <maven.compile.source>5</maven.compile.source>
+ <maven.compile.target>5</maven.compile.target>
</properties>
<build>
Modified:
jakarta/cactus/trunk/samples/ejb3/src/main/java/org/apache/cactus/sample/ejb3/TestConverterEJB.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb3/src/main/java/org/apache/cactus/sample/ejb3/TestConverterEJB.java?rev=672785&r1=672784&r2=672785&view=diff
==============================================================================
---
jakarta/cactus/trunk/samples/ejb3/src/main/java/org/apache/cactus/sample/ejb3/TestConverterEJB.java
(original)
+++
jakarta/cactus/trunk/samples/ejb3/src/main/java/org/apache/cactus/sample/ejb3/TestConverterEJB.java
Mon Jun 30 07:49:58 2008
@@ -22,9 +22,9 @@
import java.util.Properties;
-import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.rmi.PortableRemoteObject;
+
+import junit.framework.TestCase;
import org.apache.cactus.ServletTestCase;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
