--- a/ChangeLog	Tue May 10 12:52:05 2011 +0200
+++ b/ChangeLog	Tue May 10 14:40:57 2011 +0200
@@ -1,3 +1,9 @@
+2011-05-10  Stephan Holl  <stephan.holl@intevation.de>
+
+	* mapserver/mapfile/mapfile_header.include, mapserver/mapfile/mxd.map,
+	  mapserver/symbols/symbols.sym: Optimized the mapfile to use as a
+	  template when instantiating the new mapObj.
+
 2011-05-10  Stephan Holl  <stephan.holl@intevation.de>
 
 	* properties.xml: Adopt build-path to Windows-TMP-folder

--- a/mapserver/mapfile/mapfile_header.include	Tue May 10 12:52:05 2011 +0200
+++ b/mapserver/mapfile/mapfile_header.include	Tue May 10 14:40:57 2011 +0200
@@ -3,20 +3,17 @@
 EXTENT 3427000 5787000 3444200 5801000
 UNITS meters
 IMAGECOLOR -1 -1 -1 #transparent
-#FONTSET "../fonts/fonts.txt"
 FONTSET "../../ttf-fonts/fonts.txt"
 SYMBOLSET "../symbols/symbols.sym"
-SHAPEPATH "../../testdata-frida"
 IMAGETYPE png 
 CONFIG "ON_MISSING_DATA" "LOG" # see http://mapserver.org/mapfile/map.html for details
-CONFIG "CPL_DEBUG" "ON" # GDAL-debugging on
-CONFIG "MS_ERRORFILE" "/home/intevation/mxd-testbed/mapserver/logs/ms_error.log"
+CONFIG "MS_ERRORFILE" "../../logs/ms_error.log"
 DEBUG 5
 
 MAXSIZE 2500 # 2500x2500 pixel maximum Site
 
 # Own PROJECTION-file
-CONFIG "PROJ_LIB" "/home/intevation/mxd-testbed/mapserver/epsg"
+CONFIG "PROJ_LIB" "../../mapserver/epsg"
 
 PROJECTION
 	"init=epsg:31467"
@@ -60,13 +57,3 @@
 	EXTENSION "png"
 END
 
-# 8bit jpeg
-OUTPUTFORMAT
-	NAME jpeg
-	DRIVER "GD/JPEG"
-	MIMETYPE "image/jpeg"
-	IMAGEMODE RGB
-	EXTENSION "jpg"
-	FORMATOPTION "QUALITY=80"
-	FORMATOPTION "INTERLACE=ON"
-END

--- a/mapserver/mapfile/mxd.map	Tue May 10 12:52:05 2011 +0200
+++ b/mapserver/mapfile/mxd.map	Tue May 10 14:40:57 2011 +0200
@@ -7,8 +7,6 @@
 WEB
   IMAGEPATH "/tmp/"
   IMAGEURL "/tmp/"
-  MINSCALEDENOM 1000 
-  MAXSCALEDENOM 100000
 
   METADATA
     'ows_title'           'Intevation MXD WMS DemoService'
@@ -33,36 +31,10 @@
     'ows_sld_enabled'   'false'
     'ows_http_max_age'  '86400' # should 24h in seconds
     'wms_feature_info_mime_type'    'text/html'
-    'wms_getmap_formatlist' 'image/jpeg,image/png,image/png; mode=24bit'
+    'wms_getmap_formatlist' 'image/png,image/png; mode=24bit'
     'wms_encoding' 'UTF-8'
     'wms_exceptions_format' 'XML'
   END
 END
 
-# Styles: point
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/SimpleMarkerSymbol/p_single_4pt_c255-0-0.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/PictureMarkerSymbol/p_pictmarker_11pt_warning.bmp.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/CharacterMarkerSymbol/p_single_18pt_c255-255-255_ttf.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/CharacterMarkerSymbol/p_charmarker_18pt_c255-0-0.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/ArrowMarkerSymbol/p_arrowmarker_0-0-0_12-0.map"
-# Styles: line
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dash-dott-dott_1pt_c255-255-255.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dash-dotted_1pt_c255-255-255.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dashed_1pt_c255-255-255.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dotted_1pt_c255-255-255.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_solid_1pt_c255-255-255.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/PictureLineSymbol/l_pictureline_brick1_1_1_1-0-0-0.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-bever.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-miter.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-round.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_round-butted.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_6pt_c255-255-255_butt-round_template.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_04pt_c255-255-255_butt-round_template_multilayer.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/MarkerLineSymbol/l_markerline_18pt_0-0-0_raute.map"
-# Styles: polygon
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/SimpleFillSymbol/pol_simple_255-0-0.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/SimpleFillSymbol/pol_simple_transp_dashed-outline.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/PictureFillSymbol/pol_single_04pt_109-187-67_0-1-1_Grassland.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/MarkerFillSymbol/pol_marker_fill_0-0-0_1.map"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/LineFillSymbol/pol_linefill_255-0-0_45_outline.map"
 END

--- a/mapserver/symbols/symbols.sym	Tue May 10 12:52:05 2011 +0200
+++ b/mapserver/symbols/symbols.sym	Tue May 10 14:40:57 2011 +0200
@@ -1,28 +1,28 @@
 SYMBOLSET
-# Styles: point
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/SimpleMarkerSymbol/p_single_4pt_c255-0-0.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/PictureMarkerSymbol/p_pictmarker_11pt_warning.bmp.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/CharacterMarkerSymbol/p_single_18pt_c255-255-255_ttf.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/CharacterMarkerSymbol/p_charmarker_18pt_c255-0-0.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/ArrowMarkerSymbol/p_arrowmarker_0-0-0_12-0.sym"
-# Styles: line
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dash-dott-dott_1pt_c255-255-255.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dash-dotted_1pt_c255-255-255.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dashed_1pt_c255-255-255.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dotted_1pt_c255-255-255.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_solid_1pt_c255-255-255.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/PictureLineSymbol/l_pictureline_brick1_1_1_1-0-0-0.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-bever.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-miter.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-round.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_round-butted.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_6pt_c255-255-255_butt-round_template.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_04pt_c255-255-255_butt-round_template_multilayer.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/MarkerLineSymbol/l_markerline_18pt_0-0-0_raute.sym"
-# Styles: polygon
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/SimpleFillSymbol/pol_simple_255-0-0.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/SimpleFillSymbol/pol_simple_transp_dashed-outline.sym" 
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/PictureFillSymbol/pol_single_04pt_109-187-67_0-1-1_Grassland.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/MarkerFillSymbol/pol_marker_fill_0-0-0_1.sym"
-INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/LineFillSymbol/pol_linefill_255-0-0_45_outline.sym"
-END
+### Styles: point
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/SimpleMarkerSymbol/p_single_4pt_c255-0-0.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/PictureMarkerSymbol/p_pictmarker_11pt_warning.bmp.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/CharacterMarkerSymbol/p_single_18pt_c255-255-255_ttf.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/CharacterMarkerSymbol/p_charmarker_18pt_c255-0-0.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/ArrowMarkerSymbol/p_arrowmarker_0-0-0_12-0.sym"
+### Styles: line
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dash-dott-dott_1pt_c255-255-255.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dash-dotted_1pt_c255-255-255.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dashed_1pt_c255-255-255.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dotted_1pt_c255-255-255.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_solid_1pt_c255-255-255.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/PictureLineSymbol/l_pictureline_brick1_1_1_1-0-0-0.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-bever.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-miter.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-round.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_round-butted.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_6pt_c255-255-255_butt-round_template.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_04pt_c255-255-255_butt-round_template_multilayer.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/MarkerLineSymbol/l_markerline_18pt_0-0-0_raute.sym"
+### Styles: polygon
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/SimpleFillSymbol/pol_simple_255-0-0.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/SimpleFillSymbol/pol_simple_transp_dashed-outline.sym" 
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/PictureFillSymbol/pol_single_04pt_109-187-67_0-1-1_Grassland.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/MarkerFillSymbol/pol_marker_fill_0-0-0_1.sym"
+##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/LineFillSymbol/pol_linefill_255-0-0_45_outline.sym"
+##END