Merge tag 'v0.6.0' into develop

# Conflicts:
#	README.md

README.md

@@ -14,7 +14,7 @@ distribution and implementation.
 Copyright 2004-2006, 2008, 2017, United States Government, as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
 
 The NASA WorldWind Server Kit (WWSK) framework is licensed under the Apache License, Version 2.0 (the "License"); you may not use this application except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
- 
+
 GeoServer is licensed under the [GPL Version 2](https://www.gnu.org/licenses/gpl-2.0.html). 
 
 ## Building

pom.xml

@@ -29,7 +29,7 @@
 
     <groupId>gov.nasa.worldwind.server</groupId>
     <artifactId>worldwind-serverkit</artifactId>
-    <version>0.6.0-SNAPSHOT</version> 
+    <version>0.6.0</version> 
     <packaging>pom</packaging>
 
     <!--=====================================================================-->

worldwind-geoserver-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nasa.worldwind.server</groupId>
         <artifactId>worldwind-serverkit</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.0</version>
     </parent>
     <artifactId>worldwind-geoserver-dist</artifactId>
     <packaging>pom</packaging>

worldwind-geoserver/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nasa.worldwind.server</groupId>
         <artifactId>worldwind-serverkit</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.0</version>
     </parent>    
     <artifactId>worldwind-geoserver</artifactId>
     <packaging>war</packaging>
@@ -84,6 +84,12 @@
         <dependency>
             <groupId>org.geoserver.web</groupId>
             <artifactId>gs-web-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.geotools</groupId>
+                    <artifactId>gt-geopkg</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.geoserver.web</groupId>

worldwind-gs-explorer/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nasa.worldwind.server</groupId>
         <artifactId>worldwind-serverkit</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.0</version>
     </parent>
     <artifactId>worldwind-gs-explorer</artifactId>
     <packaging>jar</packaging>

worldwind-gs-geopkg/pom.xml

@@ -9,7 +9,7 @@ application directory.
     <parent>
         <groupId>gov.nasa.worldwind.server</groupId>
         <artifactId>worldwind-serverkit</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.0</version>
     </parent>
 
     <groupId>gov.nasa.worldwind.server</groupId>
@@ -127,6 +127,12 @@ application directory.
         <dependency>
             <groupId>org.geoserver.web</groupId>
             <artifactId>gs-web-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.geotools</groupId>
+                    <artifactId>gt-geopkg</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency> 
         <dependency>
             <groupId>org.geoserver</groupId>

worldwind-gs-geopkg/src/main/java/applicationContext.xml

@@ -65,7 +65,7 @@ application directory.
     -->
     <bean id="GeoPackageDataStorePanel" class="org.geoserver.web.data.resource.DataStorePanelInfo">
         <property name="id" value="gpkgRaster"/>
-        <property name="factoryClass" value="gov.nasa.worldwind.geopkg.mosaic.GeoPackageFormat"/>
+        <property name="factoryClass" value="org.geotools.geopkg.mosaic.GeoPackageFormat"/>
         <property name="iconBase" value="org.geoserver.web.GeoServerApplication"/>
         <property name="icon" value="img/icons/geosilk/page_white_raster.png"/>
         <property name="componentClass" value="gov.nasa.worldwind.gs.geopkg.GeoPackageRasterEditPanel"/>

worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/GeoPackageGetFeatureOutputFormat.java

@@ -11,8 +11,8 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
-import gov.nasa.worldwind.geopkg.FeatureEntry;
-import gov.nasa.worldwind.geopkg.GeoPackage;
+import org.geotools.geopkg.FeatureEntry;
+import org.geotools.geopkg.GeoPackage;
 
 import static gov.nasa.worldwind.gs.geopkg.GeoPkg.*;
 

worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/GeoPackageGetMapOutputFormat.java

@@ -8,10 +8,10 @@
 import com.google.common.collect.Sets;
 import com.vividsolutions.jts.geom.Envelope;
 
-import gov.nasa.worldwind.geopkg.GeoPackage;
-import gov.nasa.worldwind.geopkg.Tile;
-import gov.nasa.worldwind.geopkg.TileEntry;
-import gov.nasa.worldwind.geopkg.TileMatrix;
+import org.geotools.geopkg.GeoPackage;
+import org.geotools.geopkg.Tile;
+import org.geotools.geopkg.TileEntry;
+import org.geotools.geopkg.TileMatrix;
 import gov.nasa.worldwind.gs.wms.map.MapResponseOutputStreamAdaptor;
 
 import static java.lang.String.format;

worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/GeoPkgDataStoreFactoryInitializer.java

@@ -5,7 +5,7 @@
  */
 package gov.nasa.worldwind.gs.geopkg;
 
-import gov.nasa.worldwind.geopkg.GeoPkgDataStoreFactory;
+import org.geotools.geopkg.GeoPkgDataStoreFactory;
 
 import org.geoserver.data.DataStoreFactoryInitializer;
 import org.geoserver.platform.GeoServerResourceLoader;

worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/web/CoveragePanel.java

@@ -14,7 +14,7 @@
 import org.apache.wicket.model.ResourceModel;
 
 import com.vividsolutions.jts.geom.Envelope;
-import gov.nasa.worldwind.geopkg.wps.GeoPackageProcessRequest.TilesLayer.TilesCoverage;
+import org.geotools.geopkg.wps.GeoPackageProcessRequest.TilesLayer.TilesCoverage;
 import org.apache.wicket.Component;
 import org.apache.wicket.util.visit.IVisit;
 import org.geoserver.catalog.Catalog;

worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/web/ExecuteRequest.java

@@ -17,7 +17,7 @@
  */
 package gov.nasa.worldwind.gs.geopkg.web;
 
-import gov.nasa.worldwind.geopkg.wps.GeoPackageProcessRequest;
+import org.geotools.geopkg.wps.GeoPackageProcessRequest;
 import java.io.Serializable;
 
 /**

worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/web/ExportGeoPackagePage.java

@@ -17,9 +17,9 @@
  */
 package gov.nasa.worldwind.gs.geopkg.web;
 
-import gov.nasa.worldwind.geopkg.wps.GeoPackageProcessRequestTransformer;
+import org.geotools.geopkg.wps.GeoPackageProcessRequestTransformer;
 import com.vividsolutions.jts.geom.Envelope;
-import gov.nasa.worldwind.geopkg.wps.GeoPackageProcessRequest;
+import org.geotools.geopkg.wps.GeoPackageProcessRequest;
 import java.io.ByteArrayOutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -51,7 +51,7 @@
 import org.geoserver.web.GeoServerSecuredPage;
 
 import com.google.common.collect.Lists;
-import gov.nasa.worldwind.geopkg.wps.GeoPackageProcessRequest.TilesLayer.TilesCoverage;
+import org.geotools.geopkg.wps.GeoPackageProcessRequest.TilesLayer.TilesCoverage;
 import java.util.Arrays;
 import java.util.Comparator;
 import javax.xml.namespace.QName;

worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/wps/GeoPackageProcess.java

@@ -2,15 +2,15 @@
 
 import com.vividsolutions.jts.geom.Envelope;
 
-import gov.nasa.worldwind.geopkg.Entry;
-import gov.nasa.worldwind.geopkg.FeatureEntry;
-import gov.nasa.worldwind.geopkg.GeoPackage;
-import gov.nasa.worldwind.geopkg.TileEntry;
-import gov.nasa.worldwind.geopkg.wps.GeoPackageProcessRequest;
-import gov.nasa.worldwind.geopkg.wps.GeoPackageProcessRequest.FeaturesLayer;
-import gov.nasa.worldwind.geopkg.wps.GeoPackageProcessRequest.Layer;
-import gov.nasa.worldwind.geopkg.wps.GeoPackageProcessRequest.LayerType;
-import gov.nasa.worldwind.geopkg.wps.GeoPackageProcessRequest.TilesLayer;
+import org.geotools.geopkg.Entry;
+import org.geotools.geopkg.FeatureEntry;
+import org.geotools.geopkg.GeoPackage;
+import org.geotools.geopkg.TileEntry;
+import org.geotools.geopkg.wps.GeoPackageProcessRequest;
+import org.geotools.geopkg.wps.GeoPackageProcessRequest.FeaturesLayer;
+import org.geotools.geopkg.wps.GeoPackageProcessRequest.Layer;
+import org.geotools.geopkg.wps.GeoPackageProcessRequest.LayerType;
+import org.geotools.geopkg.wps.GeoPackageProcessRequest.TilesLayer;
 
 import gov.nasa.worldwind.gs.geopkg.GeoPackageGetMapOutputFormat;
 

worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/wps/GeoPackageProcessRequestPPIO.java

@@ -1,8 +1,8 @@
 package gov.nasa.worldwind.gs.geopkg.wps;
 
-import gov.nasa.worldwind.geopkg.wps.GeoPackageProcessRequest;
-import gov.nasa.worldwind.geopkg.wps.xml.GPKGConfiguration;
-import gov.nasa.worldwind.geopkg.wps.xml.GPKGParserDelegate;
+import org.geotools.geopkg.wps.GeoPackageProcessRequest;
+import org.geotools.geopkg.wps.xml.GPKGConfiguration;
+import org.geotools.geopkg.wps.xml.GPKGParserDelegate;
 
 import java.io.InputStream;
 import java.io.OutputStream;

worldwind-gs-geopkg/src/test/java/gov/nasa/worldwind/gs/geopkg/GeoPackageGetFeatureOutputFormatTest.java

@@ -27,8 +27,8 @@
 import org.geotools.data.simple.SimpleFeatureReader;
 import org.geotools.factory.CommonFactoryFinder;
 import org.geotools.feature.FeatureCollection;
-import gov.nasa.worldwind.geopkg.FeatureEntry;
-import gov.nasa.worldwind.geopkg.GeoPackage;
+import org.geotools.geopkg.FeatureEntry;
+import org.geotools.geopkg.GeoPackage;
 import java.util.logging.Level;
 import org.geotools.sql.SqlUtil;
 import org.geotools.util.logging.Logging;

worldwind-gs-geopkg/src/test/java/gov/nasa/worldwind/gs/geopkg/GeoPackageGetMapOutputFormatTest.java

@@ -21,7 +21,7 @@
 import org.geoserver.wms.WMSTestSupport;
 import org.geoserver.wms.WebMap;
 import org.geoserver.wms.map.RawMap;
-import gov.nasa.worldwind.geopkg.GeoPackage;
+import org.geotools.geopkg.GeoPackage;
 import org.junit.Before;
 import org.junit.Test;
 

worldwind-gs-geopkg/src/test/java/gov/nasa/worldwind/gs/geopkg/GeoPkgDataStoreFactoryInitializerTest.java

@@ -3,7 +3,7 @@
 import org.geoserver.data.DataStoreFactoryInitializer;
 import org.geoserver.platform.GeoServerExtensions;
 import org.geoserver.platform.GeoServerResourceLoader;
-import gov.nasa.worldwind.geopkg.GeoPkgDataStoreFactory;
+import org.geotools.geopkg.GeoPkgDataStoreFactory;
 import org.junit.Test;
 import org.springframework.web.context.WebApplicationContext;
 import org.vfny.geoserver.util.DataStoreUtils;

worldwind-gs-geopkg/src/test/java/gov/nasa/worldwind/gs/geopkg/wps/gs/GeoPackageProcessTest.java

@@ -10,11 +10,11 @@
 import org.geoserver.wps.WPSTestSupport;
 import org.geotools.data.DataUtilities;
 import org.geotools.data.simple.SimpleFeatureReader;
-import gov.nasa.worldwind.geopkg.FeatureEntry;
-import gov.nasa.worldwind.geopkg.GeoPackage;
-import gov.nasa.worldwind.geopkg.TileEntry;
-import gov.nasa.worldwind.geopkg.TileMatrix;
-import gov.nasa.worldwind.geopkg.TileReader;
+import org.geotools.geopkg.FeatureEntry;
+import org.geotools.geopkg.GeoPackage;
+import org.geotools.geopkg.TileEntry;
+import org.geotools.geopkg.TileMatrix;
+import org.geotools.geopkg.TileReader;
 import org.junit.Ignore;
 import org.junit.Test;
 

worldwind-gs-web/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nasa.worldwind.server</groupId>
         <artifactId>worldwind-serverkit</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.0</version>
     </parent>
     <artifactId>worldwind-gs-web</artifactId>
     <packaging>jar</packaging>

worldwind-gs-wms/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nasa.worldwind.server</groupId>
         <artifactId>worldwind-serverkit</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.0</version>
     </parent>
     <artifactId>worldwind-gs-wms</artifactId>
     <packaging>jar</packaging>

worldwind-gt-geopkg/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>gov.nasa.worldwind.server</groupId>
         <artifactId>worldwind-serverkit</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.0</version>
     </parent>
 
     <!-- =========================================================== -->

worldwind-gt-geopkg/src/main/java/gov/nasa/worldwind/geopkg/ByteArrayImageInputStreamSpi.java → worldwind-gt-geopkg/src/main/java/org/geotools/geopkg/ByteArrayImageInputStreamSpi.java

@@ -14,7 +14,7 @@
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *    Lesser General Public License for more details.
  */
-package gov.nasa.worldwind.geopkg;
+package org.geotools.geopkg;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

worldwind-gt-geopkg/src/main/java/gov/nasa/worldwind/geopkg/Entry.java → worldwind-gt-geopkg/src/main/java/org/geotools/geopkg/Entry.java

@@ -14,7 +14,7 @@
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *    Lesser General Public License for more details.
  */
-package gov.nasa.worldwind.geopkg;
+package org.geotools.geopkg;
 
 import java.util.Date;
 

worldwind-gt-geopkg/src/main/java/gov/nasa/worldwind/geopkg/FeatureEntry.java → worldwind-gt-geopkg/src/main/java/org/geotools/geopkg/FeatureEntry.java

@@ -14,7 +14,7 @@
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *    Lesser General Public License for more details.
  */
-package gov.nasa.worldwind.geopkg;
+package org.geotools.geopkg;
 
 import org.geotools.geometry.jts.Geometries;
 

worldwind-gt-geopkg/src/main/java/gov/nasa/worldwind/geopkg/Features.java → worldwind-gt-geopkg/src/main/java/org/geotools/geopkg/Features.java

@@ -14,7 +14,7 @@
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *    Lesser General Public License for more details.
  */
-package gov.nasa.worldwind.geopkg;
+package org.geotools.geopkg;
 
 import java.io.IOException;
 import java.util.NoSuchElementException;

worldwind-gt-geopkg/src/main/java/gov/nasa/worldwind/geopkg/GeoPackage.java → worldwind-gt-geopkg/src/main/java/org/geotools/geopkg/GeoPackage.java

@@ -14,7 +14,7 @@
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *    Lesser General Public License for more details.
  */
-package gov.nasa.worldwind.geopkg;
+package org.geotools.geopkg;
 
 import static java.lang.String.format;
 import static org.geotools.sql.SqlUtil.prepare;
@@ -59,9 +59,9 @@
 import org.geotools.geometry.GeneralEnvelope;
 import org.geotools.geometry.jts.Geometries;
 import org.geotools.geometry.jts.ReferencedEnvelope;
-import gov.nasa.worldwind.geopkg.geom.GeoPkgGeomReader;
-import gov.nasa.worldwind.geopkg.geom.GeoPkgGeomWriter;
-import gov.nasa.worldwind.geopkg.geom.GeometryFunction;
+import org.geotools.geopkg.geom.GeoPkgGeomReader;
+import org.geotools.geopkg.geom.GeoPkgGeomWriter;
+import org.geotools.geopkg.geom.GeometryFunction;
 import org.geotools.jdbc.JDBCDataStore;
 import org.geotools.jdbc.JDBCFeatureStore;
 import org.geotools.jdbc.PrimaryKey;
@@ -470,7 +470,7 @@ public List<Entry> contents() {
                     try (ResultSet rs = st.executeQuery("SELECT * FROM " + GEOPACKAGE_CONTENTS)) {
                         while (rs.next()) {
                             String dt = rs.getString("data_type");
-                            gov.nasa.worldwind.geopkg.Entry.DataType type = Entry.DataType.valueOf(dt);
+                            org.geotools.geopkg.Entry.DataType type = Entry.DataType.valueOf(dt);
                             Entry e = null;
                             switch (type) {
                                 case Feature:

worldwind-gt-geopkg/src/main/java/gov/nasa/worldwind/geopkg/GeoPkgDataStoreFactory.java → worldwind-gt-geopkg/src/main/java/org/geotools/geopkg/GeoPkgDataStoreFactory.java

@@ -14,14 +14,14 @@
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *    Lesser General Public License for more details.
  */
-package gov.nasa.worldwind.geopkg;
+package org.geotools.geopkg;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
 
 import org.apache.commons.dbcp.BasicDataSource;
-import gov.nasa.worldwind.geopkg.geom.GeoPkgGeomWriter;
+import org.geotools.geopkg.geom.GeoPkgGeomWriter;
 import org.geotools.jdbc.JDBCDataStore;
 import org.geotools.jdbc.JDBCDataStoreFactory;
 import org.geotools.jdbc.SQLDialect;

worldwind-gt-geopkg/src/main/java/gov/nasa/worldwind/geopkg/GeoPkgDialect.java → worldwind-gt-geopkg/src/main/java/org/geotools/geopkg/GeoPkgDialect.java

@@ -14,12 +14,12 @@
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *    Lesser General Public License for more details.
  */
-package gov.nasa.worldwind.geopkg;
+package org.geotools.geopkg;
 
 import static java.lang.String.format;
-import static gov.nasa.worldwind.geopkg.GeoPackage.GEOMETRY_COLUMNS;
-import static gov.nasa.worldwind.geopkg.GeoPackage.GEOPACKAGE_CONTENTS;
-import static gov.nasa.worldwind.geopkg.GeoPackage.SPATIAL_REF_SYS;
+import static org.geotools.geopkg.GeoPackage.GEOMETRY_COLUMNS;
+import static org.geotools.geopkg.GeoPackage.GEOPACKAGE_CONTENTS;
+import static org.geotools.geopkg.GeoPackage.SPATIAL_REF_SYS;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -35,9 +35,9 @@
 import java.util.logging.Level;
 
 import org.geotools.geometry.jts.Geometries;
-import gov.nasa.worldwind.geopkg.Entry.DataType;
-import gov.nasa.worldwind.geopkg.geom.GeoPkgGeomReader;
-import gov.nasa.worldwind.geopkg.geom.GeoPkgGeomWriter;
+import org.geotools.geopkg.Entry.DataType;
+import org.geotools.geopkg.geom.GeoPkgGeomReader;
+import org.geotools.geopkg.geom.GeoPkgGeomWriter;
 import org.geotools.jdbc.JDBCDataStore;
 import org.geotools.jdbc.PreparedFilterToSQL;
 import org.geotools.jdbc.PreparedStatementSQLDialect;

worldwind-gt-geopkg/src/main/java/gov/nasa/worldwind/geopkg/GeoPkgFilterToSQL.java → worldwind-gt-geopkg/src/main/java/org/geotools/geopkg/GeoPkgFilterToSQL.java

@@ -14,7 +14,7 @@
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *    Lesser General Public License for more details.
  */
-package gov.nasa.worldwind.geopkg;
+package org.geotools.geopkg;
 
 import java.io.IOException;
 import java.io.Writer;