diff --git a/examples/controls.html b/examples/controls.html
index 2ed482d7cc..78f7fc9c38 100644
--- a/examples/controls.html
+++ b/examples/controls.html
@@ -14,8 +14,8 @@
var map = new OpenLayers.Map('map', { controls: [] });
var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
- "http://octo.metacarta.com/cgi-bin/mapserv",
- {map: '/mapdata/vmap_wms.map', layers: 'basic'} );
+ "http://labs.metacarta.com/wms/vmap0",
+ {layers: 'basic'} );
var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
"http://wms.jpl.nasa.gov/wms.cgi",
diff --git a/examples/example.html b/examples/example.html
index fc2b7f107d..c94c6a9e7e 100644
--- a/examples/example.html
+++ b/examples/example.html
@@ -14,8 +14,7 @@
var map = new OpenLayers.Map('map');
var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
- "http://octo.metacarta.com/cgi-bin/mapserv",
- {map: '/mapdata/vmap_wms.map', layers: 'basic'} );
+ "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'} );
var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
"http://wms.jpl.nasa.gov/wms.cgi",
diff --git a/examples/google.html b/examples/google.html
index feeabc3d9d..7eea3b8edd 100644
--- a/examples/google.html
+++ b/examples/google.html
@@ -23,8 +23,7 @@
map = new OpenLayers.Map( $('map') );
gmap = new OpenLayers.Layer.Google( "Google" );
layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
- "http://octo.metacarta.com/cgi-bin/mapserv",
- {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'} );
+ "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
map.addLayer(layer);
diff --git a/examples/markerResize.html b/examples/markerResize.html
index d5b940d4e0..851ab0b38e 100644
--- a/examples/markerResize.html
+++ b/examples/markerResize.html
@@ -17,8 +17,7 @@
function init(){
map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
- "http://octo.metacarta.com/cgi-bin/mapserv",
- {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'} );
+ "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
map.addLayer(layer);
var markers = new OpenLayers.Layer.Markers( "Markers" );
diff --git a/examples/markers.html b/examples/markers.html
index 0667160f35..6bde6bd02f 100644
--- a/examples/markers.html
+++ b/examples/markers.html
@@ -16,8 +16,7 @@
function init(){
map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
- "http://octo.metacarta.com/cgi-bin/mapserv",
- {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'} );
+ "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
map.addLayer(layer);
var markers = new OpenLayers.Layer.Markers( "Markers" );
diff --git a/examples/markers2.html b/examples/markers2.html
index caa28e4374..409e0f3a70 100644
--- a/examples/markers2.html
+++ b/examples/markers2.html
@@ -16,8 +16,7 @@
function init(){
map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
- "http://octo.metacarta.com/cgi-bin/mapserv",
- {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'} );
+ "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
map.addLayer(layer);
var markers = new OpenLayers.Layer.Markers( "Markers" );
diff --git a/examples/markersTextLayer.html b/examples/markersTextLayer.html
index d6079360aa..893e286330 100644
--- a/examples/markersTextLayer.html
+++ b/examples/markersTextLayer.html
@@ -16,8 +16,7 @@
function init(){
map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
- "http://octo.metacarta.com/cgi-bin/mapserv",
- {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'} );
+ "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
map.addLayer(layer);
diff --git a/examples/markerss.html b/examples/markerss.html
index 71cbbb63a2..57f47a3083 100644
--- a/examples/markerss.html
+++ b/examples/markerss.html
@@ -18,8 +18,7 @@
function init(){
map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
- "http://octo.metacarta.com/cgi-bin/mapserv",
- {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'} );
+ "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
map.addLayer(
diff --git a/examples/mvs.html b/examples/mvs.html
index 5336177721..1bdfa0424d 100644
--- a/examples/mvs.html
+++ b/examples/mvs.html
@@ -107,11 +107,10 @@ function runMVS() {
switch(safeArgs.layers[i]) {
case 'openlayers':
theMVS.addLayer(
- new OpenLayers.Layer.WMS("OpenLayers WMS",
- "http://octo.metacarta.com/cgi-bin/mapserv",
- {"map" : "/mapdata/vmap_wms.map",
- layers: 'basic'}
- ));
+ new OpenLayers.Layer.WMS( "OpenLayers WMS",
+ "http://labs.metacarta.com/wms/vmap0",
+ {layers: 'basic'} )
+ );
break;
case 'nasa':
theMVS.addLayer(
diff --git a/examples/popups.html b/examples/popups.html
index 9ccd897b2d..5a53798a07 100644
--- a/examples/popups.html
+++ b/examples/popups.html
@@ -17,9 +17,7 @@
function init(){
map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
- "http://octo.metacarta.com/cgi-bin/mapserv",
- {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'} );
-
+ "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
map.addLayer(layer);
layer = new OpenLayers.Layer.WMS( "OpenLayers WMS2",
diff --git a/examples/wfs.html b/examples/wfs.html
index 6e0acd990c..2d0e62934f 100644
--- a/examples/wfs.html
+++ b/examples/wfs.html
@@ -16,9 +16,7 @@
function init(){
map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
- "http://octo.metacarta.com/cgi-bin/mapserv",
- {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'} );
-
+ "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
map.addLayer(layer);
layer = new OpenLayers.Layer.WFS( "OpenLayers WFS",