[mapserver-commits] r12111 - trunk/msautotest/wxs/expected
svn at osgeo.org
svn at osgeo.org
Thu Aug 25 04:55:06 EDT 2011
Author: schpidi
Date: 2011-08-25 01:55:05 -0700 (Thu, 25 Aug 2011)
New Revision: 12111
Modified:
trunk/msautotest/wxs/expected/wcs_20_cap.xml
trunk/msautotest/wxs/expected/wcs_20_cap_accept_versions.xml
trunk/msautotest/wxs/expected/wcs_20_cap_sections_all.xml
trunk/msautotest/wxs/expected/wcs_20_cap_sections_all_specific.xml
trunk/msautotest/wxs/expected/wcs_20_cap_sections_contents.xml
trunk/msautotest/wxs/expected/wcs_20_cap_sections_operations_metadata.xml
trunk/msautotest/wxs/expected/wcs_20_cap_sections_service_identification.xml
trunk/msautotest/wxs/expected/wcs_20_cap_sections_service_provider.xml
trunk/msautotest/wxs/expected/wcs_20_cap_updatesequence.xml
trunk/msautotest/wxs/expected/wcs_20_post_cap.xml
Log:
WCS 2.0: Adjustments to OGC CITE tests (#4003).
Modified: trunk/msautotest/wxs/expected/wcs_20_cap.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_cap.xml 2011-08-24 13:36:39 UTC (rev 12110)
+++ trunk/msautotest/wxs/expected/wcs_20_cap.xml 2011-08-25 08:55:05 UTC (rev 12111)
@@ -10,15 +10,14 @@
<ows:ServiceType codeSpace="OGC">OGC WCS</ows:ServiceType>
<ows:ServiceTypeVersion>2.0.0</ows:ServiceTypeVersion>
<ows:Profile>http://www.opengis.net/spec/WCS/2.0/conf/core</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_get-kvp/1.0</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_post-xml/1.0</ows:Profile>
- <ows:Profile>http://www.placeholder.com/EPSG</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_get-kvp/1.0/conf/get-kvp</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_post-xml/1.0/conf/post-xml</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_crs-predefined/1.0/conf/crs-predefined</ows:Profile>
<ows:Profile>http://www.placeholder.com/IMAGECRS</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_coverage-encoding_geotiff/1.0/</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_encoding_geotiff/1.0/conf/geotiff</ows:Profile>
<ows:Profile>http://www.placeholder.com/GML_and_GeoTIFF</ows:Profile>
- <ows:Profile>http://www.placeholder.com/SCALING</ows:Profile>
- <ows:Profile>http://www.placeholder.com/INTERPOLATION</ows:Profile>
- <ows:Profile>http://www.placeholder.com/RANGESUBSET</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_scaling+interpolation/1.0/conf/scaling+interpolation</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_band-subsetting/1.0/conf/band-subsetting</ows:Profile>
<ows:Fees>NONE</ows:Fees>
<ows:AccessConstraints>NONE</ows:AccessConstraints>
</ows:ServiceIdentification>
@@ -92,7 +91,7 @@
</ows:DCP>
</ows:Operation>
</ows:OperationsMetadata>
- <wcs:ServiceMetadata version="1.0.0"/>
+ <wcs:ServiceMetadata/>
<wcs:Contents>
<wcs:CoverageSummary>
<wcs:CoverageId>grey</wcs:CoverageId>
Modified: trunk/msautotest/wxs/expected/wcs_20_cap_accept_versions.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_cap_accept_versions.xml 2011-08-24 13:36:39 UTC (rev 12110)
+++ trunk/msautotest/wxs/expected/wcs_20_cap_accept_versions.xml 2011-08-25 08:55:05 UTC (rev 12111)
@@ -10,15 +10,14 @@
<ows:ServiceType codeSpace="OGC">OGC WCS</ows:ServiceType>
<ows:ServiceTypeVersion>2.0.0</ows:ServiceTypeVersion>
<ows:Profile>http://www.opengis.net/spec/WCS/2.0/conf/core</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_get-kvp/1.0</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_post-xml/1.0</ows:Profile>
- <ows:Profile>http://www.placeholder.com/EPSG</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_get-kvp/1.0/conf/get-kvp</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_post-xml/1.0/conf/post-xml</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_crs-predefined/1.0/conf/crs-predefined</ows:Profile>
<ows:Profile>http://www.placeholder.com/IMAGECRS</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_coverage-encoding_geotiff/1.0/</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_encoding_geotiff/1.0/conf/geotiff</ows:Profile>
<ows:Profile>http://www.placeholder.com/GML_and_GeoTIFF</ows:Profile>
- <ows:Profile>http://www.placeholder.com/SCALING</ows:Profile>
- <ows:Profile>http://www.placeholder.com/INTERPOLATION</ows:Profile>
- <ows:Profile>http://www.placeholder.com/RANGESUBSET</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_scaling+interpolation/1.0/conf/scaling+interpolation</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_band-subsetting/1.0/conf/band-subsetting</ows:Profile>
<ows:Fees>NONE</ows:Fees>
<ows:AccessConstraints>NONE</ows:AccessConstraints>
</ows:ServiceIdentification>
@@ -92,7 +91,7 @@
</ows:DCP>
</ows:Operation>
</ows:OperationsMetadata>
- <wcs:ServiceMetadata version="1.0.0"/>
+ <wcs:ServiceMetadata/>
<wcs:Contents>
<wcs:CoverageSummary>
<wcs:CoverageId>grey</wcs:CoverageId>
Modified: trunk/msautotest/wxs/expected/wcs_20_cap_sections_all.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_cap_sections_all.xml 2011-08-24 13:36:39 UTC (rev 12110)
+++ trunk/msautotest/wxs/expected/wcs_20_cap_sections_all.xml 2011-08-25 08:55:05 UTC (rev 12111)
@@ -10,15 +10,14 @@
<ows:ServiceType codeSpace="OGC">OGC WCS</ows:ServiceType>
<ows:ServiceTypeVersion>2.0.0</ows:ServiceTypeVersion>
<ows:Profile>http://www.opengis.net/spec/WCS/2.0/conf/core</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_get-kvp/1.0</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_post-xml/1.0</ows:Profile>
- <ows:Profile>http://www.placeholder.com/EPSG</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_get-kvp/1.0/conf/get-kvp</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_post-xml/1.0/conf/post-xml</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_crs-predefined/1.0/conf/crs-predefined</ows:Profile>
<ows:Profile>http://www.placeholder.com/IMAGECRS</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_coverage-encoding_geotiff/1.0/</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_encoding_geotiff/1.0/conf/geotiff</ows:Profile>
<ows:Profile>http://www.placeholder.com/GML_and_GeoTIFF</ows:Profile>
- <ows:Profile>http://www.placeholder.com/SCALING</ows:Profile>
- <ows:Profile>http://www.placeholder.com/INTERPOLATION</ows:Profile>
- <ows:Profile>http://www.placeholder.com/RANGESUBSET</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_scaling+interpolation/1.0/conf/scaling+interpolation</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_band-subsetting/1.0/conf/band-subsetting</ows:Profile>
<ows:Fees>NONE</ows:Fees>
<ows:AccessConstraints>NONE</ows:AccessConstraints>
</ows:ServiceIdentification>
@@ -92,7 +91,7 @@
</ows:DCP>
</ows:Operation>
</ows:OperationsMetadata>
- <wcs:ServiceMetadata version="1.0.0"/>
+ <wcs:ServiceMetadata/>
<wcs:Contents>
<wcs:CoverageSummary>
<wcs:CoverageId>grey</wcs:CoverageId>
Modified: trunk/msautotest/wxs/expected/wcs_20_cap_sections_all_specific.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_cap_sections_all_specific.xml 2011-08-24 13:36:39 UTC (rev 12110)
+++ trunk/msautotest/wxs/expected/wcs_20_cap_sections_all_specific.xml 2011-08-25 08:55:05 UTC (rev 12111)
@@ -10,15 +10,14 @@
<ows:ServiceType codeSpace="OGC">OGC WCS</ows:ServiceType>
<ows:ServiceTypeVersion>2.0.0</ows:ServiceTypeVersion>
<ows:Profile>http://www.opengis.net/spec/WCS/2.0/conf/core</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_get-kvp/1.0</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_post-xml/1.0</ows:Profile>
- <ows:Profile>http://www.placeholder.com/EPSG</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_get-kvp/1.0/conf/get-kvp</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_post-xml/1.0/conf/post-xml</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_crs-predefined/1.0/conf/crs-predefined</ows:Profile>
<ows:Profile>http://www.placeholder.com/IMAGECRS</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_coverage-encoding_geotiff/1.0/</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_encoding_geotiff/1.0/conf/geotiff</ows:Profile>
<ows:Profile>http://www.placeholder.com/GML_and_GeoTIFF</ows:Profile>
- <ows:Profile>http://www.placeholder.com/SCALING</ows:Profile>
- <ows:Profile>http://www.placeholder.com/INTERPOLATION</ows:Profile>
- <ows:Profile>http://www.placeholder.com/RANGESUBSET</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_scaling+interpolation/1.0/conf/scaling+interpolation</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_band-subsetting/1.0/conf/band-subsetting</ows:Profile>
<ows:Fees>NONE</ows:Fees>
<ows:AccessConstraints>NONE</ows:AccessConstraints>
</ows:ServiceIdentification>
@@ -92,7 +91,7 @@
</ows:DCP>
</ows:Operation>
</ows:OperationsMetadata>
- <wcs:ServiceMetadata version="1.0.0"/>
+ <wcs:ServiceMetadata/>
<wcs:Contents>
<wcs:CoverageSummary>
<wcs:CoverageId>grey</wcs:CoverageId>
Modified: trunk/msautotest/wxs/expected/wcs_20_cap_sections_contents.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_cap_sections_contents.xml 2011-08-24 13:36:39 UTC (rev 12110)
+++ trunk/msautotest/wxs/expected/wcs_20_cap_sections_contents.xml 2011-08-25 08:55:05 UTC (rev 12111)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<wcs:Capabilities xmlns:wcs="http://www.opengis.net/wcs/2.0" xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:swe="http://www.opengis.net/swe/2.0" xsi:schemaLocation="http://www.opengis.net/wcs/2.0 http://schemas.opengis.net/wcs/2.0/wcsAll.xsd " version="2.0.0" updateSequence="2007-10-30T14:23:38Z">
- <wcs:ServiceMetadata version="1.0.0"/>
+ <wcs:ServiceMetadata/>
<wcs:Contents>
<wcs:CoverageSummary>
<wcs:CoverageId>grey</wcs:CoverageId>
Modified: trunk/msautotest/wxs/expected/wcs_20_cap_sections_operations_metadata.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_cap_sections_operations_metadata.xml 2011-08-24 13:36:39 UTC (rev 12110)
+++ trunk/msautotest/wxs/expected/wcs_20_cap_sections_operations_metadata.xml 2011-08-25 08:55:05 UTC (rev 12111)
@@ -44,5 +44,5 @@
</ows:DCP>
</ows:Operation>
</ows:OperationsMetadata>
- <wcs:ServiceMetadata version="1.0.0"/>
+ <wcs:ServiceMetadata/>
</wcs:Capabilities>
Modified: trunk/msautotest/wxs/expected/wcs_20_cap_sections_service_identification.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_cap_sections_service_identification.xml 2011-08-24 13:36:39 UTC (rev 12110)
+++ trunk/msautotest/wxs/expected/wcs_20_cap_sections_service_identification.xml 2011-08-25 08:55:05 UTC (rev 12111)
@@ -10,17 +10,16 @@
<ows:ServiceType codeSpace="OGC">OGC WCS</ows:ServiceType>
<ows:ServiceTypeVersion>2.0.0</ows:ServiceTypeVersion>
<ows:Profile>http://www.opengis.net/spec/WCS/2.0/conf/core</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_get-kvp/1.0</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_post-xml/1.0</ows:Profile>
- <ows:Profile>http://www.placeholder.com/EPSG</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_get-kvp/1.0/conf/get-kvp</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_post-xml/1.0/conf/post-xml</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_crs-predefined/1.0/conf/crs-predefined</ows:Profile>
<ows:Profile>http://www.placeholder.com/IMAGECRS</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_coverage-encoding_geotiff/1.0/</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_encoding_geotiff/1.0/conf/geotiff</ows:Profile>
<ows:Profile>http://www.placeholder.com/GML_and_GeoTIFF</ows:Profile>
- <ows:Profile>http://www.placeholder.com/SCALING</ows:Profile>
- <ows:Profile>http://www.placeholder.com/INTERPOLATION</ows:Profile>
- <ows:Profile>http://www.placeholder.com/RANGESUBSET</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_scaling+interpolation/1.0/conf/scaling+interpolation</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_band-subsetting/1.0/conf/band-subsetting</ows:Profile>
<ows:Fees>NONE</ows:Fees>
<ows:AccessConstraints>NONE</ows:AccessConstraints>
</ows:ServiceIdentification>
- <wcs:ServiceMetadata version="1.0.0"/>
+ <wcs:ServiceMetadata/>
</wcs:Capabilities>
Modified: trunk/msautotest/wxs/expected/wcs_20_cap_sections_service_provider.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_cap_sections_service_provider.xml 2011-08-24 13:36:39 UTC (rev 12110)
+++ trunk/msautotest/wxs/expected/wcs_20_cap_sections_service_provider.xml 2011-08-25 08:55:05 UTC (rev 12111)
@@ -26,5 +26,5 @@
<ows:Role>staff</ows:Role>
</ows:ServiceContact>
</ows:ServiceProvider>
- <wcs:ServiceMetadata version="1.0.0"/>
+ <wcs:ServiceMetadata/>
</wcs:Capabilities>
Modified: trunk/msautotest/wxs/expected/wcs_20_cap_updatesequence.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_cap_updatesequence.xml 2011-08-24 13:36:39 UTC (rev 12110)
+++ trunk/msautotest/wxs/expected/wcs_20_cap_updatesequence.xml 2011-08-25 08:55:05 UTC (rev 12111)
@@ -10,15 +10,14 @@
<ows:ServiceType codeSpace="OGC">OGC WCS</ows:ServiceType>
<ows:ServiceTypeVersion>2.0.0</ows:ServiceTypeVersion>
<ows:Profile>http://www.opengis.net/spec/WCS/2.0/conf/core</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_get-kvp/1.0</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_post-xml/1.0</ows:Profile>
- <ows:Profile>http://www.placeholder.com/EPSG</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_get-kvp/1.0/conf/get-kvp</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_post-xml/1.0/conf/post-xml</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_crs-predefined/1.0/conf/crs-predefined</ows:Profile>
<ows:Profile>http://www.placeholder.com/IMAGECRS</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_coverage-encoding_geotiff/1.0/</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_encoding_geotiff/1.0/conf/geotiff</ows:Profile>
<ows:Profile>http://www.placeholder.com/GML_and_GeoTIFF</ows:Profile>
- <ows:Profile>http://www.placeholder.com/SCALING</ows:Profile>
- <ows:Profile>http://www.placeholder.com/INTERPOLATION</ows:Profile>
- <ows:Profile>http://www.placeholder.com/RANGESUBSET</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_scaling+interpolation/1.0/conf/scaling+interpolation</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_band-subsetting/1.0/conf/band-subsetting</ows:Profile>
<ows:Fees>NONE</ows:Fees>
<ows:AccessConstraints>NONE</ows:AccessConstraints>
</ows:ServiceIdentification>
@@ -92,7 +91,7 @@
</ows:DCP>
</ows:Operation>
</ows:OperationsMetadata>
- <wcs:ServiceMetadata version="1.0.0"/>
+ <wcs:ServiceMetadata/>
<wcs:Contents>
<wcs:CoverageSummary>
<wcs:CoverageId>grey</wcs:CoverageId>
Modified: trunk/msautotest/wxs/expected/wcs_20_post_cap.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_post_cap.xml 2011-08-24 13:36:39 UTC (rev 12110)
+++ trunk/msautotest/wxs/expected/wcs_20_post_cap.xml 2011-08-25 08:55:05 UTC (rev 12111)
@@ -10,15 +10,14 @@
<ows:ServiceType codeSpace="OGC">OGC WCS</ows:ServiceType>
<ows:ServiceTypeVersion>2.0.0</ows:ServiceTypeVersion>
<ows:Profile>http://www.opengis.net/spec/WCS/2.0/conf/core</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_get-kvp/1.0</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_post-xml/1.0</ows:Profile>
- <ows:Profile>http://www.placeholder.com/EPSG</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_get-kvp/1.0/conf/get-kvp</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_post-xml/1.0/conf/post-xml</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_crs-predefined/1.0/conf/crs-predefined</ows:Profile>
<ows:Profile>http://www.placeholder.com/IMAGECRS</ows:Profile>
- <ows:Profile>http://www.opengis.net/spec/WCS_coverage-encoding_geotiff/1.0/</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_encoding_geotiff/1.0/conf/geotiff</ows:Profile>
<ows:Profile>http://www.placeholder.com/GML_and_GeoTIFF</ows:Profile>
- <ows:Profile>http://www.placeholder.com/SCALING</ows:Profile>
- <ows:Profile>http://www.placeholder.com/INTERPOLATION</ows:Profile>
- <ows:Profile>http://www.placeholder.com/RANGESUBSET</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_scaling+interpolation/1.0/conf/scaling+interpolation</ows:Profile>
+ <ows:Profile>http://www.opengis.net/spec/WCS_service-model_band-subsetting/1.0/conf/band-subsetting</ows:Profile>
<ows:Fees>NONE</ows:Fees>
<ows:AccessConstraints>NONE</ows:AccessConstraints>
</ows:ServiceIdentification>
@@ -92,7 +91,7 @@
</ows:DCP>
</ows:Operation>
</ows:OperationsMetadata>
- <wcs:ServiceMetadata version="1.0.0"/>
+ <wcs:ServiceMetadata/>
<wcs:Contents>
<wcs:CoverageSummary>
<wcs:CoverageId>grey</wcs:CoverageId>
More information about the mapserver-commits
mailing list