Skip to content

Commit

Permalink
Implemented a CrossOriginFilter for the Jetty embedded server
Browse files Browse the repository at this point in the history
  • Loading branch information
point85 committed Oct 22, 2024
1 parent d41254c commit 4f8ab03
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 16 deletions.
3 changes: 3 additions & 0 deletions Release Notes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -333,4 +333,7 @@ Note that version 3.2.0 has the following schema changes:
- Updated WebSocket to 1.5.7
- Updated JavaFX to 17.0.12

(46) 3.11.1, October 21, 2024:
- Implemented a CrossOriginFilter for the Jetty embedded server

Please send comments and suggestions to [email protected].
6 changes: 3 additions & 3 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<project name="oee-apps" default="build-distro" basedir="." >

<!-- distribution archive -->
<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"/>
<property name="app_version" value="3.11.1"/>
<property name="domain.jar" value="oee-domain-3.11.1.jar"/>
<property name="collector.jar" value="oee-collector-3.11.1.jar"/>

<!-- folders -->
<property name="fxbuild.dir" value="fxbuild"/>
Expand Down
Binary file modified docs/Point85 OEE Getting Started Guide.pdf
Binary file not shown.
Binary file modified docs/Point85 OEE Getting Started Guide.tmdx
Binary file not shown.
Binary file modified docs/Point85 OEE User Guide.pdf
Binary file not shown.
Binary file modified docs/Point85 OEE User Guide.tmdx
Binary file not shown.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

<groupId>org.point85</groupId>
<artifactId>oee-apps</artifactId>
<version>3.11.0</version>
<version>3.11.1</version>
<packaging>jar</packaging>

<name>Point85 OEE JavaFX Applications</name>
<url>https://github.com/point85</url>

<properties>
<domain.version>3.11.0</domain.version>
<domain.version>3.11.1</domain.version>
<maven.compiler.release>11</maven.compiler.release>
<javafx.version>17.0.12</javafx.version>
<javafx.maven.plugin.version>0.0.8</javafx.maven.plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion run-collector-app.bat
Original file line number Diff line number Diff line change
@@ -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.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
start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.11.1.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
2 changes: 1 addition & 1 deletion run-collector-app.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Launch the Collector application (args: JDBC connection string, user name, password and optional collector name)
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
java -cp ./oee-apps-3.11.1.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
2 changes: 1 addition & 1 deletion run-designer-app-debug.bat
Original file line number Diff line number Diff line change
@@ -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.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
java.exe -Xdebug -Xrunjdwp:transport=dt_socket,address=8998,server=y -cp ./oee-apps-3.11.1.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
2 changes: 1 addition & 1 deletion run-designer-app.bat
Original file line number Diff line number Diff line change
@@ -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.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
start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.11.1.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

2 changes: 1 addition & 1 deletion run-designer-app.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Launch the Designer application (args: JDBC connection string, user name, password and optional collector name)
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
java -cp ./oee-apps-3.11.1.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
2 changes: 1 addition & 1 deletion run-monitor-app.bat
Original file line number Diff line number Diff line change
@@ -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.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
start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.11.1.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
2 changes: 1 addition & 1 deletion run-monitor-app.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Launch the Monitor application (args: JDBC connection string, user name, password and optional collector name)
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
java -cp ./oee-apps-3.11.1.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
2 changes: 1 addition & 1 deletion run-operator-app.bat
Original file line number Diff line number Diff line change
@@ -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.11.0.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.1.jar OPERATOR jdbc:hsqldb:hsql://localhost/OEE SA
2 changes: 1 addition & 1 deletion run-operator-app.sh
Original file line number Diff line number Diff line change
@@ -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.11.0.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.1.jar OPERATOR jdbc:hsqldb:hsql://localhost/OEE SA
2 changes: 1 addition & 1 deletion run-tester-app.bat
Original file line number Diff line number Diff line change
@@ -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.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
start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.11.1.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
2 changes: 1 addition & 1 deletion run-tester-app.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Launch the Tester application (args: JDBC connection string, user name, password and optional collector name)
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
java -cp ./oee-apps-3.11.1.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

0 comments on commit 4f8ab03

Please sign in to comment.