1 files changed, 98 insertions, 56 deletions

diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index f6acc4523320..ad7ad95d605a 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -28,6 +28,11 @@
 @unexec if cmp -s %D/%%G%%/data_dir/layergroups/tasmania.xml %D/%%G%%/data_dir/layergroups/tasmania.xml.sample; then rm -f %D/%%G%%/data_dir/layergroups/tasmania.xml; fi
 @unexec if cmp -s %D/%%G%%/data_dir/layergroups/tiger-ny.xml %D/%%G%%/data_dir/layergroups/tiger-ny.xml.sample; then rm -f %D/%%G%%/data_dir/layergroups/tiger-ny.xml; fi
 @unexec if cmp -s %D/%%G%%/data_dir/logging.xml %D/%%G%%/data_dir/logging.xml.sample; then rm -f %D/%%G%%/data_dir/logging.xml; fi
+@unexec if cmp -s %D/%%G%%/data_dir/logs/DEFAULT_LOGGING.properties  %D/%%G%%/data_dir/logs/DEFAULT_LOGGING.properties.sample; then rm -f %D/%%G%%/data_dir/logs/DEFAULT_LOGGING.properties; fi
+@unexec if cmp -s %D/%%G%%/data_dir/logs/GEOSERVER_DEVELOPER_LOGGING.properties  %D/%%G%%/data_dir/logs/GEOSERVER_DEVELOPER_LOGGING.properties.sample; then rm -f %D/%%G%%/data_dir/logs/GEOSERVER_DEVELOPER_LOGGING.properties; fi
+@unexec if cmp -s %D/%%G%%/data_dir/logs/GEOTOOLS_DEVELOPER_LOGGING.properties  %D/%%G%%/data_dir/logs/GEOTOOLS_DEVELOPER_LOGGING.properties.sample; then rm -f %D/%%G%%/data_dir/logs/GEOTOOLS_DEVELOPER_LOGGING.properties; fi
+@unexec if cmp -s %D/%%G%%/data_dir/logs/PRODUCTION_LOGGING.properties  %D/%%G%%/data_dir/logs/PRODUCTION_LOGGING.properties.sample; then rm -f %D/%%G%%/data_dir/logs/PRODUCTION_LOGGING.properties; fi
+@unexec if cmp -s %D/%%G%%/data_dir/logs/VERBOSE_LOGGING.properties  %D/%%G%%/data_dir/logs/VERBOSE_LOGGING.properties.sample; then rm -f %D/%%G%%/data_dir/logs/VERBOSE_LOGGING.properties; fi
 @unexec if cmp -s %D/%%G%%/data_dir/plugIns/AddressGap.xml %D/%%G%%/data_dir/plugIns/AddressGap.xml.sample; then rm -f %D/%%G%%/data_dir/plugIns/AddressGap.xml; fi
 @unexec if cmp -s %D/%%G%%/data_dir/plugIns/AddressOverlap.xml %D/%%G%%/data_dir/plugIns/AddressOverlap.xml.sample; then rm -f %D/%%G%%/data_dir/plugIns/AddressOverlap.xml; fi
 @unexec if cmp -s %D/%%G%%/data_dir/plugIns/AngleSize.xml %D/%%G%%/data_dir/plugIns/AngleSize.xml.sample; then rm -f %D/%%G%%/data_dir/plugIns/AngleSize.xml; fi
@@ -80,6 +85,7 @@
 @unexec if cmp -s %D/%%G%%/data_dir/plugIns/Uniquity.xml %D/%%G%%/data_dir/plugIns/Uniquity.xml.sample; then rm -f %D/%%G%%/data_dir/plugIns/Uniquity.xml; fi
 @unexec if cmp -s %D/%%G%%/data_dir/plugIns/WithinIntegrity.xml %D/%%G%%/data_dir/plugIns/WithinIntegrity.xml.sample; then rm -f %D/%%G%%/data_dir/plugIns/WithinIntegrity.xml; fi
 @unexec if cmp -s %D/%%G%%/data_dir/security/layers.properties %D/%%G%%/data_dir/security/layers.properties.sample; then rm -f %D/%%G%%/data_dir/security/layers.properties; fi
+@unexec if cmp -s %D/%%G%%/data_dir/security/rest.properties %D/%%G%%/data_dir/security/rest.properties.sample; then rm -f %D/%%G%%/data_dir/security/rest.properties; fi
 @unexec if cmp -s %D/%%G%%/data_dir/security/service.properties %D/%%G%%/data_dir/security/service.properties.sample; then rm -f %D/%%G%%/data_dir/security/service.properties; fi
 @unexec if cmp -s %D/%%G%%/data_dir/security/users.properties %D/%%G%%/data_dir/security/users.properties.sample; then rm -f %D/%%G%%/data_dir/security/users.properties; fi
 @unexec if cmp -s %D/%%G%%/data_dir/styles/burg.xml %D/%%G%%/data_dir/styles/burg.xml.sample; then rm -f %D/%%G%%/data_dir/styles/burg.xml; fi
@@ -110,6 +116,7 @@
 @unexec if cmp -s %D/%%G%%/data_dir/wcs.xml %D/%%G%%/data_dir/wcs.xml.sample; then rm -f %D/%%G%%/data_dir/wcs.xml; fi
 @unexec if cmp -s %D/%%G%%/data_dir/wfs.xml %D/%%G%%/data_dir/wfs.xml.sample; then rm -f %D/%%G%%/data_dir/wfs.xml; fi
 @unexec if cmp -s %D/%%G%%/data_dir/wms.xml %D/%%G%%/data_dir/wms.xml.sample; then rm -f %D/%%G%%/data_dir/wms.xml; fi
+@unexec if cmp -s %D/%%G%%/data_dir/workspaces/default.xml %D/%%G%%/data_dir/workspaces/default.xml.sample; then rm -f %D/%%G%%/data_dir/workspaces/default.xml; fi
 @unexec if cmp -s %D/%%G%%/data_dir/workspaces/cite/namespace.xml %D/%%G%%/data_dir/workspaces/cite/namespace.xml.sample; then rm -f %D/%%G%%/data_dir/workspaces/cite/namespace.xml; fi
 @unexec if cmp -s %D/%%G%%/data_dir/workspaces/cite/workspace.xml %D/%%G%%/data_dir/workspaces/cite/workspace.xml.sample; then rm -f %D/%%G%%/data_dir/workspaces/cite/workspace.xml; fi
 @unexec if cmp -s %D/%%G%%/data_dir/workspaces/it.geosolutions/namespace.xml %D/%%G%%/data_dir/workspaces/it.geosolutions/namespace.xml.sample; then rm -f %D/%%G%%/data_dir/workspaces/it.geosolutions/namespace.xml; fi
@@ -289,63 +296,79 @@
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.shp
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.shx
 %%G%%/data_dir/data/nyc/giant_polygon.dbf
+%%G%%/data_dir/data/nyc/giant_polygon.fix
 %%G%%/data_dir/data/nyc/giant_polygon.prj
 %%G%%/data_dir/data/nyc/giant_polygon.qix
 %%G%%/data_dir/data/nyc/giant_polygon.shp
 %%G%%/data_dir/data/nyc/giant_polygon.shx
 %%G%%/data_dir/data/nyc/poi.dbf
+%%G%%/data_dir/data/nyc/poi.fix
 %%G%%/data_dir/data/nyc/poi.prj
 %%G%%/data_dir/data/nyc/poi.qix
 %%G%%/data_dir/data/nyc/poi.shp
 %%G%%/data_dir/data/nyc/poi.shx
 %%G%%/data_dir/data/nyc/poly_landmarks.dbf
+%%G%%/data_dir/data/nyc/poly_landmarks.fix
 %%G%%/data_dir/data/nyc/poly_landmarks.prj
 %%G%%/data_dir/data/nyc/poly_landmarks.qix
 %%G%%/data_dir/data/nyc/poly_landmarks.shp
 %%G%%/data_dir/data/nyc/poly_landmarks.shx
 %%G%%/data_dir/data/nyc/tiger_roads.dbf
+%%G%%/data_dir/data/nyc/tiger_roads.fix
 %%G%%/data_dir/data/nyc/tiger_roads.prj
 %%G%%/data_dir/data/nyc/tiger_roads.qix
 %%G%%/data_dir/data/nyc/tiger_roads.shp
 %%G%%/data_dir/data/nyc/tiger_roads.shx
 %%G%%/data_dir/data/sf/archsites.dbf
+%%G%%/data_dir/data/sf/archsites.fix
 %%G%%/data_dir/data/sf/archsites.prj
 %%G%%/data_dir/data/sf/archsites.shp
 %%G%%/data_dir/data/sf/archsites.shx
 %%G%%/data_dir/data/sf/bugsites.dbf
+%%G%%/data_dir/data/sf/bugsites.fix
 %%G%%/data_dir/data/sf/bugsites.prj
 %%G%%/data_dir/data/sf/bugsites.shp
 %%G%%/data_dir/data/sf/bugsites.shx
 %%G%%/data_dir/data/sf/restricted.dbf
+%%G%%/data_dir/data/sf/restricted.fix
 %%G%%/data_dir/data/sf/restricted.prj
 %%G%%/data_dir/data/sf/restricted.shp
 %%G%%/data_dir/data/sf/restricted.shx
 %%G%%/data_dir/data/sf/roads.dbf
+%%G%%/data_dir/data/sf/roads.fix
 %%G%%/data_dir/data/sf/roads.prj
 %%G%%/data_dir/data/sf/roads.shp
 %%G%%/data_dir/data/sf/roads.shx
 %%G%%/data_dir/data/sf/sfdem.tif
 %%G%%/data_dir/data/sf/streams.dbf
+%%G%%/data_dir/data/sf/streams.fix
 %%G%%/data_dir/data/sf/streams.prj
 %%G%%/data_dir/data/sf/streams.shp
 %%G%%/data_dir/data/sf/streams.shx
 %%G%%/data_dir/data/shapefiles/states.dbf
+%%G%%/data_dir/data/shapefiles/states.fix
 %%G%%/data_dir/data/shapefiles/states.prj
+%%G%%/data_dir/data/shapefiles/states.qix
 %%G%%/data_dir/data/shapefiles/states.shp
 %%G%%/data_dir/data/shapefiles/states.shx
 %%G%%/data_dir/data/taz_shapes/tasmania_cities.dbf
+%%G%%/data_dir/data/taz_shapes/tasmania_cities.fix
 %%G%%/data_dir/data/taz_shapes/tasmania_cities.prj
 %%G%%/data_dir/data/taz_shapes/tasmania_cities.shp
 %%G%%/data_dir/data/taz_shapes/tasmania_cities.shx
 %%G%%/data_dir/data/taz_shapes/tasmania_roads.dbf
+%%G%%/data_dir/data/taz_shapes/tasmania_roads.fix
 %%G%%/data_dir/data/taz_shapes/tasmania_roads.prj
+%%G%%/data_dir/data/taz_shapes/tasmania_roads.qix
 %%G%%/data_dir/data/taz_shapes/tasmania_roads.shp
 %%G%%/data_dir/data/taz_shapes/tasmania_roads.shx
 %%G%%/data_dir/data/taz_shapes/tasmania_state_boundaries.dbf
+%%G%%/data_dir/data/taz_shapes/tasmania_state_boundaries.fix
 %%G%%/data_dir/data/taz_shapes/tasmania_state_boundaries.prj
 %%G%%/data_dir/data/taz_shapes/tasmania_state_boundaries.shp
 %%G%%/data_dir/data/taz_shapes/tasmania_state_boundaries.shx
 %%G%%/data_dir/data/taz_shapes/tasmania_water_bodies.dbf
+%%G%%/data_dir/data/taz_shapes/tasmania_water_bodies.fix
 %%G%%/data_dir/data/taz_shapes/tasmania_water_bodies.prj
 %%G%%/data_dir/data/taz_shapes/tasmania_water_bodies.shp
 %%G%%/data_dir/data/taz_shapes/tasmania_water_bodies.shx
@@ -426,6 +449,16 @@
 @exec [ -f %B/tiger-ny.xml ] || cp %B/%f %B/tiger-ny.xml
 %%G%%/data_dir/logging.xml.sample
 @exec [ -f %B/logging.xml ] || cp %B/%f %B/logging.xml
+%%G%%/data_dir/logs/DEFAULT_LOGGING.properties.sample
+@exec [ -f %B/DEFAULT_LOGGING.properties ] || cp %B/%f %B/DEFAULT_LOGGING.properties
+%%G%%/data_dir/logs/GEOSERVER_DEVELOPER_LOGGING.properties.sample
+@exec [ -f %B/GEOSERVER_DEVELOPER_LOGGING.properties ] || cp %B/%f %B/GEOSERVER_DEVELOPER_LOGGING.properties
+%%G%%/data_dir/logs/GEOTOOLS_DEVELOPER_LOGGING.properties.sample
+@exec [ -f %B/GEOTOOLS_DEVELOPER_LOGGING.properties ] || cp %B/%f %B/GEOTOOLS_DEVELOPER_LOGGING.properties
+%%G%%/data_dir/logs/PRODUCTION_LOGGING.properties.sample
+@exec [ -f %B/PRODUCTION_LOGGING.properties ] || cp %B/%f %B/PRODUCTION_LOGGING.properties
+%%G%%/data_dir/logs/VERBOSE_LOGGING.properties.sample
+@exec [ -f %B/VERBOSE_LOGGING.properties ] || cp %B/%f %B/VERBOSE_LOGGING.properties
 %%G%%/data_dir/palettes/dem31.pal
 %%G%%/data_dir/palettes/ita31.pal
 %%G%%/data_dir/palettes/ny31.pal
@@ -534,6 +567,8 @@
 @exec [ -f %B/WithinIntegrity.xml ] || cp %B/%f %B/WithinIntegrity.xml
 %%G%%/data_dir/security/layers.properties.sample
 @exec [ -f %B/layers.properties ] || cp %B/%f %B/layers.properties
+%%G%%/data_dir/security/rest.properties.sample
+@exec [ -f %B/rest.properties ] || cp %B/%f %B/rest.properties
 %%G%%/data_dir/security/service.properties.sample
 @exec [ -f %B/service.properties ] || cp %B/%f %B/service.properties
 %%G%%/data_dir/security/users.properties.sample
@@ -618,6 +653,8 @@
 @exec [ -f %B/wfs.xml ] || cp %B/%f %B/wfs.xml
 %%G%%/data_dir/wms.xml.sample
 @exec [ -f %B/wms.xml ] || cp %B/%f %B/wms.xml
+%%G%%/data_dir/workspaces/default.xml.sample
+@exec [ -f %B/default.xml ] || cp %B/%f %B/default.xml
 %%G%%/data_dir/workspaces/cite/namespace.xml.sample
 @exec [ -f %B/namespace.xml ] || cp %B/%f %B/namespace.xml
 %%G%%/data_dir/workspaces/cite/workspace.xml.sample
@@ -903,42 +940,41 @@
 %%G%%/webapps/geoserver/WEB-INF/lib/freemarker-2.3.13.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/geoapi-2.3-M1.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/geoapi-pending-2.3-M1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/geowebcache-1.2.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-api-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-arcgrid-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-coverage-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-cql-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-data-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-directory-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-epsg-hsql-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-geotiff-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-graph-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-gtopo30-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-image-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-imageio-ext-gdal-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-imagemosaic-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-jdbc-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-jdbc-postgis-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-main-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-metadata-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-property-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-referencing-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-render-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-shapefile-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-shapefile-renderer-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-svg-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-validation-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-wfs-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-wms-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xml-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-core-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-filter-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-gml2-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-gml3-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-ows-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-sld-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-wfs-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gwc-2.0.1.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/geowebcache-1.2.2.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-api-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-arcgrid-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-coverage-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-cql-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-data-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-directory-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-epsg-hsql-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-geotiff-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-graph-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-gtopo30-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-image-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-imageio-ext-gdal-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-imagemosaic-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-jdbc-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-jdbc-postgis-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-main-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-metadata-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-property-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-referencing-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-render-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-shapefile-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-shapefile-renderer-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-svg-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-validation-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-wfs-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-xml-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-core-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-filter-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-gml2-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-gml3-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-ows-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-sld-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-wfs-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gwc-2.0.2.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/h2-1.1.104.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/h2-1.1.119.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/hsqldb-1.8.0.7.jar
@@ -946,10 +982,12 @@
 %%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-arcgrid-1.0.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-customstreams-1.0.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdal-bindings-1.4.5b.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalarcbinarygrid-1.0.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdaldted-1.0.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalecw-1.0.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalecwjp2-1.0.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalehdr-1.0.5.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalenvihdr-1.0.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalerdasimg-1.0.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalframework-1.0.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalkakadujp2-1.0.5.jar
@@ -971,24 +1009,24 @@
 %%G%%/webapps/geoserver/WEB-INF/lib/jts-1.10.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/log4j-1.2.14.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/mail-1.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/main-2.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.ows-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.wcs-2.6.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.wfs-2.6.1.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/main-%%MVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.ows-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.wcs-%%GTVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.wfs-%%GTVER%%.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/org.json-2.0.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/org.restlet-1.0.8.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/org.restlet.ext.freemarker-1.0.8.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/org.restlet.ext.json-1.0.1.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/org.restlet.ext.spring-1.0.8.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/org.simpleframework-3.1.3.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/org.w3.xlink-2.6.1.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/org.w3.xlink-%%GTVER%%.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/oro-2.0.8.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/ows-2.0.1-tests.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/ows-2.0.1.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/ows-%%MVER%%-tests.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/ows-%%MVER%%.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/picocontainer-1.2.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/platform-2.0.1.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/platform-%%MVER%%.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/postgresql-8.4-701.jdbc3.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/rest-2.0.1.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/rest-%%MVER%%.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/servlet-api-2.4.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/slf4j-api-1.4.2.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/slf4j-log4j12-1.4.2.jar
@@ -1001,24 +1039,25 @@
 %%G%%/webapps/geoserver/WEB-INF/lib/spring-tx-2.5.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/spring-web-2.5.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/spring-webmvc-2.5.5.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/stax-1.2.0.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/stax-api-1.0.1.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/struts-1.2.9.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/vecmath-1.3.2.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wcs-2.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wcs1_1-2.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/web-core-2.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/web-demo-2.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/web-gwc-2.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/web-security-2.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/web-wcs-2.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/web-wfs-2.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/web-wms-2.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wfs-2.0.1.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/wcs-%%MVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/wcs1_1-%%MVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/web-core-%%MVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/web-demo-%%MVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/web-gwc-%%MVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/web-security-%%MVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/web-wcs-%%MVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/web-wfs-%%MVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/web-wms-%%MVER%%.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/wfs-%%MVER%%.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/wicket-1.3.7.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/wicket-extensions-1.3.7.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/wicket-ioc-1.3.7.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/wicket-spring-1.3.7.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wms-2.0.1.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/wms-%%MVER%%.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/xalan-2.7.0.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/xercesImpl-2.6.2.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/xml-apis-1.3.04.jar
@@ -1202,7 +1241,10 @@
 @dirrmtry %%G%%/data_dir/data/taz_shapes
 @dirrmtry %%G%%/data_dir/data
 @dirrmtry %%G%%/data_dir/demo
+@dirrmtry %%G%%/data_dir/gwc/meta_jdbc_h2
+@dirrmtry %%G%%/data_dir/gwc
 @dirrmtry %%G%%/data_dir/layergroups
+@dirrmtry %%G%%/data_dir/logs
 @dirrmtry %%G%%/data_dir/palettes
 @dirrmtry %%G%%/data_dir/plugIns
 @dirrmtry %%G%%/data_dir/security