Skip to content

Commit 9db1e34

Browse files
emxsysemxsys
committed
Merge branch 'release/v0.1.0-RC'
2 parents 60e0d33 + 01ef914 commit 9db1e34

File tree

123 files changed

+12629
-29
lines changed

Some content is hidden

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

123 files changed

+12629
-29
lines changed

‎.gitignore‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,33 @@ target
1212
.idea/
1313
nb-configuration.xml
1414
nbactions.xml
15-
/data/ssgf/coverages/
15+
/data/ssgf/coverages/
16+
/worldwind-gt-geopkg/nbproject/
17+
/worldwind-gs-geopkg/nbproject/
18+
/worldwind-gs-wms/nbproject/
19+
/worldwind-gt-geopkg/src/test/resources/gov/nasa/worldwind/geopkg/mosaic/ERDC_Whitehorse_GeoPackage.gpkg
20+
/worldwind-gs-geopkg/src/test/resources/gov/nasa/worldwind/gs/geopkg/agc-JOG(1).jpg
21+
/worldwind-gs-geopkg/src/test/resources/gov/nasa/worldwind/gs/geopkg/jog.gpkg
22+
/worldwind-gs-geopkg/src/test/resources/gov/nasa/worldwind/gs/geopkg/agc-JOG.jpg
23+
/worldwind-gs-geopkg/src/test/resources/gov/nasa/worldwind/gs/geopkg/jog.png
24+
/data/ssgf/workspaces/agc/AGC_TLM50_FtBelvoir_11_14_17JAN2017/
25+
/data/ssgf/workspaces/agc/AGC_JOG_DMV_8_11_17JAN2017/
26+
/data/ssgf/workspaces/agc/AGC_BUCK_FtBelvoir_16_19_23DEC2016/
27+
/data/ssgf/workspaces/agc/AGC_GGDM_Hayfield_19JAN2017/
28+
/data/ssgf/workspaces/agc/AGC_NITF_DC_15_18_17JAN2017/
29+
/data/ssgf/workspaces/agc/AGC_DG_APG_R2C3_14_17_23NOV2016/
30+
/data/ssgf/workspaces/agc/AGC_DG_APG_R3C2_14_17_23NOV2016/
31+
/data/ssgf/workspaces/agc/AGC_DG_APG_R3C2_P2_14_17_23NOV2016/
32+
/data/ssgf/workspaces/agc/AGC_DG_APG_R4C1_14_17_23NOV2016/
33+
/data/ssgf/workspaces/agc/AGC_DG_APG_R3C1_14_17_23NOV2016/
34+
/data/ssgf/workspaces/agc/AGC_DG_APG_R2C2_14_17_22NOV2016/
35+
/data/ssgf/workspaces/agc/AGC_DG_APG_R2C2_P2_14_17_23NOV2016/
36+
/data/ssgf/workspaces/agc/AGC_DG_APG_R4C3_14_17_23NOV2016/
37+
/data/ssgf/workspaces/agc/AGC_DG_APG_R5C2_14_17_23NOV2016/
38+
/data/ssgf/workspaces/agc/AGC_DG_APG_R4C2_14_17_23NOV2016/
39+
/data/ssgf/workspaces/agc/AGC_DG_APG_R2C1_14_17_22NOV2016/
40+
/data/ssgf/workspaces/agc/AGC_DG_APG_R4C2_14_17_P2_23NOV2016/
41+
/data/ssgf/workspaces/agc/AGC_DG_APG_R3C3_14_17_23NOV2016/
42+
/data/ssgf/workspaces/agc/AGC_DG_APG_R5C3_14_17_23NOV2016/
43+
/data/ssgf/workspaces/agc/layergroups/
44+
/worldwind-geoserver/*.log

‎pom.xml‎

Lines changed: 54 additions & 2 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.1.0</version>
6+
<version>0.1.0-RC</version>
77
<packaging>pom</packaging>
88

99
<name>WorldWind Server Kit</name>
@@ -128,6 +128,12 @@
128128
<artifactId>gs-wfs</artifactId>
129129
<version>${gs.version}</version>
130130
</dependency>
131+
<dependency>
132+
<groupId>org.geoserver</groupId>
133+
<artifactId>gs-wfs</artifactId>
134+
<version>${gs.version}</version>
135+
<classifier>tests</classifier>
136+
</dependency>
131137
<dependency>
132138
<groupId>org.geoserver</groupId>
133139
<artifactId>gs-wms</artifactId>
@@ -159,6 +165,12 @@
159165
<artifactId>gs-web-core</artifactId>
160166
<version>${gs.version}</version>
161167
</dependency>
168+
<dependency>
169+
<groupId>org.geoserver.web</groupId>
170+
<artifactId>gs-web-core</artifactId>
171+
<version>${gs.version}</version>
172+
<classifier>tests</classifier>
173+
</dependency>
162174

163175

164176
<dependency>
@@ -1214,11 +1226,51 @@
12141226
<artifactId>imageio-ext-turbojpeg</artifactId>
12151227
<version>${imageio-ext.version}</version>
12161228
</dependency>
1229+
1230+
<dependency>
1231+
<groupId>org.geoserver.extension</groupId>
1232+
<artifactId>gs-wps-core</artifactId>
1233+
<version>${gs.version}</version>
1234+
</dependency>
1235+
<dependency>
1236+
<groupId>org.geoserver.extension</groupId>
1237+
<artifactId>gs-wps-core</artifactId>
1238+
<version>${gs.version}</version>
1239+
<classifier>tests</classifier>
1240+
</dependency>
1241+
<dependency>
1242+
<groupId>org.geoserver.community</groupId>
1243+
<artifactId>gs-mbtiles</artifactId>
1244+
<version>${gs.version}</version>
1245+
</dependency>
1246+
1247+
<dependency>
1248+
<groupId>simple-jndi</groupId>
1249+
<artifactId>simple-jndi</artifactId>
1250+
<version>0.11.4.1</version>
1251+
</dependency>
1252+
1253+
<dependency>
1254+
<groupId>org.xerial</groupId>
1255+
<artifactId>sqlite-jdbc</artifactId>
1256+
<version>3.16.1</version>
1257+
</dependency>
1258+
12171259
</dependencies>
12181260
</dependencyManagement>
12191261

1262+
<dependencies>
1263+
<dependency>
1264+
<groupId>junit</groupId>
1265+
<artifactId>junit</artifactId>
1266+
<scope>test</scope>
1267+
</dependency>
1268+
</dependencies>
1269+
12201270
<modules>
1221-
<module>worldwind-geopackage</module>
1271+
<module>worldwind-gt-geopkg</module>
1272+
<module>worldwind-gs-geopkg</module>
1273+
<module>worldwind-gs-wms</module>
12221274
<module>worldwind-geoserver</module>
12231275
<module>worldwind-geoserver-dist</module>
12241276
</modules>

‎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.1.0</version>
7+
<version>0.1.0-RC</version>
88
</parent>
99
<artifactId>worldwind-geoserver-dist</artifactId>
1010
<packaging>pom</packaging>

‎worldwind-geoserver/pom.xml‎

Lines changed: 26 additions & 25 deletions
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.1.0</version>
7+
<version>0.1.0-RC</version>
88
</parent>
99

1010
<artifactId>worldwind-geoserver</artifactId>
@@ -14,13 +14,20 @@
1414
<properties>
1515
<maven.compiler.source>1.8</maven.compiler.source>
1616
<maven.compiler.target>1.8</maven.compiler.target>
17+
1718
<!--Configuration for Jetty-->
18-
<configId>minimal</configId>
19-
<configDirectory>${basedir}/../data</configDirectory>
2019
<webappSourceDirectory>${basedir}/src/main/webapp</webappSourceDirectory>
2120
<sde.version>9.3</sde.version>
2221
<jetty.port>8080</jetty.port>
23-
<jetty.run.daemon>false</jetty.run.daemon>
22+
<jetty.run.daemon>false</jetty.run.daemon>
23+
<!-- configId : typically "minimal"
24+
configId defines the data folder template. It should match a subfolder
25+
under the parent folder's data folder. Its contents will be copied into
26+
the war file.
27+
-->
28+
<configId>minimal</configId>
29+
<!--<configId>ssgf</configId>-->
30+
<configDirectory>${basedir}/../data</configDirectory>
2431
</properties>
2532

2633
<dependencies>
@@ -88,10 +95,6 @@
8895
<groupId>org.geoserver</groupId>
8996
<artifactId>gs-wfs</artifactId>
9097
</dependency>
91-
<dependency>
92-
<groupId>org.geoserver</groupId>
93-
<artifactId>gs-wms</artifactId>
94-
</dependency>
9598
<dependency>
9699
<groupId>org.geoserver</groupId>
97100
<artifactId>gs-kml</artifactId>
@@ -117,37 +120,39 @@
117120
<artifactId>gs-sec-ldap</artifactId>
118121
</dependency>
119122

120-
121123
<!--Web Processing Service extension-->
122124
<dependency>
123125
<groupId>org.geoserver.extension</groupId>
124126
<artifactId>gs-wps-core</artifactId>
125-
<version>${gs.version}</version>
126127
</dependency>
127128
<dependency>
128129
<groupId>org.geoserver.extension</groupId>
129130
<artifactId>gs-web-wps</artifactId>
130131
<version>${gs.version}</version>
131132
</dependency>
132-
133-
<!--GeoServer GeoPackage community plugin-->
133+
134+
<!--WorldWind GeoServer WMS module-->
134135
<dependency>
135-
<groupId>org.geoserver.community</groupId>
136-
<artifactId>gs-geopkg</artifactId>
137-
<version>${gs.version}</version>
136+
<groupId>${project.groupId}</groupId>
137+
<artifactId>worldwind-gs-wms</artifactId>
138+
<version>${project.version}</version>
138139
</dependency>
139-
<!--GeoTools GeoPackage module-->
140+
141+
<!--WorldWind GeoServer GeoPackage extension -->
140142
<dependency>
141-
<groupId>org.geotools</groupId>
142-
<artifactId>gt-geopkg</artifactId>
143+
<groupId>${project.groupId}</groupId>
144+
<artifactId>worldwind-gs-geopkg</artifactId>
145+
<version>${project.version}</version>
143146
</dependency>
144-
<!--WorldWind OGC compliant GeoPackage module-->
147+
148+
<!--WorldWind GeoTools GeoPackage module-->
145149
<dependency>
146150
<groupId>${project.groupId}</groupId>
147-
<artifactId>worldwind-geopackage</artifactId>
151+
<artifactId>worldwind-gt-geopkg</artifactId>
148152
<version>${project.version}</version>
149153
</dependency>
150-
154+
155+
151156
<!-- GeoTools -->
152157
<dependency>
153158
<groupId>org.geotools.jdbc</groupId>
@@ -190,8 +195,6 @@
190195
<artifactId>gt-imagepyramid</artifactId>
191196
</dependency>
192197

193-
194-
195198
<dependency>
196199
<groupId>org.eclipse.jetty</groupId>
197200
<artifactId>jetty-server</artifactId>
@@ -229,11 +232,9 @@
229232
<scope>test</scope>
230233
</dependency>
231234

232-
<!--SQLLite explicit version resolves issue opening GeoPackages-->
233235
<dependency>
234236
<groupId>org.xerial</groupId>
235237
<artifactId>sqlite-jdbc</artifactId>
236-
<version>3.14.2.1</version>
237238
</dependency>
238239
</dependencies>
239240

0 commit comments

Comments
 (0)