- Update to 1.7.0

PR:		128412
Submitted by:	Wen Heping <wenheping@gmail.com> (maintainer)

3 files changed, 4 insertions, 30 deletions

diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index 39b459e56f36..5d93448e69c7 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	geoserver
-PORTVERSION=	1.6.5
+PORTVERSION=	1.7.0
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index 023d3ffd7c80..d416d7639e50 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (geoserver-1.6.5-bin.zip) = e4bf88e2989a9973bd3ab62b09a95860
-SHA256 (geoserver-1.6.5-bin.zip) = b9fd844793cd3e2fec16f7a8f678f6fb343e0c1905a1229aab93a13fd0ef1565
-SIZE (geoserver-1.6.5-bin.zip) = 39716160
+MD5 (geoserver-1.7.0-bin.zip) = 40b8045de91cfee5ff2a66a863ab9985
+SHA256 (geoserver-1.7.0-bin.zip) = 211ba54ea09cb83c6b2879f5c9636aa64b6bba8e3f6a1be28a358a4cfb5a98c9
+SIZE (geoserver-1.7.0-bin.zip) = 43849533
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 802666080b8b..118fedac9602 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -173,9 +173,7 @@ lib/geoserver/data_dir/demo/WFS_getCapabilities-1.0.xml
 lib/geoserver/data_dir/demo/WFS_getCapabilities-1.1.xml
 lib/geoserver/data_dir/demo/WFS_getFeature-1.0.xml
 lib/geoserver/data_dir/demo/WFS_getFeature-1.1.xml
-lib/geoserver/data_dir/demo/WFS_getFeatureBBOX-1.0.url
 lib/geoserver/data_dir/demo/WFS_getFeatureBBOX-1.0.xml
-lib/geoserver/data_dir/demo/WFS_getFeatureBBOX-1.1.url
 lib/geoserver/data_dir/demo/WFS_getFeatureBBOX-1.1.xml
 lib/geoserver/data_dir/demo/WFS_getFeatureBetween-1.0.xml
 lib/geoserver/data_dir/demo/WFS_getFeatureBetween-1.1.xml
@@ -376,11 +374,8 @@ lib/geoserver/lib/commons-logging-1.0.jar
 lib/geoserver/lib/jasper-compiler-5.5.15.jar
 lib/geoserver/lib/jasper-compiler-jdt-5.5.15.jar
 lib/geoserver/lib/jasper-runtime-5.5.15.jar
-lib/geoserver/lib/jetty-6.0.2.jar
-lib/geoserver/lib/jetty-util-6.0.2.jar
 lib/geoserver/lib/jsp-api-2.0.jar
 lib/geoserver/lib/log4j-1.2.14.jar
-lib/geoserver/lib/servlet-api-2.5-6.0.2.jar
 lib/geoserver/lib/slf4j-simple-1.0.1.jar
 lib/geoserver/lib/xercesImpl-2.6.2.jar
 lib/geoserver/lib/xmlParserAPIs-2.6.2.jar
@@ -407,7 +402,6 @@ lib/geoserver/webapps/geoserver/WEB-INF/classes/org/geoserver/filters/GZIPRespon
 lib/geoserver/webapps/geoserver/WEB-INF/classes/org/geoserver/filters/GZIPResponseWrapper.class
 lib/geoserver/webapps/geoserver/WEB-INF/classes/org/geoserver/filters/LoggingFilter.class
 lib/geoserver/webapps/geoserver/WEB-INF/classes/org/geoserver/logging/LoggingStartupContextListener.class
-lib/geoserver/webapps/geoserver/WEB-INF/classes/org/geoserver/request/Dispatcher.class
 lib/geoserver/webapps/geoserver/WEB-INF/classes/org/vfny/geoserver/action/AdminIndexAction.class
 lib/geoserver/webapps/geoserver/WEB-INF/classes/org/vfny/geoserver/action/ConfigAction.class
 lib/geoserver/webapps/geoserver/WEB-INF/classes/org/vfny/geoserver/action/ConfigIndexAction.class
@@ -550,9 +544,7 @@ lib/geoserver/webapps/geoserver/WEB-INF/lib/commons-lang-2.1.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/commons-logging-1.0.3.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/commons-pool-1.3.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/commons-validator-1.1.4.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/concurrent-1.3.4.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/ecore-2.2.2.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/geoapi-nogenerics-2.1-RC1.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/hsqldb-1.8.0.7.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/imageio-ext-arcgrid-1.0-SNAPSHOT.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/imageio-ext-customstreams-1.0-SNAPSHOT.jar
@@ -560,30 +552,13 @@ lib/geoserver/webapps/geoserver/WEB-INF/lib/itext-2.0.6.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/jai_codec-1.1.3.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/jai_core-1.1.3.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/jai_imageio-1.1.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/jaxb-api-1.3.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/jaxb-impl-1.3.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/jaxb-libs-1.3.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/jdom-1.0.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/jsr108-0.01.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/jstl-1.0.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/jts-1.8.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/log4j-1.2.14.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/lucene-1.4.3.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/oro-2.0.8.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/picocontainer-1.2.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/postgis-driver-1.0.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/postgresql-8.1-407.jdbc3.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/relaxngDatatype-X.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/spring-aop-1.2.5.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/spring-beans-1.2.5.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/spring-context-1.2.5.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/spring-core-1.2.5.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/spring-dao-1.2.8.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/spring-jdbc-1.2.8.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/spring-remoting-1.2.8.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/spring-support-1.2.8.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/spring-web-1.2.5.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/spring-webmvc-1.2.5.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/standard-1.0.6.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/struts-1.2.9.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/vecmath-1.3.1.jar
@@ -595,7 +570,6 @@ lib/geoserver/webapps/geoserver/WEB-INF/lib/xml-apis-1.0.b2.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/xml-apis-xerces-2.7.1.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/xpp3-1.1.3.4.O.jar
 lib/geoserver/webapps/geoserver/WEB-INF/lib/xsd-2.2.2.jar
-lib/geoserver/webapps/geoserver/WEB-INF/lib/xsdlib-20050614.jar
 lib/geoserver/webapps/geoserver/WEB-INF/org.openplans.geoserver-servlet.xml
 lib/geoserver/webapps/geoserver/WEB-INF/pages/Administration.jsp
 lib/geoserver/webapps/geoserver/WEB-INF/pages/Configuration.jsp