Merge branch 'release/v0.5.0'

Author: emxsys

.gitignore

@@ -58,4 +58,7 @@ nbactions.xml
 /worldwind-gs-geopkg/pom.xml.versionsBackup
 /worldwind-gs-wms/pom.xml.versionsBackup
 /worldwind-geoserver/pom.xml.versionsBackup
-/pom.xml.versionsBackup
+/pom.xml.versionsBackup
+/worldwind-geoserver/src/test/data_dir/logs/geoserver.log
+/worldwind-geoserver/src/test/data_dir/logs/geoserver.log.*
+/archive/

.travis.yml

@@ -31,15 +31,17 @@ before_script:
   - chmod +x ./travis/*.sh
 
 script:
-  # Build WWSK with Maven using the "release" profile (generates javadoc and sources)
+  # Build WWSK with Maven using the "release" profile (generates javadoc and sources) 
   ## Maven Commands
   # -B (--batch-mode) Run in non-interactive model
   # -U (--update-snapshots) Forces a check for missing releases and updated snapshots on remote repos
   # -P (--activate-profiles <arg>) Comma-delimited list of profiles to activate
-  - mvn clean install -B -U -Prelease
+  - mvn clean install -B -U -P release
+  ## Run the JMeter integration tests and output results to the reports folder
+  - ./travis/run_integration_tests.sh
 
 after_success:
-  # Create a draft release on GitHub in preparation for deploy
+  # Conditionally creates a draft release on GitHub in preparation for deploy
   - ./travis/create_draft_release.sh
 
 deploy: 
@@ -67,5 +69,12 @@ deploy:
     skip_cleanup: true
     on:
       branch: master
-      #tags: true
-      
+      
+  # Upload the integration test report(s) to the GitHub pages branch (gh-pages)
+  - provider: pages
+    github_token: $GITHUB_API_KEY
+    local_dir: worldwind-geoserver/target/reports
+    skip_cleanup: true
+    on:
+        all_branches: true
+        #branch: develop

README.md

@@ -1,4 +1,4 @@
-<img src="https://worldwind.arc.nasa.gov/css/images/nasa-logo.svg" height="100"/> 
+<img src="https://worldwind.arc.nasa.gov/img/nasa-logo.svg" height="100"/> 
 
 # WorldWindServerKit 
 

jmeter/functional_test/GeoServer Functional Tests.jmx

@@ -0,0 +1,25 @@
+#!/bin/bash
+## wms_tile_request.py
+## -count	        Number of requests to generate (default=100)
+## -region	        Bounding box: <minx> <miny> <maxx> <maxy> (negative values must quoted)
+## -minlevel	    Minimum zoom level (zero based)
+## -maxlevel	    Maximum zoom level (zero based)
+## -tilesize        Tile size in pixels: <width> <height> (default=256,256)
+## -level0          columns and rows in level 0: <columns> <rows> (default=2,1)
+## -srs             Source coordinate reference system (default=4326)
+## -srs2            Output coordinate reference system (optional)
+## -filter_within   Name of the file containing geometries to filter out (optional)
+## -output          Name of the output file (default=<srs>.csv)
+## -output2         Name of the output file (default=<srs2>.csv)
+##
+## Example: Generate 1000 WMS tile requests in CSV format around Ventura, CA
+##  python wms_tile_request.py -count 1000 -region "-120" 34 "-119" 35 -minlevel 0 -maxlevel 23 -output ventura.csv
+##
+## Example: World Wind Java WMS tile requests
+##  python wms_tile_request.py -count 1000 -region "-120" 34 "-119" 35 -level0 10 5  -minlevel 0 -maxlevel 23 -output ventura.csv
+#python  wms_tile_request.py -count 100 -region "-180" "-90" 180 90 -minlevel 0 -maxlevel 4 -output global_0-4.csv
+#python  wms_tile_request.py -count 100 -region "-180" "-90" 180 90 -minlevel 0 -maxlevel 4 -tilesize 512 512 -level0 10 5 -output global_0-4_wwj.csv
+#python  wms_tile_request.py -count 100 -region "-120" 34 "-119" 35  -minlevel 0 -maxlevel 23 -output ventura_0-23.csv
+#python  wms_tile_request.py -count 100 -region "-126" 39 "-116" 50  -minlevel 0 -maxlevel 23 -output pnw_0-23.csv
+#python  wms_tile_request.py -count 100 -region "-120" 30 "-110" 40  -minlevel 7 -maxlevel 12 -output psw_7-12.csv
+python wms_tile_request_random.py -count 5000 -region "-180" "-90" 180 90 -minlevel 0 -maxlevel 10 -output global_random_0-10.csv

jmeter/wms_test/GeoServer Stress Test.jmx

@@ -0,0 +1,25 @@
+#!/bin/bash
+##
+## wms_tile_request_zoom.py
+## -count	        Number of requests to generate (default=100)
+## -region	        Bounding box: <minx> <miny> <maxx> <maxy> (negative values must quoted)
+## -minlevel	    Minimum zoom level (zero based)
+## -maxlevel	    Maximum zoom level (zero based)
+## -tilesize        Tile size in pixels: <width> <height> (default=256,256)
+## -level0          columns and rows in level 0: <columns> <rows> (default=2,1)
+## -srs             Source coordinate reference system (default=4326)
+## -srs2            Output coordinate reference system (optional)
+## -filter_within   Name of the file containing geometries to filter out (optional)
+## -output          Name of the output file (default=<srs>.csv)
+## -output2         Name of the output file (default=<srs2>.csv)
+##
+## Example: Generate 1000 WMS tile requests in CSV format around Ventura, CA
+##  python wms_tile_request_zoom.py -count 1000 -region "-120" 34 "-119" 35 -minlevel 0 -maxlevel 23 -output ventura_4326.csv
+##
+## Example: World Wind Java WMS tile requests
+##  python wms_tile_request_zoom.py -count 1000 -region "-120" 34 "-119" 35 -level0 10 5  -minlevel 0 -maxlevel 23 -output ventura_wwj.csv
+##
+#python  wms_tile_request_zoom.py -count 100 -region "-120" 30 "-110" 40  -minlevel 7 -maxlevel 12 -output psw_7-12_4326_zoom.csv
+#python  wms_tile_request_zoom.py -count 5000 -region 7.5 47.5 11 48.5  -minlevel 13 -maxlevel 17 -output desw_13-17_4326_zoom.csv
+#python  wms_tile_request_zoom.py -count 5000 -region 7.5 47.5 11 48.5  -minlevel 13 -maxlevel 19 -output desw_13-19_4326_zoom.csv
+python  wms_tile_request_zoom.py -count 5000 -region "-106.6" 31.6 "-105.6" 32.6 -minlevel 10 -maxlevel 19 -output ft_biggs_10-19_4326_zoom.csv

jmeter/wms_test/ft_biggs_10-19_4326_zoom.csv

@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+## wms_request.py
+## -count           Number of requests to generate (default=100)
+## -region          Bounding box: <minx> <miny> <maxx> <maxy> (negative values must quoted)
+## -minres          Minimum resolution 
+## -maxres          Maximum resolution 
+## -minsize         Minimum width and height: <width> <height> (default=128,128)
+## -maxsize         Minimum width and height: <width> <height> (default=1024,768)
+## -srs             Source coordinate reference system (default=4326)
+## -srs2            Output coordinate reference system (optional)
+## -filter_within   Name of the file containing geometries to filter out (optional)
+## -output_file     Name of the output file (default=<srs>.csv)
+## -output_file2    Name of the output file (default=<srs2>.csv)
+##
+## Example: Generate 1000 WMS requests in CSV format around Ventura, CA
+##  python wms_request.py -count 1000 -region -120 34 -119 35 - -output ventura.csv
+##
+#
+python  wms_request.py -count 100 -region "-120" 30 "-110" 40  -minres 0.0001 -maxres .0002 -output psw_7-12_random.csv

jmeter/wms_test/global_random_0-10.csv

@@ -1,6 +1,9 @@
 #!/usr/bin/env python
-# ******************************************************************************
+# 
+# Original script:
+#  http://svn.osgeo.org/osgeo/foss4g/benchmarking/wms/2010/scripts/wms_request.py
 #
+# ******************************************************************************
 #  Project:  2009 Web Map Server Benchmarking
 #  Purpose:  Generate WMS BBOX/size requests randomly over a defined dataset.
 #  Author:   Frank Warmerdam, warmerdam@pobox.com
@@ -65,6 +68,8 @@ def Usage():
     coordinate_transformation = None
 
     # output files
+    output_filename = None
+    output_filename2 = None
     output_file = None
     output_file2 = None
 
@@ -104,6 +109,14 @@ def Usage():
             filter_within = argv[i + 1]
             i = i + 1
 
+        elif arg == '-output' and i < len(argv) - 1:
+            output_filename = argv[i + 1]
+            i = i + 1
+
+        elif arg == '-output2' and i < len(argv) - 1:
+            output_filename2 = argv[i + 1]
+            i = i + 1
+
         elif arg == '-srs' and i < len(argv) - 1:
             srs_input = int(argv[i + 1])
             i = i + 1
@@ -181,9 +194,14 @@ def Usage():
     # -------------------------------------------------------------------------
 
     # create output file
-    output_file = open('./' + str(srs_input) + '.csv', 'w')
+    if output_filename is None:
+        output_filename = str(srs_input) + '.csv'
+    output_file = open('./' + output_filename, 'w')
+
     if srs_output is not None:
-        output_file2 = open('./' + str(srs_output) + '.csv', 'w')
+        if output_filename2 is None:
+            output_filename2 = str(srs_output) + '.csv'
+        output_file2 = open('./' + output_filename2, 'w')
 
     first = True
     while count > 0:
@@ -203,6 +221,7 @@ def Usage():
                 center_y - height * 0.5 * res,
                 center_x + width * 0.5 * res,
                 center_y + height * 0.5 * res)
+        print '%d; %d; %.8g, %.8g, %.8g, %.8g' % (width, height, bbox[0], bbox[1], bbox[2], bbox[3])
 
         if bbox[0] >= region[0] \
                 and bbox[1] >= region[1] \
@@ -228,6 +247,7 @@ def Usage():
                 srs2_width = math.floor(delta_transformed * srs2_height)
 
             if first:
+                print '%d; %d; %.8g, %.8g, %.8g, %.8g, %d' % (width, height, bbox[0], bbox[1], bbox[2], bbox[3], count)
                 # Trick to have the command that created the csv file without making jmeter bomb (csv format has no notion of comments)
                 output_file.write(
                     '%d;%d;%.8g,%.8g,%.8g,%.8g;wms_request.py -count %d -region %.8g %.8g %.8g %.8g -minsize %d %d -maxsize %d %d -minres %.8g -maxres %.8g\n' \
@@ -242,6 +262,7 @@ def Usage():
 
                 first = False
             else:
+                print '%d; %d; %.8g, %.8g, %.8g, %.8g, %d' % (width, height, bbox[0], bbox[1], bbox[2], bbox[3], count)
                 output_file.write('%d;%d;%.8g,%.8g,%.8g,%.8g\n' \
                                   % (width, height, bbox[0], bbox[1], bbox[2], bbox[3]))
                 if srs_output is not None:

jmeter/wms_test/scripts/create_tile_requests_random.sh

@@ -1,4 +1,8 @@
 #!/usr/bin/env python
+#
+# This script was derived from wms_request.py by Frank Warmerdam
+#  http://svn.osgeo.org/osgeo/foss4g/benchmarking/wms/2010/scripts/wms_request.py
+#
 # ******************************************************************************
 #
 #  Project:  2009 Web Map Server Benchmarking
@@ -264,25 +268,25 @@ def Usage():
         if first:
             # Trick to have the command that created the csv file without making jmeter bomb (csv format has no notion of comments)
             output_file.write(
-                '%d,%d,%.10g,%.10g,%.10g,%.10g;wms_tile_request.py -count %d -region %.8g %.8g %.8g %.8g -minlevel %d -maxlevel %d -tilesize %d %d -level0 %d %d\n' \
+                '%d,%d,%.10g,%.10g,%.10g,%.10g,"wms_tile_request.py -count %d -region %.8g %.8g %.8g %.8g -minlevel %d -maxlevel %d -tilesize %d %d -level0 %d %d"\n' \
                 % (width, height, bbox[0], bbox[1], bbox[2], bbox[3],
                    count, region[0], region[1], region[2], region[3], min_level, max_level,
                    tile_size[0], tile_size[1], level0[0], level0[1]))
             if srs_output is not None:
                 output_file2.write(
-                    '%d,%d,%.10g,%.10g,%.10g,%.10g;wms_tile_request.py -count %d -region %.8g %.8g %.8g %.8g -minlevel %d -maxlevel %d -tilesize %d %d -level0 %d %d\n' \
-                    % (srs2_width, srs2_height, srs2_bbox[0][0], srs2_bbox[0][1], srs2_bbox[1][0], srs2_bbox[1][1],
+                    '%d,%d,%.10g,%.10g,%.10g,%.10g,"wms_tile_request.py -count %d -region %.8g %.8g %.8g %.8g -minlevel %d -maxlevel %d -tilesize %d %d -level0 %d %d"\n' \
+                    % (srs2_width, srs2_height, srs2_bbox[0][0], srs2_bbox[0][1], srs2_bbox[1][0],
+                       srs2_bbox[1][1],
                        count, region[0], region[1], region[2], region[3], min_level, max_level,
                        tile_size[0], tile_size[1], level0[0], level0[1]))
-
             first = False
         else:
-            output_file.write('%d,%d,%.10g,%.10g,%.10g,%.10g\n' \
-                              % (width, height, bbox[0], bbox[1], bbox[2], bbox[3]))
+            output_file.write('%d,%d,%.10g,%.10g,%.10g,%.10g,"level %d"\n' \
+                              % (width, height, bbox[0], bbox[1], bbox[2], bbox[3], level))
             if srs_output is not None:
-                output_file2.write('%d,%d,%.10g,%.10g,%.10g,%.10g\n' \
-                                   % (srs2_width, srs2_height, srs2_bbox[0][0], srs2_bbox[0][1], srs2_bbox[1][0],
-                                      srs2_bbox[1][1]))
+                output_file2.write('%d,%d,%.10g,%.10g,%.10g,%.10g,"level %d"\n' \
+                                   % (srs2_width, srs2_height, srs2_bbox[0][0], srs2_bbox[0][1],
+                                      srs2_bbox[1][0], srs2_bbox[1][1], level))
 
         count = count - 1