-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/#82-geopackage_wps_export
- Loading branch information
Showing
10 changed files
with
399 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,178 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>gov.nasa.worldwind.server</groupId> | ||
| <artifactId>worldwind-serverkit</artifactId> | ||
| <version>0.4.0-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>worldwind-gs-web</artifactId> | ||
| <packaging>jar</packaging> | ||
| <!--=====================================================================--> | ||
| <!--Project Information --> | ||
| <!--=====================================================================--> | ||
| <name>WorldWind Core UI Module</name> | ||
| <description>Core UI components for the WorldWind Server Kit (WWSK).</description> | ||
| <url>https://github.com/NASAWorldWind/WorldWindServerKit</url> | ||
| <organization> | ||
| <name>NASA World Wind</name> | ||
| <url>https://worldwind.arc.nasa.gov</url> | ||
| </organization> | ||
| <licenses> | ||
| <license> | ||
| <name>General Public License (GPL)</name> | ||
| <url>http://www.gnu.org/copyleft/gpl.txt</url> | ||
| </license> | ||
| </licenses> | ||
| <developers /> | ||
| <contributors /> | ||
| <mailingLists /> | ||
| <prerequisites /> | ||
| <!--=====================================================================--> | ||
| <!--Environment Settings --> | ||
| <!--=====================================================================--> | ||
| <scm> | ||
| <url>https://github.com/NASAWorldWind/WorldWindServerKit</url> | ||
| <connection>scm:git:git://github.com/NASAWorldWind/WorldWindServerKit.git</connection> | ||
| <developerConnection>scm:git:https://github.com/NASAWorldWind/WorldWindServerKit.git</developerConnection> | ||
| <tag>HEAD</tag> | ||
| </scm> | ||
| <issueManagement> | ||
| <system>GitHub Issues</system> | ||
| <url>https://github.com/NASAWorldWind/WorldWindServerKit/issues</url> | ||
| </issueManagement> | ||
| <ciManagement> | ||
| <system>Travis CI</system> | ||
| <url>https://travis-ci.org/NASAWorldWind/WorldWindServerKit</url> | ||
| </ciManagement> | ||
| <distributionManagement /> | ||
|
|
||
| <!--=====================================================================--> | ||
| <!--The Basics --> | ||
| <!--=====================================================================--> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.geoserver.web</groupId> | ||
| <artifactId>gs-web-core</artifactId> | ||
| </dependency> | ||
|
|
||
| <!-- test dependencies --> | ||
| <dependency> | ||
| <groupId>org.geoserver.web</groupId> | ||
| <artifactId>gs-web-core</artifactId> | ||
| <classifier>tests</classifier> | ||
| <scope>test</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.geoserver</groupId> | ||
| <artifactId>gs-main</artifactId> | ||
| <classifier>tests</classifier> | ||
| <scope>test</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.springframework</groupId> | ||
| <artifactId>spring-test</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>javax.servlet</groupId> | ||
| <artifactId>javax.servlet-api</artifactId> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <!--=====================================================================--> | ||
| <!--Build Settings --> | ||
| <!--=====================================================================--> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-antrun-plugin</artifactId> | ||
| <executions> | ||
| <!-- | ||
| Update the WWSK version number to the GeoServerApplication.properties | ||
| file(s) so it can be dislayed in the About WWSK page. | ||
| --> | ||
| <execution> | ||
| <id>process-resources</id> | ||
| <phase>process-resources</phase> | ||
| <configuration> | ||
| <tasks> | ||
| <replace dir="${project.build.outputDirectory}" encoding="ISO-8859-1"> | ||
| <include name="*.properties"/> | ||
| <replacefilter token="@wwsk.version@" value="${project.version}"/> | ||
| </replace> | ||
| </tasks> | ||
| </configuration> | ||
| <goals> | ||
| <goal>run</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| <resources> | ||
| <resource> | ||
| <!-- | ||
| Include applicationContext.xml Spring bean factory configuration, | ||
| Wicket html markup files and images. | ||
| --> | ||
| <directory>${basedir}/src/main/java</directory> | ||
| <excludes> | ||
| <exclude>**/*.java</exclude> | ||
| </excludes> | ||
| </resource> | ||
| <resource> | ||
| <!--GeoServerApplication.properties--> | ||
| <directory>${basedir}/src/main/resources</directory> | ||
| <includes> | ||
| <include>**/*</include> | ||
| </includes> | ||
| </resource> | ||
| </resources> | ||
| </build> | ||
| <profiles> | ||
| <!--Generate the javadocs and sources jar files when the "release" profile is activated--> | ||
| <profile> | ||
| <id>release</id> | ||
| <activation> | ||
| <property> | ||
| <name>release</name> | ||
| </property> | ||
| </activation> | ||
| <dependencies /> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-javadoc-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-javadocs</id> | ||
| <goals> | ||
| <goal>jar</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-source-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-sources</id> | ||
| <goals> | ||
| <goal>jar</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <modules /> | ||
| </profile> | ||
| </profiles> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> | ||
| <beans> | ||
|
|
||
| <!-- | ||
| Define the WWSK menu category. | ||
| The menu cateory's text is set in the GeoServerApplication.properties file. | ||
| GeoServer's menu categories are defined in it's Core UI Module applicationContext.xml | ||
| --> | ||
| <bean id="wwskCategory" class="org.geoserver.web.Category"> | ||
| <property name="nameKey" value="category.wwsk" /> | ||
| <property name="order" value="200" /> | ||
| </bean> | ||
|
|
||
| <!-- | ||
| Create a link to the "About WWSK" page in the WWSK category. | ||
| --> | ||
| <bean id="aboutWWSKLink" class="org.geoserver.web.MenuPageInfo"> | ||
| <!-- An internal identifier for the link component --> | ||
| <property name="id" value="aboutWWSK"/> | ||
| <!-- The i18n key for the link title --> | ||
| <property name="titleKey" value="AboutWWSKPage.page.title"/> | ||
| <!-- The i18n key for a longer description of the page used for a tooltip --> | ||
| <property name="descriptionKey" value="AboutWWSKPage.page.description"/> | ||
| <!-- The fully qualified name of the page class --> | ||
| <property name="componentClass" value="gov.nasa.worldwind.gs.web.AboutWWSKPage"/> | ||
| <!-- 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="100"/> | ||
| </bean> | ||
|
|
||
|
|
||
| </beans> |
50 changes: 50 additions & 0 deletions
50
worldwind-gs-web/src/main/java/gov/nasa/worldwind/gs/web/AboutWWSKPage.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <html> | ||
| <body> | ||
| <wicket:extend> | ||
| <div> | ||
| <form> | ||
| <li> | ||
| <fieldset style="margin-top: 1em;"> | ||
| <legend> | ||
| <span><wicket:message key="buildInformation">Build Information</wicket:message></span> | ||
| </legend> | ||
| <ul> | ||
| <li> | ||
| <label for="version"><wicket:message key="wwskVersion">Version</wicket:message></label> | ||
| <span id="version"><wicket:message key="wwsk.version"></wicket:message></span> | ||
| </li> | ||
| </ul> | ||
| </fieldset> | ||
| </li> | ||
| <ul> | ||
| <li> | ||
| <fieldset> | ||
| <legend><span><wicket:message key="moreInformation">More Information</wicket:message></span></legend> | ||
| <p> | ||
| <wicket:message key="introduction"></wicket:message> | ||
| </p> | ||
| <p> | ||
| <wicket:message key="usefulLinks"></wicket:message> | ||
| </p> | ||
| <ul style="margin-left: 2em;"> | ||
| <li> | ||
| <a href="https://worldwind.arc.nasa.gov/"><wicket:message key="website">NASA WorldWind</wicket:message></a> | ||
| </li> | ||
| <li> | ||
| <a href="https://github.com/NASAWorldWind/WorldWindServerKit/releases"><wicket:message key="releases">Releases</wicket:message></a> | ||
| </li> | ||
| <li> | ||
| <a href="https://github.com/NASAWorldWind/WorldWindServerKit/issues"><wicket:message key="bugTracker">Bug Tracker</wicket:message></a> | ||
| </li> | ||
| <li> | ||
| <a href="https://github.com/NASAWorldWind/WorldWindServerKit"><wicket:message key="project">Project</wicket:message></a> | ||
| </li> | ||
| </ul> | ||
| </fieldset> | ||
| </li> | ||
| </ul> | ||
| </form> | ||
| </div> | ||
| </wicket:extend> | ||
| </body> | ||
| </html> |
39 changes: 39 additions & 0 deletions
39
worldwind-gs-web/src/main/java/gov/nasa/worldwind/gs/web/AboutWWSKPage.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Copyright (C) 2017 NASA World Wind | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * as published by the Free Software Foundation; either version 2 | ||
| * of the License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
| */ | ||
| package gov.nasa.worldwind.gs.web; | ||
|
|
||
| import org.apache.wicket.markup.html.basic.Label; | ||
| import org.geoserver.web.GeoServerBasePage; | ||
|
|
||
| /** | ||
| * The AboutWWSKPage class manifests the "About WWSK" entry in the WWSK | ||
| * category. | ||
| * | ||
| * See the following for information on adding UI components to GeoServer: | ||
| * http://docs.geoserver.org/latest/en/developer/programming-guide/web-ui/implementing.html | ||
| * http://docs.geoserver.org/latest/en/developer/programming-guide/wicket-pages/index.html | ||
| * | ||
| * @author Bruce Schubert | ||
| */ | ||
| public class AboutWWSKPage extends GeoServerBasePage { | ||
|
|
||
| public AboutWWSKPage() { | ||
|
|
||
| } | ||
|
|
||
| } |
Binary file added
BIN
+786 Bytes
worldwind-gs-web/src/main/java/gov/nasa/worldwind/gs/web/img/icons/silk/help.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+778 Bytes
...d-gs-web/src/main/java/gov/nasa/worldwind/gs/web/img/icons/silk/information.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43 changes: 43 additions & 0 deletions
43
worldwind-gs-web/src/main/resources/GeoServerApplication.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| # Copyright (C) 2017 NASA World Wind | ||
| # | ||
| # This program is free software; you can redistribute it and/or | ||
| # modify it under the terms of the GNU General Public License | ||
| # as published by the Free Software Foundation; either version 2 | ||
| # of the License, or (at your option) any later version. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, | ||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| # GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License | ||
| # along with this program; if not, write to the Free Software | ||
| # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
|
|
||
|
|
||
| # The WWSK category in the navigation menu | ||
| category.wwsk = WWSK | ||
|
|
||
| # "About WWSK" navigation menu entry and tooltip | ||
| AboutWWSKPage.page.title=About WWSK | ||
| AboutWWSKPage.page.description=A page about the WorldWind Server Kit | ||
|
|
||
| # About WWSK page text | ||
| AboutWWSKPage.title=About the NASA WorldWind Server Kit | ||
| AboutWWSKPage.description=The NASA WorldWind Server Kit (WWSK) is an open source \ | ||
| Java project that assembles GeoServer for easy distribution and implementation. | ||
| AboutWWSKPage.introduction = WWSK is a pre-configured GeoServer distribution \ | ||
| including the extensions and plugins to support the WMS, WMTS, WFS, WCS and WPS services. \ | ||
| WWSK includes support for GDAL file formats and GeoPackages. | ||
| AboutWWSKPage.buildInformation = Build Information | ||
| AboutWWSKPage.wwskVersion = WWSK Version | ||
| AboutWWSKPage.moreInformation = More Information | ||
| AboutWWSKPage.usefulLinks = Useful Links: | ||
| AboutWWSKPage.website = NASA WorldWind Homepage | ||
| AboutWWSKPage.releases = Release Notes and Downloads | ||
| AboutWWSKPage.bugTracker = Issue Tracker | ||
| AboutWWSKPage.project = WWSK Project on GitHub | ||
|
|
||
| #The wwsk.version property is updated by an Ant Task defined in the POM file | ||
| wwsk.version = @wwsk.version@ | ||
|
|
Oops, something went wrong.