CCT 1.0.4-Milestone1 pre-release changelog:

Added ability to delete 1..N bands from the parameter table and clear the entire table from a right click context menu Added support for loading JSON parameterized input and moved the space delimited formats to the 'legacy' category in the file menu. * See the new schema folder for JsonSchema and example JSON documents! Added output JSON for measured MWs as part of the standard calibration output files. New improvements to the Waveform plot to show additional information: SNR thresholds, windowing details, etc. Map now has its own pop-out window and each tab that can map things shares it. Most tabs that can display useful map information now do so automatically when they are the active window. Experimental support for user-defined WMS layers for the map (documentation TBD). We've add Java 11 support and support for OpenJDK (Hotspot based JVMs only). General project wide version updates to keep up with fixes and improvements. Many miscellaneous small bug fixes.
LLNL · Nov 14, 2018 · adb88cf · adb88cf
1 parent 58ce33b
commit adb88cf
Show file tree

Hide file tree

Showing 636 changed files with 50,421 additions and 24,375 deletions.
diff --git a/README.md b/README.md
@@ -42,18 +42,18 @@ We don't presently deploy versioned artifacts into a public repository like the
 #### **As a single runnable JAR**
 
 ```shell
-java -jar coda-calibration/calibration-standalone/target/calibration-standalone-1.0.3-runnable.jar
+java -jar coda-calibration/calibration-standalone/target/calibration-standalone-1.0.4-runnable.jar
 ```
 
 #### **GUI alone**
 
 ```shell
-java -jar coda-calibration/calibration-gui/target/calibration-gui-1.0.3-runnable.jar
+java -jar coda-calibration/calibration-gui/target/calibration-gui-1.0.4-runnable.jar
 ```
 #### **Calibration REST service alone**
 
 ```shell
-java -jar coda-calibration/calibration-service/application/target/application-1.0.3-runnable.jar
+java -jar coda-calibration/calibration-service/application/target/application-1.0.4-runnable.jar
 ```
 
 #### A note about HTTPS

diff --git a/calibration-gui/.gitignore b/calibration-gui/.gitignore
diff --git a/calibration-gui/pom.xml b/calibration-gui/pom.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
+	<parent>
+		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
+		<artifactId>coda-calibration</artifactId>
+		<version>1.0.4-SNAPSHOT</version>
+	</parent>
+
 	<artifactId>calibration-gui</artifactId>
-	<version>1.0.3</version>
 	<packaging>jar</packaging>
-
 	<name>calibration-gui</name>
 	<url>http://www.llnl.gov</url>
 
@@ -17,11 +21,7 @@
 	</organization>
 
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compile.source>1.8</maven.compile.source>
-		<maven.compile.target>1.8</maven.compile.target>
 		<app.main.class>gov.llnl.gnem.apps.coda.calibration.gui.GuiApplication</app.main.class>
-		<maven.shade.plugin.version>3.0.0</maven.shade.plugin.version>
 	</properties>
 
 	<repositories>
@@ -41,36 +41,22 @@
 		</pluginRepository>
 	</pluginRepositories>
 
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>io.projectreactor</groupId>
-				<artifactId>reactor-bom</artifactId>
-				<version>Bismuth-RELEASE</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter-parent</artifactId>
-				<version>2.0.2.RELEASE</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<dependencies>
 		<dependency>
 			<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 			<artifactId>externals</artifactId>
-			<version>1.0.3</version>
+		</dependency>
+		<dependency>
+			<groupId>gov.llnl.gnem.apps.coda.common</groupId>
+			<artifactId>common-gui</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>gov.llnl.gnem.apps.coda.common</groupId>
+			<artifactId>mapping</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
-			<artifactId>model</artifactId>
-			<version>1.0.3</version>
+			<artifactId>calibration-model</artifactId>
 			<exclusions>
 				<exclusion>
 					<groupId>org.eclipse.persistence</groupId>
@@ -130,8 +116,18 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-params</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -160,17 +156,14 @@
 		<dependency>
 			<groupId>org.glassfish.tyrus.bundles</groupId>
 			<artifactId>tyrus-standalone-client</artifactId>
-			<version>1.13.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
-			<version>1.14</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-math3</artifactId>
-			<version>3.6.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -179,30 +172,66 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>23.0</version>
 		</dependency>
 		<dependency>
 			<groupId>net.jodah</groupId>
 			<artifactId>failsafe</artifactId>
-			<version>1.0.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-junit-jupiter</artifactId>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>gov.llnl.gnem.apps.coda.common</groupId>
+									<artifactId>common-gui</artifactId>
+									<version>${project.version}</version>
+									<includes>**</includes>
+									<excludes>gov/**</excludes>
+								</artifactItem>
+								<artifactItem>
+									<groupId>gov.llnl.gnem.apps.coda.common</groupId>
+									<artifactId>mapping</artifactId>
+									<version>${project.version}</version>
+									<includes>**</includes>
+									<excludes>gov/**</excludes>
+								</artifactItem>
+							</artifactItems>
+							<outputDirectory>${project.build.directory}/classes/</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.6.1</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>${maven.compile.source}</source>
+					<target>${maven.compile.target}</target>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>2.0.2.RELEASE</version>
 				<configuration>
 					<executable>true</executable>
 					<mainClass>${start-class}</mainClass>
@@ -220,7 +249,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.0.2</version>
 				<configuration>
 					<archive>
 						<manifest>

diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/AppProperties.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/AppProperties.java
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2017, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory
+* Copyright (c) 2018, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory
 * CODE-743439.
 * All rights reserved.
 * This file is part of CCT. For details, see https://github.com/LLNL/coda-calibration-tool. 
@@ -14,17 +14,27 @@
 */
 package gov.llnl.gnem.apps.coda.calibration.gui;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
+import gov.llnl.gnem.apps.coda.common.mapping.MapProperties;
+import gov.llnl.gnem.apps.coda.common.mapping.WMSLayerDescriptor;
+
 @Component
+@Configuration
 @ConfigurationProperties("app")
 public class AppProperties {
 
     private String baseTitle = "Coda Calibration";
     private Integer height = 800;
     private Integer width = 600;
     private Boolean debugEnabled = false;
+    private List<WMSLayerDescriptor> wmsLayers = new ArrayList<>();
 
     public Boolean getDebugEnabled() {
         return debugEnabled;
@@ -57,4 +67,17 @@ public Integer getWidth() {
     public void setWidth(Integer width) {
         this.width = width;
     }
+
+    public List<WMSLayerDescriptor> getWmsLayers() {
+        return wmsLayers;
+    }
+
+    public void setWmsLayers(List<WMSLayerDescriptor> wmsLayers) {
+        this.wmsLayers = wmsLayers;
+    }
+
+    @Bean
+    public MapProperties getMapProperties() {
+        return new MapProperties().setLayers(wmsLayers);
+    }
 }