Skip to content

Commit cde524b

Browse files
emxsysemxsys
committed
Merge branch 'release/v0.5.0'
2 parents 9a1346d + cdb3f27 commit cde524b

File tree

2,387 files changed

+491006
-380
lines changed

Some content is hidden

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

2,387 files changed

+491006
-380
lines changed

‎.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,7 @@ nbactions.xml
5858
/worldwind-gs-geopkg/pom.xml.versionsBackup
5959
/worldwind-gs-wms/pom.xml.versionsBackup
6060
/worldwind-geoserver/pom.xml.versionsBackup
61-
/pom.xml.versionsBackup
61+
/pom.xml.versionsBackup
62+
/worldwind-geoserver/src/test/data_dir/logs/geoserver.log
63+
/worldwind-geoserver/src/test/data_dir/logs/geoserver.log.*
64+
/archive/

‎.travis.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,17 @@ before_script:
3131
- chmod +x ./travis/*.sh
3232

3333
script:
34-
# Build WWSK with Maven using the "release" profile (generates javadoc and sources)
34+
# Build WWSK with Maven using the "release" profile (generates javadoc and sources)
3535
## Maven Commands
3636
# -B (--batch-mode) Run in non-interactive model
3737
# -U (--update-snapshots) Forces a check for missing releases and updated snapshots on remote repos
3838
# -P (--activate-profiles <arg>) Comma-delimited list of profiles to activate
39-
- mvn clean install -B -U -Prelease
39+
- mvn clean install -B -U -P release
40+
## Run the JMeter integration tests and output results to the reports folder
41+
- ./travis/run_integration_tests.sh
4042

4143
after_success:
42-
# Create a draft release on GitHub in preparation for deploy
44+
# Conditionally creates a draft release on GitHub in preparation for deploy
4345
- ./travis/create_draft_release.sh
4446

4547
deploy:
@@ -67,5 +69,12 @@ deploy:
6769
skip_cleanup: true
6870
on:
6971
branch: master
70-
#tags: true
71-
72+
73+
# Upload the integration test report(s) to the GitHub pages branch (gh-pages)
74+
- provider: pages
75+
github_token: $GITHUB_API_KEY
76+
local_dir: worldwind-geoserver/target/reports
77+
skip_cleanup: true
78+
on:
79+
all_branches: true
80+
#branch: develop

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<img src="https://worldwind.arc.nasa.gov/css/images/nasa-logo.svg" height="100"/>
1+
<img src="https://worldwind.arc.nasa.gov/img/nasa-logo.svg" height="100"/>
22

33
# WorldWindServerKit
44

‎jmeter/functional_test/GeoServer Functional Tests.jmx

Lines changed: 460 additions & 39 deletions
Large diffs are not rendered by default.

‎jmeter/wms_test/GeoServer Stress Test.jmx

Lines changed: 130 additions & 38 deletions
Large diffs are not rendered by default.

‎jmeter/wms_test/ft_biggs_10-19_4326_zoom.csv

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

‎jmeter/wms_test/global_random_0-10.csv

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

‎jmeter/wms_test/scripts/create_tile_requests_random.sh

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/bash
2+
## wms_tile_request.py
3+
## -count Number of requests to generate (default=100)
4+
## -region Bounding box: <minx> <miny> <maxx> <maxy> (negative values must quoted)
5+
## -minlevel Minimum zoom level (zero based)
6+
## -maxlevel Maximum zoom level (zero based)
7+
## -tilesize Tile size in pixels: <width> <height> (default=256,256)
8+
## -level0 columns and rows in level 0: <columns> <rows> (default=2,1)
9+
## -srs Source coordinate reference system (default=4326)
10+
## -srs2 Output coordinate reference system (optional)
11+
## -filter_within Name of the file containing geometries to filter out (optional)
12+
## -output Name of the output file (default=<srs>.csv)
13+
## -output2 Name of the output file (default=<srs2>.csv)
14+
##
15+
## Example: Generate 1000 WMS tile requests in CSV format around Ventura, CA
16+
## python wms_tile_request.py -count 1000 -region "-120" 34 "-119" 35 -minlevel 0 -maxlevel 23 -output ventura.csv
17+
##
18+
## Example: World Wind Java WMS tile requests
19+
## python wms_tile_request.py -count 1000 -region "-120" 34 "-119" 35 -level0 10 5 -minlevel 0 -maxlevel 23 -output ventura.csv
20+
#python wms_tile_request.py -count 100 -region "-180" "-90" 180 90 -minlevel 0 -maxlevel 4 -output global_0-4.csv
21+
#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
22+
#python wms_tile_request.py -count 100 -region "-120" 34 "-119" 35 -minlevel 0 -maxlevel 23 -output ventura_0-23.csv
23+
#python wms_tile_request.py -count 100 -region "-126" 39 "-116" 50 -minlevel 0 -maxlevel 23 -output pnw_0-23.csv
24+
#python wms_tile_request.py -count 100 -region "-120" 30 "-110" 40 -minlevel 7 -maxlevel 12 -output psw_7-12.csv
25+
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/scripts/create_tile_requests_zoom.sh

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/bash
2+
##
3+
## wms_tile_request_zoom.py
4+
## -count Number of requests to generate (default=100)
5+
## -region Bounding box: <minx> <miny> <maxx> <maxy> (negative values must quoted)
6+
## -minlevel Minimum zoom level (zero based)
7+
## -maxlevel Maximum zoom level (zero based)
8+
## -tilesize Tile size in pixels: <width> <height> (default=256,256)
9+
## -level0 columns and rows in level 0: <columns> <rows> (default=2,1)
10+
## -srs Source coordinate reference system (default=4326)
11+
## -srs2 Output coordinate reference system (optional)
12+
## -filter_within Name of the file containing geometries to filter out (optional)
13+
## -output Name of the output file (default=<srs>.csv)
14+
## -output2 Name of the output file (default=<srs2>.csv)
15+
##
16+
## Example: Generate 1000 WMS tile requests in CSV format around Ventura, CA
17+
## python wms_tile_request_zoom.py -count 1000 -region "-120" 34 "-119" 35 -minlevel 0 -maxlevel 23 -output ventura_4326.csv
18+
##
19+
## Example: World Wind Java WMS tile requests
20+
## python wms_tile_request_zoom.py -count 1000 -region "-120" 34 "-119" 35 -level0 10 5 -minlevel 0 -maxlevel 23 -output ventura_wwj.csv
21+
##
22+
#python wms_tile_request_zoom.py -count 100 -region "-120" 30 "-110" 40 -minlevel 7 -maxlevel 12 -output psw_7-12_4326_zoom.csv
23+
#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
24+
#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
25+
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/scripts/create_wms_requests.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/bin/bash
2+
#
3+
## wms_request.py
4+
## -count Number of requests to generate (default=100)
5+
## -region Bounding box: <minx> <miny> <maxx> <maxy> (negative values must quoted)
6+
## -minres Minimum resolution
7+
## -maxres Maximum resolution
8+
## -minsize Minimum width and height: <width> <height> (default=128,128)
9+
## -maxsize Minimum width and height: <width> <height> (default=1024,768)
10+
## -srs Source coordinate reference system (default=4326)
11+
## -srs2 Output coordinate reference system (optional)
12+
## -filter_within Name of the file containing geometries to filter out (optional)
13+
## -output_file Name of the output file (default=<srs>.csv)
14+
## -output_file2 Name of the output file (default=<srs2>.csv)
15+
##
16+
## Example: Generate 1000 WMS requests in CSV format around Ventura, CA
17+
## python wms_request.py -count 1000 -region -120 34 -119 35 - -output ventura.csv
18+
##
19+
#
20+
python wms_request.py -count 100 -region "-120" 30 "-110" 40 -minres 0.0001 -maxres .0002 -output psw_7-12_random.csv

0 commit comments

Comments
 (0)