[OpenLayers-Commits] r10845 - in sandbox/bjornharrtell/swipe: . examples

[commits-20090109 at openlayers.org]

Author: bjornharrtell
Date: 2010-10-17 13:27:57 -0700 (Sun, 17 Oct 2010)
New Revision: 10845

Modified:
   sandbox/bjornharrtell/swipe/
   sandbox/bjornharrtell/swipe/examples/getfeature-wfs.html
   sandbox/bjornharrtell/swipe/examples/proxy.cgi
Log:
Merged with trunk


Property changes on: sandbox/bjornharrtell/swipe
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/roberthl/openlayers:9745-9748
   + /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:10839-10844

Modified: sandbox/bjornharrtell/swipe/examples/getfeature-wfs.html
===================================================================
--- sandbox/bjornharrtell/swipe/examples/getfeature-wfs.html	2010-10-17 18:10:28 UTC (rev 10844)
+++ sandbox/bjornharrtell/swipe/examples/getfeature-wfs.html	2010-10-17 20:27:57 UTC (rev 10845)
@@ -18,8 +18,8 @@
             });
             layer = new OpenLayers.Layer.WMS(
                 "States WMS/WFS",
-                "http://demo.opengeo.org/geoserver/ows",
-                {layers: 'topp:states', format: 'image/gif'}
+                "http://v2.suite.opengeo.org/geoserver/ows",
+                {layers: 'usa:states', format: 'image/gif'}
             );
             select = new OpenLayers.Layer.Vector("Selection", {styleMap: 
                 new OpenLayers.Style(OpenLayers.Feature.Vector.style["select"])

Modified: sandbox/bjornharrtell/swipe/examples/proxy.cgi
===================================================================
--- sandbox/bjornharrtell/swipe/examples/proxy.cgi	2010-10-17 18:10:28 UTC (rev 10844)
+++ sandbox/bjornharrtell/swipe/examples/proxy.cgi	2010-10-17 20:27:57 UTC (rev 10845)
@@ -20,7 +20,7 @@
                 'prototype.openmnnd.org', 'geo.openplans.org',
                 'sigma.openplans.org', 'demo.opengeo.org',
                 'www.openstreetmap.org', 'sample.azavea.com',
-                'v-swe.uni-muenster.de:8080', 
+                'v2.suite.opengeo.org', 'v-swe.uni-muenster.de:8080', 
                 'vmap0.tiles.osgeo.org']
 
 method = os.environ["REQUEST_METHOD"]