From 9867844fd46a27c196c23efc5f5fb5ec563fd8cc Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Mon, 5 Aug 2024 09:14:42 +0200
Subject: [PATCH] OZG-6239 KOP-2448 Rename xta-test-app to xta-test-server
OZG-6239 KOP-2448 Use correct keyalias
OZG-6239 KOP-2448 pom: Rename to xta serer
OZG-6239 KOP-2448 Move from xoev to ozgcloud package
OZG-6239 KOP-2448 Rename xoev to ozgcloud
OZG-6239 KOP-2448 Rename xta-test-app to xta-test-server
---
build/assembly.xml | 4 +--
build/resources/application-local.yml | 4 +--
doc/bedienungsanleitung.adoc | 4 +--
pom.xml | 10 +++----
soapui/XTA-soapui-project.xml | 2 +-
.../xta/test/app/Application.java | 2 +-
.../config/ClientConnectionProperties.java | 2 +-
.../xta/test/app/config/ClientProperties.java | 2 +-
.../app/config/MapStructConfiguration.java | 2 +-
.../xta/test/app/config/SecurityConfig.java | 2 +-
.../xta/test/app/config/WebServiceConfig.java | 2 +-
.../xta/test/app/config/XTAServer.java | 8 +++---
.../xta/test/app/config/XtaConfig.java | 10 +++----
.../app/config/XtaConfigQualifierType.java | 2 +-
.../app/config/XtaTesterConfiguration.java | 2 +-
.../controller/ExceptionHandlerAdvice.java | 5 ++--
.../app/controller/ManagementController.java | 25 +++++++++---------
.../app/controller/RedirectController.java | 2 +-
.../test/app/controller/ViewController.java | 12 ++++-----
.../exception/CancelScenarioExecution.java | 2 +-
.../app/exception/ConfigurationException.java | 2 +-
.../app/exception/XtaTesterException.java | 2 +-
.../app/model/ContainerCustomization.java | 2 +-
.../test/app/model/CustomResponseEntity.java | 2 +-
.../xta/test/app/model/ExecutionType.java | 2 +-
.../xta/test/app/model/ProtocolMetadata.java | 2 +-
.../xta/test/app/model/ResultMessage.java | 2 +-
.../xta/test/app/model/ResultType.java | 2 +-
.../xta/test/app/model/Role.java | 2 +-
.../xta/test/app/model/RoleType.java | 2 +-
.../test/app/model/ScenarioDefinition.java | 2 +-
.../app/model/ScenarioEventDefinition.java | 2 +-
.../xta/test/app/model/ScenarioEventType.java | 4 +--
.../xta/test/app/model/ScenarioProtocol.java | 2 +-
.../test/app/model/ScenarioProtocolEvent.java | 2 +-
.../model/ScenarioProtocolEventResult.java | 2 +-
.../xta/test/app/model/ScenarioRole.java | 2 +-
.../xta/test/app/model/XtaConfigDto.java | 4 +--
.../xta/test/app/model/XtaConstants.java | 2 +-
.../test/app/model/XtaIdentifierConfig.java | 2 +-
.../xta/test/app/model/XtaProtocol.java | 2 +-
.../test/app/server/ManagementPortImpl.java | 12 ++++-----
.../xta/test/app/server/MsgBoxPortImpl.java | 14 +++++-----
.../xta/test/app/server/SendXtaPortImpl.java | 14 +++++-----
.../service/ClientConfigurationContainer.java | 10 +++----
.../app/service/ConfigurationService.java | 11 ++++----
.../app/service/CustomizationService.java | 8 +++---
.../service/ParameterValidatorService.java | 2 +-
.../xta/test/app/service/ProtocolService.java | 19 ++++++-------
.../service/ScenarioDefinitionComparator.java | 4 +--
.../test/app/service/ScenarioExecutor.java | 11 ++++----
.../xta/test/app/service/ScenarioService.java | 15 ++++++-----
.../xta/test/app/service/XtaClient.java | 10 +++----
.../app/service/XtaConfigDtoConverter.java | 13 +++++----
.../xta/test/app/service/XtaParameter.java | 2 +-
.../ClientProtocolInInterceptor.java | 4 +--
.../ClientProtocolOutInterceptor.java | 6 ++---
.../ServerProtocolFaultOutInterceptor.java | 4 +--
.../ServerProtocolInInterceptor.java | 6 ++---
.../ServerProtocolOutInterceptor.java | 4 +--
.../xta/test/app/util/UtilComponent.java | 10 +++----
.../xta/test/app/util/XtaId.java | 2 +-
.../xta/test/app/util/XtaIdGenerator.java | 2 +-
.../app/util/YamlPropertySourceFactory.java | 2 +-
src/main/resources/application.yml | 6 ++---
src/main/resources/application_second_app.yml | 8 +++---
src/main/resources/banner.txt | 16 +++++------
src/main/resources/configDefault.yaml | 2 +-
src/main/resources/log4j2.xml | 4 +--
...store.p12 => xta-test-server_keystore.p12} | Bin
...ore.jks => xta-test-server_truststore.jks} | Bin
.../xta/test/app/ApplicationTests.java | 2 +-
.../xta/test/app/TestingApplication.java | 2 +-
.../xta/test/app/service/XtaClientTest.java | 12 ++++-----
.../xta/test/app/util/XtaIdGeneratorTest.java | 5 +---
.../xta/test/app/util/XtaIdTest.java | 4 +--
src/test/resources/application.yml | 6 ++---
src/test/resources/configDefaultTest.yaml | 2 +-
78 files changed, 202 insertions(+), 202 deletions(-)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/Application.java (97%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/config/ClientConnectionProperties.java (96%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/config/ClientProperties.java (98%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/config/MapStructConfiguration.java (87%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/config/SecurityConfig.java (98%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/config/WebServiceConfig.java (98%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/config/XTAServer.java (92%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/config/XtaConfig.java (77%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/config/XtaConfigQualifierType.java (95%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/config/XtaTesterConfiguration.java (96%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/controller/ExceptionHandlerAdvice.java (96%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/controller/ManagementController.java (89%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/controller/RedirectController.java (96%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/controller/ViewController.java (94%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/exception/CancelScenarioExecution.java (96%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/exception/ConfigurationException.java (96%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/exception/XtaTesterException.java (96%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/ContainerCustomization.java (97%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/CustomResponseEntity.java (95%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/ExecutionType.java (94%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/ProtocolMetadata.java (97%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/ResultMessage.java (95%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/ResultType.java (96%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/Role.java (94%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/RoleType.java (94%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/ScenarioDefinition.java (98%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/ScenarioEventDefinition.java (97%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/ScenarioEventType.java (96%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/ScenarioProtocol.java (99%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/ScenarioProtocolEvent.java (97%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/ScenarioProtocolEventResult.java (99%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/ScenarioRole.java (97%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/XtaConfigDto.java (70%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/XtaConstants.java (98%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/XtaIdentifierConfig.java (88%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/model/XtaProtocol.java (98%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/server/ManagementPortImpl.java (96%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/server/MsgBoxPortImpl.java (96%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/server/SendXtaPortImpl.java (93%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/ClientConfigurationContainer.java (92%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/ConfigurationService.java (94%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/CustomizationService.java (98%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/ParameterValidatorService.java (99%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/ProtocolService.java (95%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/ScenarioDefinitionComparator.java (93%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/ScenarioExecutor.java (95%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/ScenarioService.java (97%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/XtaClient.java (98%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/XtaConfigDtoConverter.java (86%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/XtaParameter.java (99%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/interceptor/ClientProtocolInInterceptor.java (93%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/interceptor/ClientProtocolOutInterceptor.java (92%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/interceptor/ServerProtocolFaultOutInterceptor.java (90%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/interceptor/ServerProtocolInInterceptor.java (94%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/service/interceptor/ServerProtocolOutInterceptor.java (90%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/util/UtilComponent.java (95%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/util/XtaId.java (97%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/util/XtaIdGenerator.java (97%)
rename src/main/java/de/{xoev => ozgcloud}/xta/test/app/util/YamlPropertySourceFactory.java (96%)
rename src/main/resources/store/{xta-test-app_keystore.p12 => xta-test-server_keystore.p12} (100%)
rename src/main/resources/store/{xta-test-app_truststore.jks => xta-test-server_truststore.jks} (100%)
rename src/test/java/de/{xoev => ozgcloud}/xta/test/app/ApplicationTests.java (91%)
rename src/test/java/de/{xoev => ozgcloud}/xta/test/app/TestingApplication.java (92%)
rename src/test/java/de/{xoev => ozgcloud}/xta/test/app/service/XtaClientTest.java (90%)
rename src/test/java/de/{xoev => ozgcloud}/xta/test/app/util/XtaIdGeneratorTest.java (87%)
rename src/test/java/de/{xoev => ozgcloud}/xta/test/app/util/XtaIdTest.java (94%)
diff --git a/build/assembly.xml b/build/assembly.xml
index 363587e..33259bf 100644
--- a/build/assembly.xml
+++ b/build/assembly.xml
@@ -30,8 +30,8 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>john_smith_xta_tester.p12</include>
- <include>xta-test-app_keystore.p12</include>
- <include>xta-test-app_truststore.jks</include>
+ <include>xta-test-server_keystore.p12</include>
+ <include>xta-test-server_truststore.jks</include>
</includes>
</fileSet>
</fileSets>
diff --git a/build/resources/application-local.yml b/build/resources/application-local.yml
index f6e381c..56e45ef 100644
--- a/build/resources/application-local.yml
+++ b/build/resources/application-local.yml
@@ -11,14 +11,14 @@ server:
tomcat.max-swallow-size: 10MB
ssl:
# enthaelt den privaten und oeffentlichen Schluessel der Anwendung (SSL-Zertifikat für Webbrowser)
- key-store: ./xta-test-app_keystore.p12
+ key-store: ./xta-test-server_keystore.p12
key-store-password: password
key-store-type: pkcs12
# Alias im KeyStore
key-alias: xta-test-application
key-password: password
# enthaelt alle vertrauenswuerdigen Zertifikate oder Oberzertifikate
- trust-store: ./xta-test-app_truststore.jks
+ trust-store: ./xta-test-server_truststore.jks
trust-store-password: password
trust-store-type: JKS
client-auth: want
diff --git a/doc/bedienungsanleitung.adoc b/doc/bedienungsanleitung.adoc
index 5e1f0f8..397446c 100644
--- a/doc/bedienungsanleitung.adoc
+++ b/doc/bedienungsanleitung.adoc
@@ -99,14 +99,14 @@ Eine Konsole im Programmordner starten und folgendes Kommando ausführen. Der Pl
ist mit der jeweiligen Version zu ersetzen.
----
-java -jar xta-test-app-[VERSION].jar --spring.config.import=file:./application-local.yml
+java -jar xta-test-server-[VERSION].jar --spring.config.import=file:./application-local.yml
----
Sofern mehrere Umgebungen gleichzeitig gestartet werden sollen, so kann man sowohl die *application-xxx.yml*, als auch die
genutzte Serverkonfiguration beim Start der Anwendung mitgeben.
----
-java -jar xta-test-app-[VERSION].jar --spring.config.import=file:./application-local.yml -DconfigFileName=file:config_second.yaml
+java -jar xta-test-server-[VERSION].jar --spring.config.import=file:./application-local.yml -DconfigFileName=file:config_second.yaml
----
Der Parameter "-DconfigFileName=file:config_second.yaml" ist wie folgt aufgebaut:
diff --git a/pom.xml b/pom.xml
index c2c9c79..a1aa518 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,12 +10,12 @@
<relativePath/>
</parent>
- <groupId>de.xoev.xta</groupId>
- <artifactId>xta-test-app</artifactId>
+ <groupId>de.ozgcloud.xta</groupId>
+ <artifactId>xta-test-server</artifactId>
<version>1.4.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>XTA Test Application</name>
- <description>XTA Server and Client Test Application</description>
+ <name>XTA Test Server</name>
+ <description>A XTA Server for testing a client implementation.</description>
<properties>
@@ -674,7 +674,7 @@
<profiles>
<profile>
- <!-- to build the xta-test-app.zip -->
+ <!-- to build the xta-test-server.zip -->
<!-- > mvn clean package -Pzip -->
<activation>
<activeByDefault>false</activeByDefault>
diff --git a/soapui/XTA-soapui-project.xml b/soapui/XTA-soapui-project.xml
index 32cf9fe..2e0f250 100644
--- a/soapui/XTA-soapui-project.xml
+++ b/soapui/XTA-soapui-project.xml
@@ -10846,4 +10846,4 @@ if (action[0..1] == "\\\"") {
</ns:ContentContainer>
</ns:GenericContentContainer>
</soapenv:Body>
-</soapenv:Envelope>]]></con:responseContent><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.osci.eu/ws/2008/05/transport/urn/messageTypes/MsgBoxFetchRequest"/></con:response><con:dispatchConfig/></con:mockOperation></con:mockService><con:properties/><con:afterLoadScript/><con:wssContainer><con:crypto><con:source>../src/main/resources/store/john_smith_xta_tester.p12</con:source><con:password>password</con:password><con:type>KEYSTORE</con:type></con:crypto><con:crypto><con:source>../src/main/resources/store/xta-test-app_keystore.p12</con:source><con:password>password</con:password><con:type>TRUSTSTORE</con:type></con:crypto></con:wssContainer><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
+</soapenv:Envelope>]]></con:responseContent><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.osci.eu/ws/2008/05/transport/urn/messageTypes/MsgBoxFetchRequest"/></con:response><con:dispatchConfig/></con:mockOperation></con:mockService><con:properties/><con:afterLoadScript/><con:wssContainer><con:crypto><con:source>../src/main/resources/store/john_smith_xta_tester.p12</con:source><con:password>password</con:password><con:type>KEYSTORE</con:type></con:crypto><con:crypto><con:source>../src/main/resources/store/xta-test-server_keystore.p12</con:source><con:password>password</con:password><con:type>TRUSTSTORE</con:type></con:crypto></con:wssContainer><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
diff --git a/src/main/java/de/xoev/xta/test/app/Application.java b/src/main/java/de/ozgcloud/xta/test/app/Application.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/Application.java
rename to src/main/java/de/ozgcloud/xta/test/app/Application.java
index 00232fc..536cefd 100644
--- a/src/main/java/de/xoev/xta/test/app/Application.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/Application.java
@@ -17,7 +17,7 @@
* @formatter:on
*/
-package de.xoev.xta.test.app;
+package de.ozgcloud.xta.test.app;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/main/java/de/xoev/xta/test/app/config/ClientConnectionProperties.java b/src/main/java/de/ozgcloud/xta/test/app/config/ClientConnectionProperties.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/config/ClientConnectionProperties.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/ClientConnectionProperties.java
index cefb10c..6d4fea6 100644
--- a/src/main/java/de/xoev/xta/test/app/config/ClientConnectionProperties.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/ClientConnectionProperties.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/src/main/java/de/xoev/xta/test/app/config/ClientProperties.java b/src/main/java/de/ozgcloud/xta/test/app/config/ClientProperties.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/config/ClientProperties.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/ClientProperties.java
index c8e7250..75cf463 100644
--- a/src/main/java/de/xoev/xta/test/app/config/ClientProperties.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/ClientProperties.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.FileSystemResource;
diff --git a/src/main/java/de/xoev/xta/test/app/config/MapStructConfiguration.java b/src/main/java/de/ozgcloud/xta/test/app/config/MapStructConfiguration.java
similarity index 87%
rename from src/main/java/de/xoev/xta/test/app/config/MapStructConfiguration.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/MapStructConfiguration.java
index 14955af..4b1f76b 100644
--- a/src/main/java/de/xoev/xta/test/app/config/MapStructConfiguration.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/MapStructConfiguration.java
@@ -1,7 +1,7 @@
/*
* Created 2023-03-24
*/
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
import org.mapstruct.MapperConfig;
import org.mapstruct.ReportingPolicy;
diff --git a/src/main/java/de/xoev/xta/test/app/config/SecurityConfig.java b/src/main/java/de/ozgcloud/xta/test/app/config/SecurityConfig.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/config/SecurityConfig.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/SecurityConfig.java
index 2e2ecd7..f085241 100644
--- a/src/main/java/de/xoev/xta/test/app/config/SecurityConfig.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/SecurityConfig.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/de/xoev/xta/test/app/config/WebServiceConfig.java b/src/main/java/de/ozgcloud/xta/test/app/config/WebServiceConfig.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/config/WebServiceConfig.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/WebServiceConfig.java
index e44fc16..d13e960 100644
--- a/src/main/java/de/xoev/xta/test/app/config/WebServiceConfig.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/WebServiceConfig.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
import org.apache.catalina.Context;
import org.apache.catalina.connector.Connector;
diff --git a/src/main/java/de/xoev/xta/test/app/config/XTAServer.java b/src/main/java/de/ozgcloud/xta/test/app/config/XTAServer.java
similarity index 92%
rename from src/main/java/de/xoev/xta/test/app/config/XTAServer.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/XTAServer.java
index e877506..9195d8c 100644
--- a/src/main/java/de/xoev/xta/test/app/config/XTAServer.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/XTAServer.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
import java.util.Collection;
import java.util.List;
@@ -13,9 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import de.xoev.xta.test.app.service.interceptor.ServerProtocolFaultOutInterceptor;
-import de.xoev.xta.test.app.service.interceptor.ServerProtocolInInterceptor;
-import de.xoev.xta.test.app.service.interceptor.ServerProtocolOutInterceptor;
+import de.ozgcloud.xta.test.app.service.interceptor.ServerProtocolInInterceptor;
+import de.ozgcloud.xta.test.app.service.interceptor.ServerProtocolFaultOutInterceptor;
+import de.ozgcloud.xta.test.app.service.interceptor.ServerProtocolOutInterceptor;
import genv3.de.xoev.transport.xta.x211.ManagementPortType;
import genv3.de.xoev.transport.xta.x211.MsgBoxPortType;
import genv3.de.xoev.transport.xta.x211.SendPortType;
diff --git a/src/main/java/de/xoev/xta/test/app/config/XtaConfig.java b/src/main/java/de/ozgcloud/xta/test/app/config/XtaConfig.java
similarity index 77%
rename from src/main/java/de/xoev/xta/test/app/config/XtaConfig.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/XtaConfig.java
index 69855d2..f0fc7a3 100644
--- a/src/main/java/de/xoev/xta/test/app/config/XtaConfig.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/XtaConfig.java
@@ -1,16 +1,16 @@
/*
* Created 2022-12-14
*/
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
-import de.xoev.xta.test.app.model.ProtocolMetadata;
-import de.xoev.xta.test.app.model.XtaIdentifierConfig;
-import de.xoev.xta.test.app.service.ConfigurationService;
-import de.xoev.xta.test.app.util.YamlPropertySourceFactory;
+import de.ozgcloud.xta.test.app.model.ProtocolMetadata;
+import de.ozgcloud.xta.test.app.model.XtaIdentifierConfig;
+import de.ozgcloud.xta.test.app.util.YamlPropertySourceFactory;
+import de.ozgcloud.xta.test.app.service.ConfigurationService;
import lombok.Data;
@Data
diff --git a/src/main/java/de/xoev/xta/test/app/config/XtaConfigQualifierType.java b/src/main/java/de/ozgcloud/xta/test/app/config/XtaConfigQualifierType.java
similarity index 95%
rename from src/main/java/de/xoev/xta/test/app/config/XtaConfigQualifierType.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/XtaConfigQualifierType.java
index d2d25e6..f46b8f2 100644
--- a/src/main/java/de/xoev/xta/test/app/config/XtaConfigQualifierType.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/XtaConfigQualifierType.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
diff --git a/src/main/java/de/xoev/xta/test/app/config/XtaTesterConfiguration.java b/src/main/java/de/ozgcloud/xta/test/app/config/XtaTesterConfiguration.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/config/XtaTesterConfiguration.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/XtaTesterConfiguration.java
index e6e025e..52e41d2 100644
--- a/src/main/java/de/xoev/xta/test/app/config/XtaTesterConfiguration.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/XtaTesterConfiguration.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
diff --git a/src/main/java/de/xoev/xta/test/app/controller/ExceptionHandlerAdvice.java b/src/main/java/de/ozgcloud/xta/test/app/controller/ExceptionHandlerAdvice.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/controller/ExceptionHandlerAdvice.java
rename to src/main/java/de/ozgcloud/xta/test/app/controller/ExceptionHandlerAdvice.java
index ed45ef1..3e567d1 100644
--- a/src/main/java/de/xoev/xta/test/app/controller/ExceptionHandlerAdvice.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/controller/ExceptionHandlerAdvice.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.controller;
+package de.ozgcloud.xta.test.app.controller;
import org.apache.tomcat.util.http.fileupload.impl.SizeLimitExceededException;
import org.springframework.core.Ordered;
@@ -28,7 +28,8 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MaxUploadSizeExceededException;
-import de.xoev.xta.test.app.model.CustomResponseEntity;
+import de.ozgcloud.xta.test.app.model.CustomResponseEntity;
+
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.log4j.Log4j2;
diff --git a/src/main/java/de/xoev/xta/test/app/controller/ManagementController.java b/src/main/java/de/ozgcloud/xta/test/app/controller/ManagementController.java
similarity index 89%
rename from src/main/java/de/xoev/xta/test/app/controller/ManagementController.java
rename to src/main/java/de/ozgcloud/xta/test/app/controller/ManagementController.java
index 3bc2c01..44d3185 100644
--- a/src/main/java/de/xoev/xta/test/app/controller/ManagementController.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/controller/ManagementController.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.controller;
+package de.ozgcloud.xta.test.app.controller;
import java.io.IOException;
import java.io.InputStream;
@@ -24,6 +24,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
+import org.mapstruct.factory.Mappers;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@@ -39,15 +40,15 @@ import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
-import de.xoev.xta.test.app.config.XtaConfig;
-import de.xoev.xta.test.app.exception.XtaTesterException;
-import de.xoev.xta.test.app.model.CustomResponseEntity;
-import de.xoev.xta.test.app.model.XtaConfigDto;
-import de.xoev.xta.test.app.service.ConfigurationService;
-import de.xoev.xta.test.app.service.CustomizationService;
-import de.xoev.xta.test.app.service.ProtocolService;
-import de.xoev.xta.test.app.service.ScenarioService;
-import de.xoev.xta.test.app.service.XtaConfigDtoConverterImpl;
+import de.ozgcloud.xta.test.app.config.XtaConfig;
+import de.ozgcloud.xta.test.app.exception.XtaTesterException;
+import de.ozgcloud.xta.test.app.model.CustomResponseEntity;
+import de.ozgcloud.xta.test.app.model.XtaConfigDto;
+import de.ozgcloud.xta.test.app.service.ConfigurationService;
+import de.ozgcloud.xta.test.app.service.CustomizationService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.ScenarioService;
+import de.ozgcloud.xta.test.app.service.XtaConfigDtoConverter;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.log4j.Log4j2;
@@ -100,7 +101,7 @@ public class ManagementController {
@ResponseStatus(HttpStatus.OK)
public ResponseEntity<XtaConfigDto> saveXtaConfig(@RequestBody final XtaConfig xtaConfig) {
configService.setXtaConfig(xtaConfig);
- return ResponseEntity.ok(new XtaConfigDtoConverterImpl().fromModel(configService.getXtaConfig()));
+ return ResponseEntity.ok(Mappers.getMapper(XtaConfigDtoConverter.class).fromModel(configService.getXtaConfig()));
}
@Operation(summary = "resetXtaConfig")
@@ -109,7 +110,7 @@ public class ManagementController {
public ResponseEntity<XtaConfigDto> resetXtaConfig() {
try {
configService.resetXtaConfig();
- return ResponseEntity.ok(new XtaConfigDtoConverterImpl().fromModel(configService.getXtaConfig()));
+ return ResponseEntity.ok(Mappers.getMapper(XtaConfigDtoConverter.class).fromModel(configService.getXtaConfig()));
} catch (XtaTesterException e) {
return ResponseEntity.internalServerError().build();
}
diff --git a/src/main/java/de/xoev/xta/test/app/controller/RedirectController.java b/src/main/java/de/ozgcloud/xta/test/app/controller/RedirectController.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/controller/RedirectController.java
rename to src/main/java/de/ozgcloud/xta/test/app/controller/RedirectController.java
index ca1379f..4764306 100644
--- a/src/main/java/de/xoev/xta/test/app/controller/RedirectController.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/controller/RedirectController.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.controller;
+package de.ozgcloud.xta.test.app.controller;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/src/main/java/de/xoev/xta/test/app/controller/ViewController.java b/src/main/java/de/ozgcloud/xta/test/app/controller/ViewController.java
similarity index 94%
rename from src/main/java/de/xoev/xta/test/app/controller/ViewController.java
rename to src/main/java/de/ozgcloud/xta/test/app/controller/ViewController.java
index 616a920..ce6e0d5 100644
--- a/src/main/java/de/xoev/xta/test/app/controller/ViewController.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/controller/ViewController.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.controller;
+package de.ozgcloud.xta.test.app.controller;
import java.io.IOException;
import java.io.InputStream;
@@ -36,11 +36,11 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import de.xoev.xta.test.app.config.XtaConfig;
-import de.xoev.xta.test.app.model.ContainerCustomization;
-import de.xoev.xta.test.app.service.ConfigurationService;
-import de.xoev.xta.test.app.service.ProtocolService;
-import de.xoev.xta.test.app.service.ScenarioService;
+import de.ozgcloud.xta.test.app.config.XtaConfig;
+import de.ozgcloud.xta.test.app.model.ContainerCustomization;
+import de.ozgcloud.xta.test.app.service.ConfigurationService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.ScenarioService;
@Controller
@RequestMapping("view")
diff --git a/src/main/java/de/xoev/xta/test/app/exception/CancelScenarioExecution.java b/src/main/java/de/ozgcloud/xta/test/app/exception/CancelScenarioExecution.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/exception/CancelScenarioExecution.java
rename to src/main/java/de/ozgcloud/xta/test/app/exception/CancelScenarioExecution.java
index b20a454..833ea10 100644
--- a/src/main/java/de/xoev/xta/test/app/exception/CancelScenarioExecution.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/exception/CancelScenarioExecution.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.exception;
+package de.ozgcloud.xta.test.app.exception;
public class CancelScenarioExecution extends RuntimeException {
diff --git a/src/main/java/de/xoev/xta/test/app/exception/ConfigurationException.java b/src/main/java/de/ozgcloud/xta/test/app/exception/ConfigurationException.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/exception/ConfigurationException.java
rename to src/main/java/de/ozgcloud/xta/test/app/exception/ConfigurationException.java
index 23f9ca4..55fcddb 100644
--- a/src/main/java/de/xoev/xta/test/app/exception/ConfigurationException.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/exception/ConfigurationException.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.exception;
+package de.ozgcloud.xta.test.app.exception;
public class ConfigurationException extends RuntimeException {
diff --git a/src/main/java/de/xoev/xta/test/app/exception/XtaTesterException.java b/src/main/java/de/ozgcloud/xta/test/app/exception/XtaTesterException.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/exception/XtaTesterException.java
rename to src/main/java/de/ozgcloud/xta/test/app/exception/XtaTesterException.java
index 895101d..0467198 100644
--- a/src/main/java/de/xoev/xta/test/app/exception/XtaTesterException.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/exception/XtaTesterException.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.exception;
+package de.ozgcloud.xta.test.app.exception;
public class XtaTesterException extends Exception {
diff --git a/src/main/java/de/xoev/xta/test/app/model/ContainerCustomization.java b/src/main/java/de/ozgcloud/xta/test/app/model/ContainerCustomization.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/model/ContainerCustomization.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ContainerCustomization.java
index 79a84f0..8ebbe51 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ContainerCustomization.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ContainerCustomization.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
import java.nio.file.Path;
import java.util.UUID;
diff --git a/src/main/java/de/xoev/xta/test/app/model/CustomResponseEntity.java b/src/main/java/de/ozgcloud/xta/test/app/model/CustomResponseEntity.java
similarity index 95%
rename from src/main/java/de/xoev/xta/test/app/model/CustomResponseEntity.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/CustomResponseEntity.java
index 66c363a..2d276bd 100644
--- a/src/main/java/de/xoev/xta/test/app/model/CustomResponseEntity.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/CustomResponseEntity.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
import lombok.Data;
import lombok.experimental.Accessors;
diff --git a/src/main/java/de/xoev/xta/test/app/model/ExecutionType.java b/src/main/java/de/ozgcloud/xta/test/app/model/ExecutionType.java
similarity index 94%
rename from src/main/java/de/xoev/xta/test/app/model/ExecutionType.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ExecutionType.java
index a375060..000ee4d 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ExecutionType.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ExecutionType.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
public enum ExecutionType {
diff --git a/src/main/java/de/xoev/xta/test/app/model/ProtocolMetadata.java b/src/main/java/de/ozgcloud/xta/test/app/model/ProtocolMetadata.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/model/ProtocolMetadata.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ProtocolMetadata.java
index b0a1cd9..c3174a2 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ProtocolMetadata.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ProtocolMetadata.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
import java.util.Collections;
import java.util.List;
diff --git a/src/main/java/de/xoev/xta/test/app/model/ResultMessage.java b/src/main/java/de/ozgcloud/xta/test/app/model/ResultMessage.java
similarity index 95%
rename from src/main/java/de/xoev/xta/test/app/model/ResultMessage.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ResultMessage.java
index 3efb834..f8f3e78 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ResultMessage.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ResultMessage.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
import lombok.Data;
diff --git a/src/main/java/de/xoev/xta/test/app/model/ResultType.java b/src/main/java/de/ozgcloud/xta/test/app/model/ResultType.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/model/ResultType.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ResultType.java
index 6766cae..70b0023 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ResultType.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ResultType.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
import lombok.Getter;
diff --git a/src/main/java/de/xoev/xta/test/app/model/Role.java b/src/main/java/de/ozgcloud/xta/test/app/model/Role.java
similarity index 94%
rename from src/main/java/de/xoev/xta/test/app/model/Role.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/Role.java
index 461796a..4622868 100644
--- a/src/main/java/de/xoev/xta/test/app/model/Role.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/Role.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
public enum Role {
diff --git a/src/main/java/de/xoev/xta/test/app/model/RoleType.java b/src/main/java/de/ozgcloud/xta/test/app/model/RoleType.java
similarity index 94%
rename from src/main/java/de/xoev/xta/test/app/model/RoleType.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/RoleType.java
index ded3ab8..6364f72 100644
--- a/src/main/java/de/xoev/xta/test/app/model/RoleType.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/RoleType.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
public enum RoleType {
diff --git a/src/main/java/de/xoev/xta/test/app/model/ScenarioDefinition.java b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioDefinition.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/model/ScenarioDefinition.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ScenarioDefinition.java
index f972fd5..988b43b 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ScenarioDefinition.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioDefinition.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
import java.util.Collections;
import java.util.List;
diff --git a/src/main/java/de/xoev/xta/test/app/model/ScenarioEventDefinition.java b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioEventDefinition.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/model/ScenarioEventDefinition.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ScenarioEventDefinition.java
index f4c5c83..3a839f0 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ScenarioEventDefinition.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioEventDefinition.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
import java.util.List;
diff --git a/src/main/java/de/xoev/xta/test/app/model/ScenarioEventType.java b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioEventType.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/model/ScenarioEventType.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ScenarioEventType.java
index 29045db..4034eb1 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ScenarioEventType.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioEventType.java
@@ -16,13 +16,13 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
import java.util.Optional;
import org.apache.commons.lang3.StringUtils;
-import de.xoev.xta.test.app.model.XtaConstants.ConnectionPortType;
+import de.ozgcloud.xta.test.app.model.XtaConstants.ConnectionPortType;
import lombok.Getter;
public enum ScenarioEventType {
diff --git a/src/main/java/de/xoev/xta/test/app/model/ScenarioProtocol.java b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocol.java
similarity index 99%
rename from src/main/java/de/xoev/xta/test/app/model/ScenarioProtocol.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocol.java
index d753ef7..2555e43 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ScenarioProtocol.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocol.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
import java.util.Collections;
import java.util.HashMap;
diff --git a/src/main/java/de/xoev/xta/test/app/model/ScenarioProtocolEvent.java b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocolEvent.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/model/ScenarioProtocolEvent.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocolEvent.java
index e17718f..c1298e1 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ScenarioProtocolEvent.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocolEvent.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
import lombok.Getter;
import lombok.Setter;
diff --git a/src/main/java/de/xoev/xta/test/app/model/ScenarioProtocolEventResult.java b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocolEventResult.java
similarity index 99%
rename from src/main/java/de/xoev/xta/test/app/model/ScenarioProtocolEventResult.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocolEventResult.java
index 017354d..26ba673 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ScenarioProtocolEventResult.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocolEventResult.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
import java.time.LocalDateTime;
import java.util.ArrayList;
diff --git a/src/main/java/de/xoev/xta/test/app/model/ScenarioRole.java b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioRole.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/model/ScenarioRole.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ScenarioRole.java
index 4aac55b..c0f0d1f 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ScenarioRole.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioRole.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
import lombok.Getter;
diff --git a/src/main/java/de/xoev/xta/test/app/model/XtaConfigDto.java b/src/main/java/de/ozgcloud/xta/test/app/model/XtaConfigDto.java
similarity index 70%
rename from src/main/java/de/xoev/xta/test/app/model/XtaConfigDto.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/XtaConfigDto.java
index d38b25d..98f41eb 100644
--- a/src/main/java/de/xoev/xta/test/app/model/XtaConfigDto.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/XtaConfigDto.java
@@ -1,9 +1,9 @@
/*
* Created 2022-12-14
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
-import de.xoev.xta.test.app.config.ClientProperties;
+import de.ozgcloud.xta.test.app.config.ClientProperties;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/src/main/java/de/xoev/xta/test/app/model/XtaConstants.java b/src/main/java/de/ozgcloud/xta/test/app/model/XtaConstants.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/model/XtaConstants.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/XtaConstants.java
index df830ec..dddf3c4 100644
--- a/src/main/java/de/xoev/xta/test/app/model/XtaConstants.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/XtaConstants.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
import javax.xml.namespace.QName;
diff --git a/src/main/java/de/xoev/xta/test/app/model/XtaIdentifierConfig.java b/src/main/java/de/ozgcloud/xta/test/app/model/XtaIdentifierConfig.java
similarity index 88%
rename from src/main/java/de/xoev/xta/test/app/model/XtaIdentifierConfig.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/XtaIdentifierConfig.java
index 6d49995..c4859ad 100644
--- a/src/main/java/de/xoev/xta/test/app/model/XtaIdentifierConfig.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/XtaIdentifierConfig.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/src/main/java/de/xoev/xta/test/app/model/XtaProtocol.java b/src/main/java/de/ozgcloud/xta/test/app/model/XtaProtocol.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/model/XtaProtocol.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/XtaProtocol.java
index bd07504..ec6b26e 100644
--- a/src/main/java/de/xoev/xta/test/app/model/XtaProtocol.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/XtaProtocol.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
import java.util.Collections;
import java.util.LinkedList;
diff --git a/src/main/java/de/xoev/xta/test/app/server/ManagementPortImpl.java b/src/main/java/de/ozgcloud/xta/test/app/server/ManagementPortImpl.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/server/ManagementPortImpl.java
rename to src/main/java/de/ozgcloud/xta/test/app/server/ManagementPortImpl.java
index d775dd5..7379800 100644
--- a/src/main/java/de/xoev/xta/test/app/server/ManagementPortImpl.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/server/ManagementPortImpl.java
@@ -1,5 +1,5 @@
-package de.xoev.xta.test.app.server;
+package de.ozgcloud.xta.test.app.server;
import java.io.IOException;
import java.math.BigInteger;
@@ -12,11 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Component;
-import de.xoev.xta.test.app.service.ParameterValidatorService;
-import de.xoev.xta.test.app.service.ProtocolService;
-import de.xoev.xta.test.app.service.XtaParameter;
-import de.xoev.xta.test.app.util.UtilComponent;
-import de.xoev.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.util.UtilComponent;
+import de.ozgcloud.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.service.ParameterValidatorService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.XtaParameter;
import genv3.de.xoev.transport.xta.x211.AdditionalReportListType;
import genv3.de.xoev.transport.xta.x211.AdditionalReportListType.Report;
import genv3.de.xoev.transport.xta.x211.CancelDeniedException;
diff --git a/src/main/java/de/xoev/xta/test/app/server/MsgBoxPortImpl.java b/src/main/java/de/ozgcloud/xta/test/app/server/MsgBoxPortImpl.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/server/MsgBoxPortImpl.java
rename to src/main/java/de/ozgcloud/xta/test/app/server/MsgBoxPortImpl.java
index 1b4e9c2..1fef31b 100644
--- a/src/main/java/de/xoev/xta/test/app/server/MsgBoxPortImpl.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/server/MsgBoxPortImpl.java
@@ -1,5 +1,5 @@
-package de.xoev.xta.test.app.server;
+package de.ozgcloud.xta.test.app.server;
import java.math.BigInteger;
import java.util.Optional;
@@ -9,12 +9,12 @@ import org.apache.cxf.ws.addressing.AttributedURIType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import de.xoev.xta.test.app.service.CustomizationService;
-import de.xoev.xta.test.app.service.ParameterValidatorService;
-import de.xoev.xta.test.app.service.ProtocolService;
-import de.xoev.xta.test.app.service.XtaParameter;
-import de.xoev.xta.test.app.util.UtilComponent;
-import de.xoev.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.util.UtilComponent;
+import de.ozgcloud.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.service.CustomizationService;
+import de.ozgcloud.xta.test.app.service.ParameterValidatorService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.XtaParameter;
import genv3.de.xoev.transport.xta.x211.InvalidMessageIDException;
import genv3.de.xoev.transport.xta.x211.MsgBoxPortType;
import genv3.de.xoev.transport.xta.x211.PermissionDeniedException;
diff --git a/src/main/java/de/xoev/xta/test/app/server/SendXtaPortImpl.java b/src/main/java/de/ozgcloud/xta/test/app/server/SendXtaPortImpl.java
similarity index 93%
rename from src/main/java/de/xoev/xta/test/app/server/SendXtaPortImpl.java
rename to src/main/java/de/ozgcloud/xta/test/app/server/SendXtaPortImpl.java
index 99fbfd7..9eddbb8 100644
--- a/src/main/java/de/xoev/xta/test/app/server/SendXtaPortImpl.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/server/SendXtaPortImpl.java
@@ -1,5 +1,5 @@
-package de.xoev.xta.test.app.server;
+package de.ozgcloud.xta.test.app.server;
import java.util.Optional;
@@ -7,12 +7,12 @@ import org.apache.cxf.annotations.SchemaValidation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import de.xoev.xta.test.app.service.CustomizationService;
-import de.xoev.xta.test.app.service.ParameterValidatorService;
-import de.xoev.xta.test.app.service.ProtocolService;
-import de.xoev.xta.test.app.service.XtaParameter;
-import de.xoev.xta.test.app.util.UtilComponent;
-import de.xoev.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.util.UtilComponent;
+import de.ozgcloud.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.service.CustomizationService;
+import de.ozgcloud.xta.test.app.service.ParameterValidatorService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.XtaParameter;
import genv3.de.xoev.transport.xta.x211.GenericContentContainer;
import genv3.de.xoev.transport.xta.x211.MessageSchemaViolationException;
import genv3.de.xoev.transport.xta.x211.MessageVirusDetectionException;
diff --git a/src/main/java/de/xoev/xta/test/app/service/ClientConfigurationContainer.java b/src/main/java/de/ozgcloud/xta/test/app/service/ClientConfigurationContainer.java
similarity index 92%
rename from src/main/java/de/xoev/xta/test/app/service/ClientConfigurationContainer.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/ClientConfigurationContainer.java
index 3e51a10..00523a2 100644
--- a/src/main/java/de/xoev/xta/test/app/service/ClientConfigurationContainer.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/ClientConfigurationContainer.java
@@ -1,7 +1,7 @@
/*
* Created 2023-03-15
*/
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
import java.util.Collection;
import java.util.List;
@@ -15,10 +15,10 @@ import org.apache.cxf.message.Message;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import de.xoev.xta.test.app.exception.XtaTesterException;
-import de.xoev.xta.test.app.service.interceptor.ClientProtocolInInterceptor;
-import de.xoev.xta.test.app.service.interceptor.ClientProtocolOutInterceptor;
-import de.xoev.xta.test.app.service.interceptor.ServerProtocolFaultOutInterceptor;
+import de.ozgcloud.xta.test.app.service.interceptor.ClientProtocolInInterceptor;
+import de.ozgcloud.xta.test.app.service.interceptor.ClientProtocolOutInterceptor;
+import de.ozgcloud.xta.test.app.exception.XtaTesterException;
+import de.ozgcloud.xta.test.app.service.interceptor.ServerProtocolFaultOutInterceptor;
import genv3.de.xoev.transport.xta.x211.ManagementPortType;
import genv3.de.xoev.transport.xta.x211.MsgBoxPortType;
import genv3.de.xoev.transport.xta.x211.SendPortType;
diff --git a/src/main/java/de/xoev/xta/test/app/service/ConfigurationService.java b/src/main/java/de/ozgcloud/xta/test/app/service/ConfigurationService.java
similarity index 94%
rename from src/main/java/de/xoev/xta/test/app/service/ConfigurationService.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/ConfigurationService.java
index 992500e..9abc8d0 100644
--- a/src/main/java/de/xoev/xta/test/app/service/ConfigurationService.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/ConfigurationService.java
@@ -1,7 +1,7 @@
/*
* Created 2022-12-14
*/
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
import java.io.IOException;
import java.nio.file.Files;
@@ -23,10 +23,11 @@ import org.springframework.stereotype.Service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import de.xoev.xta.test.app.config.ClientProperties;
-import de.xoev.xta.test.app.config.XtaConfig;
-import de.xoev.xta.test.app.exception.XtaTesterException;
-import de.xoev.xta.test.app.model.ProtocolMetadata;
+import de.ozgcloud.xta.test.app.config.ClientProperties;
+import de.ozgcloud.xta.test.app.config.XtaConfig;
+import de.ozgcloud.xta.test.app.model.ProtocolMetadata;
+import de.ozgcloud.xta.test.app.exception.XtaTesterException;
+
import jakarta.annotation.PostConstruct;
import lombok.Getter;
import lombok.extern.log4j.Log4j2;
diff --git a/src/main/java/de/xoev/xta/test/app/service/CustomizationService.java b/src/main/java/de/ozgcloud/xta/test/app/service/CustomizationService.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/service/CustomizationService.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/CustomizationService.java
index d00a651..b03e53b 100644
--- a/src/main/java/de/xoev/xta/test/app/service/CustomizationService.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/CustomizationService.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
import java.io.IOException;
import java.io.StringReader;
@@ -49,9 +49,9 @@ import org.xml.sax.SAXNotSupportedException;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import de.xoev.xta.test.app.exception.ConfigurationException;
-import de.xoev.xta.test.app.model.ContainerCustomization;
-import de.xoev.xta.test.app.model.CustomResponseEntity;
+import de.ozgcloud.xta.test.app.exception.ConfigurationException;
+import de.ozgcloud.xta.test.app.model.ContainerCustomization;
+import de.ozgcloud.xta.test.app.model.CustomResponseEntity;
import genv3.de.xoev.transport.xta.x211.ContentType;
import genv3.de.xoev.transport.xta.x211.GenericContentContainer;
import genv3.de.xoev.transport.xta.x211.GenericContentContainer.ContentContainer;
diff --git a/src/main/java/de/xoev/xta/test/app/service/ParameterValidatorService.java b/src/main/java/de/ozgcloud/xta/test/app/service/ParameterValidatorService.java
similarity index 99%
rename from src/main/java/de/xoev/xta/test/app/service/ParameterValidatorService.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/ParameterValidatorService.java
index 790ff9e..caf9122 100644
--- a/src/main/java/de/xoev/xta/test/app/service/ParameterValidatorService.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/ParameterValidatorService.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
import java.util.List;
import java.util.Optional;
diff --git a/src/main/java/de/xoev/xta/test/app/service/ProtocolService.java b/src/main/java/de/ozgcloud/xta/test/app/service/ProtocolService.java
similarity index 95%
rename from src/main/java/de/xoev/xta/test/app/service/ProtocolService.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/ProtocolService.java
index b28766d..5112097 100644
--- a/src/main/java/de/xoev/xta/test/app/service/ProtocolService.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/ProtocolService.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
import java.io.IOException;
import java.nio.file.Files;
@@ -29,14 +29,15 @@ import java.util.function.Supplier;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.xoev.xta.test.app.model.ContainerCustomization;
-import de.xoev.xta.test.app.model.ProtocolMetadata;
-import de.xoev.xta.test.app.model.ScenarioDefinition;
-import de.xoev.xta.test.app.model.ScenarioEventType;
-import de.xoev.xta.test.app.model.ScenarioProtocol;
-import de.xoev.xta.test.app.model.ScenarioProtocolEvent;
-import de.xoev.xta.test.app.model.ScenarioProtocolEventResult;
-import de.xoev.xta.test.app.model.XtaProtocol;
+import de.ozgcloud.xta.test.app.model.ContainerCustomization;
+import de.ozgcloud.xta.test.app.model.ProtocolMetadata;
+import de.ozgcloud.xta.test.app.model.ScenarioDefinition;
+import de.ozgcloud.xta.test.app.model.ScenarioEventType;
+import de.ozgcloud.xta.test.app.model.ScenarioProtocol;
+import de.ozgcloud.xta.test.app.model.ScenarioProtocolEvent;
+import de.ozgcloud.xta.test.app.model.ScenarioProtocolEventResult;
+import de.ozgcloud.xta.test.app.model.XtaProtocol;
+
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import lombok.Getter;
diff --git a/src/main/java/de/xoev/xta/test/app/service/ScenarioDefinitionComparator.java b/src/main/java/de/ozgcloud/xta/test/app/service/ScenarioDefinitionComparator.java
similarity index 93%
rename from src/main/java/de/xoev/xta/test/app/service/ScenarioDefinitionComparator.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/ScenarioDefinitionComparator.java
index 50a599c..a55a964 100644
--- a/src/main/java/de/xoev/xta/test/app/service/ScenarioDefinitionComparator.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/ScenarioDefinitionComparator.java
@@ -16,11 +16,11 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
import java.util.Comparator;
-import de.xoev.xta.test.app.model.ScenarioDefinition;
+import de.ozgcloud.xta.test.app.model.ScenarioDefinition;
public class ScenarioDefinitionComparator implements Comparator<ScenarioDefinition> {
diff --git a/src/main/java/de/xoev/xta/test/app/service/ScenarioExecutor.java b/src/main/java/de/ozgcloud/xta/test/app/service/ScenarioExecutor.java
similarity index 95%
rename from src/main/java/de/xoev/xta/test/app/service/ScenarioExecutor.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/ScenarioExecutor.java
index da772ad..aca1ad8 100644
--- a/src/main/java/de/xoev/xta/test/app/service/ScenarioExecutor.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/ScenarioExecutor.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
@@ -24,10 +24,11 @@ import java.util.concurrent.atomic.AtomicReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.xoev.xta.test.app.exception.CancelScenarioExecution;
-import de.xoev.xta.test.app.exception.XtaTesterException;
-import de.xoev.xta.test.app.model.ScenarioDefinition;
-import de.xoev.xta.test.app.model.ScenarioEventDefinition;
+import de.ozgcloud.xta.test.app.model.ScenarioDefinition;
+import de.ozgcloud.xta.test.app.model.ScenarioEventDefinition;
+import de.ozgcloud.xta.test.app.exception.CancelScenarioExecution;
+import de.ozgcloud.xta.test.app.exception.XtaTesterException;
+
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import lombok.extern.log4j.Log4j2;
diff --git a/src/main/java/de/xoev/xta/test/app/service/ScenarioService.java b/src/main/java/de/ozgcloud/xta/test/app/service/ScenarioService.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/service/ScenarioService.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/ScenarioService.java
index 77eb4f5..55ad2f2 100644
--- a/src/main/java/de/xoev/xta/test/app/service/ScenarioService.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/ScenarioService.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
import java.util.ArrayList;
import java.util.Collection;
@@ -29,12 +29,13 @@ import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.xoev.xta.test.app.exception.XtaTesterException;
-import de.xoev.xta.test.app.model.ExecutionType;
-import de.xoev.xta.test.app.model.ScenarioDefinition;
-import de.xoev.xta.test.app.model.ScenarioEventDefinition;
-import de.xoev.xta.test.app.model.ScenarioEventType;
-import de.xoev.xta.test.app.model.ScenarioRole;
+import de.ozgcloud.xta.test.app.model.ExecutionType;
+import de.ozgcloud.xta.test.app.model.ScenarioDefinition;
+import de.ozgcloud.xta.test.app.model.ScenarioEventDefinition;
+import de.ozgcloud.xta.test.app.model.ScenarioEventType;
+import de.ozgcloud.xta.test.app.model.ScenarioRole;
+import de.ozgcloud.xta.test.app.exception.XtaTesterException;
+
import jakarta.annotation.PostConstruct;
import lombok.extern.log4j.Log4j2;
diff --git a/src/main/java/de/xoev/xta/test/app/service/XtaClient.java b/src/main/java/de/ozgcloud/xta/test/app/service/XtaClient.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/service/XtaClient.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/XtaClient.java
index 1fa5768..cc19104 100644
--- a/src/main/java/de/xoev/xta/test/app/service/XtaClient.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/XtaClient.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
import java.io.IOException;
import java.math.BigInteger;
@@ -46,10 +46,10 @@ import org.apache.hc.core5.ssl.SSLContexts;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.xoev.xta.test.app.exception.XtaTesterException;
-import de.xoev.xta.test.app.model.XtaConstants;
-import de.xoev.xta.test.app.util.UtilComponent;
-import de.xoev.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.model.XtaConstants;
+import de.ozgcloud.xta.test.app.util.UtilComponent;
+import de.ozgcloud.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.exception.XtaTesterException;
import genv3.de.xoev.transport.xta.x211.ContentType;
import genv3.de.xoev.transport.xta.x211.GenericContentContainer;
import genv3.de.xoev.transport.xta.x211.GenericContentContainer.ContentContainer;
diff --git a/src/main/java/de/xoev/xta/test/app/service/XtaConfigDtoConverter.java b/src/main/java/de/ozgcloud/xta/test/app/service/XtaConfigDtoConverter.java
similarity index 86%
rename from src/main/java/de/xoev/xta/test/app/service/XtaConfigDtoConverter.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/XtaConfigDtoConverter.java
index 1b32925..9ec786d 100644
--- a/src/main/java/de/xoev/xta/test/app/service/XtaConfigDtoConverter.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/XtaConfigDtoConverter.java
@@ -1,17 +1,16 @@
/*
* Created 2023-03-24
*/
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
-import org.apache.commons.lang3.StringUtils;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
-import de.xoev.xta.test.app.config.MapStructConfiguration;
-import de.xoev.xta.test.app.config.XtaConfig;
-import de.xoev.xta.test.app.config.XtaConfigQualifierType;
-import de.xoev.xta.test.app.model.XtaConfigDto;
-import de.xoev.xta.test.app.model.XtaIdentifierConfig;
+import de.ozgcloud.xta.test.app.config.MapStructConfiguration;
+import de.ozgcloud.xta.test.app.config.XtaConfig;
+import de.ozgcloud.xta.test.app.config.XtaConfigQualifierType;
+import de.ozgcloud.xta.test.app.model.XtaConfigDto;
+import de.ozgcloud.xta.test.app.model.XtaIdentifierConfig;
import genv3.eu.osci.ws.x2014.x10.transport.KeyCodeType;
import genv3.eu.osci.ws.x2014.x10.transport.PartyType;
import genv3.eu.osci.ws.x2014.x10.transport.QualifierType;
diff --git a/src/main/java/de/xoev/xta/test/app/service/XtaParameter.java b/src/main/java/de/ozgcloud/xta/test/app/service/XtaParameter.java
similarity index 99%
rename from src/main/java/de/xoev/xta/test/app/service/XtaParameter.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/XtaParameter.java
index 95d82f5..dad0b90 100644
--- a/src/main/java/de/xoev/xta/test/app/service/XtaParameter.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/XtaParameter.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
import java.util.StringJoiner;
diff --git a/src/main/java/de/xoev/xta/test/app/service/interceptor/ClientProtocolInInterceptor.java b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ClientProtocolInInterceptor.java
similarity index 93%
rename from src/main/java/de/xoev/xta/test/app/service/interceptor/ClientProtocolInInterceptor.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ClientProtocolInInterceptor.java
index 5488a82..45887f6 100644
--- a/src/main/java/de/xoev/xta/test/app/service/interceptor/ClientProtocolInInterceptor.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ClientProtocolInInterceptor.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.service.interceptor;
+package de.ozgcloud.xta.test.app.service.interceptor;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
@@ -8,7 +8,7 @@ import org.apache.cxf.phase.Phase;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import de.xoev.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
import lombok.extern.log4j.Log4j2;
/**
diff --git a/src/main/java/de/xoev/xta/test/app/service/interceptor/ClientProtocolOutInterceptor.java b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ClientProtocolOutInterceptor.java
similarity index 92%
rename from src/main/java/de/xoev/xta/test/app/service/interceptor/ClientProtocolOutInterceptor.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ClientProtocolOutInterceptor.java
index d068c02..808a20a 100644
--- a/src/main/java/de/xoev/xta/test/app/service/interceptor/ClientProtocolOutInterceptor.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ClientProtocolOutInterceptor.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.service.interceptor;
+package de.ozgcloud.xta.test.app.service.interceptor;
import java.util.Optional;
@@ -11,8 +11,8 @@ import org.apache.cxf.ws.addressing.AddressingProperties;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import de.xoev.xta.test.app.model.ScenarioEventType;
-import de.xoev.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.model.ScenarioEventType;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
import lombok.extern.log4j.Log4j2;
/**
diff --git a/src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolFaultOutInterceptor.java b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolFaultOutInterceptor.java
similarity index 90%
rename from src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolFaultOutInterceptor.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolFaultOutInterceptor.java
index 21050ad..bf601cf 100644
--- a/src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolFaultOutInterceptor.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolFaultOutInterceptor.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.service.interceptor;
+package de.ozgcloud.xta.test.app.service.interceptor;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
@@ -7,7 +7,7 @@ import org.apache.cxf.phase.Phase;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import de.xoev.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
import lombok.extern.log4j.Log4j2;
/**
diff --git a/src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolInInterceptor.java b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolInInterceptor.java
similarity index 94%
rename from src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolInInterceptor.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolInInterceptor.java
index 76b167c..4ae257a 100644
--- a/src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolInInterceptor.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolInInterceptor.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.service.interceptor;
+package de.ozgcloud.xta.test.app.service.interceptor;
import java.security.cert.X509Certificate;
import java.util.Optional;
@@ -12,8 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
-import de.xoev.xta.test.app.model.ScenarioEventType;
-import de.xoev.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.model.ScenarioEventType;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
import lombok.extern.log4j.Log4j2;
/**
diff --git a/src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolOutInterceptor.java b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolOutInterceptor.java
similarity index 90%
rename from src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolOutInterceptor.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolOutInterceptor.java
index 1c4252e..51ab1be 100644
--- a/src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolOutInterceptor.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolOutInterceptor.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.service.interceptor;
+package de.ozgcloud.xta.test.app.service.interceptor;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
@@ -7,7 +7,7 @@ import org.apache.cxf.phase.Phase;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import de.xoev.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
import lombok.extern.log4j.Log4j2;
/**
diff --git a/src/main/java/de/xoev/xta/test/app/util/UtilComponent.java b/src/main/java/de/ozgcloud/xta/test/app/util/UtilComponent.java
similarity index 95%
rename from src/main/java/de/xoev/xta/test/app/util/UtilComponent.java
rename to src/main/java/de/ozgcloud/xta/test/app/util/UtilComponent.java
index 7c64523..2e5c7a8 100644
--- a/src/main/java/de/xoev/xta/test/app/util/UtilComponent.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/util/UtilComponent.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.util;
+package de.ozgcloud.xta.test.app.util;
import java.math.BigInteger;
import java.util.Calendar;
@@ -13,10 +13,10 @@ import org.apache.cxf.ws.addressing.AttributedURIType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import de.xoev.xta.test.app.model.Role;
-import de.xoev.xta.test.app.service.ConfigurationService;
-import de.xoev.xta.test.app.service.ProtocolService;
-import de.xoev.xta.test.app.service.XtaConfigDtoConverter;
+import de.ozgcloud.xta.test.app.model.Role;
+import de.ozgcloud.xta.test.app.service.ConfigurationService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.XtaConfigDtoConverter;
import genv3.eu.osci.ws.x2008.x05.transport.MsgSelector;
import genv3.eu.osci.ws.x2014.x10.transport.DeliveryAttributesType;
import genv3.eu.osci.ws.x2014.x10.transport.DestinationsType;
diff --git a/src/main/java/de/xoev/xta/test/app/util/XtaId.java b/src/main/java/de/ozgcloud/xta/test/app/util/XtaId.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/util/XtaId.java
rename to src/main/java/de/ozgcloud/xta/test/app/util/XtaId.java
index aae6ddf..8871134 100644
--- a/src/main/java/de/xoev/xta/test/app/util/XtaId.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/util/XtaId.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.util;
+package de.ozgcloud.xta.test.app.util;
import java.util.Optional;
import java.util.regex.Matcher;
diff --git a/src/main/java/de/xoev/xta/test/app/util/XtaIdGenerator.java b/src/main/java/de/ozgcloud/xta/test/app/util/XtaIdGenerator.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/util/XtaIdGenerator.java
rename to src/main/java/de/ozgcloud/xta/test/app/util/XtaIdGenerator.java
index aba6314..97a697b 100644
--- a/src/main/java/de/xoev/xta/test/app/util/XtaIdGenerator.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/util/XtaIdGenerator.java
@@ -16,7 +16,7 @@
* limitations under the License.
* @formatter:on
*/
-package de.xoev.xta.test.app.util;
+package de.ozgcloud.xta.test.app.util;
import java.util.UUID;
diff --git a/src/main/java/de/xoev/xta/test/app/util/YamlPropertySourceFactory.java b/src/main/java/de/ozgcloud/xta/test/app/util/YamlPropertySourceFactory.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/util/YamlPropertySourceFactory.java
rename to src/main/java/de/ozgcloud/xta/test/app/util/YamlPropertySourceFactory.java
index 11b4ed9..70bbaaa 100644
--- a/src/main/java/de/xoev/xta/test/app/util/YamlPropertySourceFactory.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/util/YamlPropertySourceFactory.java
@@ -1,7 +1,7 @@
/*
* Created 2023-03-24
*/
-package de.xoev.xta.test.app.util;
+package de.ozgcloud.xta.test.app.util;
import java.io.IOException;
import java.util.Properties;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eabea82..393a557 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
application:
- name: xta-test-app
+ name: xta-test-server
servlet:
multipart:
max-file-size: 10MB
@@ -12,14 +12,14 @@ server:
tomcat.max-swallow-size: 10MB
ssl:
# enthaelt den privaten und oeffentlichen Schluessel der Anwendung
- key-store: classpath:store/xta-test-app_keystore.p12
+ key-store: classpath:store/xta-test-server_keystore.p12
key-store-password: password
key-store-type: pkcs12
# Alias im KeyStore
key-alias: xta-test-application
key-password: password
# enthaelt alle vertrauenswuerdigen Zertifikate
- trust-store: classpath:store/xta-test-app_truststore.jks
+ trust-store: classpath:store/xta-test-server_truststore.jks
trust-store-password: password
trust-store-type: JKS
# want, need, none; see org.springframework.boot.web.server.ClientAuth
diff --git a/src/main/resources/application_second_app.yml b/src/main/resources/application_second_app.yml
index d34ec9a..d86b916 100644
--- a/src/main/resources/application_second_app.yml
+++ b/src/main/resources/application_second_app.yml
@@ -1,6 +1,6 @@
spring:
application:
- name: xta-test-app
+ name: xta-test-server
servlet:
multipart:
max-file-size: 10MB
@@ -15,14 +15,14 @@ server:
tomcat.max-swallow-size: 10MB
ssl:
# enthaelt den privaten und oeffentlichen Schluessel der Anwendung
- key-store: classpath:store/xta-test-app_keystore.p12
+ key-store: classpath:store/xta-test-server_keystore.p12
key-store-password: password
key-store-type: pkcs12
# Alias im KeyStore
key-alias: xta-test-application
key-password: password
# enthaelt alle vertrauenswuerdigen Zertifikate
- trust-store: classpath:store/xta-test-app_truststore.jks
+ trust-store: classpath:store/xta-test-server_truststore.jks
trust-store-password: password
trust-store-type: JKS
# want, need, none; see org.springframework.boot.web.server.ClientAuth
@@ -43,6 +43,6 @@ logging:
org.springframework.security: WARN
org.springframework.web: INFO
org.apache.axiom: INFO
- de.xoev.xta.test.app.soap: DEBUG
+ de.ozgcloud.xta.test.app.soap: DEBUG
org.apache.axis2: INFO
diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt
index 5f47f65..e94d4fc 100644
--- a/src/main/resources/banner.txt
+++ b/src/main/resources/banner.txt
@@ -1,10 +1,10 @@
- __ _________ _______ ______ _____ _______ _____ _____
- \ \ / /__ __|/\ |__ __| ____|/ ____|__ __| /\ | __ \| __ \
- \ V / | | / \ ______ | | | |__ | (___ | | ______ / \ | |__) | |__) |
- > < | | / /\ \ |______| | | | __| \___ \ | | |______| / /\ \ | ___/| ___/
- / . \ | |/ ____ \ | | | |____ ____) | | | / ____ \| | | |
- /_/ \_\ |_/_/ \_\ |_| |______|_____/ |_| /_/ \_\_| |_|
-
-
+ _ _ _
+ __ _| |_ __ _ | |_ ___ ___| |_ ___ ___ _ ____ _____ _ __
+ \ \/ / __/ _` |_____| __/ _ \/ __| __|____/ __|/ _ \ '__\ \ / / _ \ '__|
+ > <| || (_| |_____| || __/\__ \ ||_____\__ \ __/ | \ V / __/ |
+ /_/\_\\__\__,_| \__\___||___/\__| |___/\___|_| \_/ \___|_|
+
+
+
:: XTA-Tester :: (v@project.version@)
:: Spring Boot :: (v@project.parent.version@)
diff --git a/src/main/resources/configDefault.yaml b/src/main/resources/configDefault.yaml
index a39c0bf..87afee2 100644
--- a/src/main/resources/configDefault.yaml
+++ b/src/main/resources/configDefault.yaml
@@ -17,7 +17,7 @@ clientProperties:
keyStorePassword: "password"
keyPassword: "password"
keyAlias: null
- trustStore: "classpath:store/xta-test-app_truststore.jks"
+ trustStore: "classpath:store/xta-test-server_truststore.jks"
trustStorePassword: "password"
authorIdentifierConfig:
identifierScheme: "xoev"
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 8ff45be..58516be 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -17,8 +17,8 @@
</Appenders>
<Loggers>
- <!-- By default all logs from de.xoev.xta loggers are sent to Console -->
- <Logger name="de.xoev.xta" level="debug" additivity="false">
+ <!-- By default all logs from de.ozgcloud.xta loggers are sent to Console -->
+ <Logger name="de.ozgcloud.xta" level="debug" additivity="false">
<AppenderRef ref="Console" level="${env:LOG_LEVEL_STDOUT:-debug}" />
</Logger>
diff --git a/src/main/resources/store/xta-test-app_keystore.p12 b/src/main/resources/store/xta-test-server_keystore.p12
similarity index 100%
rename from src/main/resources/store/xta-test-app_keystore.p12
rename to src/main/resources/store/xta-test-server_keystore.p12
diff --git a/src/main/resources/store/xta-test-app_truststore.jks b/src/main/resources/store/xta-test-server_truststore.jks
similarity index 100%
rename from src/main/resources/store/xta-test-app_truststore.jks
rename to src/main/resources/store/xta-test-server_truststore.jks
diff --git a/src/test/java/de/xoev/xta/test/app/ApplicationTests.java b/src/test/java/de/ozgcloud/xta/test/app/ApplicationTests.java
similarity index 91%
rename from src/test/java/de/xoev/xta/test/app/ApplicationTests.java
rename to src/test/java/de/ozgcloud/xta/test/app/ApplicationTests.java
index 341af01..bdce961 100644
--- a/src/test/java/de/xoev/xta/test/app/ApplicationTests.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/ApplicationTests.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app;
+package de.ozgcloud.xta.test.app;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/de/xoev/xta/test/app/TestingApplication.java b/src/test/java/de/ozgcloud/xta/test/app/TestingApplication.java
similarity index 92%
rename from src/test/java/de/xoev/xta/test/app/TestingApplication.java
rename to src/test/java/de/ozgcloud/xta/test/app/TestingApplication.java
index 4f26f82..5919287 100644
--- a/src/test/java/de/xoev/xta/test/app/TestingApplication.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/TestingApplication.java
@@ -1,7 +1,7 @@
/*
* Created 2022-02-06
*/
-package de.xoev.xta.test.app;
+package de.ozgcloud.xta.test.app;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/test/java/de/xoev/xta/test/app/service/XtaClientTest.java b/src/test/java/de/ozgcloud/xta/test/app/service/XtaClientTest.java
similarity index 90%
rename from src/test/java/de/xoev/xta/test/app/service/XtaClientTest.java
rename to src/test/java/de/ozgcloud/xta/test/app/service/XtaClientTest.java
index 374cee6..90cb848 100644
--- a/src/test/java/de/xoev/xta/test/app/service/XtaClientTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/service/XtaClientTest.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
import static org.junit.jupiter.api.Assertions.fail;
@@ -21,11 +21,11 @@ import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit.jupiter.SpringExtension;
-import de.xoev.xta.test.app.TestingApplication;
-import de.xoev.xta.test.app.exception.CancelScenarioExecution;
-import de.xoev.xta.test.app.model.ExecutionType;
-import de.xoev.xta.test.app.model.ScenarioEventDefinition;
-import de.xoev.xta.test.app.model.ScenarioEventType;
+import de.ozgcloud.xta.test.app.model.ScenarioEventType;
+import de.ozgcloud.xta.test.app.TestingApplication;
+import de.ozgcloud.xta.test.app.exception.CancelScenarioExecution;
+import de.ozgcloud.xta.test.app.model.ExecutionType;
+import de.ozgcloud.xta.test.app.model.ScenarioEventDefinition;
import lombok.extern.log4j.Log4j2;
@Log4j2
diff --git a/src/test/java/de/xoev/xta/test/app/util/XtaIdGeneratorTest.java b/src/test/java/de/ozgcloud/xta/test/app/util/XtaIdGeneratorTest.java
similarity index 87%
rename from src/test/java/de/xoev/xta/test/app/util/XtaIdGeneratorTest.java
rename to src/test/java/de/ozgcloud/xta/test/app/util/XtaIdGeneratorTest.java
index 56c1693..f964cc1 100644
--- a/src/test/java/de/xoev/xta/test/app/util/XtaIdGeneratorTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/util/XtaIdGeneratorTest.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.util;
+package de.ozgcloud.xta.test.app.util;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -6,9 +6,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.junit.jupiter.api.Test;
-import de.xoev.xta.test.app.util.XtaId;
-import de.xoev.xta.test.app.util.XtaIdGenerator;
-
public class XtaIdGeneratorTest {
@Test
diff --git a/src/test/java/de/xoev/xta/test/app/util/XtaIdTest.java b/src/test/java/de/ozgcloud/xta/test/app/util/XtaIdTest.java
similarity index 94%
rename from src/test/java/de/xoev/xta/test/app/util/XtaIdTest.java
rename to src/test/java/de/ozgcloud/xta/test/app/util/XtaIdTest.java
index 241a15f..1e02d3b 100644
--- a/src/test/java/de/xoev/xta/test/app/util/XtaIdTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/util/XtaIdTest.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.util;
+package de.ozgcloud.xta.test.app.util;
import static org.junit.jupiter.api.Assertions.assertAll;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -8,8 +8,6 @@ import java.util.Optional;
import org.junit.jupiter.api.Test;
-import de.xoev.xta.test.app.util.XtaId;
-
public class XtaIdTest {
@Test
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index bf1d410..3b93649 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -1,19 +1,19 @@
spring:
application:
- name: xta-test-app
+ name: xta-test-server
server:
port: 9443
ssl:
# enthaelt den privaten und oeffentlichen Schluessel der Anwendung
- key-store: classpath:store/xta-test-app_keystore.p12
+ key-store: classpath:store/xta-test-server_keystore.p12
key-store-password: password
key-store-type: pkcs12
# Alias im KeyStore
key-alias: xta-test-application
key-password: password
# enthaelt alle vertrauenswuerdigen Zertifikate
- trust-store: classpath:store/xta-test-app_truststore.jks
+ trust-store: classpath:store/xta-test-server_truststore.jks
trust-store-password: password
trust-store-type: JKS
# want, need, none; see org.springframework.boot.web.server.ClientAuth
diff --git a/src/test/resources/configDefaultTest.yaml b/src/test/resources/configDefaultTest.yaml
index a7b6a22..948caf8 100644
--- a/src/test/resources/configDefaultTest.yaml
+++ b/src/test/resources/configDefaultTest.yaml
@@ -17,5 +17,5 @@ clientProperties:
keyStorePassword: "password"
keyPassword: "password"
keyAlias: null
- trustStore: "classpath:store/xta-test-app_truststore.jks"
+ trustStore: "classpath:store/xta-test-server_truststore.jks"
trustStorePassword: "password"
--
GitLab