Merge branch 'release/v0.4.0'

Author: emxsys

.travis.yml

@@ -68,11 +68,4 @@ deploy:
     on:
       branch: master
       #tags: true
-      
-notifications:
-  # Notify the World Wind services mailing list on every build
-  email:
-    recipients:
-        secure: "khLHCEeK0yziQdyvMMWdQ4b6qeGvwG1T1Ph9t361tc0aPvyfR/lreHGJPbKRoOJSfe1F0E4mruigcWJPXUawVJFgzSgF1aybw5JWpAj7ricRniHy3kfbxG3eedlzYtnQU+Bkxdl9yKC/SxCuUvy+dESrEyegO1weRnesSwNefJ2VjtNAn7JZhCiGHQLh4mAHQy64AH/In9cRcoh7YOaBF3dedQkGYItA1hQ7bIsVbteJIwzNRnuPRaQUQhIkpwUUq0MrTsOhRWn7XFw5qZTEOA87TNu7rT5fn4Eqot+1zzEBr5S4PnDQJbzbAPPodldeWGdQY93ceKOvSm+qdSTpEFqyau2+CEYP6og5XXVt8hNTYc3BDECjsYtHgXiJaxeniiyUuR6e815t0oSyiAbwsE5leU5HiG0zVVPEx9hxzHSwWkjprrlQJE9U+8elhBUR73JYbactdDBkxklY5jcCQ/V5dAYcs+vXupojv6IkFdKM58o+HM9rduaHRaqIunDEoyBoma2CLLdyJP8O0nznrKLG8ViWROm6FFqaGfMitKZMFP3K9jSd9gq4P2LwGl05lRtPEUF21G9xT5mvux3Dfn56ea/ZqUM5zrsP3jSJNvadgu88jCEwnpdIeTeLaxsl1o/Wk+Kkc4OOnz2Ly3nnub71f/GrG3IaYKLXxMkuAvU="
-    on_success: always
-    on_failure: always  
+      

pom.xml

@@ -29,7 +29,7 @@
 
     <groupId>gov.nasa.worldwind.server</groupId>
     <artifactId>worldwind-serverkit</artifactId>
-    <version>0.3.1</version> 
+    <version>0.4.0</version> 
     <packaging>pom</packaging>
 
     <!--=====================================================================-->
@@ -62,6 +62,7 @@
         <module>worldwind-gt-geopkg</module>
         <module>worldwind-gs-geopkg</module>
         <module>worldwind-gs-wms</module>
+        <module>worldwind-gs-web</module>
         <module>worldwind-geoserver</module>
         <module>worldwind-geoserver-dist</module>
     </modules>  

worldwind-geoserver-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nasa.worldwind.server</groupId>
         <artifactId>worldwind-serverkit</artifactId>
-        <version>0.3.1</version>
+        <version>0.4.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.3.1</version>
+        <version>0.4.0</version>
     </parent>    
     <artifactId>worldwind-geoserver</artifactId>
     <packaging>war</packaging>
@@ -173,6 +173,13 @@
             <version>${gs.version}</version>
         </dependency>
 
+        <!--WorldWind GeoServer Core UI module-->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>worldwind-gs-web</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        
         <!--WorldWind GeoServer WMS module-->
         <dependency>
             <groupId>${project.groupId}</groupId>

worldwind-gs-geopkg/pom.xml

@@ -9,7 +9,7 @@ application directory.
     <parent>
         <groupId>gov.nasa.worldwind.server</groupId>
         <artifactId>worldwind-serverkit</artifactId>
-        <version>0.3.1</version>
+        <version>0.4.0</version>
     </parent>
 
     <groupId>gov.nasa.worldwind.server</groupId>
@@ -117,6 +117,12 @@ application directory.
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>worldwind-gs-web</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <!--Module Dependencies--> 
         <dependency>
             <groupId>org.geoserver.web</groupId>
@@ -216,13 +222,19 @@ application directory.
         <plugins />
         <resources>
             <resource>
+                <!--
+                Include applicationContext.xml Spring bean factory configuration,
+                Wicket html markup files and images.
+                -->
                 <directory>${basedir}/src/main/java</directory>
-                <includes>
-                    <!--Spring bean factory configuration-->
-                    <include>applicationContext.xml</include>
-                </includes>
-            </resource>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>        
             <resource>
+                <!--
+                Include i8n GeoServerApplication.properties file(s)
+                -->
                 <directory>${basedir}/src/main/resources</directory>
                 <includes>
                     <include>**/*</include>

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

@@ -7,19 +7,33 @@ application directory.
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
 
-    <!--GeoPackageModuleStatus provides an entry in the "Server Status" > "Modules" page-->
+    <!--
+    GeoPackageModuleStatus provides an entry in the "Server Status | Modules" page.
+    -->
     <bean class="gov.nasa.worldwind.gs.geopkg.GeoPackageModuleStatus"/>  
 
+    <!--
+    The GeoPackageGetMapOutputFormat is a WFSGetFeatureOutputFormat subclass
+    that generates a response to a WFS GetFeature operation for a GeoPackage
+    mime type ("application/x-gpkg").
+    -->
     <bean id="GeoPackageGetMapOutputFormat" class="gov.nasa.worldwind.gs.geopkg.GeoPackageGetMapOutputFormat">
         <constructor-arg ref="webMapService" />
         <constructor-arg ref="wms" />
         <constructor-arg ref="gwcFacade" />
     </bean>
 
+    <!--
+    The GeoPackageGetFeatureOutputFormat is a GetMapOutputFormat implemenation that 
+    generates the WMS GetMap output for a GeoPackage mime type ("application/x-gpkg").
+    -->
     <bean id="GeoPackageGetFeatureOutputFormat" class="gov.nasa.worldwind.gs.geopkg.GeoPackageGetFeatureOutputFormat">
         <constructor-arg ref="geoServer" />
     </bean>
 
+    <!--    
+    The GeoPackageProcess is responsible for processing a WPS GeoPackageProcessRequest.
+    -->
     <bean id="GeoPackageProcess" class="gov.nasa.worldwind.gs.geopkg.wps.GeoPackageProcess">
         <constructor-arg index="0" ref="geoServer"/>
         <constructor-arg index="1" ref="GeoPackageGetMapOutputFormat" />
@@ -28,24 +42,53 @@ application directory.
     </bean>
 
     <!--    
-    Depends on the wpsXmlConfiguration-1.0.0 WPSConfiguration object registered in  
-    the wps-core module to execute WPS requests.
+    The GeoPackageProcessRequestPPIO is the WPS process parameter input/output 
+    for the GeoPackage mime type: "text/xml; subtype=geoserver/geopackage"  
+    It depends on the wpsXmlConfiguration-1.0.0 WPSConfiguration object 
+    registered in the wps-core module to execute WPS requests.
     -->
     <bean id="GeoPackageProcessRequestPPIO" class="gov.nasa.worldwind.gs.geopkg.wps.GeoPackageProcessRequestPPIO" >
         <constructor-arg index="0" ref="entityResolverProvider"/>
         <constructor-arg index="1" ref="wpsXmlConfiguration-1.0.0" />
     </bean>
 
+    <!--    
+    The GeoPackageDataStoreFactoryInitializer initializes GeoPkgDataStoreFactory.
+    -->
     <bean id="GeoPackageDataStoreFactoryInitializer" class="gov.nasa.worldwind.gs.geopkg.GeoPkgDataStoreFactoryInitializer">
         <property name="resourceLoader" ref="resourceLoader"/>
     </bean>
 
-    <!--UI Component for browsing to a GeoPackage file-->
+    <!-- 
+    The GeoPackageDataStorePanel is the UI Component for browsing to a GeoPackage 
+    file when creating a Data Store 
+    -->
     <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="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"/>
     </bean>
+    
+    
+    <!--
+    Bean to create a link to the "Export GeoPackage" in the WWSK category.
+    -->
+    <bean id="exportGeoPackageLink" class="org.geoserver.web.MenuPageInfo">
+        <!-- An internal identifier for the link component -->
+        <property name="id" value="exportGeoPackage"/>
+        <!-- The i18n key for the link title -->
+        <property name="titleKey" value="ExportGeoPackagePage.page.title"/>
+        <!-- The i18n key for a longer description of the page used for a tooltip -->
+        <property name="descriptionKey" value="ExportGeoPackagePage.page.description"/>
+        <!-- The fully qualified name of the page class -->
+        <property name="componentClass" value="gov.nasa.worldwind.gs.geopkg.web.ExportGeoPackagePage"/>
+        <!-- Optional, an icon to display alongside the link. -->
+        <!--<property name="icon" value="img/icons/silk/help.png"/>-->
+        <!-- Optional, the bean id of the menu category in which the link should be grouped. -->
+        <property name="category" ref="wwskCategory"/>
+        <!-- Optional, a key used to order the links in the menu. -->
+        <property name="order" value="110"/>
+    </bean>    
 </beans>

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

@@ -10,11 +10,9 @@
 import org.geoserver.data.DataStoreFactoryInitializer;
 import org.geoserver.platform.GeoServerResourceLoader;
 
-
-
 /**
- * Initializes an GeoPkg data store factory setting its location to the geoserver
- *  data directory.
+ * Initializes an GeoPkg data store factory by setting its location to the
+ * GeoServer data directory.
  *
  * @author Justin Deoliveira, Boundless
  *
@@ -25,14 +23,15 @@ public class GeoPkgDataStoreFactoryInitializer extends
     GeoServerResourceLoader resourceLoader;
 
     public GeoPkgDataStoreFactoryInitializer() {
-        super( GeoPkgDataStoreFactory.class );
+        super(GeoPkgDataStoreFactory.class);
     }
 
     public void setResourceLoader(GeoServerResourceLoader resourceLoader) {
         this.resourceLoader = resourceLoader;
     }
 
+    @Override
     public void initialize(GeoPkgDataStoreFactory factory) {
-        factory.setBaseDirectory( resourceLoader.getBaseDirectory() );
+        factory.setBaseDirectory(resourceLoader.getBaseDirectory());
     }
 }

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

@@ -0,0 +1,34 @@
+<html>
+    <head>
+        <title><wicket:message key="title">BBox Panel</wicket:message></title>
+    </head>
+    <body>
+    <wicket:panel>
+        <!--   <form wicket:id="form">  -->
+        <ul class="selfclear">
+            <li class="leftwise">
+                <label for="minX" wicket:id="minXL">minX</label>
+                <input wicket:id="minX" id="minX" type="text" class="text" style="width: 100px;"/>
+            </li>
+            <li class="leftwise">
+                <label for="minY" wicket:id="minYL">Min Y</label>
+                <input wicket:id="minY" id="minY" type="text" class="text" style="width: 100px;"/>
+            </li>
+            <li class="leftwise">
+                <label for="maxX" wicket:id="maxXL">Max X</label>
+                <input wicket:id="maxX" id="maxX" type="text" class="text" style="width: 100px;"/>
+            </li>
+            <li class="leftwise">
+                <label for="maxY" wicket:id="maxYL">Max Y</label>
+                <input wicket:id="maxY" id="maxY" type="text" class="text" style="width: 100px;"/>
+            </li>
+            <br/>
+<!--            <li class="clearBoth" wicket:id="crsContainer">
+                <label for="crs"><wicket:message key="crs">Coordinate Reference System</wicket:message></label>
+                <span wicket:id="crs"/>
+            </li>-->
+        </ul>
+        <!--    </form> -->
+    </wicket:panel>
+</body>
+</html>

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

@@ -0,0 +1,118 @@
+/* (c) 2014 - 2016 Open Source Geospatial Foundation - all rights reserved
+ * (c) 2001 - 2013 OpenPlans
+ * This code is licensed under the GPL 2.0 license, available at the root
+ * application directory.
+ */
+package gov.nasa.worldwind.gs.geopkg.web;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.ResourceModel;
+
+import com.vividsolutions.jts.geom.Envelope;
+import org.apache.wicket.Component;
+import org.apache.wicket.util.visit.IVisit;
+import org.apache.wicket.util.visit.IVisitor;
+import org.geoserver.web.wicket.DecimalTextField;
+
+/**
+ * A form component for a {@link Envelope} object.
+ *
+ * @author Justin Deoliveira, OpenGeo
+ * @author Andrea Aime, OpenGeo
+ */
+public class BBoxPanel extends FormComponentPanel<Envelope> {
+
+    private static final long serialVersionUID = -2975427786330616705L;
+
+    protected Label minXLabel, minYLabel, maxXLabel, maxYLabel;
+
+    protected Double minX, minY, maxX, maxY;
+
+    protected DecimalTextField minXInput, minYInput, maxXInput, maxYInput;
+
+    public BBoxPanel(String id) {
+        super(id);
+
+        initComponents();
+    }
+
+    public BBoxPanel(String id, Envelope e) {
+        this(id, new Model<Envelope>(e));
+    }
+
+    public BBoxPanel(String id, IModel<Envelope> model) {
+        super(id, model);
+
+        initComponents();
+    }
+
+    public void setLabelsVisibility(boolean visible) {
+        minXLabel.setVisible(visible);
+        minYLabel.setVisible(visible);
+        maxXLabel.setVisible(visible);
+        maxYLabel.setVisible(visible);
+    }
+
+    void initComponents() {
+        updateFields();
+
+        add(minXLabel = new Label("minXL", new ResourceModel("minX")));
+        add(minYLabel = new Label("minYL", new ResourceModel("minY")));
+        add(maxXLabel = new Label("maxXL", new ResourceModel("maxX")));
+        add(maxYLabel = new Label("maxYL", new ResourceModel("maxY")));
+
+        add(minXInput = new DecimalTextField("minX", new PropertyModel<>(this, "minX")));
+        add(minYInput = new DecimalTextField("minY", new PropertyModel<>(this, "minY")));
+        add(maxXInput = new DecimalTextField("maxX", new PropertyModel<>(this, "maxX")));
+        add(maxYInput = new DecimalTextField("maxY", new PropertyModel<>(this, "maxY")));
+
+    }
+
+    @Override
+    protected void onBeforeRender() {
+        updateFields();
+        super.onBeforeRender();
+    }
+
+    private void updateFields() {
+        Envelope e = (Envelope) getModelObject();
+        if (e != null) {
+            this.minX = e.getMinX();
+            this.minY = e.getMinY();
+            this.maxX = e.getMaxX();
+            this.maxY = e.getMaxY();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void convertInput() {
+        visitChildren(TextField.class, (component, visit) -> {
+            ((TextField<String>) component).processInput();
+        });
+
+        // update the envelope model
+        if (minX != null && maxX != null && minY != null && maxY != null) {
+            setConvertedInput(new Envelope(minX, maxX, minY, maxY));
+        } else {
+            setConvertedInput(null);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected void onModelChanged() {
+        // when the client programmatically changed the model, update the fields
+        // so that the textfields will change too
+        updateFields();
+        visitChildren(TextField.class, (Component component, IVisit<Object> visit) -> {
+            ((TextField<String>) component).clearInput();
+        });
+    }
+
+}