Skip to content

Commit d1969ac

Browse files
emxsysemxsys
committed
Merge branch 'hotfix/v0.2.1'
2 parents 3c884f9 + 4ecc894 commit d1969ac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2543
-1681
lines changed

‎.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,7 @@ nbactions.xml
4747
/wps_request.xml
4848
/wcs_request.txt
4949
/wps_output.txt
50-
/jmeter/wcs_test/output/
50+
/jmeter/wcs_test/output/
51+
/dist/
52+
/jmeter/JMeter.lnk
53+
/jmeter/wms_test/output/

‎data_config/nasa/data/nasa/BMNG_world.topo.bathy.200405.3.2048x1024.tif renamed to ‎data_config/nasa/data/nasa/base/BMNG_world.topo.bathy.200405.3.2048x1024.tif

File renamed without changes.

‎data_config/nasa/workspaces/nasa/world_topo_bathy_lowres/coveragestore.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
<id>WorkspaceInfoImpl-7479188c:15a4e04681d:-7fc5</id>
99
</workspace>
1010
<__default>false</__default>
11-
<url>file:data/nasa/BMNG_world.topo.bathy.200405.3.2048x1024.tif</url>
11+
<url>file:data/nasa/base/BMNG_world.topo.bathy.200405.3.2048x1024.tif</url>
1212
</coverageStore>

‎data_config/ssgf/workspaces/agc/namespace.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎data_config/ssgf/workspaces/agc/workspace.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎jmeter/GeoServer Functional Tests.jmx

Lines changed: 663 additions & 0 deletions
Large diffs are not rendered by default.

‎jmeter/functional_test/wps_request.xml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<wps:Execute version="1.0.0" service="WPS"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns="http://www.opengis.net/wps/1.0.0"
5+
xmlns:wfs="http://www.opengis.net/wfs"
6+
xmlns:wps="http://www.opengis.net/wps/1.0.0"
7+
xmlns:ows="http://www.opengis.net/ows/1.1"
8+
xmlns:gml="http://www.opengis.net/gml"
9+
xmlns:ogc="http://www.opengis.net/ogc"
10+
xmlns:wcs="http://www.opengis.net/wcs/1.1.1"
11+
xmlns:xlink="http://www.w3.org/1999/xlink"
12+
xsi:schemaLocation="http://www.opengis.net/wps/1.0.0 http://schemas.opengis.net/wps/1.0.0/wpsAll.xsd">
13+
<ows:Identifier>gs:GeoPackage</ows:Identifier>
14+
<wps:DataInputs>
15+
<wps:Input>
16+
<ows:Identifier>contents</ows:Identifier>
17+
<wps:Data>
18+
<wps:ComplexData mimeType="text/xml; subtype=geoserver/geopackage">
19+
<geopackage xmlns="http://www.opengis.net/gpkg" name="world">
20+
<tiles identifier="L01" name="world_bbox">
21+
<description>World terrain and bathometry</description>
22+
<srs>EPSG:4326</srs>
23+
<bbox>
24+
<minx>-180</minx>
25+
<miny>-90</miny>
26+
<maxx>180</maxx>
27+
<maxy>90</maxy>
28+
</bbox>
29+
<coverage>
30+
<minZoom>0</minZoom>
31+
<maxZoom>4</maxZoom>
32+
</coverage>
33+
<layers>test:world</layers>
34+
<styles>raster</styles>
35+
</tiles>
36+
<!--
37+
<tiles identifier="L02" name="usa_bbox">
38+
<description>USA terrain and bathometry</description>
39+
<srs>EPSG:4326</srs>
40+
<bbox>
41+
<minx>-171.791111</minx>
42+
<miny>18.91619</miny>
43+
<maxx>-66.96466</maxx>
44+
<maxy>71.357764</maxy>
45+
</bbox>
46+
<coverage>
47+
<minZoom>0</minZoom>
48+
<maxZoom>3</maxZoom>
49+
</coverage>
50+
<layers>test:world</layers>
51+
<styles>raster</styles>
52+
</tiles>
53+
-->
54+
</geopackage>
55+
</wps:ComplexData>
56+
</wps:Data>
57+
</wps:Input>
58+
</wps:DataInputs>
59+
<wps:ResponseForm>
60+
<wps:RawDataOutput>
61+
<ows:Identifier>geopackage</ows:Identifier>
62+
</wps:RawDataOutput>
63+
</wps:ResponseForm>
64+
</wps:Execute>

‎jmeter/jmeter.log

Lines changed: 0 additions & 1305 deletions
This file was deleted.

‎pom.xml

Lines changed: 51 additions & 47 deletions
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</version>
6+
<version>0.2.1</version>
77
<packaging>pom</packaging>
88

99
<name>WorldWind Server Kit</name>
@@ -21,6 +21,56 @@
2121
</license>
2222
</licenses>
2323

24+
<properties>
25+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26+
<!--The GeoServer version used in this build; used for artifacts and assemblies-->
27+
<gs.version>2.10.0</gs.version>
28+
<!--The GeoTools version used in this build-->
29+
<gt.version>16.0</gt.version>
30+
<!--The ImageIO-Ext version; used for artifacts and assemblies -->
31+
<imageio-ext.version>1.1.16</imageio-ext.version>
32+
<!--The GeoWebCache version-->
33+
<gwc.version>1.10.0</gwc.version>
34+
<spring.version>4.2.5.RELEASE</spring.version>
35+
<spring.security.version>4.0.4.RELEASE</spring.security.version>
36+
<servlet-api.version>3.0.1</servlet-api.version>
37+
<jetty.version>9.2.13.v20150730</jetty.version>
38+
<jetty.servlet-api.version>3.1.0</jetty.servlet-api.version>
39+
<poi.version>3.14</poi.version>
40+
<wicket.version>7.1.0</wicket.version>
41+
<ant.version>1.8.4</ant.version>
42+
<jaiext.version>1.0.11</jaiext.version>
43+
<java.awt.headless>true</java.awt.headless>
44+
<jvm.opts/>
45+
<jalopy.phase>disabled</jalopy.phase>
46+
<jalopy.srcExcludesPattern>disabled</jalopy.srcExcludesPattern>
47+
<test.maxHeapSize>512M</test.maxHeapSize>
48+
<test.excludedGroups/>
49+
<test.exclude.pattern>none</test.exclude.pattern>
50+
<quietTests>true</quietTests>
51+
<remoteOwsTests>false</remoteOwsTests>
52+
<maven.build.timestamp.format>dd-MMM-yyyy HH:mm</maven.build.timestamp.format>
53+
<build.timestamp>${maven.build.timestamp}</build.timestamp>
54+
<build.hudsonId>-1</build.hudsonId>
55+
<fork.javac>true</fork.javac>
56+
<javac.maxHeapSize>256m</javac.maxHeapSize>
57+
<image.tests>true</image.tests>
58+
<interactive.tests>false</interactive.tests>
59+
<windows.leniency>true</windows.leniency>
60+
<gf.version>3.2-SNAPSHOT</gf.version>
61+
<hibernate-version>3.6.0.Final</hibernate-version>
62+
<hibernate-generic-dao-version>1.1.0</hibernate-generic-dao-version>
63+
<hibernate-spatial-version>1.1.1</hibernate-spatial-version>
64+
<hibernate-spatial-h2-version>1.1.1</hibernate-spatial-h2-version>
65+
<!-- NOTE: be careful if upgrading slf4j, check the netcdf and netcdf-out build correcly -->
66+
<slf4j.version>1.6.4</slf4j.version>
67+
<joda-time.version>2.8.1</joda-time.version>
68+
<git.commit.useNative>false</git.commit.useNative>
69+
<git.commit.runOnlyOnce>true</git.commit.runOnlyOnce>
70+
<maven.compiler.source>1.8</maven.compiler.source>
71+
<maven.compiler.target>1.8</maven.compiler.target>
72+
</properties>
73+
2474
<repositories>
2575
<!--GeoServer-->
2676
<repository>
@@ -1280,52 +1330,6 @@
12801330
<module>worldwind-geoserver</module>
12811331
<module>worldwind-geoserver-dist</module>
12821332
</modules>
1283-
1284-
<properties>
1285-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1286-
<gs.version>2.10.0</gs.version>
1287-
<gt.version>16.0</gt.version>
1288-
<gwc.version>1.10.0</gwc.version>
1289-
<spring.version>4.2.5.RELEASE</spring.version>
1290-
<spring.security.version>4.0.4.RELEASE</spring.security.version>
1291-
<servlet-api.version>3.0.1</servlet-api.version>
1292-
<jetty.version>9.2.13.v20150730</jetty.version>
1293-
<jetty.servlet-api.version>3.1.0</jetty.servlet-api.version>
1294-
<poi.version>3.14</poi.version>
1295-
<wicket.version>7.1.0</wicket.version>
1296-
<ant.version>1.8.4</ant.version>
1297-
<imageio-ext.version>1.1.13</imageio-ext.version>
1298-
<jaiext.version>1.0.11</jaiext.version>
1299-
<java.awt.headless>true</java.awt.headless>
1300-
<jvm.opts/>
1301-
<jalopy.phase>disabled</jalopy.phase>
1302-
<jalopy.srcExcludesPattern>disabled</jalopy.srcExcludesPattern>
1303-
<test.maxHeapSize>512M</test.maxHeapSize>
1304-
<test.excludedGroups/>
1305-
<test.exclude.pattern>none</test.exclude.pattern>
1306-
<quietTests>true</quietTests>
1307-
<remoteOwsTests>false</remoteOwsTests>
1308-
<maven.build.timestamp.format>dd-MMM-yyyy HH:mm</maven.build.timestamp.format>
1309-
<build.timestamp>${maven.build.timestamp}</build.timestamp>
1310-
<build.hudsonId>-1</build.hudsonId>
1311-
<fork.javac>true</fork.javac>
1312-
<javac.maxHeapSize>256m</javac.maxHeapSize>
1313-
<image.tests>true</image.tests>
1314-
<interactive.tests>false</interactive.tests>
1315-
<windows.leniency>true</windows.leniency>
1316-
<gf.version>3.2-SNAPSHOT</gf.version>
1317-
<hibernate-version>3.6.0.Final</hibernate-version>
1318-
<hibernate-generic-dao-version>1.1.0</hibernate-generic-dao-version>
1319-
<hibernate-spatial-version>1.1.1</hibernate-spatial-version>
1320-
<hibernate-spatial-h2-version>1.1.1</hibernate-spatial-h2-version>
1321-
<!-- NOTE: be careful if upgrading slf4j, check the netcdf and netcdf-out build correcly -->
1322-
<slf4j.version>1.6.4</slf4j.version>
1323-
<joda-time.version>2.8.1</joda-time.version>
1324-
<git.commit.useNative>false</git.commit.useNative>
1325-
<git.commit.runOnlyOnce>true</git.commit.runOnlyOnce>
1326-
<maven.compiler.source>1.8</maven.compiler.source>
1327-
<maven.compiler.target>1.8</maven.compiler.target>
1328-
</properties>
13291333

13301334
<build>
13311335
<pluginManagement>

‎scripts/generate_j2w_prj_files.sh

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
#!/bin/sh
2+
3+
# ==============================================================================
4+
# The GeoServer "JP2K (Direct)" coverage reader cannot read the georeferencing
5+
# information in a .jp2 file, so we need to generate a world file (.j2w) and a
6+
# projection file (.prj) using GDAL to extract the information.
7+
# ==============================================================================
8+
9+
for file in *.jp2; do
10+
11+
# Use GDAL to get the georeferencing info from the JP2 file.
12+
#
13+
# Example output:
14+
# Driver: JP2OpenJPEG/JPEG-2000 driver based on OpenJPEG library
15+
# Files: BMNG_500m_A1.jp2
16+
# Size is 21600, 21600
17+
# Coordinate System is:
18+
# GEOGCS["WGS 84",
19+
# DATUM["WGS_1984",
20+
# SPHEROID["WGS 84",6378137,298.257223563,
21+
# AUTHORITY["EPSG","7030"]],
22+
# AUTHORITY["EPSG","6326"]],
23+
# PRIMEM["Greenwich",0],
24+
# UNIT["degree",0.0174532925199433],
25+
# AUTHORITY["EPSG","4326"]]
26+
# Origin = (-180.000000000000512,90.000000000000199)
27+
# Pixel Size = (0.004166666667000,-0.004166666667000)
28+
# Image Structure Metadata:
29+
# . . .
30+
info=$(gdalinfo $file)
31+
32+
# Define the .j2w and .prj filenames
33+
# ${file%.*} returns filename after removing extension (.*)
34+
j2w=${file%.*}.j2w
35+
prj=${file%.*}.prj
36+
37+
# Extract the origin values inside the parenthesis, e.g.:
38+
# Origin = (-180.000000000000512,90.000000000000199)
39+
origin=$(echo $info | grep -Po '(?<=Origin = \()[-]?[0-9]+\.?[0-9]+,[-]?[0-9]+\.?[0-9]+(?=\))')
40+
41+
# Extract the pixel size values inside the parenthesis, e.g.:
42+
# Pixel Size = (0.004166666667000,-0.004166666667000)
43+
size=$(echo $info | grep -Po '(?<=Pixel Size = \()[-]?[0-9]+\.?[0-9]+,[-]?[0-9]+\.?[0-9]+(?=\))')
44+
45+
# Extract the coordinate system from the gdalinfo, e.g.:
46+
# Coordinate System is: GEOGCS["WGS 84", . . . ]]
47+
crs=$(echo $info | grep -Po '(?<=Coordinate System is\: ).*\[(.*)\]')
48+
49+
50+
# Create the .j2w world file
51+
# The generic meaning of the six parameters in a world file (as defined by Esri[1]) are:
52+
# Line 1: A: pixel size in the x-direction in map units/pixel
53+
# Line 2: D: rotation about y-axis
54+
# Line 3: B: rotation about x-axis
55+
# Line 4: E: pixel size in the y-direction in map units, almost always negative[3]
56+
# Line 5: C: x-coordinate of the center of the upper left pixel
57+
# Line 6: F: y-coordinate of the center of the upper left pixel
58+
echo "Writing $j2w"
59+
# Output pixel size in x-direction - get floating point number before ','
60+
echo $size | grep -Po '[-]?[0-9]+\.?[0-9]+(?=,)' > $j2w
61+
echo 0.0 >> $j2w
62+
echo 0.0 >> $j2w
63+
# Output pixel size in y-direction - get floating point number after ','
64+
echo $size | grep -Po '(?<=,)[-]?[0-9]+\.?[0-9]+' >> $j2w
65+
# Output x-coordinate - get floating point number before ','
66+
echo $origin | grep -Po '[-]?[0-9]+\.?[0-9]+(?=,)' >> $j2w
67+
# Output y coordinate - get floating point number after ','
68+
echo $origin | grep -Po '(?<=,)[-]?[0-9]+\.?[0-9]+' >> $j2w
69+
70+
# Create the .prj projection file
71+
echo "Writing $prj"
72+
echo $crs > $prj
73+
74+
done
75+

‎worldwind-geoserver-dist/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ including:
1111
* Java runtime for Windows x64
1212
* GDAL natives for Windows x64
1313
* Basic data configuration
14-
* Linux x64 (worldwind-geoserver-\<version>-linux64.tgz)
14+
* Ubuntu x64 (worldwind-geoserver-\<version>-ubuntu64.tgz)
1515
* GeoServer web app configured with a Jetty application server
1616
* Java runtime for Linux x64
1717
* GDAL natives for Ubuntu x64
1818
* Basic data configuration
19-
* Hybrid OS (worldwind-geoserver-\<version>-hybrid_os.tgz)
19+
* CentOS x64 (worldwind-geoserver-\<version>-centos64.tgz)
2020
* GeoServer web app configured with a Jetty application server
2121
* Java runtime for Linux x64
2222
* GDAL natives for CentOS x64

0 commit comments

Comments
 (0)