incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jus...@apache.org
Subject svn commit: r1060682 - in /sling/trunk: bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/HttpTestBase.java launchpad/integration-tests/pom.xml launchpad/testing-war/pom.xml launchpad/testing/pom.xml
Date Wed, 19 Jan 2011 05:44:26 GMT
Author: justin
Date: Wed Jan 19 05:44:26 2011
New Revision: 1060682

URL: http://svn.apache.org/viewvc?rev=1060682&view=rev
Log:
SLING-1936 - adding SERVLET_CONTEXT static to HttpTestBase

Modified:
    sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/HttpTestBase.java
    sling/trunk/launchpad/integration-tests/pom.xml
    sling/trunk/launchpad/testing-war/pom.xml
    sling/trunk/launchpad/testing/pom.xml

Modified: sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/HttpTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/HttpTestBase.java?rev=1060682&r1=1060681&r2=1060682&view=diff
==============================================================================
--- sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/HttpTestBase.java
(original)
+++ sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/HttpTestBase.java
Wed Jan 19 05:44:26 2011
@@ -47,6 +47,7 @@ import org.slf4j.MDC;
 public class HttpTestBase extends TestCase {
     public static final String HTTP_BASE_URL = removeEndingSlash(System.getProperty("launchpad.http.server.url",
"http://localhost:8888"));
     public static final String WEBDAV_BASE_URL = removeEndingSlash(System.getProperty("launchpad.webdav.server.url",
"http://localhost:8888"));
+    public static final String SERVLET_CONTEXT = removeEndingSlash(System.getProperty("launchpad.servlet.context",
""));
 
     /** base path for test files */
     public static final String TEST_PATH = "/launchpad-integration-tests";
@@ -172,7 +173,7 @@ public class HttpTestBase extends TestCa
         slingStartupOk = false;
 
         System.err.println("Checking if the required Sling services are started (timeout
" + READY_TIMEOUT_SECONDS + " seconds)...");
-        System.err.println("(base URLs=" + HTTP_BASE_URL + " and " + WEBDAV_BASE_URL + ")");
+        System.err.println("(base URLs=" + HTTP_BASE_URL + " and " + WEBDAV_BASE_URL + ";
servlet context="+ SERVLET_CONTEXT +")");
 
         // Try creating a node on server, every 500msec, until ok, with timeout
         final List<String> exceptionMessages = new LinkedList<String>();

Modified: sling/trunk/launchpad/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/pom.xml?rev=1060682&r1=1060681&r2=1060682&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/pom.xml (original)
+++ sling/trunk/launchpad/integration-tests/pom.xml Wed Jan 19 05:44:26 2011
@@ -126,7 +126,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.commons.testing</artifactId>
-      <version>2.0.6</version>
+      <version>2.0.7-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>

Modified: sling/trunk/launchpad/testing-war/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/pom.xml?rev=1060682&r1=1060681&r2=1060682&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/pom.xml (original)
+++ sling/trunk/launchpad/testing-war/pom.xml Wed Jan 19 05:44:26 2011
@@ -246,6 +246,12 @@
                                 http://${test.host}:${http.port}/${webdav.workspace.path}
                             </value>
                         </property>
+                        <property>
+                            <name>launchpad.servlet.context</name>
+                            <value>
+                                /${http.base.path}
+                            </value>
+                        </property>
                     </systemProperties>
                 </configuration>
             </plugin>
@@ -360,7 +366,12 @@
                                                 http://${test.host}:${http.port}/${webdav.workspace.path}
                                             </value>
                                         </property>
-
+                                        <property>
+                                            <name>launchpad.servlet.context</name>
+                                            <value>
+                                                /${http.base.path}
+                                            </value>
+                                        </property>
                                     </systemProperties>
                                 </configuration>
                             </execution>
@@ -421,6 +432,13 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>warIntegrationTestsInNonRootContext</id>
+            <properties>
+                <http.base.path>${project.build.finalName}</http.base.path>
+                <webdav.workspace.path>${project.build.finalName}</webdav.workspace.path>
+            </properties>
+        </profile>
     </profiles>
 
     <dependencies>
@@ -452,12 +470,12 @@
             <version>0.0.169</version>
             <scope>test</scope>
         </dependency>
-		
+
         <!-- Dependencies for the Test Build and Run -->
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.testing</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7-SNAPSHOT</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

Modified: sling/trunk/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=1060682&r1=1060681&r2=1060682&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/pom.xml (original)
+++ sling/trunk/launchpad/testing/pom.xml Wed Jan 19 05:44:26 2011
@@ -489,7 +489,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.testing</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7-SNAPSHOT</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>



Mime
View raw message