You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/08/30 11:37:48 UTC
svn commit: r1806687 - in /sling/trunk: contrib/launchpad/testing/
launchpad/builder/
launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/
samples/installing-dependencies/
Author: rombert
Date: Wed Aug 30 11:37:48 2017
New Revision: 1806687
URL: http://svn.apache.org/viewvc?rev=1806687&view=rev
Log:
SLING-7092: Stop using port 8888 as a default for testing
Various documentation and pom updates.
Modified:
sling/trunk/contrib/launchpad/testing/README.txt
sling/trunk/contrib/launchpad/testing/pom.xml
sling/trunk/launchpad/builder/README.txt
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java
sling/trunk/samples/installing-dependencies/pom.xml
Modified: sling/trunk/contrib/launchpad/testing/README.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/README.txt?rev=1806687&r1=1806686&r2=1806687&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/testing/README.txt (original)
+++ sling/trunk/contrib/launchpad/testing/README.txt Wed Aug 30 11:37:48 2017
@@ -88,7 +88,7 @@ jcrinstall-tests profile such as in
*** WARNING: the jcrinstall-tests do not work in revision 741168, due to changes
in the start levels. They can be run according to the scenario below, if you
change the default bundles start level to 30, after starting the Sling instance
-with mvn jetty:run, from http://localhost:8888/system/console/vmstat. ***
+with mvn jetty:run, from http://localhost:8080/system/console/vmstat. ***
To run the jcrinstall integration tests quickly, without having to start the
webapp first:
Modified: sling/trunk/contrib/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/pom.xml?rev=1806687&r1=1806686&r2=1806687&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/testing/pom.xml (original)
+++ sling/trunk/contrib/launchpad/testing/pom.xml Wed Aug 30 11:37:48 2017
@@ -45,7 +45,7 @@
<properties>
<!-- HTTP port to use when running mvn jetty:run -->
- <jetty.http.port>8888</jetty.http.port>
+ <jetty.http.port>8080</jetty.http.port>
<!-- path suffix for HTTP access to Sling -->
<http.base.path />
Modified: sling/trunk/launchpad/builder/README.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/README.txt?rev=1806687&r1=1806686&r2=1806687&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/README.txt (original)
+++ sling/trunk/launchpad/builder/README.txt Wed Aug 30 11:37:48 2017
@@ -11,11 +11,11 @@ How to run the Sling launchpad/builder m
directory. It is advisable to use a work directory outside of the
project directory.
-1) Build Sling using
+1) Build the Sling Launchpad using
mvn clean install
-in the top-level directory of the Sling source code.
+in the current directory.
2) Start the generated jar with
@@ -30,21 +30,11 @@ Use the correct version number instead o
How to run the Sling launchpad/builder module in webapp mode
----------------------------------------
-1) Build Sling using
+1) Build the Sling Launchpad using
mvn clean install
-in the top-level directory of the Sling source code.
+in the current directory.
-2) Start the generated war with
-
- mvn jetty:run-war
-
-3) Browse Sling in:
-
- http://localhost:8888
-
- OR
-
- Deploy target/org.apache.sling.launchpad-8.war to your favorite application
- server or servlet container.
+2) Deploy target/org.apache.sling.launchpad-8.war to your favorite application
+server or servlet container.
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java?rev=1806687&r1=1806686&r2=1806687&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java Wed Aug 30 11:37:48 2017
@@ -137,8 +137,8 @@ public class JsonRenderingTest extends H
log.info("Url: {}", url);
log.info("postUrl: {}", postUrl);
// Get the resource url. (everything after the port)
- // We skip http://localhost:8888/org.apache.sling.launchpad.testing-6-SNAPSHOT/
- // or http://localhost:8888/
+ // We skip http://localhost:8080/org.apache.sling.launchpad.testing-6-SNAPSHOT/
+ // or http://localhost:8080/
String resourceUrl = url;
final int toSkip = resourceUrl.contains("/org.apache.sling.launchpad") ? 4 : 3;
for (int i = toSkip;i>0;i--) {
@@ -275,4 +275,4 @@ public class JsonRenderingTest extends H
assertJavascript("rep:root", json, "out.print(data[\"jcr:primaryType\"])");
assertJavascript("rep:system", json, "out.print(data[\"jcr:system\"][\"jcr:primaryType\"])");
}
-}
\ No newline at end of file
+}
Modified: sling/trunk/samples/installing-dependencies/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/installing-dependencies/pom.xml?rev=1806687&r1=1806686&r2=1806687&view=diff
==============================================================================
--- sling/trunk/samples/installing-dependencies/pom.xml (original)
+++ sling/trunk/samples/installing-dependencies/pom.xml Wed Aug 30 11:37:48 2017
@@ -130,7 +130,7 @@
</execution>
</executions>
<configuration>
- <slingUrl>http://localhost:8888/system/console</slingUrl>
+ <slingUrl>http://localhost:8080/system/console</slingUrl>
<user>admin</user>
<password>admin</password>
</configuration>