1 files changed, 76 insertions, 69 deletions

diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 66d569ae0bde..f6acc4523320 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -861,6 +861,8 @@
 %%G%%/webapps/geoserver/WEB-INF/lib/ant-optional-1.5.1.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/antlr-2.7.2.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/aopalliance-1.0.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/avalon-framework-api-4.3.1.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/avalon-framework-impl-4.3.1.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/batik-anim-1.7.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/batik-awt-util-1.7.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/batik-bridge-1.7.jar
@@ -901,61 +903,63 @@
 %%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.1.5b.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-api-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-arcgrid-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-coverage-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-cql-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-data-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-directory-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-epsg-hsql-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-geotiff-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-graph-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-gtopo30-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-image-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-imageio-ext-gdal-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-imagemosaic-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-jdbc-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-jdbc-postgis-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-main-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-metadata-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-property-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-referencing-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-render-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-shapefile-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-shapefile-renderer-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-validation-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-wfs-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-wms-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xml-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-core-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-filter-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-gml2-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-gml3-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-ows-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-sld-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-wfs-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gwc-2.0.0.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/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
 %%G%%/webapps/geoserver/WEB-INF/lib/htmlvalidator-1.2.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-arcgrid-1.0.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-customstreams-1.0.4.jar
+%%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-gdaldted-1.0.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalecw-1.0.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalecwjp2-1.0.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalehdr-1.0.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalerdasimg-1.0.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalframework-1.0.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalkakadujp2-1.0.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalmrsid-1.0.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalmrsidjp2-1.0.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalnitf-1.0.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-geocore-1.0.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-imagereadmt-1.0.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-tiff-1.0.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-utilities-1.0.4.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-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
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalmrsid-1.0.5.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalmrsidjp2-1.0.5.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalnitf-1.0.5.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-geocore-1.0.5.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-imagereadmt-1.0.5.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-tiff-1.0.5.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-utilities-1.0.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/itext-2.1.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/jai_codec-1.1.3.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/jai_core-1.1.3.jar
@@ -967,24 +971,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.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.ows-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.wcs-2.6.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.wfs-2.6.0.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/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.0.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/org.w3.xlink-2.6.1.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/oro-2.0.8.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/ows-2.0.0-tests.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/ows-2.0.0.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/picocontainer-1.2.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/platform-2.0.0.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/platform-2.0.1.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/postgresql-8.4-701.jdbc3.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/rest-2.0.0.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/rest-2.0.1.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
@@ -1000,19 +1004,21 @@
 %%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.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wcs1_1-2.0.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/web-core-2.0.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/web-demo-2.0.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/web-wcs-2.0.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/web-wfs-2.0.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/web-wms-2.0.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wfs-2.0.0.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/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.0.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/wms-2.0.1.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
@@ -1025,6 +1031,7 @@
 %%G%%/webapps/geoserver/WEB-INF/lib/xstream-1.3.1.jar
 %%G%%/webapps/geoserver/WEB-INF/web.xml.sample
 @exec [ -f %B/web.xml ] || cp %B/%f %B/web.xml
+%%G%%/webapps/geoserver/j_acegi_security_check
 %%G%%/webapps/geoserver/index.html
 %%G%%/webapps/geoserver/openlayers/OpenLayers.js
 %%G%%/webapps/geoserver/openlayers/img/blank.gif