Allowed an HTTP data source to be configured standalone and not assoc…

…iated with a resolver for use by external applications

Enhanced the restore functionality to allow finer object-level control
Fixed return type of PersistenceService executeQuery() and executeNativeQuery() methods
Updated Milo to version 0.6.12
Updated Hibernate to version 5.6.15.Final
Updated Jetty to version 9.4.54.v20240208
Updated Jackson to version 2.16.1
Updated WebSocket to version 1.5.6
Updated log4j2 to version 2.23.0
Updated MySQL driver to version 8.3.0
Updated PostgreSQL driver to 42.7.2

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.2 is a maintenance release. Please see the Release Notes.txt file for release history and additional details.
+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.
 
 ## 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

@@ -304,7 +304,20 @@ Note that version 3.2.0 has the following schema changes:
     - Fixed work schedule editor issue when saving a schedule.	
 	- Documented an MQTT example for the Arduino R4
 
-(42) 3.10.2, January 16, 2024:	
+(43) 3.10.2, January 16, 2024:	
     - Fixed an event resolver issue when the reason input and output values are different.	
+
+(44) 3.10.3, March 1, 2024:	
+    - Allowed an HTTP data source to be configured standalone and not associated with a resolver for use by external applications
+	- Enhanced the restore functionality to allow finer object-level control 
+	- Fixed return type of PersistenceService executeQuery() and executeNativeQuery() methods
+	- Updated Milo to version 0.6.12
+	- Updated Hibernate to version 5.6.15.Final
+	- Updated Jetty to version 9.4.54.v20240208
+	- Updated Jackson to version 2.16.1
+	- Updated WebSocket to version 1.5.6
+	- Updated log4j2 to version 2.23.0
+	- Updated MySQL driver to version 8.3.0
+	- Updated PostgreSQL driver to 42.7.2
 
 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.2"/>
-	<property name="domain.jar" value="oee-domain-3.10.2.jar"/>
-	<property name="collector.jar" value="oee-collector-3.10.2.jar"/>
+	<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"/>
 
 	<!-- folders -->
 	<property name="fxbuild.dir" value="fxbuild"/>

pom.xml

@@ -4,19 +4,19 @@
 
   <groupId>org.point85</groupId>
   <artifactId>oee-apps</artifactId>
-  <version>3.10.2</version>
+  <version>3.10.3</version>
   <packaging>jar</packaging>
 
   <name>Point85 OEE JavaFX Applications</name>
   <url>https://github.com/point85</url>
 
   <properties>
-  	<domain.version>3.10.2</domain.version>    
+  	<domain.version>3.10.3</domain.version>    
     <maven.compiler.release>11</maven.compiler.release>
     <javafx.version>17.0.9</javafx.version>
     <javafx.maven.plugin.version>0.0.8</javafx.maven.plugin.version>
-    <jetty.version>9.4.53.v20231009</jetty.version>
-    <log4j2.version>2.21.1</log4j2.version>
+    <jetty.version>9.4.54.v20240208</jetty.version>
+    <log4j2.version>2.23.0</log4j2.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -47,7 +47,7 @@
 <dependency>
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-hikaricp</artifactId>
-    <version>5.6.14.Final</version>
+    <version>5.6.15.Final</version>
 </dependency>
 
 <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
@@ -98,7 +98,7 @@
 <dependency>
     <groupId>com.mysql</groupId>
     <artifactId>mysql-connector-j</artifactId>
-    <version>8.1.0</version>
+    <version>8.3.0</version>
 </dependency>
 
 
@@ -107,7 +107,7 @@
 <dependency>
     <groupId>org.postgresql</groupId>
     <artifactId>postgresql</artifactId>
-    <version>42.6.0</version>
+    <version>42.7.2</version>
 </dependency>
 
 <!-- HSQLDB DATABASE -->

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.2.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.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 

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.2.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.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  

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.2.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.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

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.2.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.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 
 

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.2.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.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

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.2.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.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  

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.2.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.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  

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.2.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.10.3.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.2.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.10.3.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.2.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.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 

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.2.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.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  

src/main/java/org/point85/app/http/HttpServerController.java

@@ -23,6 +23,7 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
+import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.PasswordField;
@@ -44,6 +45,9 @@ public class HttpServerController extends DesignerDialogController {
 	@FXML
 	private TextField tfHttpsPort;
 
+	@FXML
+	private CheckBox ckStandalone;
+
 	@FXML
 	private ComboBox<HttpSource> cbDataSources;
 
@@ -142,6 +146,7 @@ private void onSelectDataSource() {
 			String httpsPort = dataSource.getHttpsPort() != null ? String.valueOf(dataSource.getHttpsPort()) : "";
 			this.tfHttpsPort.setText(httpsPort);
 			this.tfDescription.setText(dataSource.getDescription());
+			this.ckStandalone.setSelected(dataSource.isStandalone());
 
 			this.tfOAuthClientId.setText(dataSource.getClientId());
 			this.tfOAuthClientSecret.setText(dataSource.getClientSecret());
@@ -188,6 +193,7 @@ private void onNewDataSource() {
 			this.tfOAuthClientSecret.clear();
 			this.tfOAuthUserName.clear();
 			this.pfOAuthPassword.clear();
+			this.ckStandalone.setSelected(false);
 
 			this.setSource(null);
 		} catch (Exception e) {
@@ -231,6 +237,7 @@ private void onSaveDataSource() {
 			eventSource.setPort(getPort());
 			eventSource.setHttpsPort(getHttpsPort());
 			eventSource.setDescription(getDescription());
+			eventSource.setStandalone(isStandalone());
 
 			// OAuth
 			eventSource.setClientId(getOAuthClientId());
@@ -287,6 +294,10 @@ private Integer getHttpsPort() {
 		return (text != null && text.length() > 0) ? Integer.parseInt(text) : null;
 	}
 
+	private boolean isStandalone() {
+		return ckStandalone.isSelected();
+	}
+
 	private String getDescription() {
 		return this.tfDescription.getText();
 	}

src/main/java/org/point85/app/reason/ReasonEditorController.java

@@ -466,11 +466,8 @@ private void onDeleteReason() {
 			TreeItem<ReasonNode> parentNode = reasonItem.getParent();
 			parentNode.getChildren().remove(reasonItem);
 
-			// clear fields
-			onNewReason();
-			tvReasons.getSelectionModel().clearSelection();
-
-			tvReasons.refresh();
+			// refresh all
+			onRefreshAllReasons();
 			parentNode.setExpanded(true);
 
 		} catch (Exception e) {

src/main/resources/fxml/EquipmentResolver.fxml

@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<AnchorPane xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.point85.app.designer.EquipmentResolverController">
+<AnchorPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.point85.app.designer.EquipmentResolverController">
    <children>
       <GridPane hgap="10.0" layoutX="5.0" layoutY="14.0" vgap="5.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="14.0">
         <columnConstraints>

src/main/resources/fxml/HttpServer.fxml

@@ -2,6 +2,7 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.PasswordField?>
@@ -13,7 +14,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.point85.app.http.HttpServerController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.point85.app.http.HttpServerController">
    <children>
       <HBox alignment="CENTER" layoutX="10.0" layoutY="10.0" prefHeight="50.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
          <children>
@@ -37,6 +38,7 @@
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
          </rowConstraints>
          <children>
             <Label text="%host" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
@@ -66,6 +68,7 @@
             <Label text="%https.port" GridPane.halignment="RIGHT" GridPane.rowIndex="4" />
             <TextField fx:id="tfHttpsPort" promptText="%enter.https.port" GridPane.columnIndex="1" GridPane.rowIndex="4" />
             <Button fx:id="btBackup" mnemonicParsing="false" onAction="#onBackup" prefWidth="100.0" text="%backup" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+            <CheckBox fx:id="ckStandalone" mnemonicParsing="false" text="%standalone" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowIndex="6" />
          </children>
       </GridPane>
       <TitledPane prefHeight="200.0" prefWidth="200.0" text="OAuth 2.0" AnchorPane.bottomAnchor="50.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="350.0">

src/main/resources/i18n/DesignerLang.properties

@@ -206,6 +206,7 @@ https.port = HTTPS Port
 enter.host = Enter host name or IP address
 enter.port = Enter port
 enter.https.port = Enter HTTPS port
+standalone = Standalone Server
 choose.saved = Choose Saved
 jdbc.conn = JDBC Connection
 conn.string = Enter JDBC connection string