Skip to content

Commit f53f829

Browse files
emxsysemxsys
committed
Merge branch 'release/v0.2.0'
2 parents 498a6a4 + b7f0978 commit f53f829

File tree

16 files changed

+88
-55
lines changed

16 files changed

+88
-55
lines changed

‎README.md

Lines changed: 41 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<img src="https://worldwind.arc.nasa.gov/css/images/nasa-logo.svg" height="100"/>
2-
# WorldWind Server Kit
2+
3+
# WorldWindServerKit
34

45
The [NASA World Wind](https://worldwind.arc.nasa.gov) Server Kit (WWSK) is an open
56
source Java project that assembles [GeoServer](http://geoserver.org/) for easy
@@ -19,17 +20,45 @@ Example:
1920

2021
## Running
2122

22-
### Option 1. Deploy the WAR file
23+
### Option 1. Deploy a standalone WWSK distribution
24+
Copy and unzip the *worldwind-geoserver-\<version>-\<platform>* tar/zip distribution
25+
for your platform (found in the *worldwind-geoserver-dist/target* folder) to a folder
26+
on the target computer. Then navigate to the root of the distribution folder and launch
27+
the *setup* script to install the Oracle Server JRE and the GDAL dependencies.
28+
Afterwards, you can launch GeoServer with the *run* script.
29+
30+
#### a) Setup the GeoServer environment, (one time)
31+
Windows example:
32+
33+
C:\...> setup.bat
34+
35+
Linux example:
36+
37+
$ ./setup.sh
38+
39+
#### b) Run the script to launch GeoServer
40+
Windows example:
41+
42+
C:\...> run.bat
43+
44+
Linux example:
45+
46+
$ ./run.sh
47+
48+
Then point your browser to http://localhost:8080/geoserver/index.html to access the
49+
GeoServer web admin interface.
50+
51+
### Option 2. Deploy the WAR file
2352
Deploy the *worldwind-geoserver.war* file (found in the *worldwind-geoserver/target* folder)
2453
to your preferred servlet container, e.g., Apache Tomcat. Then point your browser to the
2554
*geoserver* web context on your server.
2655

27-
### Option 2. Run in NetBeans
56+
### Option 3. Run in NetBeans
2857
Simply invoke "Run" on the *WorldWind GeoServer Application* module (*worldwind-geoserver*)
2958
and NetBeans will automatically deploy the war file to your configured application server
3059
and launch your browser (typically http://localhost:8084/geoserver/index.html).
3160

32-
### Option 3. Run in Jetty
61+
### Option 4. Run in Jetty from Maven
3362
Run the preconfigured *jetty-maven-plugin* with maven from the root of the *WorldWind
3463
GeoServer Application* module (*worldwind-geoserver*). Example:
3564

@@ -38,7 +67,7 @@ GeoServer Application* module (*worldwind-geoserver*). Example:
3867
Then point your browser to http://localhost:8080/geoserver/index.html to access the
3968
GeoServer web admin interface.
4069

41-
### Option 4. Deploy a binary distribution
70+
### Option 5. Deploy a binary distribution
4271
Copy and unzip a binary distribution (found in the *worldwind-geoserver-dist/target* folder)
4372
to a folder on your target computer. Then navigate to the root of the distribution folder
4473
and launch the appropriate startup script found in the bin folder. You must establish
@@ -56,31 +85,15 @@ Linux example
5685
Then point your browser to http://localhost:8080/geoserver/index.html to access the
5786
GeoServer web admin interface.
5887

59-
### Option 5. Deploy the SSGF distribution
60-
Copy and unzip the *ssgf* tarball distribution (found in the *worldwind-geoserver-dist/target*
61-
folder) to a folder on the target Linux computer. Then navigate to the root of the
62-
distribution folder and launch the setup script to install the Oracle Server JRE.
63-
Afterwards, you can launch GeoServer with the run script.
64-
65-
Install the JRE (one time), example:
66-
67-
$ ./setup.sh
68-
69-
Launch GeoServer, example:
70-
71-
$ ./run.sh
72-
73-
Then point your browser to http://localhost:8080/geoserver/index.html to access the
74-
GeoServer web admin interface.
7588

7689
## OGC GeoPackage
77-
The WWSK adds support for reading OGC GeoPackages in GeoServer. WWSK manifests the
78-
**GeoPackage (mosaic) [OGC Compliant]** raster data source for OGC GeoPackages.
90+
The WWSK adds support for reading and writing OGC GeoPackages in GeoServer.
91+
WWSK manifests the **GeoPackage (tiles) ** raster data source for OGC GeoPackages.
7992

80-
The **GeoPackage (mosaic)** raster data source is the native GeoServer/GeoTools
81-
GeoPackage extension which is not compatible with GeoPackages conforming to the
93+
Note: the **GeoPackage (mosaic)** raster data source is the GeoServer/GeoTools
94+
GeoPackage community extension which is not compatible with GeoPackages conforming to the
8295
OGC GeoPackage Encoding Standard (http://www.geopackage.org/spec/).
83-
Do not use the native data source for OGC GeoPackages.
96+
Do not use the community extension data source for OGC GeoPackages.
8497

8598
### Reading
8699
Add an OGC GeoPackage layer:
@@ -100,7 +113,8 @@ Add an OGC GeoPackage layer:
100113
7. Scroll down and select "Save" at the bottom of the "Edit Layer" page.
101114

102115
### Writing
103-
TBD: Not implemented yet.
116+
Raster layers can be exported to GeoPackages via the Web Administration's Layer Preview or
117+
through Web Processing Service (WPS) requests.
104118

105119
## GeoWebCache
106120
The WWSK has integrated support the GeoWebCache (GWC) enabled by default. Tile Caching

‎data_config/base/gwc-gs.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
<gutter>0</gutter>
2626
<defaultCachingGridSetIds>
2727
<string>EPSG:4326</string>
28-
<string>WW Imagery</string>
29-
<string>WW Elevations</string>
3028
</defaultCachingGridSetIds>
3129
<defaultCoverageCacheFormats>
3230
<string>image/png</string>

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>gov.nasa.worldwind</groupId>
55
<artifactId>worldwind-serverkit</artifactId>
6-
<version>0.2.0-RC</version>
6+
<version>0.2.0</version>
77
<packaging>pom</packaging>
88

99
<name>WorldWind Server Kit</name>

‎scripts/installers/install-wwsk.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,17 @@
88
## Parse arguments
99
if [ $# -lt 2 ]; then
1010
echo "$0: missing argument(s)"
11-
echo "Syntax: $0 SOURCE DEST [TARGET]"
12-
echo "SOURCE: source WWSK distribution file (.tgz) to extract"
13-
echo "DEST: destination folder"
14-
echo "TARGET: new name of unzipped folder (optional)"
11+
echo "Usage: $0 SOURCE DEST [TARGET]"
12+
echo " SOURCE: source WWSK distribution file (.tgz) to extract"
13+
echo " DEST: destination folder"
14+
echo " TARGET: new name of unzipped folder; if not defined, the root folder in the .tgz is used"
1515
echo "The DEST folder will be created if it doesn't exist"
1616
echo "The previous contents of the TARGET folder will be deleted"
17+
echo "Examples:"
18+
echo " install-wwsk worldwind-geoserver-1.0.0-Linux64.tgz /opt/maps/wwsk"
19+
echo " Copies the root folder of .tgz to /opts/maps/wwsk"
20+
echo " install-wwsk worldwind-geoserver-1.0.0-Linux64.tgz /opt/maps wwsk"
21+
echo " Copies the root folder of .tgz to /opts/maps and renames it to wwsk"
1722
exit
1823
else
1924
SOURCE=$1

‎worldwind-geoserver-dist/README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
<img src="https://worldwind.arc.nasa.gov/css/images/nasa-logo.svg" height="100"/>
2+
23
# WorldWind Server Kit (WWSK)
34
## WorldWind GeoServer Distribution
45

56
This module builds several distributions of the WorldWind GeoServer Application,
67
including:
78

8-
* Windows x64 (worldwind-geoserver-<version>-win64.zip)
9-
* GeoServer web app configured a Jetty servet container
9+
* Windows x64 (worldwind-geoserver-\<version>-win64.zip)
10+
* GeoServer web app configured with a Jetty application server
1011
* Java runtime for Windows x64
1112
* GDAL natives for Windows x64
1213
* Basic data configuration
13-
* Linux x64 (worldwind-geoserver-<version>-linux64.tgz)
14-
* GeoServer web app configured a Jetty servet container
14+
* Linux x64 (worldwind-geoserver-\<version>-linux64.tgz)
15+
* GeoServer web app configured with a Jetty application server
1516
* Java runtime for Linux x64
16-
* GDAL natives for Linux x64
17+
* GDAL natives for Ubuntu x64
1718
* Basic data configuration
18-
* Hybrid OS (worldwind-geoserver-<version>-hybrid_os.tgz)
19-
* GeoServer web app configured a Jetty servet container
19+
* Hybrid OS (worldwind-geoserver-\<version>-hybrid_os.tgz)
20+
* GeoServer web app configured with a Jetty application server
2021
* Java runtime for Linux x64
2122
* GDAL natives for CentOS x64
2223
* Basic data configuration
23-
* Binary (worldwind-geoserver-<version>-bin.tgz))
24+
* Binary (worldwind-geoserver-\<version>-bin.tgz))
2425
* GeoServer web app
2526
* Basic data configuration
26-
* WAR (worldwind-geoserver-<version>-war.zip)
27+
* WAR (worldwind-geoserver-\<version>-war.zip)
2728
* GeoServer web app
2829
* Basic data configuration

‎worldwind-geoserver-dist/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>gov.nasa.worldwind</groupId>
66
<artifactId>worldwind-serverkit</artifactId>
7-
<version>0.2.0-RC</version>
7+
<version>0.2.0</version>
88
</parent>
99
<artifactId>worldwind-geoserver-dist</artifactId>
1010
<packaging>pom</packaging>

‎worldwind-geoserver-dist/src/main/resources/hybrid/env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export GEOSERVER_DATA_DIR=${GEOSERVER_HOME}/data_dir
1111
# -----------------------------------------------------------------------------
1212
# Set how much heap memory to allocate to GeoServer (min and max)
1313
# The max size of the "older generation" heap is controlled by the -Xms parameter.
14-
HEAP="-Xms2048m -Xmx2048m"
14+
HEAP="-Xms4096m -Xmx4096m"
1515

1616
# Set how much memory to set aside for new objects.
1717
# The "young generation" is further divided into an Eden, and Semi-spaces.

‎worldwind-geoserver/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<img src="https://worldwind.arc.nasa.gov/css/images/nasa-logo.svg" height="100"/>
2+
23
# WorldWind Server Kit (WWSK)
34
## WorldWind GeoServer Application (worldwind-geoserver)
45

56
This module builds the basic WWSK GeoServer web application.
67

7-
The maven POM.xml defines all the dependencies for the WWSK GeoServer.
8+
The maven POM.xml defines all the dependencies for the WWSK GeoServer.

‎worldwind-geoserver/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>gov.nasa.worldwind</groupId>
66
<artifactId>worldwind-serverkit</artifactId>
7-
<version>0.2.0-RC</version>
7+
<version>0.2.0</version>
88
</parent>
99

1010
<artifactId>worldwind-geoserver</artifactId>

‎worldwind-geoserver/src/main/webapp/data/gwc-gs.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
<gutter>0</gutter>
2626
<defaultCachingGridSetIds>
2727
<string>EPSG:4326</string>
28-
<string>WW Imagery</string>
29-
<string>WW Elevations</string>
3028
</defaultCachingGridSetIds>
3129
<defaultCoverageCacheFormats>
3230
<string>image/png</string>

‎worldwind-gs-geopkg/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<img src="https://worldwind.arc.nasa.gov/css/images/nasa-logo.svg" height="100"/>
2+
23
# WorldWind Server Kit (WWSK)
34
## WorldWind GeoPackage Extension (worldwind-gs-geopkg)
45

5-
This module is a fork of the GeoServer GeoPackage community plugin (gs-geopkg v2.10.0).
6+
* This module is a fork of the GeoServer GeoPackage community plugin (gs-geopkg v2.10.0).
7+
* It manifests the __GeoPackage (tiles)__ raster data store in GeoServer.
8+
* It ingests and exports GeoPackages using an OGC compliant tiling scheme.

‎worldwind-gs-geopkg/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ application directory.
99
<parent>
1010
<groupId>gov.nasa.worldwind</groupId>
1111
<artifactId>worldwind-serverkit</artifactId>
12-
<version>0.2.0-RC</version>
12+
<version>0.2.0</version>
1313
</parent>
1414

1515
<groupId>gov.nasa.worldwind</groupId>

‎worldwind-gs-wms/README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<img src="https://worldwind.arc.nasa.gov/css/images/nasa-logo.svg" height="100"/>
2+
23
# WorldWind Server Kit (WWSK)
34
## WorldWind GeoServer WMS Module (worldwind-gs-wms)
45

5-
This module is a derivative of the GeoServer WMS module (current build version).
6+
This module is a derivative of the _GeoServer WMS_ module (current build version).
7+
8+
* It resolves an issue with GeoTools' ImageWorker.writeJPEG() when procssing tile image offsets != 0
9+
* It provides a CustomRenderedImageMapOutputFormat class that ensures the buildMap() output is compatible with the ImageIO.read() method
10+
* CustomRenderedImageMapOuputFormat is used in the applicationContext.xml
11+
* It provides a MapResponseOutputStreamAdaptor class that ensures the WMSMapContent image is compatible downstream image read operations
12+
* MapResponseOutputStreamAdaptor is used by the GeoPackageGetmapOutputFormat class in the _WorldWind GeoServer Extention_ module (worldwind-gs-geopkg)

‎worldwind-gs-wms/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>gov.nasa.worldwind</groupId>
66
<artifactId>worldwind-serverkit</artifactId>
7-
<version>0.2.0-RC</version>
7+
<version>0.2.0</version>
88
</parent>
99
<artifactId>worldwind-gs-wms</artifactId>
1010
<packaging>jar</packaging>

‎worldwind-gt-geopkg/README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<img src="https://worldwind.arc.nasa.gov/css/images/nasa-logo.svg" height="100"/>
2+
23
# WorldWind Server Kit (WWSK)
34
## WorldWind GeoPackage Module (worldwind-gt-geopkg)
45

5-
This module is a fork of the GeoTools GeoPackage plugin (gt-geopkg v1.16.0).
6+
This module is a fork of the _GeoTools GeoPackage_ plugin (gt-geopkg v1.16.0).
7+
8+
* This module is a replacement for the _GeoTools GeoPackage_ plugin
9+
* The enclosed GeoPackage class uses the OGC Tiling Scheme for GeoPackages; note _the GeoTools plugin uses incompatilbe TMS tiling scheme_
10+
* The GeoPackageFormat is manifest as "GeoPackage (tiles)" as compared to the GeoTools plugin which is "GeoPackage (mosaic)"
11+
* This module will not correctly ingest a GeoPackage that uses the TMS tiling scheme, nor will the GeoTools plugin ingest a GeoPackage using the OCG tiling scheme for GeoPackages

‎worldwind-gt-geopkg/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>gov.nasa.worldwind</groupId>
1717
<artifactId>worldwind-serverkit</artifactId>
18-
<version>0.2.0-RC</version>
18+
<version>0.2.0</version>
1919
</parent>
2020

2121
<!-- =========================================================== -->

0 commit comments

Comments
 (0)