[mapserver-commits] r9271 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Tue Aug 25 15:46:49 EDT 2009
Author: tomkralidis
Date: 2009-08-25 15:46:48 -0400 (Tue, 25 Aug 2009)
New Revision: 9271
Modified:
trunk/msautotest/wxs/expected/wfs11_cap.xml
trunk/msautotest/wxs/expected/wfs11_caps_updatesequence.xml
trunk/msautotest/wxs/expected/wfs11_describe.xml
trunk/msautotest/wxs/expected/wfs11_exception.xml
trunk/msautotest/wxs/expected/wfs11_exception_updatesequence1.xml
trunk/msautotest/wxs/expected/wfs11_exception_updatesequence2.xml
trunk/msautotest/wxs/expected/wfs_cap.xml
trunk/msautotest/wxs/expected/wfs_caps_updatesequence.xml
trunk/msautotest/wxs/expected/wfs_describe.xml
trunk/msautotest/wxs/expected/wfs_describe_feature_type_gml2.xml
trunk/msautotest/wxs/expected/wfs_describe_feature_type_gml3l0.xml
trunk/msautotest/wxs/expected/wfs_exception.xml
trunk/msautotest/wxs/expected/wfs_exception_updatesequence1.xml
trunk/msautotest/wxs/expected/wfs_exception_updatesequence2.xml
trunk/msautotest/wxs/expected/wfs_get_caps.xml
trunk/msautotest/wxs/expected/wfs_get_feature.xml
trunk/msautotest/wxs/expected/wfs_get_feature_gml2.xml
trunk/msautotest/wxs/expected/wfs_get_feature_id.xml
trunk/msautotest/wxs/expected/wms_describe_layer.xml
trunk/msautotest/wxs/expected/wms_get_caps.xml
trunk/msautotest/wxs/expected/wms_get_styles.sld
trunk/msautotest/wxs/tomk_workshop.map
trunk/msautotest/wxs/wfs_simple.map
trunk/msautotest/wxs/wms_nosld.map
trunk/msautotest/wxs/wms_raster.map
Log:
update schema location to schemas.opengis.net
Modified: trunk/msautotest/wxs/expected/wfs11_cap.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_cap.xml 2009-08-25 18:29:55 UTC (rev 9270)
+++ trunk/msautotest/wxs/expected/wfs11_cap.xml 2009-08-25 19:46:48 UTC (rev 9271)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version="1.0" encoding="ISO-8859-1"?>
-<wfs:WFS_Capabilities xmlns:gml="http://www.opengis.net/gml" xmlns:wfs="http://www.opengis.net/wfs" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ogc="http://www.opengis.net/ogc" xmlns="http://www.opengis.net/wfs" version="1.1.0" updateSequence="123" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengeospatial.net/wfs/1.1.0/wfs.xsd">
+<wfs:WFS_Capabilities xmlns:gml="http://www.opengis.net/gml" xmlns:wfs="http://www.opengis.net/wfs" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ogc="http://www.opengis.net/ogc" xmlns="http://www.opengis.net/wfs" version="1.1.0" updateSequence="123" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
<ows:ServiceIdentification>
<ows:Title>Test simple wfs</ows:Title>
<ows:Abstract>Test WFS Abstract</ows:Abstract>
Modified: trunk/msautotest/wxs/expected/wfs11_caps_updatesequence.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_caps_updatesequence.xml 2009-08-25 18:29:55 UTC (rev 9270)
+++ trunk/msautotest/wxs/expected/wfs11_caps_updatesequence.xml 2009-08-25 19:46:48 UTC (rev 9271)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version="1.0" encoding="ISO-8859-1"?>
-<wfs:WFS_Capabilities xmlns:gml="http://www.opengis.net/gml" xmlns:wfs="http://www.opengis.net/wfs" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ogc="http://www.opengis.net/ogc" xmlns="http://www.opengis.net/wfs" version="1.1.0" updateSequence="123" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengeospatial.net/wfs/1.1.0/wfs.xsd">
+<wfs:WFS_Capabilities xmlns:gml="http://www.opengis.net/gml" xmlns:wfs="http://www.opengis.net/wfs" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ogc="http://www.opengis.net/ogc" xmlns="http://www.opengis.net/wfs" version="1.1.0" updateSequence="123" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
<ows:ServiceIdentification>
<ows:Title>Test simple wfs</ows:Title>
<ows:Abstract>Test WFS Abstract</ows:Abstract>
Modified: trunk/msautotest/wxs/expected/wfs11_describe.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_describe.xml 2009-08-25 18:29:55 UTC (rev 9270)
+++ trunk/msautotest/wxs/expected/wfs11_describe.xml 2009-08-25 19:46:48 UTC (rev 9271)
@@ -11,7 +11,7 @@
elementFormDefault="qualified" version="0.1" >
<import namespace="http://www.opengis.net/gml"
- schemaLocation="http://schemas.opengeospatial.net/gml/3.1.1/base/gml.xsd" />
+ schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd" />
<element name="province"
type="ms:provinceType"
Modified: trunk/msautotest/wxs/expected/wfs11_exception.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_exception.xml 2009-08-25 18:29:55 UTC (rev 9270)
+++ trunk/msautotest/wxs/expected/wfs11_exception.xml 2009-08-25 19:46:48 UTC (rev 9271)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version="1.0" encoding="ISO-8859-1"?>
-<ows:ExceptionReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows" version="1.1.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengeospatial.net/ows/1.0.0/owsExceptionReport.xsd">
+<ows:ExceptionReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows" version="1.1.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengis.net/ows/1.0.0/owsExceptionReport.xsd">
<ows:Exception exceptionCode="request" locator="MissingParameterValue">
<ows:ExceptionText>msWFSDispatch(): WFS server error. Incomplete WFS request: REQUEST parameter missing</ows:ExceptionText>
</ows:Exception>
Modified: trunk/msautotest/wxs/expected/wfs11_exception_updatesequence1.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_exception_updatesequence1.xml 2009-08-25 18:29:55 UTC (rev 9270)
+++ trunk/msautotest/wxs/expected/wfs11_exception_updatesequence1.xml 2009-08-25 19:46:48 UTC (rev 9271)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version="1.0" encoding="ISO-8859-1"?>
-<ows:ExceptionReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows" version="1.1.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengeospatial.net/ows/1.0.0/owsExceptionReport.xsd">
+<ows:ExceptionReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows" version="1.1.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengis.net/ows/1.0.0/owsExceptionReport.xsd">
<ows:Exception exceptionCode="CurrentUpdateSequence" locator="updatesequence">
<ows:ExceptionText>msWFSGetCapabilities11(): WFS server error. UPDATESEQUENCE parameter (123) is equal to server (123)</ows:ExceptionText>
</ows:Exception>
Modified: trunk/msautotest/wxs/expected/wfs11_exception_updatesequence2.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_exception_updatesequence2.xml 2009-08-25 18:29:55 UTC (rev 9270)
+++ trunk/msautotest/wxs/expected/wfs11_exception_updatesequence2.xml 2009-08-25 19:46:48 UTC (rev 9271)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version="1.0" encoding="ISO-8859-1"?>
-<ows:ExceptionReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows" version="1.1.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengeospatial.net/ows/1.0.0/owsExceptionReport.xsd">
+<ows:ExceptionReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows" version="1.1.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengis.net/ows/1.0.0/owsExceptionReport.xsd">
<ows:Exception exceptionCode="InvalidUpdateSequence" locator="updatesequence">
<ows:ExceptionText>msWFSGetCapabilities11(): WFS server error. UPDATESEQUENCE parameter (1234) is higher than server (123)</ows:ExceptionText>
</ows:Exception>
Modified: trunk/msautotest/wxs/expected/wfs_cap.xml
===================================================================
(Binary files differ)
Modified: trunk/msautotest/wxs/expected/wfs_caps_updatesequence.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_caps_updatesequence.xml 2009-08-25 18:29:55 UTC (rev 9270)
+++ trunk/msautotest/wxs/expected/wfs_caps_updatesequence.xml 2009-08-25 19:46:48 UTC (rev 9271)
@@ -7,7 +7,7 @@
xmlns="http://www.opengis.net/wfs"
xmlns:ogc="http://www.opengis.net/ogc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengeospatial.net/wfs/1.0.0/WFS-capabilities.xsd">
+ xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/WFS-capabilities.xsd">
<Service>
<Name>MapServer WFS</Name>
Modified: trunk/msautotest/wxs/expected/wfs_describe.xml
===================================================================
(Binary files differ)
Modified: trunk/msautotest/wxs/expected/wfs_describe_feature_type_gml2.xml
===================================================================
(Binary files differ)
Modified: trunk/msautotest/wxs/expected/wfs_describe_feature_type_gml3l0.xml
===================================================================
(Binary files differ)
Modified: trunk/msautotest/wxs/expected/wfs_exception.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_exception.xml 2009-08-25 18:29:55 UTC (rev 9270)
+++ trunk/msautotest/wxs/expected/wfs_exception.xml 2009-08-25 19:46:48 UTC (rev 9271)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version='1.0' encoding="ISO-8859-1" ?>
-<ServiceExceptionReport version="1.2.0" xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengeospatial.net/wfs/1.0.0/OGC-exception.xsd">
+<ServiceExceptionReport version="1.2.0" xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/wfs/1.0.0/OGC-exception.xsd">
<ServiceException code="MissingParameterValue" locator="request">
msWFSDispatch(): WFS server error. Incomplete WFS request: REQUEST parameter missing
</ServiceException>
Modified: trunk/msautotest/wxs/expected/wfs_exception_updatesequence1.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_exception_updatesequence1.xml 2009-08-25 18:29:55 UTC (rev 9270)
+++ trunk/msautotest/wxs/expected/wfs_exception_updatesequence1.xml 2009-08-25 19:46:48 UTC (rev 9271)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version='1.0' encoding="ISO-8859-1" ?>
-<ServiceExceptionReport version="1.2.0" xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengeospatial.net/wfs/1.0.0/OGC-exception.xsd">
+<ServiceExceptionReport version="1.2.0" xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/wfs/1.0.0/OGC-exception.xsd">
<ServiceException code="CurrentUpdateSequence" locator="updatesequence">
msWFSGetCapabilities(): WFS server error. UPDATESEQUENCE parameter (123) is equal to server (123)
</ServiceException>
Modified: trunk/msautotest/wxs/expected/wfs_exception_updatesequence2.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_exception_updatesequence2.xml 2009-08-25 18:29:55 UTC (rev 9270)
+++ trunk/msautotest/wxs/expected/wfs_exception_updatesequence2.xml 2009-08-25 19:46:48 UTC (rev 9271)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version='1.0' encoding="ISO-8859-1" ?>
-<ServiceExceptionReport version="1.2.0" xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengeospatial.net/wfs/1.0.0/OGC-exception.xsd">
+<ServiceExceptionReport version="1.2.0" xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/wfs/1.0.0/OGC-exception.xsd">
<ServiceException code="InvalidUpdateSequence" locator="updatesequence">
msWFSGetCapabilities(): WFS server error. UPDATESEQUENCE parameter (1234) is higher than server (123)
</ServiceException>
Modified: trunk/msautotest/wxs/expected/wfs_get_caps.xml
===================================================================
(Binary files differ)
Modified: trunk/msautotest/wxs/expected/wfs_get_feature.xml
===================================================================
(Binary files differ)
Modified: trunk/msautotest/wxs/expected/wfs_get_feature_gml2.xml
===================================================================
(Binary files differ)
Modified: trunk/msautotest/wxs/expected/wfs_get_feature_id.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_get_feature_id.xml 2009-08-25 18:29:55 UTC (rev 9270)
+++ trunk/msautotest/wxs/expected/wfs_get_feature_id.xml 2009-08-25 19:46:48 UTC (rev 9271)
@@ -7,7 +7,7 @@
xmlns:gml="http://www.opengis.net/gml"
xmlns:ogc="http://www.opengis.net/ogc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengeospatial.net/wfs/1.0.0/WFS-basic.xsd
+ xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/WFS-basic.xsd
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=XMLSCHEMA">
<gml:boundedBy>
<gml:Box srsName="EPSG:4326">
Modified: trunk/msautotest/wxs/expected/wms_describe_layer.xml
===================================================================
(Binary files differ)
Modified: trunk/msautotest/wxs/expected/wms_get_caps.xml
===================================================================
(Binary files differ)
Modified: trunk/msautotest/wxs/expected/wms_get_styles.sld
===================================================================
(Binary files differ)
Modified: trunk/msautotest/wxs/tomk_workshop.map
===================================================================
--- trunk/msautotest/wxs/tomk_workshop.map 2009-08-25 18:29:55 UTC (rev 9270)
+++ trunk/msautotest/wxs/tomk_workshop.map 2009-08-25 19:46:48 UTC (rev 9271)
@@ -122,12 +122,6 @@
"ows_updateSequence" "123"
- # generic OWS specific info
- # sets base URL for OGC Schemas so the root element in the
- # Capabilities document points to the correct schema location
- # to produce valid XML
- "ows_schemas_location" "http://schemas.opengeospatial.net"
-
# unified OWS tags
# sets:
Modified: trunk/msautotest/wxs/wfs_simple.map
===================================================================
--- trunk/msautotest/wxs/wfs_simple.map 2009-08-25 18:29:55 UTC (rev 9270)
+++ trunk/msautotest/wxs/wfs_simple.map 2009-08-25 19:46:48 UTC (rev 9271)
@@ -99,7 +99,6 @@
"wfs_title" "Test simple wfs"
"wfs_onlineresource" "http://localhost/path/to/wfs_simple?"
"wfs_srs" "EPSG:4326 EPSG:4269"
- "ows_schemas_location" "http://schemas.opengeospatial.net"
"ows_abstract" "Test WFS Abstract"
"ows_keywordlist" "ogc,wfs,gml,om"
"ows_service_onlineresource" "http://localhost"
Modified: trunk/msautotest/wxs/wms_nosld.map
===================================================================
--- trunk/msautotest/wxs/wms_nosld.map 2009-08-25 18:29:55 UTC (rev 9270)
+++ trunk/msautotest/wxs/wms_nosld.map 2009-08-25 19:46:48 UTC (rev 9271)
@@ -14,6 +14,8 @@
# GetLegendGraphic
# RUN_PARMS: wms_nosld_legend.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetLegendGraphic&FORMAT=image/png&LAYER=road&sld_body=%3CStyledLayerDescriptor+version%3D%221.0.0%22%3E%0D%0A%3CNamedLayer%3E%0D%0A%3CName%3Eroad%3C%2FName%3E%0D%0A%3CUserStyle%3E%0D%0A%3CTitle%3Exxx%3C%2FTitle%3E%0D%0A%3CFeatureTypeStyle%3E%0D%0A%3CRule%3E%0D%0A%3CLineSymbolizer%3E%0D%0A%3CGeometry%3E%0D%0A%3CPropertyName%3Ecenter-line%3C%2FPropertyName%3E%0D%0A%3C%2FGeometry%3E%0D%0A%3CStroke%3E%0D%0A%3CCssParameter+name%3D%22stroke%22%3E%230000ff%3C%2FCssParameter%3E%0D%0A%3C%2FStroke%3E%0D%0A%3C%2FLineSymbolizer%3E%0D%0A%3C%2FRule%3E%0D%0A%3C%2FFeatureTypeStyle%3E%0D%0A%3C%2FUserStyle%3E%0D%0A%3C%2FNamedLayer%3E%0D%0A%3C%2FStyledLayerDescriptor%3E%0D%0A" > [RESULT_DEMIME]
+MAP
+
NAME WMS_NOSLD
STATUS ON
SIZE 400 300
Modified: trunk/msautotest/wxs/wms_raster.map
===================================================================
--- trunk/msautotest/wxs/wms_raster.map 2009-08-25 18:29:55 UTC (rev 9270)
+++ trunk/msautotest/wxs/wms_raster.map 2009-08-25 19:46:48 UTC (rev 9271)
@@ -10,6 +10,8 @@
# Capabilities
# RUN_PARMS: wms_rast_cap.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities" > [RESULT_DEVERSION]
+MAP
+
NAME WMS_TEST
STATUS ON
SIZE 400 300
More information about the mapserver-commits
mailing list