continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wsm...@apache.org
Subject svn commit: r744215 - in /continuum/trunk/continuum-webapp-test: pom2.xml src/test/pom2/org/apache/continuum/web/test/CargoTestSetup.java
Date Fri, 13 Feb 2009 18:42:46 GMT
Author: wsmoak
Date: Fri Feb 13 18:42:45 2009
New Revision: 744215

URL: http://svn.apache.org/viewvc?rev=744215&view=rev
Log:
[CONTINUUM-2073] Move to latest Cargo snapshot and update CargoTestSetup for api changes.

Modified:
    continuum/trunk/continuum-webapp-test/pom2.xml
    continuum/trunk/continuum-webapp-test/src/test/pom2/org/apache/continuum/web/test/CargoTestSetup.java

Modified: continuum/trunk/continuum-webapp-test/pom2.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/pom2.xml?rev=744215&r1=744214&r2=744215&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/pom2.xml (original)
+++ continuum/trunk/continuum-webapp-test/pom2.xml Fri Feb 13 18:42:45 2009
@@ -147,13 +147,13 @@
     <dependency>
         <groupId>org.codehaus.cargo</groupId>
         <artifactId>cargo-core-uberjar</artifactId>
-        <version>0.8</version>
+        <version>1.0-SNAPSHOT</version>
         <optional>true</optional>
     </dependency>
     <dependency>
         <groupId>org.codehaus.cargo</groupId>
         <artifactId>cargo-ant</artifactId>
-        <version>0.8</version>
+        <version>1.0-SNAPSHOT</version>
         <optional>true</optional>
     </dependency>
   </dependencies>

Modified: continuum/trunk/continuum-webapp-test/src/test/pom2/org/apache/continuum/web/test/CargoTestSetup.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/pom2/org/apache/continuum/web/test/CargoTestSetup.java?rev=744215&r1=744214&r2=744215&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/pom2/org/apache/continuum/web/test/CargoTestSetup.java
(original)
+++ continuum/trunk/continuum-webapp-test/src/test/pom2/org/apache/continuum/web/test/CargoTestSetup.java
Fri Feb 13 18:42:45 2009
@@ -104,6 +104,7 @@
         LocalConfiguration configuration =
                 (LocalConfiguration) configurationFactory.createConfiguration(
                         containerId,
+                        ContainerType.INSTALLED,
                         ConfigurationType.STANDALONE);
 
         // Find and (if provided) set the port to use for the container.
@@ -127,7 +128,7 @@
             containerHome = System.getenv("TOMCAT_HOME");
         }
         System.out.println("[INFO] container home: " + containerHome);
-        container.setHome(new File(containerHome));
+        container.setHome(containerHome);
 
         // Find and (if provided) set the path to a log file
         String containerLog = System.getProperty("cargo.container.log");
@@ -140,7 +141,7 @@
         String containerOutput = System.getProperty("cargo.container.output");
         if (containerOutput != null) {
             System.out.println("[INFO] container output: " + containerOutput);
-            container.setOutput(new File(containerOutput));
+            container.setOutput(containerOutput);
         }
 
         container.start();



Mime
View raw message