[mapserver-commits] r12792 - in sandbox/inspire_soc2011: mapserver mapserver/mapscript/php msautotest msautotest/wxs/expected

[svn at osgeo.org]

Author: schpidi
Date: 2011-11-22 05:17:42 -0800 (Tue, 22 Nov 2011)
New Revision: 12792

Modified:
   sandbox/inspire_soc2011/mapserver/
   sandbox/inspire_soc2011/mapserver/mapscript/php/
   sandbox/inspire_soc2011/msautotest/
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_legendgraphic_airlink.png
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_legendgraphic_roadarea.png
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_legendgraphic_roadlink.png
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_legendgraphic_transportlink.png
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_map130_airlink.png
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_map130_roadarea.png
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_map130_roadlink.png
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_map130_transportlink.png
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_legendgraphic_airlink.png
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_legendgraphic_roadarea.png
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_legendgraphic_roadlink.png
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_legendgraphic_transportlink.png
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_map130_airlink.png
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_map130_roadarea.png
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_map130_roadlink.png
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_map130_transportlink.png
Log:
Updating expected results in INSPIRE sandbox.



Property changes on: sandbox/inspire_soc2011/mapserver
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/aboudreault:9103-9193
/sandbox/mapserver6:10108-10742
/trunk/mapserver:11677-12790
   + /sandbox/aboudreault:9103-9193
/sandbox/mapserver6:10108-10742
/trunk/mapserver:11677-12791


Property changes on: sandbox/inspire_soc2011/mapserver/mapscript/php
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/aboudreault/mapscript/php3:9103-9193
/sandbox/mapserver6/mapscript/php:10108-10742
/trunk/mapserver/mapscript/php:11677-12790
   + /sandbox/aboudreault/mapscript/php3:9103-9193
/sandbox/mapserver6/mapscript/php:10108-10742
/trunk/mapserver/mapscript/php:11677-12791


Property changes on: sandbox/inspire_soc2011/msautotest
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/msautotest:11678-12790
   + /trunk/msautotest:11678-12791

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml	2011-11-22 11:44:17 UTC (rev 12791)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml	2011-11-22 13:17:42 UTC (rev 12792)
@@ -49,6 +49,8 @@
       <Format>image/jpeg</Format>
       <Format>image/gif</Format>
       <Format>image/png; mode=8bit</Format>
+      <Format>application/x-pdf</Format>
+      <Format>image/svg+xml</Format>
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml	2011-11-22 11:44:17 UTC (rev 12791)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml	2011-11-22 13:17:42 UTC (rev 12792)
@@ -49,6 +49,8 @@
       <Format>image/jpeg</Format>
       <Format>image/gif</Format>
       <Format>image/png; mode=8bit</Format>
+      <Format>application/x-pdf</Format>
+      <Format>image/svg+xml</Format>
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml	2011-11-22 11:44:17 UTC (rev 12791)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml	2011-11-22 13:17:42 UTC (rev 12792)
@@ -49,6 +49,8 @@
       <Format>image/jpeg</Format>
       <Format>image/gif</Format>
       <Format>image/png; mode=8bit</Format>
+      <Format>application/x-pdf</Format>
+      <Format>image/svg+xml</Format>
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_legendgraphic_airlink.png
===================================================================
(Binary files differ)

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_legendgraphic_roadarea.png
===================================================================
(Binary files differ)

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_legendgraphic_roadlink.png
===================================================================
(Binary files differ)

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_legendgraphic_transportlink.png
===================================================================
(Binary files differ)

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_map130_airlink.png
===================================================================
(Binary files differ)

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_map130_roadarea.png
===================================================================
(Binary files differ)

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_map130_roadlink.png
===================================================================
(Binary files differ)

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_map130_transportlink.png
===================================================================
(Binary files differ)

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml	2011-11-22 11:44:17 UTC (rev 12791)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml	2011-11-22 13:17:42 UTC (rev 12792)
@@ -49,6 +49,8 @@
       <Format>image/jpeg</Format>
       <Format>image/gif</Format>
       <Format>image/png; mode=8bit</Format>
+      <Format>application/x-pdf</Format>
+      <Format>image/svg+xml</Format>
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml	2011-11-22 11:44:17 UTC (rev 12791)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml	2011-11-22 13:17:42 UTC (rev 12792)
@@ -49,6 +49,8 @@
       <Format>image/jpeg</Format>
       <Format>image/gif</Format>
       <Format>image/png; mode=8bit</Format>
+      <Format>application/x-pdf</Format>
+      <Format>image/svg+xml</Format>
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml	2011-11-22 11:44:17 UTC (rev 12791)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml	2011-11-22 13:17:42 UTC (rev 12792)
@@ -49,6 +49,8 @@
       <Format>image/jpeg</Format>
       <Format>image/gif</Format>
       <Format>image/png; mode=8bit</Format>
+      <Format>application/x-pdf</Format>
+      <Format>image/svg+xml</Format>
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_legendgraphic_airlink.png
===================================================================
(Binary files differ)

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_legendgraphic_roadarea.png
===================================================================
(Binary files differ)

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_legendgraphic_roadlink.png
===================================================================
(Binary files differ)

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_legendgraphic_transportlink.png
===================================================================
(Binary files differ)

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_map130_airlink.png
===================================================================
(Binary files differ)

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_map130_roadarea.png
===================================================================
(Binary files differ)

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_map130_roadlink.png
===================================================================
(Binary files differ)

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_map130_transportlink.png
===================================================================
(Binary files differ)