diff --git a/formcycle-adapter/formcycle-adapter-impl/pom.xml b/formcycle-adapter/formcycle-adapter-impl/pom.xml
index 3780ceaf98ab22897aca467c2ad90c48ca558eb1..5c0ce03397ff0228a8406fe4528baf109c1a80de 100644
--- a/formcycle-adapter/formcycle-adapter-impl/pom.xml
+++ b/formcycle-adapter/formcycle-adapter-impl/pom.xml
@@ -36,7 +36,7 @@
<name>EM - Formcycle Adapter - Implementation</name>
<properties>
- <formcycle-interface.version>1.3.0</formcycle-interface.version>
+ <formcycle-interface.version>1.10.0-SNAPSHOT</formcycle-interface.version>
</properties>
<dependencies>
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapper.java b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapper.java
index 9af9edb81aa0de5411311938068d0de2e7240871..776acf93c327b41566ab1ea29e07d5aaf73c3cae 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapper.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapper.java
@@ -26,7 +26,6 @@ package de.ozgcloud.eingang.formcycle;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData;
import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper;
import de.ozgcloud.eingang.common.formdata.FormData;
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java
index b1c18ae5692d61908617b682bd173a6e08c44100..4d9717afce4a9b2d881891914112fe65c46f6330 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java
@@ -39,18 +39,13 @@ import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleAttachmentGroup;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleConfirmationResponse;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCyclePostfachAddress;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleServiceKonto;
import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
import de.ozgcloud.eingang.common.formdata.ServiceKonto;
-import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
+import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
import de.ozgcloud.eingang.semantik.SemantikAdapter;
import de.ozgcloud.eingang.semantik.enginebased.FilesMapperHelper;
import lombok.RequiredArgsConstructor;
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormcycleAdapterApplication.java b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormcycleAdapterApplication.java
index 89e485f5a9e59fe7e423627c3595bf2083da627a..f686a47234de43b9a172141cb4e15d9a769c4382 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormcycleAdapterApplication.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormcycleAdapterApplication.java
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean;
import de.ozgcloud.eingang.semantik.enginebased.EngineBasedSemantikAdapter;
import de.ozgcloud.eingang.semantik.enginebased.formcycle.FormCycleEngineBasedAdapter;
-@SpringBootApplication(scanBasePackages = "de.itvsh.kop")
+@SpringBootApplication(scanBasePackages = { "de.itvsh.kop", "de.ozgcloud.*" })
public class FormcycleAdapterApplication {
public static void main(String[] args) {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleAttachmentGroupTestFactory.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleAttachmentGroupTestFactory.java
index df3aeae15e3392491ba8b2e45aa2bb8a56d928ca..0d7eed096bf428fb629215a40a7946b6c21599dc 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleAttachmentGroupTestFactory.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleAttachmentGroupTestFactory.java
@@ -23,7 +23,6 @@
*/
package de.ozgcloud.eingang.formcycle;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleAttachmentGroup;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
@@ -37,6 +36,5 @@ public class FormCycleAttachmentGroupTestFactory {
return FormCycleAttachmentGroup.newBuilder()
.setName(IncomingFileGroupTestFactory.NAME)
.addFileId(IncomingFileTestFactory.NAME);
-
}
}
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java
index 409e8e2d2910339910bdae32f49d3f06f041d60e..f8217b25700b409404a4ab724ee84b416d572a4e 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java
@@ -32,7 +32,6 @@ import org.mockito.InjectMocks;
import org.mockito.Spy;
import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper;
-import de.ozgcloud.eingang.formcycle.FormCycleFormDataMapper;
class FormCycleFormDataMapperTest {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataTestFactory.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataTestFactory.java
index 4ed6d89cf86f5c1eb2805077c46cfd3684f67fa6..24a1605294bdbba43cb5d3ac79da0127927a5358 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataTestFactory.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataTestFactory.java
@@ -23,11 +23,9 @@
*/
package de.ozgcloud.eingang.formcycle;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleAttachmentGroup;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData.Builder;
import de.itvsh.kop.pluto.common.grpc.GrpcFormDataTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
+import de.ozgcloud.eingang.formcycle.FormCycleFormData.Builder;
class FormCycleFormDataTestFactory {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormHeaderTestFactory.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormHeaderTestFactory.java
index 124c3d6243641344b8311aa30f8358bf1e64398d..43b5accd0a695e7434dcab0b2febf164da8a9677 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormHeaderTestFactory.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormHeaderTestFactory.java
@@ -23,8 +23,7 @@
*/
package de.ozgcloud.eingang.formcycle;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormHeader;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormHeader.Builder;
+import de.ozgcloud.eingang.formcycle.FormCycleFormHeader.Builder;
public class FormCycleFormHeaderTestFactory {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCyclePostfachAddressTestFactory.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCyclePostfachAddressTestFactory.java
index dd017cd435eadd7c3f7d0412b41debeaa10108f5..5744864496aab362d4758109487b5343c91bd63f 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCyclePostfachAddressTestFactory.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCyclePostfachAddressTestFactory.java
@@ -2,9 +2,8 @@ package de.ozgcloud.eingang.formcycle;
import java.util.UUID;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCyclePostfachAddress;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCyclePostfachAddress.Builder;
import de.ozgcloud.eingang.common.formdata.PostfachAddressTestFactory;
+import de.ozgcloud.eingang.formcycle.FormCyclePostfachAddress.Builder;
public class FormCyclePostfachAddressTestFactory {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoTestFactory.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoTestFactory.java
index 3c2fbe87b3fd2b9c6a7fca40bfb9fcf53802072f..486eb12a5e88635fddf8acf4452d6e97f0f88226 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoTestFactory.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoTestFactory.java
@@ -25,9 +25,7 @@ package de.ozgcloud.eingang.formcycle;
import java.util.UUID;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCyclePostfachAddress;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleServiceKonto;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleServiceKonto.Builder;
+import de.ozgcloud.eingang.formcycle.FormCycleServiceKonto.Builder;
public class FormCycleServiceKontoTestFactory {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerTest.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerTest.java
index 77dc6e37d7e5d313c803d84cbc46b7f4f0d87ba8..04df09b1eb00117d6118ae59ee33a4895155c263 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerTest.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerTest.java
@@ -46,17 +46,13 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleConfirmationResponse;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
import de.ozgcloud.eingang.common.formdata.FormHeader;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
-import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
-import de.ozgcloud.eingang.formcycle.FormCycleFormDataMapper;
-import de.ozgcloud.eingang.formcycle.FormDataController;
+import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
import de.ozgcloud.eingang.formcycle.common.protobuf.ProtobufMessageConverter;
import de.ozgcloud.eingang.semantik.SemantikAdapter;
import lombok.SneakyThrows;
diff --git a/formcycle-adapter/formcycle-adapter-interface/src/main/protobuf/form-data.model.proto b/formcycle-adapter/formcycle-adapter-interface/src/main/protobuf/form-data.model.proto
index 1514a00a22ab785164daf2609edd48902782cd47..b476eac4e8cea0f75945523315678889a3138103 100644
--- a/formcycle-adapter/formcycle-adapter-interface/src/main/protobuf/form-data.model.proto
+++ b/formcycle-adapter/formcycle-adapter-interface/src/main/protobuf/form-data.model.proto
@@ -23,13 +23,13 @@
*/
syntax = "proto3";
-package de.itvsh.kop.eingangsadapter.formcycle;
+package de.ozgcloud.eingang.formcycle;
/*import "common.model.proto";*/
import "vorgangmodel.proto";
option java_multiple_files = true;
-option java_package = "de.itvsh.kop.eingangsadapter.formcycle";
+option java_package = "de.ozgcloud.eingang.formcycle";
option java_outer_classname = "FormcycleFormDataProto";
message FormCycleConfirmationResponse {
diff --git a/formsolutions-adapter/pom.xml b/formsolutions-adapter/pom.xml
index 11a4d73879284fda10d3fcbae76926877d265e91..143e6af44e8122a4e1334a0d417f9aca3acca1ee 100644
--- a/formsolutions-adapter/pom.xml
+++ b/formsolutions-adapter/pom.xml
@@ -144,7 +144,7 @@
</executions>
<configuration>
<schemaLanguage>WSDL</schemaLanguage>
- <generatePackage>de.itvsh.kop.eingangsadapter.formsolutions</generatePackage>
+ <generatePackage>de.ozgcloud.eingang.formsolutions</generatePackage>
<schemas>
<schema>
<fileset>
diff --git a/intelliform-adapter/pom.xml b/intelliform-adapter/pom.xml
index 426682ce68e8a0ec7ced288b4cb771dec12206cd..12c342127e4cc764bd9768418fb5136a71ab1f23 100644
--- a/intelliform-adapter/pom.xml
+++ b/intelliform-adapter/pom.xml
@@ -189,7 +189,7 @@
<configuration>
<strict>false</strict>
<schemaLanguage>WSDL</schemaLanguage>
- <generatePackage>de.itvsh.kop.eingangsadapter.intelliform</generatePackage>
+ <generatePackage>de.ozgcloud.eingang.intelliform</generatePackage>
<schemas>
<schema>
<fileset>