- Added a REST API for materials, reasons, plant entities and equipment.

- Updated Jetty to 9.4.56.v20240826
- Updated Bouncy Castle to 1.78.1
- Updated Milo to 0.6.14
- Updated RabbitMQ to 5.21.0
- Updated ActiveMQ to 5.18.5
- Updated Modbus to 3.2.1
- Updated Kafka to 3.8.0
- Updated Jackson to 2.17.2
- Updated WebSocket to 1.5.7
- Updated JavaFX to 17.0.12

README.md

@@ -130,7 +130,7 @@ The Java Persistence 2.2 API (JPA) as implemented by the Hibernate ORM framework
 Hibernate and JPA abstract-away database specific aspects of inserting, updating, reading and deleting records in the tables.  The API is designed to work with any relational database supported by Hibernate.  
 
 ## What's New
-Version 3.10.3 allows an HTTP data source to be configured standalone, and not associated with a resolver for use by external applications. Please see the Release Notes.txt file for release history and additional details.
+Version 3.11.0 adds a REST API for materials, reasons, plant entities and equipment.  Please see the Release Notes.txt file for release history and additional details.
 
 ## Getting Started
 The desktop applications are packaged in the oee-<version>.zip file in the latest Git release link at https://github.com/point85/OEE-Designer/releases.  Download the oee-<version>.zip file and expand the archive into a folder of your choice.  Next, download the Point85 OEE Getting Started Guide and follow instructions in that document.  Additional information may be found in the Point85 OEE User Guide.

Release Notes.txt

@@ -320,4 +320,17 @@ Note that version 3.2.0 has the following schema changes:
 	- Updated MySQL driver to version 8.3.0
 	- Updated PostgreSQL driver to 42.7.2
 
+(45) 3.11.0, September 20, 2024:	
+	- Added a REST API for materials, reasons, plant entities and equipment.
+	- Updated Jetty to 9.4.56.v20240826
+	- Updated Bouncy Castle to 1.78.1
+	- Updated Milo to 0.6.14
+	- Updated RabbitMQ to 5.21.0
+	- Updated ActiveMQ to 5.18.5
+	- Updated Modbus to 3.2.1
+	- Updated Kafka to 3.8.0
+	- Updated Jackson to 2.17.2
+	- Updated WebSocket to 1.5.7
+	- Updated JavaFX to 17.0.12	
+
 Please send comments and suggestions to [email protected].

build.xml

@@ -2,9 +2,9 @@
 	<project name="oee-apps" default="build-distro" basedir="." > 
 
 	<!-- distribution archive -->
-	<property name="app_version" value="3.10.3"/>
-	<property name="domain.jar" value="oee-domain-3.10.3.jar"/>
-	<property name="collector.jar" value="oee-collector-3.10.3.jar"/>
+	<property name="app_version" value="3.11.0"/>
+	<property name="domain.jar" value="oee-domain-3.11.0.jar"/>
+	<property name="collector.jar" value="oee-collector-3.11.0.jar"/>
 
 	<!-- folders -->
 	<property name="fxbuild.dir" value="fxbuild"/>

pom.xml

@@ -4,18 +4,18 @@
 
   <groupId>org.point85</groupId>
   <artifactId>oee-apps</artifactId>
-  <version>3.10.3</version>
+  <version>3.11.0</version>
   <packaging>jar</packaging>
 
   <name>Point85 OEE JavaFX Applications</name>
   <url>https://github.com/point85</url>
 
   <properties>
-  	<domain.version>3.10.3</domain.version>    
+  	<domain.version>3.11.0</domain.version>    
     <maven.compiler.release>11</maven.compiler.release>
-    <javafx.version>17.0.9</javafx.version>
+    <javafx.version>17.0.12</javafx.version>
     <javafx.maven.plugin.version>0.0.8</javafx.maven.plugin.version>
-    <jetty.version>9.4.54.v20240208</jetty.version>
+    <jetty.version>9.4.56.v20240826</jetty.version>
     <log4j2.version>2.23.0</log4j2.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>

run-collector-app.bat

@@ -1,2 +1,2 @@
 rem Launch the Collector application (args: JDBC connection string, user name, password and optional collector name)
-start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.10.3.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication COLLECTOR jdbc:hsqldb:hsql://localhost/OEE SA 
+start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.11.0.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication COLLECTOR jdbc:hsqldb:hsql://localhost/OEE SA 

run-collector-app.sh

@@ -1,2 +1,2 @@
 # Launch the Collector application (args: JDBC connection string, user name, password and optional collector name)
-java -cp ./oee-apps-3.10.3.jar:lib/*:lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication COLLECTOR jdbc:hsqldb:hsql://localhost/OEE SA  
+java -cp ./oee-apps-3.11.0.jar:lib/*:lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication COLLECTOR jdbc:hsqldb:hsql://localhost/OEE SA  

run-designer-app-debug.bat

@@ -1,2 +1,2 @@
 rem Launch the Designer application (args: JDBC connection string, user name, password and optional collector name)
-java.exe -Xdebug -Xrunjdwp:transport=dt_socket,address=8998,server=y -cp ./oee-apps-3.10.3.jar;lib/*;lib/ext/* -p %JAVAFX_HOME%\lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication DESIGNER jdbc:hsqldb:hsql://localhost/OEE SA
+java.exe -Xdebug -Xrunjdwp:transport=dt_socket,address=8998,server=y -cp ./oee-apps-3.11.0.jar;lib/*;lib/ext/* -p %JAVAFX_HOME%\lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication DESIGNER jdbc:hsqldb:hsql://localhost/OEE SA

run-designer-app.bat

@@ -1,3 +1,3 @@
 rem Launch the Designer application (args: JDBC connection string, user name, password and optional collector name)
-start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.10.3.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication DESIGNER jdbc:hsqldb:hsql://localhost/OEE SA 
+start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.11.0.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication DESIGNER jdbc:hsqldb:hsql://localhost/OEE SA 
 

run-designer-app.sh

@@ -1,2 +1,2 @@
 # Launch the Designer application (args: JDBC connection string, user name, password and optional collector name)
-java -cp ./oee-apps-3.10.3.jar:lib/*:lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication DESIGNER jdbc:hsqldb:hsql://localhost/OEE SA
+java -cp ./oee-apps-3.11.0.jar:lib/*:lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication DESIGNER jdbc:hsqldb:hsql://localhost/OEE SA

run-monitor-app.bat

@@ -1,2 +1,2 @@
 rem Launch the Monitor application (args: JDBC connection string, user name, password and optional collector name)
-start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.10.3.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication MONITOR jdbc:hsqldb:hsql://localhost/OEE SA  
+start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.11.0.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication MONITOR jdbc:hsqldb:hsql://localhost/OEE SA  

run-monitor-app.sh

@@ -1,2 +1,2 @@
 # Launch the Monitor application (args: JDBC connection string, user name, password and optional collector name)
-java -cp ./oee-apps-3.10.3.jar:lib/*:lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication MONITOR jdbc:hsqldb:hsql://localhost/OEE SA  
+java -cp ./oee-apps-3.11.0.jar:lib/*:lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication MONITOR jdbc:hsqldb:hsql://localhost/OEE SA  

run-operator-app.bat

@@ -1,2 +1,2 @@
 rem Launch the Operator application (args: JDBC connection string, user name, password and optional collector name) 
-start "" "%JAVA_HOME%\bin\javaw.exe" -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml -jar oee-apps-3.10.3.jar OPERATOR jdbc:hsqldb:hsql://localhost/OEE SA 
+start "" "%JAVA_HOME%\bin\javaw.exe" -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml -jar oee-apps-3.11.0.jar OPERATOR jdbc:hsqldb:hsql://localhost/OEE SA 

run-operator-app.sh

@@ -1,2 +1,2 @@
 # Launch the Operator application (args: JDBC connection string, user name, password and optional collector name)
-java -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml -jar oee-apps-3.10.3.jar OPERATOR jdbc:hsqldb:hsql://localhost/OEE SA  
+java -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml -jar oee-apps-3.11.0.jar OPERATOR jdbc:hsqldb:hsql://localhost/OEE SA  

run-tester-app.bat

@@ -1,2 +1,2 @@
 rem Launch the Tester application (args: JDBC connection string, user name, password and optional collector name) 
-start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.10.3.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication TESTER jdbc:hsqldb:hsql://localhost/OEE SA 
+start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.11.0.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication TESTER jdbc:hsqldb:hsql://localhost/OEE SA 

run-tester-app.sh

@@ -1,2 +1,2 @@
 # Launch the Tester application (args: JDBC connection string, user name, password and optional collector name)
-java -cp ./oee-apps-3.10.3.jar:lib/*:lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication TESTER jdbc:hsqldb:hsql://localhost/OEE SA  
+java -cp ./oee-apps-3.11.0.jar:lib/*:lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication TESTER jdbc:hsqldb:hsql://localhost/OEE SA  

src/main/java/org/point85/app/MaterialNode.java

@@ -30,7 +30,9 @@ public void setMaterial(Material material) {
 		this.material = material;
 
 		// category could have changed
-		this.category = material.getCategory();
+		if (material != null) {
+			this.category = material.getCategory();
+		}
 	}
 
 	public boolean isMaterial() {

src/main/java/org/point85/app/ReasonNode.java

@@ -19,6 +19,10 @@ public void setReason(Reason reason) {
 
 	@Override
 	public String toString() {
-		return reason.getName() + " (" + reason.getDescription() + ")";
+		String value = "";
+		if (reason != null) {
+			value = reason.getName() + " (" + reason.getDescription() + ")";
+		} 
+		return value;
 	}
 }

src/main/java/org/point85/app/dashboard/DashboardController.java

@@ -1084,7 +1084,7 @@ protected void updateItem(Reason reason, boolean empty) {
 			SimpleObjectProperty<Text> lossProperty = null;
 			Reason reason = event.getReason();
 
-			if (reason != null) {
+			if (reason != null && reason.getLossCategory() != null) {
 				Color color = Color.web(reason.getLossCategory().getColor());
 				Text text = new Text(reason.getLossCategory().toString());
 				text.setFill(color);

src/main/java/org/point85/app/dashboard/SetupEditorController.java

@@ -89,7 +89,7 @@ protected void saveRecord() throws Exception {
 
 			if (newStart.isBefore(lastStart)) {
 				throw new Exception(
-						DesignerLocalizer.instance().getErrorString("start.before.end", newStart, lastStart));
+						DesignerLocalizer.instance().getErrorString("new.start.before.last.start", newStart, lastStart));
 			}
 
 			lastRecord.setEndTime(newStart);

src/main/java/org/point85/app/tester/TesterController.java

@@ -50,7 +50,7 @@
 import org.point85.domain.dto.WorkCellDto;
 import org.point85.domain.email.EmailClient;
 import org.point85.domain.email.EmailSource;
-import org.point85.domain.exim.ExportContent;
+import org.point85.domain.exim.ExportImportContent;
 import org.point85.domain.exim.Importer;
 import org.point85.domain.file.FileEventClient;
 import org.point85.domain.file.FileEventSource;
@@ -372,6 +372,10 @@ private void onSelectSource() {
 		try {
 			// populate source ids for this source type
 			DataSourceType sourceType = cbDataSourceType.getSelectionModel().getSelectedItem();
+
+			if (sourceType == null) {
+				return;
+			}
 			populateSourceIds(sourceType);
 
 			if (sourceType.equals(DataSourceType.HTTP)) {
@@ -1158,7 +1162,7 @@ private HttpOeeClient getHttpClient() throws Exception {
 	protected void getPlantEntities() throws Exception {
 		PlantEntityResponseDto responseDto = getHttpClient().getPlantEntities();
 
-		ExportContent content = responseDto.getContent();
+		ExportImportContent content = responseDto.getContent();
 
 		ttvEntities.getRoot().getChildren().clear();
 

src/main/resources/i18n/DesignerError.properties

@@ -20,6 +20,7 @@ invalid.retention = The retention period must be greater than or equal to zero d
 unsubscribe.failed = Unsubscribe from data source failed with error {0}.
 # AppUtils
 start.before.end = The starting time {0} must be before the ending time {1}.
+new.start.before.last.start = The new starting time {0} must be after the previous starting time {1}.
 both.hours.and.minutes = Both hours and minutes for the start time of day must be specified.
 not.number = {0} is not a number.
 no.values = A test value(s) must entered.