Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 15 Dec 2019 21:43:31 +0000 (UTC)
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r520201 - head/graphics/geoserver
Message-ID:  <201912152143.xBFLhV14049627@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bofh
Date: Sun Dec 15 21:43:30 2019
New Revision: 520201
URL: https://svnweb.freebsd.org/changeset/ports/520201

Log:
  graphics/geoserver: Update version 2.15.1=>2.16.1
  
  - Fix geoserver start [1]
  
  PR:		222783 [1]
  Reported by:	david@dafnet.se [1]

Modified:
  head/graphics/geoserver/Makefile
  head/graphics/geoserver/distinfo
  head/graphics/geoserver/pkg-plist

Modified: head/graphics/geoserver/Makefile
==============================================================================
--- head/graphics/geoserver/Makefile	Sun Dec 15 21:36:02 2019	(r520200)
+++ head/graphics/geoserver/Makefile	Sun Dec 15 21:43:30 2019	(r520201)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geoserver
-PORTVERSION=	2.15.1
+PORTVERSION=	2.16.1
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -19,11 +19,12 @@ NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GEOSERVERDIR=	${PREFIX}/${PORTNAME}
-GEODIRS=	data_dir etc lib logs resources webapps
+GEODIRS=	data_dir etc lib logs modules resources webapps
 
 USE_RC_SUBR=	${PORTNAME}
-PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=20.1 MVER=${PORTVERSION} \
-		VER2=1.14.1 VER3=1.1.3 VER4=1.10 VER5=1.1.27
+PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=22.1 MVER=${PORTVERSION} \
+		VER3=1.1.3 BATIK=1.10 GWC=1.16.1 \
+		JETTY=9.4.18.v20190429 IMAGEIO=1.3.2 JT=1.1.12 SPRINGS=5.1.5
 SUB_LIST=	GEOSERVERDIR="${GEOSERVERDIR}" JAVA="${JAVA}"
 SUB_FILES=	pkg-message
 NO_ARCH=	yes
@@ -32,17 +33,19 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$$GEOSERVER_HOME|${GEOSERVERDIR}|g' \
 		-e 's|%%JAVA%%|${JAVA}|g' \
 		${WRKSRC}/bin/startup.sh ${WRKSRC}/bin/shutdown.sh
+	@(cd ${WRKSRC}/etc;${FIND} -E . -type f -iregex ".*(keystore|\.(xml|properties))") \
+		| while read a; do \
+			${MV} ${WRKSRC}/etc/$$a ${WRKSRC}/etc/$$a.sample; \
+		done
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${GEOSERVERDIR}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.sh ${STAGEDIR}${GEOSERVERDIR}/bin
-	(cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.txt README.txt RUNNING.txt \
+	${INSTALL_SCRIPT} ${WRKSRC}/start.jar ${STAGEDIR}${GEOSERVERDIR}/
+	${INSTALL_DATA} ${WRKSRC}/start.ini ${STAGEDIR}${GEOSERVERDIR}/
+	(cd ${WRKSRC} && ${INSTALL_DATA} GPL.txt LICENSE.txt README.txt RUNNING.txt \
 		VERSION.txt start.jar ${STAGEDIR}${GEOSERVERDIR})
 .for dir in ${GEODIRS}
-	@(cd ${WRKSRC};${FIND} -E ${dir} -type f -iregex ".*(keystore|\.(xml|properties))") \
-		| while read a; do \
-			${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.sample; \
-		done
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${GEOSERVERDIR})
 .endfor
 

Modified: head/graphics/geoserver/distinfo
==============================================================================
--- head/graphics/geoserver/distinfo	Sun Dec 15 21:36:02 2019	(r520200)
+++ head/graphics/geoserver/distinfo	Sun Dec 15 21:43:30 2019	(r520201)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556647820
-SHA256 (geoserver-2.15.1-bin.zip) = eff6602bee2881d88181f9cabafc4f08558ca6dad3bbfe4cb53cd58cf38af22c
-SIZE (geoserver-2.15.1-bin.zip) = 101394327
+TIMESTAMP = 1576358818
+SHA256 (geoserver-2.16.1-bin.zip) = b74d85baddc18674ef8bcff6e9f9a0748cbef02f6e0f148568d90844361d1fd5
+SIZE (geoserver-2.16.1-bin.zip) = 106853686

Modified: head/graphics/geoserver/pkg-plist
==============================================================================
--- head/graphics/geoserver/pkg-plist	Sun Dec 15 21:36:02 2019	(r520200)
+++ head/graphics/geoserver/pkg-plist	Sun Dec 15 21:43:30 2019	(r520201)
@@ -1,3 +1,4 @@
+%%G%%/GPL.txt
 %%G%%/LICENSE.txt
 %%G%%/README.txt
 %%G%%/RUNNING.txt
@@ -5,13 +6,13 @@
 %%G%%/bin/shutdown.sh
 %%G%%/bin/startup.sh
 %%G%%/data_dir/README.rst
-%%G%%/data_dir/coverages/arc_sample/info.xml.sample
+%%G%%/data_dir/coverages/arc_sample/info.xml
 %%G%%/data_dir/coverages/arc_sample/precip30min.asc
 %%G%%/data_dir/coverages/arc_sample/precip30min.prj
 %%G%%/data_dir/coverages/img_sample/Pk50095.prj
 %%G%%/data_dir/coverages/img_sample/Pk50095.tfw
 %%G%%/data_dir/coverages/img_sample/Pk50095.tif
-%%G%%/data_dir/coverages/img_sample/info.xml.sample
+%%G%%/data_dir/coverages/img_sample/info.xml
 %%G%%/data_dir/coverages/img_sample/usa.jpeg
 %%G%%/data_dir/coverages/img_sample/usa.meta
 %%G%%/data_dir/coverages/img_sample/usa.prj
@@ -90,16 +91,16 @@
 %%G%%/data_dir/coverages/mosaic_sample/global_mosaic_9.pgw
 %%G%%/data_dir/coverages/mosaic_sample/global_mosaic_9.png
 %%G%%/data_dir/coverages/mosaic_sample/global_mosaic_9.prj
-%%G%%/data_dir/coverages/mosaic_sample/info.xml.sample
+%%G%%/data_dir/coverages/mosaic_sample/info.xml
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.dbf
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.fix
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.prj
-%%G%%/data_dir/coverages/mosaic_sample/mosaic.properties.sample
+%%G%%/data_dir/coverages/mosaic_sample/mosaic.properties
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.qix
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.shp
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.shx
-%%G%%/data_dir/coverages/sfdem_sfdem/info.xml.sample
-%%G%%/data_dir/csw.xml.sample
+%%G%%/data_dir/coverages/sfdem_sfdem/info.xml
+%%G%%/data_dir/csw.xml
 %%G%%/data_dir/data/nyc/giant_polygon.dbf
 %%G%%/data_dir/data/nyc/giant_polygon.prj
 %%G%%/data_dir/data/nyc/giant_polygon.qix
@@ -161,55 +162,55 @@
 %%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
-%%G%%/data_dir/demo/WCS_describeCoverage.xml.sample
+%%G%%/data_dir/demo/WCS_describeCoverage.xml
 %%G%%/data_dir/demo/WCS_describeCoverage_2.0.1.url
-%%G%%/data_dir/demo/WCS_describeCoverage_2.0.1.xml.sample
-%%G%%/data_dir/demo/WCS_getCapabilities.xml.sample
+%%G%%/data_dir/demo/WCS_describeCoverage_2.0.1.xml
+%%G%%/data_dir/demo/WCS_getCapabilities.xml
 %%G%%/data_dir/demo/WCS_getCapabilities_2.0.1.url
-%%G%%/data_dir/demo/WCS_getCapabilities_2.0.1.xml.sample
-%%G%%/data_dir/demo/WCS_getCoverage.xml.sample
+%%G%%/data_dir/demo/WCS_getCapabilities_2.0.1.xml
+%%G%%/data_dir/demo/WCS_getCoverage.xml
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_format_geotiff.url
-%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_format_gmlcov.xml.sample
+%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_format_gmlcov.xml
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_scale_extent.url
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_scale_factor.url
-%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_scale_factor.xml.sample
+%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_scale_factor.xml
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_scale_size.url
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_epsg32632.url
-%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_epsg32632.xml.sample
+%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_epsg32632.xml
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_latlon.url
-%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_latlon.xml.sample
+%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_latlon.xml
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_range_component.url
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_range_falsecolor.url
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_range_interval.url
-%%G%%/data_dir/demo/WFS_describeFeatureType-1.0.xml.sample
-%%G%%/data_dir/demo/WFS_describeFeatureType-1.1.xml.sample
-%%G%%/data_dir/demo/WFS_getCapabilities-1.0.xml.sample
-%%G%%/data_dir/demo/WFS_getCapabilities-1.1.xml.sample
-%%G%%/data_dir/demo/WFS_getFeature-1.0.xml.sample
-%%G%%/data_dir/demo/WFS_getFeature-1.1.xml.sample
+%%G%%/data_dir/demo/WFS_describeFeatureType-1.0.xml
+%%G%%/data_dir/demo/WFS_describeFeatureType-1.1.xml
+%%G%%/data_dir/demo/WFS_getCapabilities-1.0.xml
+%%G%%/data_dir/demo/WFS_getCapabilities-1.1.xml
+%%G%%/data_dir/demo/WFS_getFeature-1.0.xml
+%%G%%/data_dir/demo/WFS_getFeature-1.1.xml
 %%G%%/data_dir/demo/WFS_getFeature-2.0.url
-%%G%%/data_dir/demo/WFS_getFeature-2.0.xml.sample
-%%G%%/data_dir/demo/WFS_getFeatureBBOX-1.0.xml.sample
-%%G%%/data_dir/demo/WFS_getFeatureBBOX-1.1.xml.sample
+%%G%%/data_dir/demo/WFS_getFeature-2.0.xml
+%%G%%/data_dir/demo/WFS_getFeatureBBOX-1.0.xml
+%%G%%/data_dir/demo/WFS_getFeatureBBOX-1.1.xml
 %%G%%/data_dir/demo/WFS_getFeatureBBOX.url
-%%G%%/data_dir/demo/WFS_getFeatureBetween-1.0.xml.sample
-%%G%%/data_dir/demo/WFS_getFeatureBetween-1.1.xml.sample
+%%G%%/data_dir/demo/WFS_getFeatureBetween-1.0.xml
+%%G%%/data_dir/demo/WFS_getFeatureBetween-1.1.xml
 %%G%%/data_dir/demo/WFS_getFeatureBetween.url
 %%G%%/data_dir/demo/WFS_getFeatureBetweenCQL.url
 %%G%%/data_dir/demo/WFS_getFeatureFid.url
 %%G%%/data_dir/demo/WFS_getFeatureFidFilter.url
-%%G%%/data_dir/demo/WFS_getFeatureIntersects-1.0.xml.sample
-%%G%%/data_dir/demo/WFS_getFeatureIntersects-1.1.xml.sample
+%%G%%/data_dir/demo/WFS_getFeatureIntersects-1.0.xml
+%%G%%/data_dir/demo/WFS_getFeatureIntersects-1.1.xml
 %%G%%/data_dir/demo/WFS_getFeatureIntersects.url
 %%G%%/data_dir/demo/WFS_getFeatureMultiFilter.url
 %%G%%/data_dir/demo/WFS_getFeatureNotDisjoint-2.0.url
-%%G%%/data_dir/demo/WFS_getFeatureNotDisjoint-2.0.xml.sample
+%%G%%/data_dir/demo/WFS_getFeatureNotDisjoint-2.0.xml
 %%G%%/data_dir/demo/WFS_mathGetFeature.url
-%%G%%/data_dir/demo/WFS_mathGetFeature.xml.sample
-%%G%%/data_dir/demo/WFS_transactionDelete.xml.sample
-%%G%%/data_dir/demo/WFS_transactionInsert.xml.sample
-%%G%%/data_dir/demo/WFS_transactionUpdate.xml.sample
-%%G%%/data_dir/demo/WFS_transactionUpdateGeom.xml.sample
+%%G%%/data_dir/demo/WFS_mathGetFeature.xml
+%%G%%/data_dir/demo/WFS_transactionDelete.xml
+%%G%%/data_dir/demo/WFS_transactionInsert.xml
+%%G%%/data_dir/demo/WFS_transactionUpdate.xml
+%%G%%/data_dir/demo/WFS_transactionUpdateGeom.xml
 %%G%%/data_dir/demo/WMS_GetLegendGraphic-SLD.url
 %%G%%/data_dir/demo/WMS_GetLegendGraphic-SLD_BODY.url
 %%G%%/data_dir/demo/WMS_GetLegendGraphic.url
@@ -217,7 +218,7 @@
 %%G%%/data_dir/demo/WMS_featureInfo.url
 %%G%%/data_dir/demo/WMS_getCapabilities.url
 %%G%%/data_dir/demo/WMS_getMap.url
-%%G%%/data_dir/demo/WMS_getMap.xml.sample
+%%G%%/data_dir/demo/WMS_getMap.xml
 %%G%%/data_dir/demo/WMS_getMap_OpenLayers.url
 %%G%%/data_dir/demo/WMS_getMap_SLD_BODY_LiteralMode-1.3.url
 %%G%%/data_dir/demo/WMS_getMap_SLD_BODY_LiteralMode.url
@@ -226,216 +227,216 @@
 %%G%%/data_dir/demo/WMS_getMap_fid.url
 %%G%%/data_dir/demo/WMS_getMap_fidfilter.url
 %%G%%/data_dir/demo/WMS_getMap_inlineFeature.url
-%%G%%/data_dir/demo/WMS_getMap_inlineFeatureSmile.xml.sample
+%%G%%/data_dir/demo/WMS_getMap_inlineFeatureSmile.xml
 %%G%%/data_dir/demo/WMS_getMap_multilayer.url
 %%G%%/data_dir/demo/WMS_getMap_multilayer_cql.url
 %%G%%/data_dir/demo/WMS_getMap_multilayer_filter.url
-%%G%%/data_dir/demo/WPS_aggregate_1.0.xml.sample
-%%G%%/data_dir/demo/WPS_aggregate_groupby_1.0.xml.sample
-%%G%%/data_dir/global.xml.sample
-%%G%%/data_dir/layergroups/spearfish.xml.sample
-%%G%%/data_dir/layergroups/tasmania.xml.sample
-%%G%%/data_dir/layergroups/tiger-ny.xml.sample
-%%G%%/data_dir/logging.xml.sample
+%%G%%/data_dir/demo/WPS_aggregate_1.0.xml
+%%G%%/data_dir/demo/WPS_aggregate_groupby_1.0.xml
+%%G%%/data_dir/global.xml
+%%G%%/data_dir/layergroups/spearfish.xml
+%%G%%/data_dir/layergroups/tasmania.xml
+%%G%%/data_dir/layergroups/tiger-ny.xml
+%%G%%/data_dir/logging.xml
 %%G%%/data_dir/palettes/dem31.pal
 %%G%%/data_dir/palettes/ita31.pal
 %%G%%/data_dir/palettes/ny31.pal
 %%G%%/data_dir/palettes/popshade.png
-%%G%%/data_dir/plugIns/AddressGap.xml.sample
-%%G%%/data_dir/plugIns/AddressOverlap.xml.sample
-%%G%%/data_dir/plugIns/AngleSize.xml.sample
-%%G%%/data_dir/plugIns/Attribute.xml.sample
-%%G%%/data_dir/plugIns/Constraint.xml.sample
-%%G%%/data_dir/plugIns/ContainsIntegrity.xml.sample
-%%G%%/data_dir/plugIns/CrossesIntegrity.xml.sample
-%%G%%/data_dir/plugIns/DisjointIntegrity.xml.sample
-%%G%%/data_dir/plugIns/Domain.xml.sample
-%%G%%/data_dir/plugIns/Equality.xml.sample
-%%G%%/data_dir/plugIns/GazetteerName.xml.sample
-%%G%%/data_dir/plugIns/IntersectsIntegrity.xml.sample
-%%G%%/data_dir/plugIns/IsValidGeometry.xml.sample
-%%G%%/data_dir/plugIns/LineCoveredByFeatureLine.xml.sample
-%%G%%/data_dir/plugIns/LineCoveredByPolygon.xml.sample
-%%G%%/data_dir/plugIns/LineCoveredByPolygonBoundary.xml.sample
-%%G%%/data_dir/plugIns/LineEndPointCoveredByLine.xml.sample
-%%G%%/data_dir/plugIns/LineIntersectsLineWithNode.xml.sample
-%%G%%/data_dir/plugIns/LineMustBeASinglePart.xml.sample
-%%G%%/data_dir/plugIns/LineNoDangles.xml.sample
-%%G%%/data_dir/plugIns/LineNoPseudoNode.xml.sample
-%%G%%/data_dir/plugIns/LineNoSelfIntersect.xml.sample
-%%G%%/data_dir/plugIns/LineNoSelfOverlapping.xml.sample
-%%G%%/data_dir/plugIns/LineNotTouchingPolygonInterior.xml.sample
-%%G%%/data_dir/plugIns/LinesNotIntersect.xml.sample
-%%G%%/data_dir/plugIns/LinesNotOverlap.xml.sample
-%%G%%/data_dir/plugIns/NameExists.xml.sample
-%%G%%/data_dir/plugIns/NameInList.xml.sample
-%%G%%/data_dir/plugIns/NullZero.xml.sample
-%%G%%/data_dir/plugIns/OverlapsIntegrity.xml.sample
-%%G%%/data_dir/plugIns/PointCoveredByEndPointOfLine.xml.sample
-%%G%%/data_dir/plugIns/PointCoveredByLine.xml.sample
-%%G%%/data_dir/plugIns/PointCoveredByPolygon.xml.sample
-%%G%%/data_dir/plugIns/PointCoveredByPolygonBoundary.xml.sample
-%%G%%/data_dir/plugIns/PointInsidePolygon.xml.sample
-%%G%%/data_dir/plugIns/PolygonBoundaryCoveredByPolygon.xml.sample
-%%G%%/data_dir/plugIns/PolygonCoveredByFeaturePolygon.xml.sample
-%%G%%/data_dir/plugIns/PolygonCoveredByPolygon.xml.sample
-%%G%%/data_dir/plugIns/PolygonNoGaps.xml.sample
-%%G%%/data_dir/plugIns/PolygonNotCoveredByPolygon.xml.sample
-%%G%%/data_dir/plugIns/PolygonNotOverlappingLine.xml.sample
-%%G%%/data_dir/plugIns/PolygonNotOverlappingPolygon.xml.sample
-%%G%%/data_dir/plugIns/Range.xml.sample
-%%G%%/data_dir/plugIns/RelateIntegrity.xml.sample
-%%G%%/data_dir/plugIns/SQL.xml.sample
-%%G%%/data_dir/plugIns/SingleValue.xml.sample
-%%G%%/data_dir/plugIns/StarNode.xml.sample
-%%G%%/data_dir/plugIns/TouchesIntegrity.xml.sample
-%%G%%/data_dir/plugIns/UniqueFID.xml.sample
-%%G%%/data_dir/plugIns/Uniquity.xml.sample
-%%G%%/data_dir/plugIns/WithinIntegrity.xml.sample
-%%G%%/data_dir/security/auth/default/config.xml.sample
-%%G%%/data_dir/security/config.xml.sample
-%%G%%/data_dir/security/filter/anonymous/config.xml.sample
-%%G%%/data_dir/security/filter/basic/config.xml.sample
-%%G%%/data_dir/security/filter/contextAsc/config.xml.sample
-%%G%%/data_dir/security/filter/contextNoAsc/config.xml.sample
-%%G%%/data_dir/security/filter/exception/config.xml.sample
-%%G%%/data_dir/security/filter/form/config.xml.sample
-%%G%%/data_dir/security/filter/formLogout/config.xml.sample
-%%G%%/data_dir/security/filter/interceptor/config.xml.sample
-%%G%%/data_dir/security/filter/rememberme/config.xml.sample
-%%G%%/data_dir/security/filter/restInterceptor/config.xml.sample
-%%G%%/data_dir/security/filter/roleFilter/config.xml.sample
-%%G%%/data_dir/security/filter/sslFilter/config.xml.sample
-%%G%%/data_dir/security/layers.properties.sample
-%%G%%/data_dir/security/masterpw.xml.sample
-%%G%%/data_dir/security/masterpw/default/config.xml.sample
+%%G%%/data_dir/plugIns/AddressGap.xml
+%%G%%/data_dir/plugIns/AddressOverlap.xml
+%%G%%/data_dir/plugIns/AngleSize.xml
+%%G%%/data_dir/plugIns/Attribute.xml
+%%G%%/data_dir/plugIns/Constraint.xml
+%%G%%/data_dir/plugIns/ContainsIntegrity.xml
+%%G%%/data_dir/plugIns/CrossesIntegrity.xml
+%%G%%/data_dir/plugIns/DisjointIntegrity.xml
+%%G%%/data_dir/plugIns/Domain.xml
+%%G%%/data_dir/plugIns/Equality.xml
+%%G%%/data_dir/plugIns/GazetteerName.xml
+%%G%%/data_dir/plugIns/IntersectsIntegrity.xml
+%%G%%/data_dir/plugIns/IsValidGeometry.xml
+%%G%%/data_dir/plugIns/LineCoveredByFeatureLine.xml
+%%G%%/data_dir/plugIns/LineCoveredByPolygon.xml
+%%G%%/data_dir/plugIns/LineCoveredByPolygonBoundary.xml
+%%G%%/data_dir/plugIns/LineEndPointCoveredByLine.xml
+%%G%%/data_dir/plugIns/LineIntersectsLineWithNode.xml
+%%G%%/data_dir/plugIns/LineMustBeASinglePart.xml
+%%G%%/data_dir/plugIns/LineNoDangles.xml
+%%G%%/data_dir/plugIns/LineNoPseudoNode.xml
+%%G%%/data_dir/plugIns/LineNoSelfIntersect.xml
+%%G%%/data_dir/plugIns/LineNoSelfOverlapping.xml
+%%G%%/data_dir/plugIns/LineNotTouchingPolygonInterior.xml
+%%G%%/data_dir/plugIns/LinesNotIntersect.xml
+%%G%%/data_dir/plugIns/LinesNotOverlap.xml
+%%G%%/data_dir/plugIns/NameExists.xml
+%%G%%/data_dir/plugIns/NameInList.xml
+%%G%%/data_dir/plugIns/NullZero.xml
+%%G%%/data_dir/plugIns/OverlapsIntegrity.xml
+%%G%%/data_dir/plugIns/PointCoveredByEndPointOfLine.xml
+%%G%%/data_dir/plugIns/PointCoveredByLine.xml
+%%G%%/data_dir/plugIns/PointCoveredByPolygon.xml
+%%G%%/data_dir/plugIns/PointCoveredByPolygonBoundary.xml
+%%G%%/data_dir/plugIns/PointInsidePolygon.xml
+%%G%%/data_dir/plugIns/PolygonBoundaryCoveredByPolygon.xml
+%%G%%/data_dir/plugIns/PolygonCoveredByFeaturePolygon.xml
+%%G%%/data_dir/plugIns/PolygonCoveredByPolygon.xml
+%%G%%/data_dir/plugIns/PolygonNoGaps.xml
+%%G%%/data_dir/plugIns/PolygonNotCoveredByPolygon.xml
+%%G%%/data_dir/plugIns/PolygonNotOverlappingLine.xml
+%%G%%/data_dir/plugIns/PolygonNotOverlappingPolygon.xml
+%%G%%/data_dir/plugIns/Range.xml
+%%G%%/data_dir/plugIns/RelateIntegrity.xml
+%%G%%/data_dir/plugIns/SQL.xml
+%%G%%/data_dir/plugIns/SingleValue.xml
+%%G%%/data_dir/plugIns/StarNode.xml
+%%G%%/data_dir/plugIns/TouchesIntegrity.xml
+%%G%%/data_dir/plugIns/UniqueFID.xml
+%%G%%/data_dir/plugIns/Uniquity.xml
+%%G%%/data_dir/plugIns/WithinIntegrity.xml
+%%G%%/data_dir/security/auth/default/config.xml
+%%G%%/data_dir/security/config.xml
+%%G%%/data_dir/security/filter/anonymous/config.xml
+%%G%%/data_dir/security/filter/basic/config.xml
+%%G%%/data_dir/security/filter/contextAsc/config.xml
+%%G%%/data_dir/security/filter/contextNoAsc/config.xml
+%%G%%/data_dir/security/filter/exception/config.xml
+%%G%%/data_dir/security/filter/form/config.xml
+%%G%%/data_dir/security/filter/formLogout/config.xml
+%%G%%/data_dir/security/filter/interceptor/config.xml
+%%G%%/data_dir/security/filter/rememberme/config.xml
+%%G%%/data_dir/security/filter/restInterceptor/config.xml
+%%G%%/data_dir/security/filter/roleFilter/config.xml
+%%G%%/data_dir/security/filter/sslFilter/config.xml
+%%G%%/data_dir/security/layers.properties
+%%G%%/data_dir/security/masterpw.xml
+%%G%%/data_dir/security/masterpw/default/config.xml
 %%G%%/data_dir/security/masterpw/default/passwd
-%%G%%/data_dir/security/pwpolicy/default/config.xml.sample
-%%G%%/data_dir/security/pwpolicy/master/config.xml.sample
-%%G%%/data_dir/security/rest.properties.sample
-%%G%%/data_dir/security/role/default/config.xml.sample
-%%G%%/data_dir/security/role/default/roles.xml.sample
+%%G%%/data_dir/security/pwpolicy/default/config.xml
+%%G%%/data_dir/security/pwpolicy/master/config.xml
+%%G%%/data_dir/security/rest.properties
+%%G%%/data_dir/security/role/default/config.xml
+%%G%%/data_dir/security/role/default/roles.xml
 %%G%%/data_dir/security/role/default/roles.xsd
-%%G%%/data_dir/security/services.properties.sample
-%%G%%/data_dir/security/usergroup/default/config.xml.sample
-%%G%%/data_dir/security/usergroup/default/users.xml.sample
+%%G%%/data_dir/security/services.properties
+%%G%%/data_dir/security/usergroup/default/config.xml
+%%G%%/data_dir/security/usergroup/default/users.xml
 %%G%%/data_dir/security/usergroup/default/users.xsd
 %%G%%/data_dir/styles/Lakes.sld
 %%G%%/data_dir/styles/NamedPlaces.sld
 %%G%%/data_dir/styles/burg.sld
-%%G%%/data_dir/styles/burg.xml.sample
+%%G%%/data_dir/styles/burg.xml
 %%G%%/data_dir/styles/burg02.svg
 %%G%%/data_dir/styles/capitals.sld
-%%G%%/data_dir/styles/capitals.xml.sample
-%%G%%/data_dir/styles/cite_lakes.xml.sample
+%%G%%/data_dir/styles/capitals.xml
+%%G%%/data_dir/styles/cite_lakes.xml
 %%G%%/data_dir/styles/default_generic.sld
 %%G%%/data_dir/styles/default_line.sld
 %%G%%/data_dir/styles/default_line2.sld
 %%G%%/data_dir/styles/default_point.sld
 %%G%%/data_dir/styles/default_polygon.sld
 %%G%%/data_dir/styles/dem.sld
-%%G%%/data_dir/styles/dem.xml.sample
-%%G%%/data_dir/styles/generic.xml.sample
+%%G%%/data_dir/styles/dem.xml
+%%G%%/data_dir/styles/generic.xml
 %%G%%/data_dir/styles/giant_polygon.sld
-%%G%%/data_dir/styles/giant_polygon.xml.sample
-%%G%%/data_dir/styles/grass.xml.sample
+%%G%%/data_dir/styles/giant_polygon.xml
+%%G%%/data_dir/styles/grass.xml
 %%G%%/data_dir/styles/grass_fill.png
 %%G%%/data_dir/styles/grass_poly.sld
 %%G%%/data_dir/styles/green.sld
-%%G%%/data_dir/styles/green.xml.sample
-%%G%%/data_dir/styles/line.xml.sample
+%%G%%/data_dir/styles/green.xml
+%%G%%/data_dir/styles/line.xml
 %%G%%/data_dir/styles/poi.sld
-%%G%%/data_dir/styles/poi.xml.sample
-%%G%%/data_dir/styles/point.xml.sample
+%%G%%/data_dir/styles/poi.xml
+%%G%%/data_dir/styles/point.xml
 %%G%%/data_dir/styles/poly_landmarks.sld
-%%G%%/data_dir/styles/poly_landmarks.xml.sample
-%%G%%/data_dir/styles/polygon.xml.sample
+%%G%%/data_dir/styles/poly_landmarks.xml
+%%G%%/data_dir/styles/polygon.xml
 %%G%%/data_dir/styles/pophatch.sld
-%%G%%/data_dir/styles/pophatch.xml.sample
+%%G%%/data_dir/styles/pophatch.xml
 %%G%%/data_dir/styles/popshade.sld
-%%G%%/data_dir/styles/population.xml.sample
+%%G%%/data_dir/styles/population.xml
 %%G%%/data_dir/styles/rain.sld
-%%G%%/data_dir/styles/rain.xml.sample
+%%G%%/data_dir/styles/rain.xml
 %%G%%/data_dir/styles/raster.sld
-%%G%%/data_dir/styles/raster.xml.sample
+%%G%%/data_dir/styles/raster.xml
 %%G%%/data_dir/styles/restricted.sld
-%%G%%/data_dir/styles/restricted.xml.sample
+%%G%%/data_dir/styles/restricted.xml
 %%G%%/data_dir/styles/simpleRoads.sld
-%%G%%/data_dir/styles/simple_roads.xml.sample
+%%G%%/data_dir/styles/simple_roads.xml
 %%G%%/data_dir/styles/simple_streams.sld
-%%G%%/data_dir/styles/simple_streams.xml.sample
+%%G%%/data_dir/styles/simple_streams.xml
 %%G%%/data_dir/styles/tiger_roads.sld
-%%G%%/data_dir/styles/tiger_roads.xml.sample
-%%G%%/data_dir/user_projections/epsg.properties.sample
-%%G%%/data_dir/validation/FeatureCheck.xml.sample
-%%G%%/data_dir/validation/IntegrityCheck.xml.sample
-%%G%%/data_dir/wcs.xml.sample
-%%G%%/data_dir/wfs.xml.sample
-%%G%%/data_dir/wms.xml.sample
-%%G%%/data_dir/workspaces/cite/namespace.xml.sample
-%%G%%/data_dir/workspaces/cite/workspace.xml.sample
-%%G%%/data_dir/workspaces/default.xml.sample
-%%G%%/data_dir/workspaces/it.geosolutions/namespace.xml.sample
-%%G%%/data_dir/workspaces/it.geosolutions/workspace.xml.sample
-%%G%%/data_dir/workspaces/nurc/arcGridSample/Arc_Sample/coverage.xml.sample
-%%G%%/data_dir/workspaces/nurc/arcGridSample/Arc_Sample/layer.xml.sample
-%%G%%/data_dir/workspaces/nurc/arcGridSample/coveragestore.xml.sample
-%%G%%/data_dir/workspaces/nurc/img_sample2/Pk50095/coverage.xml.sample
-%%G%%/data_dir/workspaces/nurc/img_sample2/Pk50095/layer.xml.sample
-%%G%%/data_dir/workspaces/nurc/img_sample2/coveragestore.xml.sample
-%%G%%/data_dir/workspaces/nurc/mosaic/coveragestore.xml.sample
-%%G%%/data_dir/workspaces/nurc/mosaic/mosaic/coverage.xml.sample
-%%G%%/data_dir/workspaces/nurc/mosaic/mosaic/layer.xml.sample
-%%G%%/data_dir/workspaces/nurc/namespace.xml.sample
-%%G%%/data_dir/workspaces/nurc/workspace.xml.sample
-%%G%%/data_dir/workspaces/nurc/worldImageSample/Img_Sample/coverage.xml.sample
-%%G%%/data_dir/workspaces/nurc/worldImageSample/Img_Sample/layer.xml.sample
-%%G%%/data_dir/workspaces/nurc/worldImageSample/coveragestore.xml.sample
-%%G%%/data_dir/workspaces/sde/namespace.xml.sample
-%%G%%/data_dir/workspaces/sde/workspace.xml.sample
-%%G%%/data_dir/workspaces/sf/namespace.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/archsites/featuretype.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/archsites/layer.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/bugsites/featuretype.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/bugsites/layer.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/datastore.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/restricted/featuretype.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/restricted/layer.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/roads/featuretype.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/roads/layer.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/streams/featuretype.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/streams/layer.xml.sample
-%%G%%/data_dir/workspaces/sf/sfdem/coveragestore.xml.sample
-%%G%%/data_dir/workspaces/sf/sfdem/sfdem/coverage.xml.sample
-%%G%%/data_dir/workspaces/sf/sfdem/sfdem/layer.xml.sample
-%%G%%/data_dir/workspaces/sf/workspace.xml.sample
-%%G%%/data_dir/workspaces/tiger/namespace.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/datastore.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/giant_polygon/featuretype.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/giant_polygon/layer.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/poi/featuretype.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/poi/layer.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/poly_landmarks/featuretype.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/poly_landmarks/layer.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/tiger_roads/featuretype.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/tiger_roads/layer.xml.sample
-%%G%%/data_dir/workspaces/tiger/workspace.xml.sample
-%%G%%/data_dir/workspaces/topp/namespace.xml.sample
-%%G%%/data_dir/workspaces/topp/states_shapefile/datastore.xml.sample
+%%G%%/data_dir/styles/tiger_roads.xml
+%%G%%/data_dir/user_projections/epsg.properties
+%%G%%/data_dir/validation/FeatureCheck.xml
+%%G%%/data_dir/validation/IntegrityCheck.xml
+%%G%%/data_dir/wcs.xml
+%%G%%/data_dir/wfs.xml
+%%G%%/data_dir/wms.xml
+%%G%%/data_dir/workspaces/cite/namespace.xml
+%%G%%/data_dir/workspaces/cite/workspace.xml
+%%G%%/data_dir/workspaces/default.xml
+%%G%%/data_dir/workspaces/it.geosolutions/namespace.xml
+%%G%%/data_dir/workspaces/it.geosolutions/workspace.xml
+%%G%%/data_dir/workspaces/nurc/arcGridSample/Arc_Sample/coverage.xml
+%%G%%/data_dir/workspaces/nurc/arcGridSample/Arc_Sample/layer.xml
+%%G%%/data_dir/workspaces/nurc/arcGridSample/coveragestore.xml
+%%G%%/data_dir/workspaces/nurc/img_sample2/Pk50095/coverage.xml
+%%G%%/data_dir/workspaces/nurc/img_sample2/Pk50095/layer.xml
+%%G%%/data_dir/workspaces/nurc/img_sample2/coveragestore.xml
+%%G%%/data_dir/workspaces/nurc/mosaic/coveragestore.xml
+%%G%%/data_dir/workspaces/nurc/mosaic/mosaic/coverage.xml
+%%G%%/data_dir/workspaces/nurc/mosaic/mosaic/layer.xml
+%%G%%/data_dir/workspaces/nurc/namespace.xml
+%%G%%/data_dir/workspaces/nurc/workspace.xml
+%%G%%/data_dir/workspaces/nurc/worldImageSample/Img_Sample/coverage.xml
+%%G%%/data_dir/workspaces/nurc/worldImageSample/Img_Sample/layer.xml
+%%G%%/data_dir/workspaces/nurc/worldImageSample/coveragestore.xml
+%%G%%/data_dir/workspaces/sde/namespace.xml
+%%G%%/data_dir/workspaces/sde/workspace.xml
+%%G%%/data_dir/workspaces/sf/namespace.xml
+%%G%%/data_dir/workspaces/sf/sf/archsites/featuretype.xml
+%%G%%/data_dir/workspaces/sf/sf/archsites/layer.xml
+%%G%%/data_dir/workspaces/sf/sf/bugsites/featuretype.xml
+%%G%%/data_dir/workspaces/sf/sf/bugsites/layer.xml
+%%G%%/data_dir/workspaces/sf/sf/datastore.xml
+%%G%%/data_dir/workspaces/sf/sf/restricted/featuretype.xml
+%%G%%/data_dir/workspaces/sf/sf/restricted/layer.xml
+%%G%%/data_dir/workspaces/sf/sf/roads/featuretype.xml
+%%G%%/data_dir/workspaces/sf/sf/roads/layer.xml
+%%G%%/data_dir/workspaces/sf/sf/streams/featuretype.xml
+%%G%%/data_dir/workspaces/sf/sf/streams/layer.xml
+%%G%%/data_dir/workspaces/sf/sfdem/coveragestore.xml
+%%G%%/data_dir/workspaces/sf/sfdem/sfdem/coverage.xml
+%%G%%/data_dir/workspaces/sf/sfdem/sfdem/layer.xml
+%%G%%/data_dir/workspaces/sf/workspace.xml
+%%G%%/data_dir/workspaces/tiger/namespace.xml
+%%G%%/data_dir/workspaces/tiger/nyc/datastore.xml
+%%G%%/data_dir/workspaces/tiger/nyc/giant_polygon/featuretype.xml
+%%G%%/data_dir/workspaces/tiger/nyc/giant_polygon/layer.xml
+%%G%%/data_dir/workspaces/tiger/nyc/poi/featuretype.xml
+%%G%%/data_dir/workspaces/tiger/nyc/poi/layer.xml
+%%G%%/data_dir/workspaces/tiger/nyc/poly_landmarks/featuretype.xml
+%%G%%/data_dir/workspaces/tiger/nyc/poly_landmarks/layer.xml
+%%G%%/data_dir/workspaces/tiger/nyc/tiger_roads/featuretype.xml
+%%G%%/data_dir/workspaces/tiger/nyc/tiger_roads/layer.xml
+%%G%%/data_dir/workspaces/tiger/workspace.xml
+%%G%%/data_dir/workspaces/topp/namespace.xml
+%%G%%/data_dir/workspaces/topp/states_shapefile/datastore.xml
 %%G%%/data_dir/workspaces/topp/states_shapefile/states/description.ftl
-%%G%%/data_dir/workspaces/topp/states_shapefile/states/featuretype.xml.sample
-%%G%%/data_dir/workspaces/topp/states_shapefile/states/layer.xml.sample
+%%G%%/data_dir/workspaces/topp/states_shapefile/states/featuretype.xml
+%%G%%/data_dir/workspaces/topp/states_shapefile/states/layer.xml
 %%G%%/data_dir/workspaces/topp/states_shapefile/states/title.ftl
-%%G%%/data_dir/workspaces/topp/taz_shapes/datastore.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_cities/featuretype.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_cities/layer.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_roads/featuretype.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_roads/layer.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_state_boundaries/featuretype.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_state_boundaries/layer.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_water_bodies/featuretype.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_water_bodies/layer.xml.sample
-%%G%%/data_dir/workspaces/topp/workspace.xml.sample
+%%G%%/data_dir/workspaces/topp/taz_shapes/datastore.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_cities/featuretype.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_cities/layer.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_roads/featuretype.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_roads/layer.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_state_boundaries/featuretype.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_state_boundaries/layer.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_water_bodies/featuretype.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_water_bodies/layer.xml
+%%G%%/data_dir/workspaces/topp/workspace.xml
 %%G%%/data_dir/www/ol-demo.html
 %%G%%/data_dir/www/openlayers/OpenLayers.js
 %%G%%/data_dir/www/openlayers/img/blank.gif
@@ -496,18 +497,18 @@
 %%G%%/data_dir/www/styles/remoteOws.sld
 %%G%%/data_dir/www/styles/remoteTasmania.sld
 %%G%%/data_dir/www/wfs-t.html
-%%G%%/etc/jdbcRealm.properties.sample
-%%G%%/etc/jetty-deploy.xml.sample
-%%G%%/etc/jetty-http.xml.sample
-%%G%%/etc/jetty-https.xml.sample
-%%G%%/etc/jetty-jmx-platform.xml.sample
-%%G%%/etc/jetty-jmx.xml.sample
-%%G%%/etc/jetty-plus.xml.sample
-%%G%%/etc/jetty-ssl.xml.sample
-%%G%%/etc/jetty.xml.sample
-%%G%%/etc/keystore.sample
-%%G%%/etc/realm.properties.sample
-%%G%%/etc/webdefault.xml.sample
+@sample %%G%%/etc/jdbcRealm.properties.sample
+@sample %%G%%/etc/jetty-deploy.xml.sample
+@sample %%G%%/etc/jetty-http.xml.sample
+@sample %%G%%/etc/jetty-https.xml.sample
+@sample %%G%%/etc/jetty-jmx-platform.xml.sample
+@sample %%G%%/etc/jetty-jmx.xml.sample
+@sample %%G%%/etc/jetty-plus.xml.sample
+@sample %%G%%/etc/jetty-ssl.xml.sample
+@sample %%G%%/etc/jetty.xml.sample
+@sample %%G%%/etc/keystore.sample
+@sample %%G%%/etc/realm.properties.sample
+@sample %%G%%/etc/webdefault.xml.sample
 %%G%%/lib/ant-1.6.5.jar
 %%G%%/lib/ant-1.8.4.jar
 %%G%%/lib/ant-launcher-1.8.4.jar
@@ -517,47 +518,57 @@
 %%G%%/lib/jasper-compiler-jdt-5.5.15.jar
 %%G%%/lib/jasper-runtime-5.5.15.jar
 %%G%%/lib/javax.servlet-api-3.1.0.jar
-%%G%%/lib/jetty-continuation-9.4.12.v20180830.jar
-%%G%%/lib/jetty-deploy-9.4.12.v20180830.jar
-%%G%%/lib/jetty-http-9.4.12.v20180830.jar
-%%G%%/lib/jetty-io-9.4.12.v20180830.jar
+%%G%%/lib/jetty-continuation-%%JETTY%%.jar
+%%G%%/lib/jetty-deploy-%%JETTY%%.jar
+%%G%%/lib/jetty-http-%%JETTY%%.jar
+%%G%%/lib/jetty-io-%%JETTY%%.jar
 %%G%%/lib/jetty-schemas-3.1.M0.jar
-%%G%%/lib/jetty-security-9.4.12.v20180830.jar
-%%G%%/lib/jetty-server-9.4.12.v20180830.jar
-%%G%%/lib/jetty-servlet-9.4.12.v20180830.jar
-%%G%%/lib/jetty-servlets-9.4.12.v20180830.jar
-%%G%%/lib/jetty-util-9.4.12.v20180830.jar
-%%G%%/lib/jetty-webapp-9.4.12.v20180830.jar
-%%G%%/lib/jetty-xml-9.4.12.v20180830.jar
+%%G%%/lib/jetty-security-%%JETTY%%.jar
+%%G%%/lib/jetty-server-%%JETTY%%.jar
+%%G%%/lib/jetty-servlet-%%JETTY%%.jar
+%%G%%/lib/jetty-servlets-%%JETTY%%.jar
+%%G%%/lib/jetty-util-%%JETTY%%.jar
+%%G%%/lib/jetty-webapp-%%JETTY%%.jar
+%%G%%/lib/jetty-xml-%%JETTY%%.jar
 %%G%%/lib/jsp-api-2.0.jar
 %%G%%/lib/log4j-1.2.17.jar
 %%G%%/lib/xmlParserAPIs-2.6.2.jar
 %%G%%/logs/keepme.txt
-%%G%%/resources/log4j.properties.sample
+%%G%%/modules/deploy.mod
+%%G%%/modules/http.mod
+%%G%%/modules/https.mod
+%%G%%/modules/resources.mod
+%%G%%/modules/security.mod
+%%G%%/modules/server.mod
+%%G%%/modules/servlet.mod
+%%G%%/modules/servlets.mod
+%%G%%/modules/webapp.mod
+%%G%%/resources/log4j.properties
+%%G%%/start.ini
 %%G%%/start.jar
-%%G%%/webapps/%%G%%/WEB-INF/dispatcher-servlet.xml.sample
+%%G%%/webapps/%%G%%/WEB-INF/dispatcher-servlet.xml
 %%G%%/webapps/%%G%%/WEB-INF/lib/FastInfoset-1.2.15.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/GeographicLib-Java-1.49.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/JavaAPIforKml-2.2.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/activation-1.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/animal-sniffer-annotations-1.17.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/antlr4-runtime-4.7.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-anim-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-awt-util-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-bridge-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-constants-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-css-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-dom-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-ext-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-gvt-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-i18n-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-parser-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-script-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-svg-dom-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-svggen-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-transcoder-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-util-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-xml-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-anim-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-awt-util-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-bridge-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-constants-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-css-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-dom-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-ext-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-gvt-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-i18n-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-parser-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-script-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-svg-dom-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-svggen-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-transcoder-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-util-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-xml-%%BATIK%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/bcprov-jdk15on-1.60.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/bigint-0.7.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/checker-qual-2.5.2.jar
@@ -613,151 +624,158 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-web-wms-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-wfs-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-wms-%%MVER%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-app-schema-resolver-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-arcgrid-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-complex-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-coverage-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-cql-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-epsg-hsql-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geojson-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geopkg-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geotiff-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-grid-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-image-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-imagemosaic-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-postgis-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-main-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-metadata-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-opengis-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-feature-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-raster-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-property-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-referencing-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-render-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-shapefile-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-svg-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-tile-client-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-transform-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wfs-ng-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wms-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wmts-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xml-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-core-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-fes-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-filter-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml2-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml3-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-ows-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-sld-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wcs-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wfs-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wmts-21.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-app-schema-resolver-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-arcgrid-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-complex-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-coverage-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-cql-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-epsg-hsql-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geojson-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geopkg-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geotiff-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-grid-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-image-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-imagemosaic-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-postgis-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-main-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-metadata-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-opengis-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-feature-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-raster-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-property-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-referencing-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-render-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gs-restconfig-wmts-%%MVER%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-shapefile-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-svg-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-tile-client-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-transform-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wfs-ng-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wms-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wmts-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xml-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-core-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-fes-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-filter-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml2-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml3-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-ows-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-sld-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wcs-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wfs-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wmts-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/guava-27.0-jre.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-core-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-core-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-jdbc-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-georss-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-gmaps-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-kml-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-rest-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-tms-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-ve-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wms-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wmts-1.15.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-core-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-core-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-jdbc-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-georss-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-gmaps-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-kml-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-rest-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-tms-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-ve-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wms-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wmts-%%GWC%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/h2-1.1.119.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/hsqldb-2.4.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/httpclient-4.5.5.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/httpclient-cache-4.5.5.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/httpcore-4.4.10.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-arcgrid-1.2.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-geocore-1.2.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-png-1.2.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-streams-1.2.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-tiff-1.2.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-utilities-1.2.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-arcgrid-%%IMAGEIO%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-geocore-%%IMAGEIO%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-png-%%IMAGEIO%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-streams-%%IMAGEIO%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-tiff-%%IMAGEIO%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-utilities-%%IMAGEIO%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/istack-commons-runtime-3.0.7.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/itext-2.1.5.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/j2objc-annotations-1.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-core-2.9.7.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-core-2.10.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jai_codec-%%VER3%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jai_core-%%VER3%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jai_imageio-1.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/janino-3.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jasypt-1.9.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jasypt-springsecurity3-1.9.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/javaee-api-7.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/javax.activation-api-1.2.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/javax.mail-1.5.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jaxb-api-2.4.0-b180830.0359.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jaxb-runtime-2.4.0-b180830.0438.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jdom2-2.0.6.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jettison-1.0.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jgridshift-1.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/json-lib-2.4-jdk15.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jgridshift-core-1.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jna-5.3.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jna-platform-5.3.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/joda-time-2.8.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/json-lib-2.4.2-%%G%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/json-simple-1.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jsr305-2.0.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-affine-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-algebra-1.1.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-affine-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-algebra-%%JT%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-attributeop-1.5.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandcombine-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandmerge-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandselect-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-binarize-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-border-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-buffer-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-classbreaks-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-classifier-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorconvert-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorindexer-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-concurrent-tile-cache-1.1.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandcombine-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandmerge-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandselect-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-binarize-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-border-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-buffer-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-classbreaks-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-classifier-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorconvert-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorindexer-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-concurrent-tile-cache-%%JT%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-contour-1.5.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-crop-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-errordiffusion-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-format-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-imagefunction-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-iterators-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-jiffle-language-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-jiffle-op-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-lookup-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-mosaic-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-nullop-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-orderdither-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-piecewise-1.1.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-crop-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-errordiffusion-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-format-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-imagefunction-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-iterators-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-jiffle-language-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-jiffle-op-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-lookup-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-mosaic-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-nullop-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-orderdither-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-piecewise-%%JT%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-rangelookup-1.5.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rescale-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rlookup-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-scale-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-scale2-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-shadedrelief-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-stats-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-translate-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-utilities-1.1.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rescale-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rlookup-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-scale-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-scale2-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-shadedrelief-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-stats-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-translate-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-utilities-%%JT%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-utils-1.5.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorbin-1.1.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorbin-%%JT%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorbinarize-1.5.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorize-1.5.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-warp-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonal-1.1.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-warp-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonal-%%JT%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonalstats-1.5.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jts-core-1.16.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jts-core-%%GWC%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/log4j-1.2.17.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/mail-1.4.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/marlin-0.9.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.fes-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.ows-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wcs-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wfs-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wmts-21.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.fes-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.ows-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wcs-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wfs-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wmts-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.common-2.12.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.ecore-2.12.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.ecore.xmi-2.12.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.xsd-2.12.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.json-2.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/org.w3.xlink-21.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/org.w3.xlink-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-3.13.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/picocontainer-1.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/pngj-2.0.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/postgresql-42.1.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/postgresql-42.2.5.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/serializer-2.7.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/si-quantity-0.7.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/si-units-java8-0.7.1.jar
@@ -772,14 +790,14 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-jcl-5.1.1.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-jdbc-5.1.1.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-ldap-core-2.3.2.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-config-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-core-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-ldap-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-web-5.1.1.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-config-%%SPRINGS%%.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-core-%%SPRINGS%%.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-ldap-%%SPRINGS%%.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-web-%%SPRINGS%%.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-tx-5.1.1.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-web-5.1.1.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-webmvc-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/sqlite-jdbc-3.23.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/sqlite-jdbc-3.27.2.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-1.2.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-api-1.0.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-ex-1.8.jar
@@ -789,6 +807,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/uom-lib-common-1.0.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/uom-se-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/wicket-core-7.6.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-datetime-7.6.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/wicket-dnd-0.7.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/wicket-extensions-7.6.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/wicket-request-7.6.0.jar
@@ -803,7 +822,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/xmlpull-%%VER3%%.1.jar

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912152143.xBFLhV14049627>