From f952431eeb351dc09ad671eec550b2dccbd1f8f0 Mon Sep 17 00:00:00 2001 From: JensBuehring Date: Wed, 7 Jan 2026 15:14:23 +0100 Subject: [PATCH] Projektstruktur vereinfacht --- .gitignore | 22 ++------ .../.run => .run}/Einbeziehung PDF.run.xml | 0 ...SServiceDefinition [clean, deploy].run.xml | 0 ...ServiceDefinition [clean, install].run.xml | 0 ...ServiceDefinition [clean, package].run.xml | 0 .../OMDSServiceDefinition assembly.run.xml | 0 .../.gitea/workflows/maven-build.yaml | 47 ------------------ OMDSServiceDefinition/.gitignore | 5 -- README.md | 24 --------- .../assembly.xml => assembly.xml | 4 -- OMDSServiceDefinition/pom.xml => pom.xml | 0 .../vvo/omds/client/BuildRequestHelper.java | 0 .../vvo/omds/client/LogCalculateResponse.java | 0 .../at/vvo/omds/client/api/CommonRequest.java | 0 .../java/at/vvo/omds/client/api/Product.java | 0 .../client/api/ProduktbausteinInterface.java | 0 .../at/vvo/omds/client/api/SOAPConnector.java | 0 .../omds/client/api/UnfallCalcService.java | 0 .../client/api/UnterbausteinInterface.java | 0 .../client/api/VerkaufsproduktInterface.java | 0 .../client/api/unfall/BuildUnfallRequest.java | 0 .../api/unfall/DefaultUnfallBuilder.java | 0 .../client/api/unfall/LaUnfallAssistance.java | 0 .../omds/client/api/unfall/Leistungsart.java | 0 .../api/unfall/LeistungsartInvaliditaet.java | 0 .../api/unfall/LeistungsartSpitalgeld.java | 0 .../api/unfall/LeistungsartUnfallkosten.java | 0 .../api/unfall/LeistungsartUnfallrente.java | 0 .../api/unfall/LeistungsartUnfalltod.java | 0 .../api/unfall/VerkaufsproduktUnfall.java | 0 .../client/api/unfall/VersichertePerson.java | 0 .../vvo/omds/client/gui/FehlerDefinitionen.md | 0 .../at/vvo/omds/client/gui/GuiProdukt.java | 0 .../at/vvo/omds/client/gui/ItemAttribute.java | 0 .../java/at/vvo/omds/client/gui/MainView.java | 0 .../omds/client/gui/ObjectFactoryFactory.java | 0 .../java/at/vvo/omds/client/gui/Plausi.java | 0 .../at/vvo/omds/client/gui/RDFHelper.java | 0 .../vvo/omds/client/gui/RisikoobjektView.java | 0 .../at/vvo/omds/client/gui/TreeHelper.java | 0 .../omds/client/gui/api/SOAPConnector.java | 0 .../api/apriori/AprioriAuskunftService.java | 0 .../gui/api/apriori/BuildProductsRequest.java | 0 .../calc/BuildCalculateRequestAuskunft.java | 0 .../calc/CalculateRequestAuskunftService.java | 0 ...asis-200401-wss-wssecurity-utility-1.0.xsd | 0 .../external/ws-2004-09-policy-ws-policy.xsd | 0 ...05-07-securitypolicy-ws-securitypolicy.xsd | 0 .../main/resources/def/external/ws-policy.xsd | 0 .../main/resources/def/r2025_27/binding.xjb | 0 .../resources/def/r2025_27/omds217-00.xsd | 0 .../def/r2025_27/omds3CommonServiceTypes.xsd | 0 .../def/r2025_27/omds3ServiceTypes.xsd | 0 .../resources/def/r2025_27/omds3Services.wsdl | 0 .../r2025_27/omds3_ON1_Basisfunktionen.xsd | 0 .../def/r2025_27/omds3_ON2_Antrag_Common.xsd | 0 .../def/r2025_27/omds3_ON2_Antrag_Kfz.xsd | 0 .../def/r2025_27/omds3_ON2_Antrag_Kranken.xsd | 0 .../def/r2025_27/omds3_ON2_Antrag_Leben.xsd | 0 .../omds3_ON2_Antrag_Rechtsschutz.xsd | 0 .../r2025_27/omds3_ON2_Antrag_SachPrivat.xsd | 0 .../def/r2025_27/omds3_ON2_Antrag_Unfall.xsd | 0 .../def/r2025_27/omds3_ON7_Schaden.xsd | 0 .../main/resources/log4j.properties | 0 .../main/resources/logo/VVO_Logo_2024.png | Bin .../main/resources/logo/VVO_Logo_2024.svg | 0 .../OmdsclientApplicationTests.java | 0 .../java/omdsclient/ProduktauskunftTests.java | 0 68 files changed, 5 insertions(+), 97 deletions(-) rename {OMDSServiceDefinition/.run => .run}/Einbeziehung PDF.run.xml (100%) rename {OMDSServiceDefinition/.run => .run}/OMDSServiceDefinition [clean, deploy].run.xml (100%) rename {OMDSServiceDefinition/.run => .run}/OMDSServiceDefinition [clean, install].run.xml (100%) rename {OMDSServiceDefinition/.run => .run}/OMDSServiceDefinition [clean, package].run.xml (100%) rename {OMDSServiceDefinition/.run => .run}/OMDSServiceDefinition assembly.run.xml (100%) delete mode 100644 OMDSServiceDefinition/.gitea/workflows/maven-build.yaml delete mode 100644 OMDSServiceDefinition/.gitignore rename OMDSServiceDefinition/assembly.xml => assembly.xml (89%) rename OMDSServiceDefinition/pom.xml => pom.xml (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/BuildRequestHelper.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/LogCalculateResponse.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/CommonRequest.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/Product.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/ProduktbausteinInterface.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/SOAPConnector.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/UnfallCalcService.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/UnterbausteinInterface.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/VerkaufsproduktInterface.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/unfall/BuildUnfallRequest.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/unfall/DefaultUnfallBuilder.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/unfall/LaUnfallAssistance.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/unfall/Leistungsart.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/unfall/LeistungsartInvaliditaet.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/unfall/LeistungsartSpitalgeld.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/unfall/LeistungsartUnfallkosten.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/unfall/LeistungsartUnfallrente.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/unfall/LeistungsartUnfalltod.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/unfall/VerkaufsproduktUnfall.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/api/unfall/VersichertePerson.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/gui/FehlerDefinitionen.md (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/gui/GuiProdukt.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/gui/ItemAttribute.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/gui/MainView.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/gui/ObjectFactoryFactory.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/gui/Plausi.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/gui/RDFHelper.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/gui/RisikoobjektView.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/gui/TreeHelper.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/gui/api/SOAPConnector.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/gui/api/apriori/AprioriAuskunftService.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/gui/api/apriori/BuildProductsRequest.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/gui/api/calc/BuildCalculateRequestAuskunft.java (100%) rename {OMDSServiceDefinition/src => src}/main/java/at/vvo/omds/client/gui/api/calc/CalculateRequestAuskunftService.java (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/external/oasis-200401-wss-wssecurity-utility-1.0.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/external/ws-2004-09-policy-ws-policy.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/external/ws-2005-07-securitypolicy-ws-securitypolicy.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/external/ws-policy.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/r2025_27/binding.xjb (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/r2025_27/omds217-00.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/r2025_27/omds3CommonServiceTypes.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/r2025_27/omds3ServiceTypes.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/r2025_27/omds3Services.wsdl (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/r2025_27/omds3_ON1_Basisfunktionen.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/r2025_27/omds3_ON2_Antrag_Common.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/r2025_27/omds3_ON2_Antrag_Kfz.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/r2025_27/omds3_ON2_Antrag_Kranken.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/r2025_27/omds3_ON2_Antrag_Leben.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/r2025_27/omds3_ON2_Antrag_Rechtsschutz.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/r2025_27/omds3_ON2_Antrag_SachPrivat.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/r2025_27/omds3_ON2_Antrag_Unfall.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/def/r2025_27/omds3_ON7_Schaden.xsd (100%) rename {OMDSServiceDefinition/src => src}/main/resources/log4j.properties (100%) rename {OMDSServiceDefinition/src => src}/main/resources/logo/VVO_Logo_2024.png (100%) rename {OMDSServiceDefinition/src => src}/main/resources/logo/VVO_Logo_2024.svg (100%) rename {OMDSServiceDefinition/src => src}/test/java/omdsclient/OmdsclientApplicationTests.java (100%) rename {OMDSServiceDefinition/src => src}/test/java/omdsclient/ProduktauskunftTests.java (100%) diff --git a/.gitignore b/.gitignore index 39d600e5..c5ad8fda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,7 @@ -OMDSServiceDefinition/.settings/ -OMDSServiceDefinition/doc/WSDL-XSD-Dokumentation/ -OMDSServiceDefinition/.project .project -OMDSServiceDefinition/OMDSServiceDefinition.iml -OMDSServiceDefinition/.idea/compiler.xml -OMDSServiceDefinition/.idea/ -.idea/.gitignore -.idea/dbnavigator.xml -.idea/misc.xml -.idea/modules.xml -.idea/omdsservicedefinitions.iml -.idea/vcs.xml -.idea/codeStyles/codeStyleConfig.xml -.idea/codeStyles/Project.xml *.iml -/.idea/compiler.xml -/.idea/encodings.xml -/.idea/jarRepositories.xml +/target/ +/docGen/ +/out +/auxil +/.idea/ diff --git a/OMDSServiceDefinition/.run/Einbeziehung PDF.run.xml b/.run/Einbeziehung PDF.run.xml similarity index 100% rename from OMDSServiceDefinition/.run/Einbeziehung PDF.run.xml rename to .run/Einbeziehung PDF.run.xml diff --git a/OMDSServiceDefinition/.run/OMDSServiceDefinition [clean, deploy].run.xml b/.run/OMDSServiceDefinition [clean, deploy].run.xml similarity index 100% rename from OMDSServiceDefinition/.run/OMDSServiceDefinition [clean, deploy].run.xml rename to .run/OMDSServiceDefinition [clean, deploy].run.xml diff --git a/OMDSServiceDefinition/.run/OMDSServiceDefinition [clean, install].run.xml b/.run/OMDSServiceDefinition [clean, install].run.xml similarity index 100% rename from OMDSServiceDefinition/.run/OMDSServiceDefinition [clean, install].run.xml rename to .run/OMDSServiceDefinition [clean, install].run.xml diff --git a/OMDSServiceDefinition/.run/OMDSServiceDefinition [clean, package].run.xml b/.run/OMDSServiceDefinition [clean, package].run.xml similarity index 100% rename from OMDSServiceDefinition/.run/OMDSServiceDefinition [clean, package].run.xml rename to .run/OMDSServiceDefinition [clean, package].run.xml diff --git a/OMDSServiceDefinition/.run/OMDSServiceDefinition assembly.run.xml b/.run/OMDSServiceDefinition assembly.run.xml similarity index 100% rename from OMDSServiceDefinition/.run/OMDSServiceDefinition assembly.run.xml rename to .run/OMDSServiceDefinition assembly.run.xml diff --git a/OMDSServiceDefinition/.gitea/workflows/maven-build.yaml b/OMDSServiceDefinition/.gitea/workflows/maven-build.yaml deleted file mode 100644 index 7f0c13ba..00000000 --- a/OMDSServiceDefinition/.gitea/workflows/maven-build.yaml +++ /dev/null @@ -1,47 +0,0 @@ -name: Productmodel Java CI with Maven - -on: - push: - branches: [main] - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout Code - uses: actions/checkout@v3 - - # Debugging-Schritt, um Umgebung zu überprüfen - - name: Debug Environment - run: | - echo "=== Arbeitsverzeichnis ===" - pwd - echo "=== Dateien ===" - ls -la - echo "=== Java-Version ===" - java -version || echo "Java nicht gefunden!" - echo "=== Maven-Version ===" - mvn -version || echo "Maven nicht gefunden!" - echo "=== Netzwerk-Test (falls nötig) ===" - ping -c 1 google.com || echo "Netzwerkprobleme?" - - # Java und Maven manuell installieren, falls nicht im Image -# - name: Install Java and Maven (Fallback) -# run: | -# # Das maven:3.9.9-eclipse-temurin-22-Image sollte Java und Maven haben, -# # aber als Fallback: -# if ! command -v java &> /dev/null; then -# echo "Installiere Java..." -# apt update && apt install -y openjdk-22-jdk -# fi -# if ! command -v mvn &> /dev/null; then -# echo "Installiere Maven..." -# apt install -y maven -# fi -# -# - name: Build with Maven -# run: | -# echo "Starte Maven-Build..." -# mvn -B package -# echo "Build abgeschlossen. Ergebnisse:" -# ls -la target \ No newline at end of file diff --git a/OMDSServiceDefinition/.gitignore b/OMDSServiceDefinition/.gitignore deleted file mode 100644 index c42a7c4f..00000000 --- a/OMDSServiceDefinition/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/target/ -/docGen/ -/out -/auxil -/.idea/ diff --git a/README.md b/README.md index 78e8dc64..eacfd60a 100644 --- a/README.md +++ b/README.md @@ -3,37 +3,13 @@ Dieses Projekt enthält die Servicedefinitionen von OMDS 3 als WSDLs und XSDs. Ferner sind die Dokumentationen der Services als Word-Dateien enthalten. -Git-Workflow ------------- -Das Projekt folgt dem GitFlow-Workflow, welcher [hier](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) beschrieben ist. - -Es gibt folgende Haupt-Branches: - -* **master** - der Master repräsentiert seit dem 1.9.2019 die offizielle Hauptentwicklungslinie und enthält die Releases als Tags -* **develop** - der Branch für die laufende Entwicklung, der Development-Branch kann der Veröffentlichung um mehrere Versionen vorauseilen. -Es können auch Services oder Objekte wieder verworfen werden. - -* **release/...** - der aktuelle Release-Candidate für die kommende Version. Dieser enthält nur solche Services und Objekte, die mit hoher Wahrscheinlichkeit im neuen Release enthalten sind. -* **feature/...** - Feature-Branches, in denen eigene Features modelliert werden, die noch so früh in der Diskussion sind, dass sie nicht einmal in den Development-Branch aufgenommen wurden. - -Daneben gibt es Feature und Release-Branches. - Projektaufbau ------------- Die Inhalte des Projekts sind in den folgenden Verzeichnissen organisiert: -* doc - Die Dokumentation der Services als Word Files -* docEntw - Die Dokumentation von Services, die noch nicht für den Release vorgesehen sind. -* docGen - Die mittels XMLSPY generierte Dokumentation (nur in den Veröffentlichungen enthalten) * src/main/java - beispielhaft mit CXF generierte Java-Klassen * src/main/resources/bind - Binding Definitionen für Apache CXF Framework * src/main/resources/def - XSD und WSDL-Files -Im Verzeichnis *src/main/resources/def* sind in Unterverzeichnisssen auch ältere Versionen -von OMDS 3 Definitionen enthahlten, damit ein einfacher Vergleich zwischen Versionen möglich ist. -In der jeweiligen Version finden sich folgende Files: -* omds3Services.wsdl - ist das WSDL mit den OMDS 3 Webservices -* omds3_ON ... .xsd - ist ein XSD mit OMDS 3 Datentypen. Es Referenziert die OMDS 2.x Datentypen -* omds...-00.xsd - ist ein XSD mit OMDS 2.x Datentypen diff --git a/OMDSServiceDefinition/assembly.xml b/assembly.xml similarity index 89% rename from OMDSServiceDefinition/assembly.xml rename to assembly.xml index dce03c46..dd6a2692 100644 --- a/OMDSServiceDefinition/assembly.xml +++ b/assembly.xml @@ -13,16 +13,12 @@ *dll *.jar - ReadMe.md - ReleaseNotes.md ${basedir} - ReadMe.md - ReleaseNotes.md pom.xml diff --git a/OMDSServiceDefinition/pom.xml b/pom.xml similarity index 100% rename from OMDSServiceDefinition/pom.xml rename to pom.xml diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/BuildRequestHelper.java b/src/main/java/at/vvo/omds/client/BuildRequestHelper.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/BuildRequestHelper.java rename to src/main/java/at/vvo/omds/client/BuildRequestHelper.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/LogCalculateResponse.java b/src/main/java/at/vvo/omds/client/LogCalculateResponse.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/LogCalculateResponse.java rename to src/main/java/at/vvo/omds/client/LogCalculateResponse.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/CommonRequest.java b/src/main/java/at/vvo/omds/client/api/CommonRequest.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/CommonRequest.java rename to src/main/java/at/vvo/omds/client/api/CommonRequest.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/Product.java b/src/main/java/at/vvo/omds/client/api/Product.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/Product.java rename to src/main/java/at/vvo/omds/client/api/Product.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/ProduktbausteinInterface.java b/src/main/java/at/vvo/omds/client/api/ProduktbausteinInterface.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/ProduktbausteinInterface.java rename to src/main/java/at/vvo/omds/client/api/ProduktbausteinInterface.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/SOAPConnector.java b/src/main/java/at/vvo/omds/client/api/SOAPConnector.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/SOAPConnector.java rename to src/main/java/at/vvo/omds/client/api/SOAPConnector.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/UnfallCalcService.java b/src/main/java/at/vvo/omds/client/api/UnfallCalcService.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/UnfallCalcService.java rename to src/main/java/at/vvo/omds/client/api/UnfallCalcService.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/UnterbausteinInterface.java b/src/main/java/at/vvo/omds/client/api/UnterbausteinInterface.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/UnterbausteinInterface.java rename to src/main/java/at/vvo/omds/client/api/UnterbausteinInterface.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/VerkaufsproduktInterface.java b/src/main/java/at/vvo/omds/client/api/VerkaufsproduktInterface.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/VerkaufsproduktInterface.java rename to src/main/java/at/vvo/omds/client/api/VerkaufsproduktInterface.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/BuildUnfallRequest.java b/src/main/java/at/vvo/omds/client/api/unfall/BuildUnfallRequest.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/BuildUnfallRequest.java rename to src/main/java/at/vvo/omds/client/api/unfall/BuildUnfallRequest.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/DefaultUnfallBuilder.java b/src/main/java/at/vvo/omds/client/api/unfall/DefaultUnfallBuilder.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/DefaultUnfallBuilder.java rename to src/main/java/at/vvo/omds/client/api/unfall/DefaultUnfallBuilder.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/LaUnfallAssistance.java b/src/main/java/at/vvo/omds/client/api/unfall/LaUnfallAssistance.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/LaUnfallAssistance.java rename to src/main/java/at/vvo/omds/client/api/unfall/LaUnfallAssistance.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/Leistungsart.java b/src/main/java/at/vvo/omds/client/api/unfall/Leistungsart.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/Leistungsart.java rename to src/main/java/at/vvo/omds/client/api/unfall/Leistungsart.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/LeistungsartInvaliditaet.java b/src/main/java/at/vvo/omds/client/api/unfall/LeistungsartInvaliditaet.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/LeistungsartInvaliditaet.java rename to src/main/java/at/vvo/omds/client/api/unfall/LeistungsartInvaliditaet.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/LeistungsartSpitalgeld.java b/src/main/java/at/vvo/omds/client/api/unfall/LeistungsartSpitalgeld.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/LeistungsartSpitalgeld.java rename to src/main/java/at/vvo/omds/client/api/unfall/LeistungsartSpitalgeld.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/LeistungsartUnfallkosten.java b/src/main/java/at/vvo/omds/client/api/unfall/LeistungsartUnfallkosten.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/LeistungsartUnfallkosten.java rename to src/main/java/at/vvo/omds/client/api/unfall/LeistungsartUnfallkosten.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/LeistungsartUnfallrente.java b/src/main/java/at/vvo/omds/client/api/unfall/LeistungsartUnfallrente.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/LeistungsartUnfallrente.java rename to src/main/java/at/vvo/omds/client/api/unfall/LeistungsartUnfallrente.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/LeistungsartUnfalltod.java b/src/main/java/at/vvo/omds/client/api/unfall/LeistungsartUnfalltod.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/LeistungsartUnfalltod.java rename to src/main/java/at/vvo/omds/client/api/unfall/LeistungsartUnfalltod.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/VerkaufsproduktUnfall.java b/src/main/java/at/vvo/omds/client/api/unfall/VerkaufsproduktUnfall.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/VerkaufsproduktUnfall.java rename to src/main/java/at/vvo/omds/client/api/unfall/VerkaufsproduktUnfall.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/VersichertePerson.java b/src/main/java/at/vvo/omds/client/api/unfall/VersichertePerson.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/unfall/VersichertePerson.java rename to src/main/java/at/vvo/omds/client/api/unfall/VersichertePerson.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/FehlerDefinitionen.md b/src/main/java/at/vvo/omds/client/gui/FehlerDefinitionen.md similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/FehlerDefinitionen.md rename to src/main/java/at/vvo/omds/client/gui/FehlerDefinitionen.md diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/GuiProdukt.java b/src/main/java/at/vvo/omds/client/gui/GuiProdukt.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/GuiProdukt.java rename to src/main/java/at/vvo/omds/client/gui/GuiProdukt.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/ItemAttribute.java b/src/main/java/at/vvo/omds/client/gui/ItemAttribute.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/ItemAttribute.java rename to src/main/java/at/vvo/omds/client/gui/ItemAttribute.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/MainView.java b/src/main/java/at/vvo/omds/client/gui/MainView.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/MainView.java rename to src/main/java/at/vvo/omds/client/gui/MainView.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/ObjectFactoryFactory.java b/src/main/java/at/vvo/omds/client/gui/ObjectFactoryFactory.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/ObjectFactoryFactory.java rename to src/main/java/at/vvo/omds/client/gui/ObjectFactoryFactory.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/Plausi.java b/src/main/java/at/vvo/omds/client/gui/Plausi.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/Plausi.java rename to src/main/java/at/vvo/omds/client/gui/Plausi.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/RDFHelper.java b/src/main/java/at/vvo/omds/client/gui/RDFHelper.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/RDFHelper.java rename to src/main/java/at/vvo/omds/client/gui/RDFHelper.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/RisikoobjektView.java b/src/main/java/at/vvo/omds/client/gui/RisikoobjektView.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/RisikoobjektView.java rename to src/main/java/at/vvo/omds/client/gui/RisikoobjektView.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/TreeHelper.java b/src/main/java/at/vvo/omds/client/gui/TreeHelper.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/TreeHelper.java rename to src/main/java/at/vvo/omds/client/gui/TreeHelper.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/SOAPConnector.java b/src/main/java/at/vvo/omds/client/gui/api/SOAPConnector.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/SOAPConnector.java rename to src/main/java/at/vvo/omds/client/gui/api/SOAPConnector.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/apriori/AprioriAuskunftService.java b/src/main/java/at/vvo/omds/client/gui/api/apriori/AprioriAuskunftService.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/apriori/AprioriAuskunftService.java rename to src/main/java/at/vvo/omds/client/gui/api/apriori/AprioriAuskunftService.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/apriori/BuildProductsRequest.java b/src/main/java/at/vvo/omds/client/gui/api/apriori/BuildProductsRequest.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/apriori/BuildProductsRequest.java rename to src/main/java/at/vvo/omds/client/gui/api/apriori/BuildProductsRequest.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/calc/BuildCalculateRequestAuskunft.java b/src/main/java/at/vvo/omds/client/gui/api/calc/BuildCalculateRequestAuskunft.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/calc/BuildCalculateRequestAuskunft.java rename to src/main/java/at/vvo/omds/client/gui/api/calc/BuildCalculateRequestAuskunft.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/calc/CalculateRequestAuskunftService.java b/src/main/java/at/vvo/omds/client/gui/api/calc/CalculateRequestAuskunftService.java similarity index 100% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/calc/CalculateRequestAuskunftService.java rename to src/main/java/at/vvo/omds/client/gui/api/calc/CalculateRequestAuskunftService.java diff --git a/OMDSServiceDefinition/src/main/resources/def/external/oasis-200401-wss-wssecurity-utility-1.0.xsd b/src/main/resources/def/external/oasis-200401-wss-wssecurity-utility-1.0.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/external/oasis-200401-wss-wssecurity-utility-1.0.xsd rename to src/main/resources/def/external/oasis-200401-wss-wssecurity-utility-1.0.xsd diff --git a/OMDSServiceDefinition/src/main/resources/def/external/ws-2004-09-policy-ws-policy.xsd b/src/main/resources/def/external/ws-2004-09-policy-ws-policy.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/external/ws-2004-09-policy-ws-policy.xsd rename to src/main/resources/def/external/ws-2004-09-policy-ws-policy.xsd diff --git a/OMDSServiceDefinition/src/main/resources/def/external/ws-2005-07-securitypolicy-ws-securitypolicy.xsd b/src/main/resources/def/external/ws-2005-07-securitypolicy-ws-securitypolicy.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/external/ws-2005-07-securitypolicy-ws-securitypolicy.xsd rename to src/main/resources/def/external/ws-2005-07-securitypolicy-ws-securitypolicy.xsd diff --git a/OMDSServiceDefinition/src/main/resources/def/external/ws-policy.xsd b/src/main/resources/def/external/ws-policy.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/external/ws-policy.xsd rename to src/main/resources/def/external/ws-policy.xsd diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/binding.xjb b/src/main/resources/def/r2025_27/binding.xjb similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/r2025_27/binding.xjb rename to src/main/resources/def/r2025_27/binding.xjb diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds217-00.xsd b/src/main/resources/def/r2025_27/omds217-00.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/r2025_27/omds217-00.xsd rename to src/main/resources/def/r2025_27/omds217-00.xsd diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3CommonServiceTypes.xsd b/src/main/resources/def/r2025_27/omds3CommonServiceTypes.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3CommonServiceTypes.xsd rename to src/main/resources/def/r2025_27/omds3CommonServiceTypes.xsd diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3ServiceTypes.xsd b/src/main/resources/def/r2025_27/omds3ServiceTypes.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3ServiceTypes.xsd rename to src/main/resources/def/r2025_27/omds3ServiceTypes.xsd diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3Services.wsdl b/src/main/resources/def/r2025_27/omds3Services.wsdl similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3Services.wsdl rename to src/main/resources/def/r2025_27/omds3Services.wsdl diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON1_Basisfunktionen.xsd b/src/main/resources/def/r2025_27/omds3_ON1_Basisfunktionen.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON1_Basisfunktionen.xsd rename to src/main/resources/def/r2025_27/omds3_ON1_Basisfunktionen.xsd diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Common.xsd b/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Common.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Common.xsd rename to src/main/resources/def/r2025_27/omds3_ON2_Antrag_Common.xsd diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Kfz.xsd b/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Kfz.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Kfz.xsd rename to src/main/resources/def/r2025_27/omds3_ON2_Antrag_Kfz.xsd diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Kranken.xsd b/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Kranken.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Kranken.xsd rename to src/main/resources/def/r2025_27/omds3_ON2_Antrag_Kranken.xsd diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Leben.xsd b/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Leben.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Leben.xsd rename to src/main/resources/def/r2025_27/omds3_ON2_Antrag_Leben.xsd diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Rechtsschutz.xsd b/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Rechtsschutz.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Rechtsschutz.xsd rename to src/main/resources/def/r2025_27/omds3_ON2_Antrag_Rechtsschutz.xsd diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON2_Antrag_SachPrivat.xsd b/src/main/resources/def/r2025_27/omds3_ON2_Antrag_SachPrivat.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON2_Antrag_SachPrivat.xsd rename to src/main/resources/def/r2025_27/omds3_ON2_Antrag_SachPrivat.xsd diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Unfall.xsd b/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Unfall.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON2_Antrag_Unfall.xsd rename to src/main/resources/def/r2025_27/omds3_ON2_Antrag_Unfall.xsd diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON7_Schaden.xsd b/src/main/resources/def/r2025_27/omds3_ON7_Schaden.xsd similarity index 100% rename from OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON7_Schaden.xsd rename to src/main/resources/def/r2025_27/omds3_ON7_Schaden.xsd diff --git a/OMDSServiceDefinition/src/main/resources/log4j.properties b/src/main/resources/log4j.properties similarity index 100% rename from OMDSServiceDefinition/src/main/resources/log4j.properties rename to src/main/resources/log4j.properties diff --git a/OMDSServiceDefinition/src/main/resources/logo/VVO_Logo_2024.png b/src/main/resources/logo/VVO_Logo_2024.png similarity index 100% rename from OMDSServiceDefinition/src/main/resources/logo/VVO_Logo_2024.png rename to src/main/resources/logo/VVO_Logo_2024.png diff --git a/OMDSServiceDefinition/src/main/resources/logo/VVO_Logo_2024.svg b/src/main/resources/logo/VVO_Logo_2024.svg similarity index 100% rename from OMDSServiceDefinition/src/main/resources/logo/VVO_Logo_2024.svg rename to src/main/resources/logo/VVO_Logo_2024.svg diff --git a/OMDSServiceDefinition/src/test/java/omdsclient/OmdsclientApplicationTests.java b/src/test/java/omdsclient/OmdsclientApplicationTests.java similarity index 100% rename from OMDSServiceDefinition/src/test/java/omdsclient/OmdsclientApplicationTests.java rename to src/test/java/omdsclient/OmdsclientApplicationTests.java diff --git a/OMDSServiceDefinition/src/test/java/omdsclient/ProduktauskunftTests.java b/src/test/java/omdsclient/ProduktauskunftTests.java similarity index 100% rename from OMDSServiceDefinition/src/test/java/omdsclient/ProduktauskunftTests.java rename to src/test/java/omdsclient/ProduktauskunftTests.java