From 00b46cfdf89d91376b75a7f9bbb696dfcf67ddb8 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 16 Dec 2022 15:29:02 +0100 Subject: [PATCH] [Major] Updated to jakarta and version 2.0.x, renamed modules --- {strolch-plc-core => plc-core}/README.md | 0 {strolch-plc-core => plc-core}/pom.xml | 15 +- .../strolch/plc/core/DefaultPlcHandler.java | 0 .../strolch/plc/core/GlobalPlcListener.java | 0 .../plc/core/NoPlcServiceInitializer.java | 0 .../li/strolch/plc/core/PlcConfigurator.java | 0 .../java/li/strolch/plc/core/PlcHandler.java | 0 .../strolch/plc/core/PlcPostInitializer.java | 0 .../java/li/strolch/plc/core/PlcService.java | 0 .../plc/core/PlcServiceInitializer.java | 0 .../li/strolch/plc/core/hw/DefaultPlc.java | 0 .../main/java/li/strolch/plc/core/hw/Plc.java | 0 .../li/strolch/plc/core/hw/PlcConnection.java | 0 .../hw/PlcConnectionStateChangeListener.java | 0 .../li/strolch/plc/core/hw/PlcListener.java | 0 .../DataLogicScannerConnection.java | 0 .../hw/connections/LoggerOutConnection.java | 0 .../connections/RandomStringConnection.java | 0 .../hw/connections/SimplePlcConnection.java | 0 .../plc/core/hw/gpio/PlcGpioController.java | 0 .../hw/gpio/RaspiBcmGpioInputConnection.java | 0 .../hw/gpio/RaspiBcmGpioOutputConnection.java | 0 .../plc/core/hw/i2c/LoggingI2cDevice.java | 0 .../hw/i2c/Multi8BitI2cOutputConnection.java | 0 .../core/hw/i2c/PCF8574InputConnection.java | 0 .../core/hw/i2c/PCF8574OutputConnection.java | 0 .../plc/core/hw/i2c/RSL366OverHorterI2c.java | 0 .../core/hw/i2c/TCA9534OutputConnection.java | 0 .../plc/core/search/PlcConnectionSearch.java | 0 .../core/search/PlcLogicalDeviceSearch.java | 0 .../service/SendPlcAddressActionService.java | 0 .../service/SetPlcConnectionStateService.java | 0 .../plc/core/service/SetPlcStateService.java | 0 .../plc/ExamplePlcConveyorPlcService.java | 0 .../resources/componentVersion.properties | 0 .../li/strolch/plc/core/PlcHandlerTest.java | 0 .../hw/DataLogicScannerConnectionTest.java | 0 .../java/li/strolch/plc/core/hw/PlcTest.java | 0 .../core/hw/i2c/RSL366OverHorterI2cTest.java | 0 .../plc/core/test/StartupPlcService.java | 0 .../core/test/TestPlcServiceInitializer.java | 0 .../plc/core/test/TogglePlcService.java | 0 .../src/test/resources/logback.xml | 0 .../test-runtime/config/PrivilegeConfig.xml | 0 .../test-runtime/config/PrivilegeRoles.xml | 0 .../test-runtime/config/PrivilegeUsers.xml | 0 .../config/StrolchConfiguration.xml | 0 .../test-runtime/config/StrolchPolicies.xml | 0 .../test-runtime/data/defaultModel.xml | 0 .../resources/test-runtime/temp/.gitignore | 0 .../pom.xml | 27 ++-- .../plc/gw/client/PlcGwClientHandler.java | 0 .../resources/componentVersion.properties | 0 .../pom.xml | 34 +++-- .../gw/server/PlcAddressResponseListener.java | 0 .../PlcAddressResponseValueListener.java | 0 .../gw/server/PlcConnectionStateListener.java | 0 .../plc/gw/server/PlcGwServerHandler.java | 0 .../strolch/plc/gw/server/PlcGwService.java | 0 .../strolch/plc/gw/server/PlcGwSrvI18n.java | 0 .../gw/server/PlcNotificationListener.java | 0 .../gw/server/PlcServerWebSocketEndpoint.java | 0 .../plc/gw/server/PlcStateHandler.java | 0 .../plc/gw/server/ReadStatePlcGwService.java | 0 .../policy/execution/PlcExecutionPolicy.java | 0 .../service/SendPlcTelegramCommand.java | 0 .../service/SendPlcTelegramService.java | 0 .../resources/componentVersion.properties | 0 .../strolch-plc-gw-server.properties | 0 .../strolch-plc-gw-server_de.properties | 0 .../strolch-plc-gw-server_fr.properties | 0 {strolch-plc-model => plc-model}/pom.xml | 10 +- .../li/strolch/plc/model/ConnectionState.java | 0 .../li/strolch/plc/model/ModelHelper.java | 0 .../java/li/strolch/plc/model/PlcAddress.java | 0 .../li/strolch/plc/model/PlcAddressKey.java | 0 .../strolch/plc/model/PlcAddressResponse.java | 0 .../li/strolch/plc/model/PlcAddressType.java | 0 .../plc/model/PlcAddressValueResponse.java | 0 .../li/strolch/plc/model/PlcConstants.java | 0 .../li/strolch/plc/model/PlcResponse.java | 0 .../strolch/plc/model/PlcResponseState.java | 0 .../li/strolch/plc/model/PlcServiceState.java | 0 .../java/li/strolch/plc/model/PlcState.java | 0 .../resources/componentVersion.properties | 0 {strolch-plc-rest => plc-rest}/pom.xml | 18 +-- .../li/strolch/plc/rest/PlcAddresses.java | 0 .../plc/rest/PlcConnectionsResource.java | 0 .../plc/rest/PlcLogicalDevicesResource.java | 0 .../li/strolch/plc/rest/PlcModelVisitor.java | 0 .../java/li/strolch/plc/rest/PlcResource.java | 0 .../plc/rest/ws/PlcWebSocketClient.java | 0 .../rest/ws/PlcWebSocketObserverHandler.java | 0 .../plc/rest/ws/WebSocketEndpoint.java | 0 .../resources/componentVersion.properties | 0 {strolch-plc-util => plc-util}/pom.xml | 13 +- .../plc/core/util/PlcAddressGenerator.java | 0 .../core/util/PlcAddressGeneratorTest.java | 0 pom.xml | 133 +++++++++--------- strolch-plc-bom/pom.xml | 14 +- 100 files changed, 134 insertions(+), 130 deletions(-) rename {strolch-plc-core => plc-core}/README.md (100%) rename {strolch-plc-core => plc-core}/pom.xml (89%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/DefaultPlcHandler.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/GlobalPlcListener.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/NoPlcServiceInitializer.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/PlcConfigurator.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/PlcHandler.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/PlcPostInitializer.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/PlcService.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/PlcServiceInitializer.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/DefaultPlc.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/Plc.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/PlcConnection.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/PlcConnectionStateChangeListener.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/PlcListener.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/connections/DataLogicScannerConnection.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/connections/LoggerOutConnection.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/connections/RandomStringConnection.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/connections/SimplePlcConnection.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/gpio/PlcGpioController.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/gpio/RaspiBcmGpioInputConnection.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/gpio/RaspiBcmGpioOutputConnection.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/i2c/LoggingI2cDevice.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/i2c/Multi8BitI2cOutputConnection.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/i2c/PCF8574InputConnection.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/i2c/PCF8574OutputConnection.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/i2c/RSL366OverHorterI2c.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/hw/i2c/TCA9534OutputConnection.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/search/PlcConnectionSearch.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/search/PlcLogicalDeviceSearch.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/service/SendPlcAddressActionService.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/service/SetPlcConnectionStateService.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/service/SetPlcStateService.java (100%) rename {strolch-plc-core => plc-core}/src/main/java/li/strolch/plc/core/service/plc/ExamplePlcConveyorPlcService.java (100%) rename {strolch-plc-core => plc-core}/src/main/resources/componentVersion.properties (100%) rename {strolch-plc-core => plc-core}/src/test/java/li/strolch/plc/core/PlcHandlerTest.java (100%) rename {strolch-plc-core => plc-core}/src/test/java/li/strolch/plc/core/hw/DataLogicScannerConnectionTest.java (100%) rename {strolch-plc-core => plc-core}/src/test/java/li/strolch/plc/core/hw/PlcTest.java (100%) rename {strolch-plc-core => plc-core}/src/test/java/li/strolch/plc/core/hw/i2c/RSL366OverHorterI2cTest.java (100%) rename {strolch-plc-core => plc-core}/src/test/java/li/strolch/plc/core/test/StartupPlcService.java (100%) rename {strolch-plc-core => plc-core}/src/test/java/li/strolch/plc/core/test/TestPlcServiceInitializer.java (100%) rename {strolch-plc-core => plc-core}/src/test/java/li/strolch/plc/core/test/TogglePlcService.java (100%) rename {strolch-plc-core => plc-core}/src/test/resources/logback.xml (100%) rename {strolch-plc-core => plc-core}/src/test/resources/test-runtime/config/PrivilegeConfig.xml (100%) rename {strolch-plc-core => plc-core}/src/test/resources/test-runtime/config/PrivilegeRoles.xml (100%) rename {strolch-plc-core => plc-core}/src/test/resources/test-runtime/config/PrivilegeUsers.xml (100%) rename {strolch-plc-core => plc-core}/src/test/resources/test-runtime/config/StrolchConfiguration.xml (100%) rename {strolch-plc-core => plc-core}/src/test/resources/test-runtime/config/StrolchPolicies.xml (100%) rename {strolch-plc-core => plc-core}/src/test/resources/test-runtime/data/defaultModel.xml (100%) rename {strolch-plc-core => plc-core}/src/test/resources/test-runtime/temp/.gitignore (100%) rename {strolch-plc-gw-client => plc-gw-client}/pom.xml (90%) rename {strolch-plc-gw-client => plc-gw-client}/src/main/java/li/strolch/plc/gw/client/PlcGwClientHandler.java (100%) rename {strolch-plc-gw-client => plc-gw-client}/src/main/resources/componentVersion.properties (100%) rename {strolch-plc-gw-server => plc-gw-server}/pom.xml (88%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/java/li/strolch/plc/gw/server/PlcAddressResponseListener.java (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/java/li/strolch/plc/gw/server/PlcAddressResponseValueListener.java (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/java/li/strolch/plc/gw/server/PlcConnectionStateListener.java (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/java/li/strolch/plc/gw/server/PlcGwServerHandler.java (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/java/li/strolch/plc/gw/server/PlcGwService.java (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/java/li/strolch/plc/gw/server/PlcGwSrvI18n.java (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/java/li/strolch/plc/gw/server/PlcNotificationListener.java (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/java/li/strolch/plc/gw/server/PlcServerWebSocketEndpoint.java (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/java/li/strolch/plc/gw/server/PlcStateHandler.java (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/java/li/strolch/plc/gw/server/ReadStatePlcGwService.java (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/java/li/strolch/plc/gw/server/policy/execution/PlcExecutionPolicy.java (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/java/li/strolch/plc/gw/server/service/SendPlcTelegramCommand.java (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/java/li/strolch/plc/gw/server/service/SendPlcTelegramService.java (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/resources/componentVersion.properties (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/resources/strolch-plc-gw-server.properties (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/resources/strolch-plc-gw-server_de.properties (100%) rename {strolch-plc-gw-server => plc-gw-server}/src/main/resources/strolch-plc-gw-server_fr.properties (100%) rename {strolch-plc-model => plc-model}/pom.xml (91%) rename {strolch-plc-model => plc-model}/src/main/java/li/strolch/plc/model/ConnectionState.java (100%) rename {strolch-plc-model => plc-model}/src/main/java/li/strolch/plc/model/ModelHelper.java (100%) rename {strolch-plc-model => plc-model}/src/main/java/li/strolch/plc/model/PlcAddress.java (100%) rename {strolch-plc-model => plc-model}/src/main/java/li/strolch/plc/model/PlcAddressKey.java (100%) rename {strolch-plc-model => plc-model}/src/main/java/li/strolch/plc/model/PlcAddressResponse.java (100%) rename {strolch-plc-model => plc-model}/src/main/java/li/strolch/plc/model/PlcAddressType.java (100%) rename {strolch-plc-model => plc-model}/src/main/java/li/strolch/plc/model/PlcAddressValueResponse.java (100%) rename {strolch-plc-model => plc-model}/src/main/java/li/strolch/plc/model/PlcConstants.java (100%) rename {strolch-plc-model => plc-model}/src/main/java/li/strolch/plc/model/PlcResponse.java (100%) rename {strolch-plc-model => plc-model}/src/main/java/li/strolch/plc/model/PlcResponseState.java (100%) rename {strolch-plc-model => plc-model}/src/main/java/li/strolch/plc/model/PlcServiceState.java (100%) rename {strolch-plc-model => plc-model}/src/main/java/li/strolch/plc/model/PlcState.java (100%) rename {strolch-plc-model => plc-model}/src/main/resources/componentVersion.properties (100%) rename {strolch-plc-rest => plc-rest}/pom.xml (90%) rename {strolch-plc-rest => plc-rest}/src/main/java/li/strolch/plc/rest/PlcAddresses.java (100%) rename {strolch-plc-rest => plc-rest}/src/main/java/li/strolch/plc/rest/PlcConnectionsResource.java (100%) rename {strolch-plc-rest => plc-rest}/src/main/java/li/strolch/plc/rest/PlcLogicalDevicesResource.java (100%) rename {strolch-plc-rest => plc-rest}/src/main/java/li/strolch/plc/rest/PlcModelVisitor.java (100%) rename {strolch-plc-rest => plc-rest}/src/main/java/li/strolch/plc/rest/PlcResource.java (100%) rename {strolch-plc-rest => plc-rest}/src/main/java/li/strolch/plc/rest/ws/PlcWebSocketClient.java (100%) rename {strolch-plc-rest => plc-rest}/src/main/java/li/strolch/plc/rest/ws/PlcWebSocketObserverHandler.java (100%) rename {strolch-plc-rest => plc-rest}/src/main/java/li/strolch/plc/rest/ws/WebSocketEndpoint.java (100%) rename {strolch-plc-rest => plc-rest}/src/main/resources/componentVersion.properties (100%) rename {strolch-plc-util => plc-util}/pom.xml (90%) rename {strolch-plc-util => plc-util}/src/main/java/li/strolch/plc/core/util/PlcAddressGenerator.java (100%) rename {strolch-plc-util => plc-util}/src/test/java/li/strolch/plc/core/util/PlcAddressGeneratorTest.java (100%) diff --git a/strolch-plc-core/README.md b/plc-core/README.md similarity index 100% rename from strolch-plc-core/README.md rename to plc-core/README.md diff --git a/strolch-plc-core/pom.xml b/plc-core/pom.xml similarity index 89% rename from strolch-plc-core/pom.xml rename to plc-core/pom.xml index 90953e1..3cb0725 100644 --- a/strolch-plc-core/pom.xml +++ b/plc-core/pom.xml @@ -41,29 +41,30 @@ li.strolch - li.strolch.utils + utils li.strolch - li.strolch.model + model li.strolch - li.strolch.agent + agent li.strolch - li.strolch.service + service li.strolch - li.strolch.rest + web-rest li.strolch - strolch-plc-model + plc-model + ${project.version} @@ -86,7 +87,7 @@ li.strolch - li.strolch.testbase + test-base diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/DefaultPlcHandler.java b/plc-core/src/main/java/li/strolch/plc/core/DefaultPlcHandler.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/DefaultPlcHandler.java rename to plc-core/src/main/java/li/strolch/plc/core/DefaultPlcHandler.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/GlobalPlcListener.java b/plc-core/src/main/java/li/strolch/plc/core/GlobalPlcListener.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/GlobalPlcListener.java rename to plc-core/src/main/java/li/strolch/plc/core/GlobalPlcListener.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/NoPlcServiceInitializer.java b/plc-core/src/main/java/li/strolch/plc/core/NoPlcServiceInitializer.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/NoPlcServiceInitializer.java rename to plc-core/src/main/java/li/strolch/plc/core/NoPlcServiceInitializer.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/PlcConfigurator.java b/plc-core/src/main/java/li/strolch/plc/core/PlcConfigurator.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/PlcConfigurator.java rename to plc-core/src/main/java/li/strolch/plc/core/PlcConfigurator.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/PlcHandler.java b/plc-core/src/main/java/li/strolch/plc/core/PlcHandler.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/PlcHandler.java rename to plc-core/src/main/java/li/strolch/plc/core/PlcHandler.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/PlcPostInitializer.java b/plc-core/src/main/java/li/strolch/plc/core/PlcPostInitializer.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/PlcPostInitializer.java rename to plc-core/src/main/java/li/strolch/plc/core/PlcPostInitializer.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/PlcService.java b/plc-core/src/main/java/li/strolch/plc/core/PlcService.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/PlcService.java rename to plc-core/src/main/java/li/strolch/plc/core/PlcService.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/PlcServiceInitializer.java b/plc-core/src/main/java/li/strolch/plc/core/PlcServiceInitializer.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/PlcServiceInitializer.java rename to plc-core/src/main/java/li/strolch/plc/core/PlcServiceInitializer.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/DefaultPlc.java b/plc-core/src/main/java/li/strolch/plc/core/hw/DefaultPlc.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/DefaultPlc.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/DefaultPlc.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/Plc.java b/plc-core/src/main/java/li/strolch/plc/core/hw/Plc.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/Plc.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/Plc.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/PlcConnection.java b/plc-core/src/main/java/li/strolch/plc/core/hw/PlcConnection.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/PlcConnection.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/PlcConnection.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/PlcConnectionStateChangeListener.java b/plc-core/src/main/java/li/strolch/plc/core/hw/PlcConnectionStateChangeListener.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/PlcConnectionStateChangeListener.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/PlcConnectionStateChangeListener.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/PlcListener.java b/plc-core/src/main/java/li/strolch/plc/core/hw/PlcListener.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/PlcListener.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/PlcListener.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/connections/DataLogicScannerConnection.java b/plc-core/src/main/java/li/strolch/plc/core/hw/connections/DataLogicScannerConnection.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/connections/DataLogicScannerConnection.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/connections/DataLogicScannerConnection.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/connections/LoggerOutConnection.java b/plc-core/src/main/java/li/strolch/plc/core/hw/connections/LoggerOutConnection.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/connections/LoggerOutConnection.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/connections/LoggerOutConnection.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/connections/RandomStringConnection.java b/plc-core/src/main/java/li/strolch/plc/core/hw/connections/RandomStringConnection.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/connections/RandomStringConnection.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/connections/RandomStringConnection.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/connections/SimplePlcConnection.java b/plc-core/src/main/java/li/strolch/plc/core/hw/connections/SimplePlcConnection.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/connections/SimplePlcConnection.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/connections/SimplePlcConnection.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/gpio/PlcGpioController.java b/plc-core/src/main/java/li/strolch/plc/core/hw/gpio/PlcGpioController.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/gpio/PlcGpioController.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/gpio/PlcGpioController.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/gpio/RaspiBcmGpioInputConnection.java b/plc-core/src/main/java/li/strolch/plc/core/hw/gpio/RaspiBcmGpioInputConnection.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/gpio/RaspiBcmGpioInputConnection.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/gpio/RaspiBcmGpioInputConnection.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/gpio/RaspiBcmGpioOutputConnection.java b/plc-core/src/main/java/li/strolch/plc/core/hw/gpio/RaspiBcmGpioOutputConnection.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/gpio/RaspiBcmGpioOutputConnection.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/gpio/RaspiBcmGpioOutputConnection.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/i2c/LoggingI2cDevice.java b/plc-core/src/main/java/li/strolch/plc/core/hw/i2c/LoggingI2cDevice.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/i2c/LoggingI2cDevice.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/i2c/LoggingI2cDevice.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/i2c/Multi8BitI2cOutputConnection.java b/plc-core/src/main/java/li/strolch/plc/core/hw/i2c/Multi8BitI2cOutputConnection.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/i2c/Multi8BitI2cOutputConnection.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/i2c/Multi8BitI2cOutputConnection.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/i2c/PCF8574InputConnection.java b/plc-core/src/main/java/li/strolch/plc/core/hw/i2c/PCF8574InputConnection.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/i2c/PCF8574InputConnection.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/i2c/PCF8574InputConnection.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/i2c/PCF8574OutputConnection.java b/plc-core/src/main/java/li/strolch/plc/core/hw/i2c/PCF8574OutputConnection.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/i2c/PCF8574OutputConnection.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/i2c/PCF8574OutputConnection.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/i2c/RSL366OverHorterI2c.java b/plc-core/src/main/java/li/strolch/plc/core/hw/i2c/RSL366OverHorterI2c.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/i2c/RSL366OverHorterI2c.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/i2c/RSL366OverHorterI2c.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/hw/i2c/TCA9534OutputConnection.java b/plc-core/src/main/java/li/strolch/plc/core/hw/i2c/TCA9534OutputConnection.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/hw/i2c/TCA9534OutputConnection.java rename to plc-core/src/main/java/li/strolch/plc/core/hw/i2c/TCA9534OutputConnection.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/search/PlcConnectionSearch.java b/plc-core/src/main/java/li/strolch/plc/core/search/PlcConnectionSearch.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/search/PlcConnectionSearch.java rename to plc-core/src/main/java/li/strolch/plc/core/search/PlcConnectionSearch.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/search/PlcLogicalDeviceSearch.java b/plc-core/src/main/java/li/strolch/plc/core/search/PlcLogicalDeviceSearch.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/search/PlcLogicalDeviceSearch.java rename to plc-core/src/main/java/li/strolch/plc/core/search/PlcLogicalDeviceSearch.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/service/SendPlcAddressActionService.java b/plc-core/src/main/java/li/strolch/plc/core/service/SendPlcAddressActionService.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/service/SendPlcAddressActionService.java rename to plc-core/src/main/java/li/strolch/plc/core/service/SendPlcAddressActionService.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/service/SetPlcConnectionStateService.java b/plc-core/src/main/java/li/strolch/plc/core/service/SetPlcConnectionStateService.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/service/SetPlcConnectionStateService.java rename to plc-core/src/main/java/li/strolch/plc/core/service/SetPlcConnectionStateService.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/service/SetPlcStateService.java b/plc-core/src/main/java/li/strolch/plc/core/service/SetPlcStateService.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/service/SetPlcStateService.java rename to plc-core/src/main/java/li/strolch/plc/core/service/SetPlcStateService.java diff --git a/strolch-plc-core/src/main/java/li/strolch/plc/core/service/plc/ExamplePlcConveyorPlcService.java b/plc-core/src/main/java/li/strolch/plc/core/service/plc/ExamplePlcConveyorPlcService.java similarity index 100% rename from strolch-plc-core/src/main/java/li/strolch/plc/core/service/plc/ExamplePlcConveyorPlcService.java rename to plc-core/src/main/java/li/strolch/plc/core/service/plc/ExamplePlcConveyorPlcService.java diff --git a/strolch-plc-core/src/main/resources/componentVersion.properties b/plc-core/src/main/resources/componentVersion.properties similarity index 100% rename from strolch-plc-core/src/main/resources/componentVersion.properties rename to plc-core/src/main/resources/componentVersion.properties diff --git a/strolch-plc-core/src/test/java/li/strolch/plc/core/PlcHandlerTest.java b/plc-core/src/test/java/li/strolch/plc/core/PlcHandlerTest.java similarity index 100% rename from strolch-plc-core/src/test/java/li/strolch/plc/core/PlcHandlerTest.java rename to plc-core/src/test/java/li/strolch/plc/core/PlcHandlerTest.java diff --git a/strolch-plc-core/src/test/java/li/strolch/plc/core/hw/DataLogicScannerConnectionTest.java b/plc-core/src/test/java/li/strolch/plc/core/hw/DataLogicScannerConnectionTest.java similarity index 100% rename from strolch-plc-core/src/test/java/li/strolch/plc/core/hw/DataLogicScannerConnectionTest.java rename to plc-core/src/test/java/li/strolch/plc/core/hw/DataLogicScannerConnectionTest.java diff --git a/strolch-plc-core/src/test/java/li/strolch/plc/core/hw/PlcTest.java b/plc-core/src/test/java/li/strolch/plc/core/hw/PlcTest.java similarity index 100% rename from strolch-plc-core/src/test/java/li/strolch/plc/core/hw/PlcTest.java rename to plc-core/src/test/java/li/strolch/plc/core/hw/PlcTest.java diff --git a/strolch-plc-core/src/test/java/li/strolch/plc/core/hw/i2c/RSL366OverHorterI2cTest.java b/plc-core/src/test/java/li/strolch/plc/core/hw/i2c/RSL366OverHorterI2cTest.java similarity index 100% rename from strolch-plc-core/src/test/java/li/strolch/plc/core/hw/i2c/RSL366OverHorterI2cTest.java rename to plc-core/src/test/java/li/strolch/plc/core/hw/i2c/RSL366OverHorterI2cTest.java diff --git a/strolch-plc-core/src/test/java/li/strolch/plc/core/test/StartupPlcService.java b/plc-core/src/test/java/li/strolch/plc/core/test/StartupPlcService.java similarity index 100% rename from strolch-plc-core/src/test/java/li/strolch/plc/core/test/StartupPlcService.java rename to plc-core/src/test/java/li/strolch/plc/core/test/StartupPlcService.java diff --git a/strolch-plc-core/src/test/java/li/strolch/plc/core/test/TestPlcServiceInitializer.java b/plc-core/src/test/java/li/strolch/plc/core/test/TestPlcServiceInitializer.java similarity index 100% rename from strolch-plc-core/src/test/java/li/strolch/plc/core/test/TestPlcServiceInitializer.java rename to plc-core/src/test/java/li/strolch/plc/core/test/TestPlcServiceInitializer.java diff --git a/strolch-plc-core/src/test/java/li/strolch/plc/core/test/TogglePlcService.java b/plc-core/src/test/java/li/strolch/plc/core/test/TogglePlcService.java similarity index 100% rename from strolch-plc-core/src/test/java/li/strolch/plc/core/test/TogglePlcService.java rename to plc-core/src/test/java/li/strolch/plc/core/test/TogglePlcService.java diff --git a/strolch-plc-core/src/test/resources/logback.xml b/plc-core/src/test/resources/logback.xml similarity index 100% rename from strolch-plc-core/src/test/resources/logback.xml rename to plc-core/src/test/resources/logback.xml diff --git a/strolch-plc-core/src/test/resources/test-runtime/config/PrivilegeConfig.xml b/plc-core/src/test/resources/test-runtime/config/PrivilegeConfig.xml similarity index 100% rename from strolch-plc-core/src/test/resources/test-runtime/config/PrivilegeConfig.xml rename to plc-core/src/test/resources/test-runtime/config/PrivilegeConfig.xml diff --git a/strolch-plc-core/src/test/resources/test-runtime/config/PrivilegeRoles.xml b/plc-core/src/test/resources/test-runtime/config/PrivilegeRoles.xml similarity index 100% rename from strolch-plc-core/src/test/resources/test-runtime/config/PrivilegeRoles.xml rename to plc-core/src/test/resources/test-runtime/config/PrivilegeRoles.xml diff --git a/strolch-plc-core/src/test/resources/test-runtime/config/PrivilegeUsers.xml b/plc-core/src/test/resources/test-runtime/config/PrivilegeUsers.xml similarity index 100% rename from strolch-plc-core/src/test/resources/test-runtime/config/PrivilegeUsers.xml rename to plc-core/src/test/resources/test-runtime/config/PrivilegeUsers.xml diff --git a/strolch-plc-core/src/test/resources/test-runtime/config/StrolchConfiguration.xml b/plc-core/src/test/resources/test-runtime/config/StrolchConfiguration.xml similarity index 100% rename from strolch-plc-core/src/test/resources/test-runtime/config/StrolchConfiguration.xml rename to plc-core/src/test/resources/test-runtime/config/StrolchConfiguration.xml diff --git a/strolch-plc-core/src/test/resources/test-runtime/config/StrolchPolicies.xml b/plc-core/src/test/resources/test-runtime/config/StrolchPolicies.xml similarity index 100% rename from strolch-plc-core/src/test/resources/test-runtime/config/StrolchPolicies.xml rename to plc-core/src/test/resources/test-runtime/config/StrolchPolicies.xml diff --git a/strolch-plc-core/src/test/resources/test-runtime/data/defaultModel.xml b/plc-core/src/test/resources/test-runtime/data/defaultModel.xml similarity index 100% rename from strolch-plc-core/src/test/resources/test-runtime/data/defaultModel.xml rename to plc-core/src/test/resources/test-runtime/data/defaultModel.xml diff --git a/strolch-plc-core/src/test/resources/test-runtime/temp/.gitignore b/plc-core/src/test/resources/test-runtime/temp/.gitignore similarity index 100% rename from strolch-plc-core/src/test/resources/test-runtime/temp/.gitignore rename to plc-core/src/test/resources/test-runtime/temp/.gitignore diff --git a/strolch-plc-gw-client/pom.xml b/plc-gw-client/pom.xml similarity index 90% rename from strolch-plc-gw-client/pom.xml rename to plc-gw-client/pom.xml index 9749a48..5ad128f 100644 --- a/strolch-plc-gw-client/pom.xml +++ b/plc-gw-client/pom.xml @@ -7,11 +7,11 @@ strolch-plc li.strolch - 1.2.0-SNAPSHOT + 2.0.0-SNAPSHOT ../pom.xml - strolch-plc-gw-client + plc-gw-client strolch-plc-gw-client jar https://github.com/4treesCH/strolch-plc @@ -42,27 +42,33 @@ li.strolch - li.strolch.utils + utils li.strolch - li.strolch.model + model li.strolch - li.strolch.agent + agent li.strolch - li.strolch.service + service li.strolch - li.strolch.rest + web-rest li.strolch - li.strolch.websocket + websocket + + + + + li.strolch + plc-core @@ -71,11 +77,6 @@ gson - - - li.strolch - strolch-plc-core - diff --git a/strolch-plc-gw-client/src/main/java/li/strolch/plc/gw/client/PlcGwClientHandler.java b/plc-gw-client/src/main/java/li/strolch/plc/gw/client/PlcGwClientHandler.java similarity index 100% rename from strolch-plc-gw-client/src/main/java/li/strolch/plc/gw/client/PlcGwClientHandler.java rename to plc-gw-client/src/main/java/li/strolch/plc/gw/client/PlcGwClientHandler.java diff --git a/strolch-plc-gw-client/src/main/resources/componentVersion.properties b/plc-gw-client/src/main/resources/componentVersion.properties similarity index 100% rename from strolch-plc-gw-client/src/main/resources/componentVersion.properties rename to plc-gw-client/src/main/resources/componentVersion.properties diff --git a/strolch-plc-gw-server/pom.xml b/plc-gw-server/pom.xml similarity index 88% rename from strolch-plc-gw-server/pom.xml rename to plc-gw-server/pom.xml index 8e4e257..385d8eb 100644 --- a/strolch-plc-gw-server/pom.xml +++ b/plc-gw-server/pom.xml @@ -7,11 +7,11 @@ strolch-plc li.strolch - 1.2.0-SNAPSHOT + 2.0.0-SNAPSHOT ../pom.xml - strolch-plc-gw-server + plc-gw-server strolch-plc-gw-client jar https://github.com/4treesCH/strolch-plc @@ -42,33 +42,27 @@ li.strolch - li.strolch.utils + utils li.strolch - li.strolch.model + model li.strolch - li.strolch.agent + agent li.strolch - li.strolch.service + service li.strolch - li.strolch.rest + web-rest li.strolch - li.strolch.websocket - - - - - li.strolch - strolch-plc-model + websocket @@ -77,6 +71,16 @@ gson + + + li.strolch + plc-model + + + li.strolch + strolch-plc-core + + jakarta.annotation @@ -109,6 +113,8 @@ org.glassfish.jersey.inject jersey-hk2 + + diff --git a/strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcAddressResponseListener.java b/plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcAddressResponseListener.java similarity index 100% rename from strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcAddressResponseListener.java rename to plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcAddressResponseListener.java diff --git a/strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcAddressResponseValueListener.java b/plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcAddressResponseValueListener.java similarity index 100% rename from strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcAddressResponseValueListener.java rename to plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcAddressResponseValueListener.java diff --git a/strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcConnectionStateListener.java b/plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcConnectionStateListener.java similarity index 100% rename from strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcConnectionStateListener.java rename to plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcConnectionStateListener.java diff --git a/strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwServerHandler.java b/plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwServerHandler.java similarity index 100% rename from strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwServerHandler.java rename to plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwServerHandler.java diff --git a/strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwService.java b/plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwService.java similarity index 100% rename from strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwService.java rename to plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwService.java diff --git a/strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwSrvI18n.java b/plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwSrvI18n.java similarity index 100% rename from strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwSrvI18n.java rename to plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwSrvI18n.java diff --git a/strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcNotificationListener.java b/plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcNotificationListener.java similarity index 100% rename from strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcNotificationListener.java rename to plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcNotificationListener.java diff --git a/strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcServerWebSocketEndpoint.java b/plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcServerWebSocketEndpoint.java similarity index 100% rename from strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcServerWebSocketEndpoint.java rename to plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcServerWebSocketEndpoint.java diff --git a/strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcStateHandler.java b/plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcStateHandler.java similarity index 100% rename from strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcStateHandler.java rename to plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcStateHandler.java diff --git a/strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/ReadStatePlcGwService.java b/plc-gw-server/src/main/java/li/strolch/plc/gw/server/ReadStatePlcGwService.java similarity index 100% rename from strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/ReadStatePlcGwService.java rename to plc-gw-server/src/main/java/li/strolch/plc/gw/server/ReadStatePlcGwService.java diff --git a/strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/policy/execution/PlcExecutionPolicy.java b/plc-gw-server/src/main/java/li/strolch/plc/gw/server/policy/execution/PlcExecutionPolicy.java similarity index 100% rename from strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/policy/execution/PlcExecutionPolicy.java rename to plc-gw-server/src/main/java/li/strolch/plc/gw/server/policy/execution/PlcExecutionPolicy.java diff --git a/strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/service/SendPlcTelegramCommand.java b/plc-gw-server/src/main/java/li/strolch/plc/gw/server/service/SendPlcTelegramCommand.java similarity index 100% rename from strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/service/SendPlcTelegramCommand.java rename to plc-gw-server/src/main/java/li/strolch/plc/gw/server/service/SendPlcTelegramCommand.java diff --git a/strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/service/SendPlcTelegramService.java b/plc-gw-server/src/main/java/li/strolch/plc/gw/server/service/SendPlcTelegramService.java similarity index 100% rename from strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/service/SendPlcTelegramService.java rename to plc-gw-server/src/main/java/li/strolch/plc/gw/server/service/SendPlcTelegramService.java diff --git a/strolch-plc-gw-server/src/main/resources/componentVersion.properties b/plc-gw-server/src/main/resources/componentVersion.properties similarity index 100% rename from strolch-plc-gw-server/src/main/resources/componentVersion.properties rename to plc-gw-server/src/main/resources/componentVersion.properties diff --git a/strolch-plc-gw-server/src/main/resources/strolch-plc-gw-server.properties b/plc-gw-server/src/main/resources/strolch-plc-gw-server.properties similarity index 100% rename from strolch-plc-gw-server/src/main/resources/strolch-plc-gw-server.properties rename to plc-gw-server/src/main/resources/strolch-plc-gw-server.properties diff --git a/strolch-plc-gw-server/src/main/resources/strolch-plc-gw-server_de.properties b/plc-gw-server/src/main/resources/strolch-plc-gw-server_de.properties similarity index 100% rename from strolch-plc-gw-server/src/main/resources/strolch-plc-gw-server_de.properties rename to plc-gw-server/src/main/resources/strolch-plc-gw-server_de.properties diff --git a/strolch-plc-gw-server/src/main/resources/strolch-plc-gw-server_fr.properties b/plc-gw-server/src/main/resources/strolch-plc-gw-server_fr.properties similarity index 100% rename from strolch-plc-gw-server/src/main/resources/strolch-plc-gw-server_fr.properties rename to plc-gw-server/src/main/resources/strolch-plc-gw-server_fr.properties diff --git a/strolch-plc-model/pom.xml b/plc-model/pom.xml similarity index 91% rename from strolch-plc-model/pom.xml rename to plc-model/pom.xml index 01636f5..011c5b1 100644 --- a/strolch-plc-model/pom.xml +++ b/plc-model/pom.xml @@ -6,11 +6,11 @@ strolch-plc li.strolch - 1.2.0-SNAPSHOT + 2.0.0-SNAPSHOT ../pom.xml - strolch-plc-model + plc-model strolch-plc-model jar https://github.com/4treesCH/strolch-plc @@ -40,11 +40,11 @@ li.strolch - li.strolch.utils + utils li.strolch - li.strolch.model + model @@ -61,7 +61,7 @@ li.strolch - li.strolch.testbase + test-base diff --git a/strolch-plc-model/src/main/java/li/strolch/plc/model/ConnectionState.java b/plc-model/src/main/java/li/strolch/plc/model/ConnectionState.java similarity index 100% rename from strolch-plc-model/src/main/java/li/strolch/plc/model/ConnectionState.java rename to plc-model/src/main/java/li/strolch/plc/model/ConnectionState.java diff --git a/strolch-plc-model/src/main/java/li/strolch/plc/model/ModelHelper.java b/plc-model/src/main/java/li/strolch/plc/model/ModelHelper.java similarity index 100% rename from strolch-plc-model/src/main/java/li/strolch/plc/model/ModelHelper.java rename to plc-model/src/main/java/li/strolch/plc/model/ModelHelper.java diff --git a/strolch-plc-model/src/main/java/li/strolch/plc/model/PlcAddress.java b/plc-model/src/main/java/li/strolch/plc/model/PlcAddress.java similarity index 100% rename from strolch-plc-model/src/main/java/li/strolch/plc/model/PlcAddress.java rename to plc-model/src/main/java/li/strolch/plc/model/PlcAddress.java diff --git a/strolch-plc-model/src/main/java/li/strolch/plc/model/PlcAddressKey.java b/plc-model/src/main/java/li/strolch/plc/model/PlcAddressKey.java similarity index 100% rename from strolch-plc-model/src/main/java/li/strolch/plc/model/PlcAddressKey.java rename to plc-model/src/main/java/li/strolch/plc/model/PlcAddressKey.java diff --git a/strolch-plc-model/src/main/java/li/strolch/plc/model/PlcAddressResponse.java b/plc-model/src/main/java/li/strolch/plc/model/PlcAddressResponse.java similarity index 100% rename from strolch-plc-model/src/main/java/li/strolch/plc/model/PlcAddressResponse.java rename to plc-model/src/main/java/li/strolch/plc/model/PlcAddressResponse.java diff --git a/strolch-plc-model/src/main/java/li/strolch/plc/model/PlcAddressType.java b/plc-model/src/main/java/li/strolch/plc/model/PlcAddressType.java similarity index 100% rename from strolch-plc-model/src/main/java/li/strolch/plc/model/PlcAddressType.java rename to plc-model/src/main/java/li/strolch/plc/model/PlcAddressType.java diff --git a/strolch-plc-model/src/main/java/li/strolch/plc/model/PlcAddressValueResponse.java b/plc-model/src/main/java/li/strolch/plc/model/PlcAddressValueResponse.java similarity index 100% rename from strolch-plc-model/src/main/java/li/strolch/plc/model/PlcAddressValueResponse.java rename to plc-model/src/main/java/li/strolch/plc/model/PlcAddressValueResponse.java diff --git a/strolch-plc-model/src/main/java/li/strolch/plc/model/PlcConstants.java b/plc-model/src/main/java/li/strolch/plc/model/PlcConstants.java similarity index 100% rename from strolch-plc-model/src/main/java/li/strolch/plc/model/PlcConstants.java rename to plc-model/src/main/java/li/strolch/plc/model/PlcConstants.java diff --git a/strolch-plc-model/src/main/java/li/strolch/plc/model/PlcResponse.java b/plc-model/src/main/java/li/strolch/plc/model/PlcResponse.java similarity index 100% rename from strolch-plc-model/src/main/java/li/strolch/plc/model/PlcResponse.java rename to plc-model/src/main/java/li/strolch/plc/model/PlcResponse.java diff --git a/strolch-plc-model/src/main/java/li/strolch/plc/model/PlcResponseState.java b/plc-model/src/main/java/li/strolch/plc/model/PlcResponseState.java similarity index 100% rename from strolch-plc-model/src/main/java/li/strolch/plc/model/PlcResponseState.java rename to plc-model/src/main/java/li/strolch/plc/model/PlcResponseState.java diff --git a/strolch-plc-model/src/main/java/li/strolch/plc/model/PlcServiceState.java b/plc-model/src/main/java/li/strolch/plc/model/PlcServiceState.java similarity index 100% rename from strolch-plc-model/src/main/java/li/strolch/plc/model/PlcServiceState.java rename to plc-model/src/main/java/li/strolch/plc/model/PlcServiceState.java diff --git a/strolch-plc-model/src/main/java/li/strolch/plc/model/PlcState.java b/plc-model/src/main/java/li/strolch/plc/model/PlcState.java similarity index 100% rename from strolch-plc-model/src/main/java/li/strolch/plc/model/PlcState.java rename to plc-model/src/main/java/li/strolch/plc/model/PlcState.java diff --git a/strolch-plc-model/src/main/resources/componentVersion.properties b/plc-model/src/main/resources/componentVersion.properties similarity index 100% rename from strolch-plc-model/src/main/resources/componentVersion.properties rename to plc-model/src/main/resources/componentVersion.properties diff --git a/strolch-plc-rest/pom.xml b/plc-rest/pom.xml similarity index 90% rename from strolch-plc-rest/pom.xml rename to plc-rest/pom.xml index 8a22ada..e5f6fd9 100644 --- a/strolch-plc-rest/pom.xml +++ b/plc-rest/pom.xml @@ -7,11 +7,11 @@ li.strolch strolch-plc - 1.2.0-SNAPSHOT + 2.0.0-SNAPSHOT ../pom.xml - strolch-plc-rest + plc-rest strolch-plc-rest jar https://github.com/4treesCH/strolch-plc @@ -42,27 +42,27 @@ li.strolch - li.strolch.utils + utils li.strolch - li.strolch.model + model li.strolch - li.strolch.agent + agent li.strolch - li.strolch.service + service li.strolch - li.strolch.rest + web-rest li.strolch - li.strolch.websocket + websocket @@ -74,7 +74,7 @@ li.strolch - strolch-plc-core + plc-core diff --git a/strolch-plc-rest/src/main/java/li/strolch/plc/rest/PlcAddresses.java b/plc-rest/src/main/java/li/strolch/plc/rest/PlcAddresses.java similarity index 100% rename from strolch-plc-rest/src/main/java/li/strolch/plc/rest/PlcAddresses.java rename to plc-rest/src/main/java/li/strolch/plc/rest/PlcAddresses.java diff --git a/strolch-plc-rest/src/main/java/li/strolch/plc/rest/PlcConnectionsResource.java b/plc-rest/src/main/java/li/strolch/plc/rest/PlcConnectionsResource.java similarity index 100% rename from strolch-plc-rest/src/main/java/li/strolch/plc/rest/PlcConnectionsResource.java rename to plc-rest/src/main/java/li/strolch/plc/rest/PlcConnectionsResource.java diff --git a/strolch-plc-rest/src/main/java/li/strolch/plc/rest/PlcLogicalDevicesResource.java b/plc-rest/src/main/java/li/strolch/plc/rest/PlcLogicalDevicesResource.java similarity index 100% rename from strolch-plc-rest/src/main/java/li/strolch/plc/rest/PlcLogicalDevicesResource.java rename to plc-rest/src/main/java/li/strolch/plc/rest/PlcLogicalDevicesResource.java diff --git a/strolch-plc-rest/src/main/java/li/strolch/plc/rest/PlcModelVisitor.java b/plc-rest/src/main/java/li/strolch/plc/rest/PlcModelVisitor.java similarity index 100% rename from strolch-plc-rest/src/main/java/li/strolch/plc/rest/PlcModelVisitor.java rename to plc-rest/src/main/java/li/strolch/plc/rest/PlcModelVisitor.java diff --git a/strolch-plc-rest/src/main/java/li/strolch/plc/rest/PlcResource.java b/plc-rest/src/main/java/li/strolch/plc/rest/PlcResource.java similarity index 100% rename from strolch-plc-rest/src/main/java/li/strolch/plc/rest/PlcResource.java rename to plc-rest/src/main/java/li/strolch/plc/rest/PlcResource.java diff --git a/strolch-plc-rest/src/main/java/li/strolch/plc/rest/ws/PlcWebSocketClient.java b/plc-rest/src/main/java/li/strolch/plc/rest/ws/PlcWebSocketClient.java similarity index 100% rename from strolch-plc-rest/src/main/java/li/strolch/plc/rest/ws/PlcWebSocketClient.java rename to plc-rest/src/main/java/li/strolch/plc/rest/ws/PlcWebSocketClient.java diff --git a/strolch-plc-rest/src/main/java/li/strolch/plc/rest/ws/PlcWebSocketObserverHandler.java b/plc-rest/src/main/java/li/strolch/plc/rest/ws/PlcWebSocketObserverHandler.java similarity index 100% rename from strolch-plc-rest/src/main/java/li/strolch/plc/rest/ws/PlcWebSocketObserverHandler.java rename to plc-rest/src/main/java/li/strolch/plc/rest/ws/PlcWebSocketObserverHandler.java diff --git a/strolch-plc-rest/src/main/java/li/strolch/plc/rest/ws/WebSocketEndpoint.java b/plc-rest/src/main/java/li/strolch/plc/rest/ws/WebSocketEndpoint.java similarity index 100% rename from strolch-plc-rest/src/main/java/li/strolch/plc/rest/ws/WebSocketEndpoint.java rename to plc-rest/src/main/java/li/strolch/plc/rest/ws/WebSocketEndpoint.java diff --git a/strolch-plc-rest/src/main/resources/componentVersion.properties b/plc-rest/src/main/resources/componentVersion.properties similarity index 100% rename from strolch-plc-rest/src/main/resources/componentVersion.properties rename to plc-rest/src/main/resources/componentVersion.properties diff --git a/strolch-plc-util/pom.xml b/plc-util/pom.xml similarity index 90% rename from strolch-plc-util/pom.xml rename to plc-util/pom.xml index 853cb01..028834f 100644 --- a/strolch-plc-util/pom.xml +++ b/plc-util/pom.xml @@ -7,11 +7,11 @@ li.strolch strolch-plc - 1.2.0-SNAPSHOT + 2.0.0-SNAPSHOT ../pom.xml - strolch-plc-util + plc-util strolch-plc-util jar https://github.com/4treesCH/strolch-plc @@ -41,17 +41,18 @@ li.strolch - li.strolch.utils + utils li.strolch - li.strolch.model + model li.strolch - strolch-plc-model + plc-model + ${project.version} @@ -72,7 +73,7 @@ li.strolch - li.strolch.testbase + test-base diff --git a/strolch-plc-util/src/main/java/li/strolch/plc/core/util/PlcAddressGenerator.java b/plc-util/src/main/java/li/strolch/plc/core/util/PlcAddressGenerator.java similarity index 100% rename from strolch-plc-util/src/main/java/li/strolch/plc/core/util/PlcAddressGenerator.java rename to plc-util/src/main/java/li/strolch/plc/core/util/PlcAddressGenerator.java diff --git a/strolch-plc-util/src/test/java/li/strolch/plc/core/util/PlcAddressGeneratorTest.java b/plc-util/src/test/java/li/strolch/plc/core/util/PlcAddressGeneratorTest.java similarity index 100% rename from strolch-plc-util/src/test/java/li/strolch/plc/core/util/PlcAddressGeneratorTest.java rename to plc-util/src/test/java/li/strolch/plc/core/util/PlcAddressGeneratorTest.java diff --git a/pom.xml b/pom.xml index 3ede60f..8c564f3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ li.strolch strolch-plc - 1.2.0-SNAPSHOT + 2.0.0-SNAPSHOT strolch-plc Module build to build strolch-plc @@ -63,6 +63,12 @@ 2.0.5 1.4.5 2.10 + 5.0.1 + 42.5.1 + 4.9.3 + 1.6.2 + 1.9.0 + 1.6.2 4.0.0 2.1.1 @@ -79,7 +85,7 @@ 17.0.1 - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT 4.13.2 @@ -119,12 +125,12 @@ strolch-plc-bom - strolch-plc-model - strolch-plc-util - strolch-plc-core - strolch-plc-rest - strolch-plc-gw-client - strolch-plc-gw-server + plc-model + plc-util + plc-core + plc-rest + plc-gw-client + plc-gw-server @@ -151,7 +157,7 @@ li.strolch - li.strolch.bom + strolch-bom ${strolch.version} pom import @@ -160,27 +166,27 @@ li.strolch - strolch-plc-model + plc-model ${project.version} li.strolch - strolch-plc-core + plc-core ${project.version} li.strolch - strolch-plc-rest + plc-rest ${project.version} li.strolch - strolch-plc-gw-client + plc-gw-client ${project.version} li.strolch - strolch-plc-gw-server + plc-gw-server ${project.version} @@ -198,83 +204,72 @@ ${jserialcomm.version} - + - jakarta.xml.bind - jakarta.xml.bind-api - ${jakarta.xml.bind-api.version} + com.sun.xml.bind + jaxb-core + ${jaxb.core.version} - jakarta.annotation - jakarta.annotation-api - ${jakarta.annotation.version} + com.sun.xml.bind + jaxb-impl + ${jaxb.impl.version} - jakarta.activation - jakarta.activation-api - ${jakarta.activation.version} + javax.xml.bind + jaxb-api + ${jaxb.api.version} - jakarta.servlet - jakarta.servlet-api - ${jakarta.servlet-api.version} + javax.xml + jaxp-api + ${jaxp.version} - jakarta.ws.rs - jakarta.ws.rs-api - ${jakarta.ws.rs-api.version} + javax.servlet + javax.servlet-api + ${serverlet.version} + provided - org.glassfish.jersey.containers - jersey-container-servlet + javax.ws.rs + javax.ws.rs-api + ${jaxrs.api.version} + + + org.glassfish.jersey.bundles + jaxrs-ri + ${jaxrs.ri.version} + + + org.glassfish.jersey + jersey-bom ${jersey.version} + pom + import - org.glassfish.jersey.containers - jersey-container-grizzly2-servlet - ${jersey.version} + org.glassfish.tyrus + tyrus-client + ${tyrus.version} - - org.glassfish.jersey.inject - jersey-hk2 - ${jersey.version} - - - org.glassfish.jersey.test-framework - jersey-test-framework-core - ${jersey.version} - test - - - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-external - ${jersey.version} - test - - - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-grizzly2 - ${jersey.version} - test - - - org.glassfish.tyrus tyrus-container-grizzly-client - ${tyrus-container-grizzly-client.version} + ${tyrus.version} + + + org.glassfish.grizzly + grizzly-framework + ${grizzly.version} - jakarta.websocket - jakarta.websocket-client-api - ${jakarta.websocket.version} - - - jakarta.websocket - jakarta.websocket-api - ${jakarta.websocket.version} + javax.websocket + javax.websocket-api + ${websocket.version} + provided diff --git a/strolch-plc-bom/pom.xml b/strolch-plc-bom/pom.xml index 5ca2ba8..58015fe 100644 --- a/strolch-plc-bom/pom.xml +++ b/strolch-plc-bom/pom.xml @@ -6,7 +6,7 @@ li.strolch strolch-plc - 1.2.0-SNAPSHOT + 2.0.0-SNAPSHOT ../pom.xml @@ -21,7 +21,7 @@ li.strolch - li.strolch.bom + strolch-bom pom ${strolch.version} import @@ -30,27 +30,27 @@ li.strolch - strolch-plc-core + plc-core ${project.version} li.strolch - strolch-plc-rest + plc-rest ${project.version} li.strolch - strolch-plc-gw-client + plc-gw-client ${project.version} li.strolch - strolch-plc-gw-server + plc-gw-server ${project.version} li.strolch - strolch-plc-util + plc-util ${project.version}