Skip to content

Commit d5b67c4

Browse files
guygriffithsguygriffiths
committed
Merge branch 'release-2.5.0'
2 parents 5a83a35 + 30a37e6 commit d5b67c4

File tree

12 files changed

+122
-89
lines changed

12 files changed

+122
-89
lines changed

‎CHANGELOG‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2.5.0
2+
=====
3+
Updated to EDAL 1.5.0
4+
Minor bugfixes
5+
Changes to make JDK11 compatible
6+
7+
2.4.2
8+
=====
9+
Updated to EDAL 1.4.2
10+
111
2.4.1
212
=====
313
Updated to EDAL 1.4.1

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN mkdir /edal && \
3535
COPY . /ncWMS
3636
RUN cd /ncWMS && \
3737
JAVA_HOME=/usr/lib/jvm/java-8-oracle mvn clean install && \
38-
unzip target/ncWMS2.war -d $CATALINA_HOME/webapps/ncWMS/ && \
38+
unzip target/ncWMS2.war -d $CATALINA_HOME/webapps/ncWMS2/ && \
3939
rm -rf /edal && \
4040
rm -rf /ncWMS/target
4141

‎docs/04-usage.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ The `TIME` parameter should specify a range of times in the form `starttime/endt
6666
* image/jpg
6767
* image/jpeg
6868
* text/csv
69+
* text/json
70+
* application/prs.coverage+json
71+
* application/prs.coverage json
6972

7073
### GetVerticalProfile
7174

@@ -75,6 +78,9 @@ This produces either a vertical profile graph or, if downloading is enabled, a C
7578
* image/jpg
7679
* image/jpeg
7780
* text/csv
81+
* text/json
82+
* application/prs.coverage+json
83+
* application/prs.coverage json
7884

7985
### GetTransect
8086

‎docs/images/palettes.png‎

9.31 KB
Loading

‎pom.xml‎

Lines changed: 54 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46
<groupId>uk.ac.rdg.resc</groupId>
57
<artifactId>ncWMS</artifactId>
6-
<version>2.4.2</version>
8+
<version>2.5.0</version>
79

810
<properties>
911
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
10-
<gwt.version>2.7.0</gwt.version>
12+
<gwt.version>2.8.2</gwt.version>
1113
<winstone.version>0.9.10</winstone.version>
12-
<edal.version>1.4.2</edal.version>
14+
<edal.version>1.5.0</edal.version>
1315
<resc.url>http://www.met.reading.ac.uk/resc/home/</resc.url>
1416
</properties>
1517

@@ -32,7 +34,8 @@
3234
full details).</comments>
3335
</license>
3436
</licenses>
35-
<!-- groupId, developers and build sections are all inherited by child modules -->
37+
<!-- groupId, developers and build sections are all inherited by child
38+
modules -->
3639
<developers>
3740
<developer>
3841
<name>Guy Griffiths</name>
@@ -63,6 +66,18 @@
6366
<artifactId>edal-godiva</artifactId>
6467
<version>${edal.version}</version>
6568
</dependency>
69+
<dependency>
70+
<groupId>com.google.gwt</groupId>
71+
<artifactId>gwt-dev</artifactId>
72+
<version>${gwt.version}</version>
73+
<scope>provided</scope>
74+
<exclusions>
75+
<exclusion>
76+
<groupId>xml-apis</groupId>
77+
<artifactId>xml-apis</artifactId>
78+
</exclusion>
79+
</exclusions>
80+
</dependency>
6681
<dependency>
6782
<groupId>com.google.gwt</groupId>
6883
<artifactId>gwt-user</artifactId>
@@ -104,6 +119,12 @@
104119
<groupId>com.google.gwt</groupId>
105120
<artifactId>gwt-codeserver</artifactId>
106121
<version>${gwt.version}</version>
122+
<exclusions>
123+
<exclusion>
124+
<groupId>com.google.gwt</groupId>
125+
<artifactId>gwt-dev</artifactId>
126+
</exclusion>
127+
</exclusions>
107128
<scope>provided</scope>
108129
</dependency>
109130
<dependency>
@@ -123,21 +144,6 @@
123144
<build>
124145
<finalName>ncWMS2</finalName>
125146
<plugins>
126-
<plugin>
127-
<groupId>org.codehaus.mojo</groupId>
128-
<artifactId>gwt-maven-plugin</artifactId>
129-
<version>${gwt.version}</version>
130-
<executions>
131-
<execution>
132-
<goals>
133-
<goal>compile</goal>
134-
</goals>
135-
</execution>
136-
</executions>
137-
<configuration>
138-
<inplace>true</inplace>
139-
</configuration>
140-
</plugin>
141147
<plugin>
142148
<artifactId>maven-war-plugin</artifactId>
143149
<version>2.2</version>
@@ -162,21 +168,23 @@
162168
<configuration>
163169
<cmdLineOptions>
164170
<property>
165-
<!-- This gives no-password access to the admin interface, which is what we want when running as a local standalone application -->
171+
<!-- This gives no-password access to the admin
172+
interface, which is what we want when running as a local standalone application -->
166173
<name>realmClassName</name>
167174
<value>uk.ac.rdg.resc.edal.ncwms.StandaloneAuthentication</value>
168175
</property>
169176
</cmdLineOptions>
170177
</configuration>
171178
</plugin>
172179
<plugin>
173-
<!-- Sets the source version to 1.7 -->
180+
<!-- Sets the source version to Java 11 -->
174181
<artifactId>maven-compiler-plugin</artifactId>
175182
<configuration>
176-
<source>1.8</source>
177-
<target>1.8</target>
183+
<source>11</source>
184+
<target>11</target>
185+
<strict>true</strict>
178186
</configuration>
179-
<version>2.5.1</version>
187+
<version>3.8.1</version>
180188
</plugin>
181189
<plugin>
182190
<groupId>org.sonatype.plugins</groupId>
@@ -202,14 +210,17 @@
202210
<!-- Create aggregated javadoc for all modules -->
203211
<groupId>org.apache.maven.plugins</groupId>
204212
<artifactId>maven-javadoc-plugin</artifactId>
205-
<version>2.10.3</version>
213+
<version>3.2.0</version>
206214
<configuration>
207-
<!-- Output the apidocs to the base directory. These are ignored in .gitignore for most branches, but NOT in the gh-pages branch. This makes documentation deployment very simple -->
215+
<!-- Output the apidocs to the base directory. These
216+
are ignored in .gitignore for most branches, but NOT in the gh-pages branch.
217+
This makes documentation deployment very simple -->
208218
<reportOutputDirectory>${project.basedir}</reportOutputDirectory>
209219
</configuration>
210220
</plugin>
211221
<plugin>
212-
<!-- On package, generate an image containing all of the palettes for the documentation -->
222+
<!-- On package, generate an image containing all of the
223+
palettes for the documentation -->
213224
<groupId>org.codehaus.mojo</groupId>
214225
<artifactId>exec-maven-plugin</artifactId>
215226
<version>1.5.0</version>
@@ -237,6 +248,16 @@
237248
</dependency>
238249
</dependencies>
239250
</plugin>
251+
<plugin>
252+
<groupId>net.ltgt.gwt.maven</groupId>
253+
<artifactId>gwt-maven-plugin</artifactId>
254+
<version>1.0.0</version>
255+
<extensions>true</extensions>
256+
<configuration>
257+
<moduleName>uk.ac.rdg.resc.edal.ncwms.Godiva3</moduleName>
258+
<webappDirectory>src/main/webapp</webappDirectory>
259+
</configuration>
260+
</plugin>
240261
</plugins>
241262
<resources>
242263
<resource>
@@ -291,7 +312,7 @@
291312
<plugin>
292313
<groupId>org.apache.maven.plugins</groupId>
293314
<artifactId>maven-javadoc-plugin</artifactId>
294-
<version>2.10.1</version>
315+
<version>3.2.0</version>
295316
<executions>
296317
<execution>
297318
<id>attach-javadocs</id>
@@ -365,7 +386,10 @@
365386
<version>2.10.3</version>
366387
<configuration>
367388
<goal>javadoc:aggregate</goal>
368-
<!-- These links really belong in the child POMs but if we put them there, they don't seem to get picked up when building the javadoc for the aggregated project. Therefore if the versions of any of the dependencies change these links will also have to be updated. -->
389+
<!-- These links really belong in the child POMs but
390+
if we put them there, they don't seem to get picked up when building the
391+
javadoc for the aggregated project. Therefore if the versions of any of the
392+
dependencies change these links will also have to be updated. -->
369393
<links>
370394
<link>http://java.sun.com/j2se/1.6.0/docs/api/</link>
371395
<link>http://joda-time.sourceforge.net/api-2.0/</link>

‎src/main/java/uk/ac/rdg/resc/edal/ncwms/NcwmsAdminServlet.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,10 @@ private void updateConfig(HttpServletRequest request, HttpServletResponse respon
532532
boolean queryable = request
533533
.getParameter("dynamicService." + ds.getAlias() + ".queryable") != null;
534534
ds.setQueryable(queryable);
535+
536+
boolean downloadable = request
537+
.getParameter("dynamicService." + ds.getAlias() + ".downloadable") != null;
538+
ds.setDownloadable(downloadable);
535539

536540
String newDataReaderClass = request
537541
.getParameter("dynamicService." + ds.getAlias() + ".reader");
@@ -724,10 +728,6 @@ private void addDataset(HttpServletRequest request, HttpServletResponse response
724728
datasetOK = false;
725729
message = "Dataset with ID " + id + " already exists";
726730
}
727-
if (CdmUtils.expandGlobExpression(location).size() < 1) {
728-
datasetOK = false;
729-
message = "Location: " + location + " doesn't refer to any existing files";
730-
}
731731
try {
732732
if (!dataReader.isEmpty()) {
733733
Class.forName(dataReader);

0 commit comments

Comments
 (0)