Support testing against localhost:8080/geoserver

Author: jodygarnett

documentation/en/user/source/development/index.rst

@@ -89,6 +89,9 @@ Build
 
       cd web
       mvn jetty:run
+   
+   The service is available on http://localhost:8081/geonetwork allowing local testing with http://localhost:8080/geoserver layers.  To change the port number use ``jetty.http.port``
+   as describde in `jetty 10 documentation <https://jetty.org/docs/jetty/10/programming-guide/maven-jetty/jetty-maven-plugin.html>`_.
 
 #. A WAR is built as the last step in ``mvn clean install`` above.
 

geowebcache/core/src/main/resources/geowebcache.xml

@@ -188,7 +188,7 @@
         </stringParameterFilter>
       </parameterFilters>
       <wmsUrl>
-        <string>https://demo.boundlessgeo.com/geoserver/topp/wms</string>
+        <string>http://localhost:8080/geoserver/topp/wms</string>
       </wmsUrl>
       <legends defaultWidth="81" defaultHeight="80" defaultFormat="image/png">
         <legend style="population"/>
@@ -217,7 +217,7 @@
         </gridSubset>
       </gridSubsets>
       <wmsUrl>
-        <string>https://demo.boundlessgeo.com/geoserver/wms</string>
+        <string>http://localhost:8080/geoserver/topp/wms</string>
       </wmsUrl>
       <wmsLayers>nasa:bluemarble</wmsLayers>
       <legends defaultWidth="20" defaultHeight="20" defaultFormat="image/png">
@@ -258,7 +258,7 @@
         <expirationRule minZoom="0" expiration="500" />
       </expireClientsList>
       <wmsUrl>
-        <string>https://demo.boundlessgeo.com/geoserver/wms</string>
+        <string>http://localhost:8080/geoserver/topp/wms</string>
       </wmsUrl>
       <wmsLayers>nurc:Img_Sample,topp:states</wmsLayers>
       <transparent>false</transparent>

geowebcache/web/pom.xml

@@ -178,6 +178,10 @@
           <webApp>
             <contextPath>/geowebcache</contextPath>
           </webApp>
+          <httpConnector>
+            <!--host>localhost</host-->
+            <port>8081</port>
+          </httpConnector>
           <systemProperties>
             <systemProperty>
               <name>log4j2.configurationFile</name>

geowebcache/web/src/test/java/org/geowebcache/jetty/RestIntegrationTest.java

@@ -558,9 +558,7 @@ public void testGetLayer() throws Exception {
                     assertThat(doc, hasXPath("/wmsLayer/name", equalTo("img states")));
                     assertThat(
                             doc,
-                            hasXPath(
-                                    "/wmsLayer/wmsUrl/string",
-                                    equalTo("https://demo.boundlessgeo.com/geoserver/wms?")));
+                            hasXPath("/wmsLayer/wmsUrl/string", equalTo("http://localhost:8080/geoserver/topp/wms?")));
                     assertThat(doc, hasXPath("/wmsLayer/wmsLayers", equalTo("nurc:Img_Sample,topp:states")));
                 });
     }

geowebcache/web/src/test/java/org/geowebcache/jetty/Start.java

@@ -42,7 +42,7 @@ public static void main(String[] args) {
             HttpConfiguration httpConfiguration = new HttpConfiguration();
 
             ServerConnector http = new ServerConnector(jettyServer, new HttpConnectionFactory(httpConfiguration));
-            http.setPort(Integer.getInteger("jetty.port", 8080));
+            http.setPort(Integer.getInteger("jetty.http.port", 8081));
             http.setAcceptQueueSize(100);
             http.setIdleTimeout(1000 * 60 * 60);