From 31bd55b0a4b71dee1ccf8a22858f49de37f07e76 Mon Sep 17 00:00:00 2001
From: Lukas <lukas.juraczka@kapdion.com>
Date: Fri, 7 Feb 2025 16:57:34 +0100
Subject: [PATCH] =?UTF-8?q?Annox=20in=20bindingx.xjb=20hinzugef=C3=BCgt,?=
 =?UTF-8?q?=20um=20die=20@XmlRootElement=20Annotation=20in=20den=20Java=20?=
 =?UTF-8?q?Klassen=20zu=20generieren.=20Nicht=20ben=C3=B6tigte=20binding?=
 =?UTF-8?q?=20Dateien=20gel=C3=B6scht.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/def/r1_10_0/bindingWsdl.xml     |  14 -
 .../main/resources/def/r1_10_0/bindingx.xjb   | 185 -------
 .../resources/def/r1_11_0/omds_binding.xml    | 177 ------
 .../resources/def/r1_11_0/wsdl_binding.xml    |  15 -
 .../main/resources/def/r1_8_0/bindingWsdl.xml |  14 -
 .../main/resources/def/r1_8_0/bindingx.xjb    | 129 -----
 .../resources/def/r1_8_0/omds_binding.xml     | 167 ------
 .../resources/def/r1_8_0/wsdl_binding.xml     |   8 -
 .../main/resources/def/r2025_05/binding.xjb   | 518 ++++++++++++++++++
 9 files changed, 518 insertions(+), 709 deletions(-)
 delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_10_0/bindingWsdl.xml
 delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_10_0/bindingx.xjb
 delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_11_0/omds_binding.xml
 delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_11_0/wsdl_binding.xml
 delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_8_0/bindingWsdl.xml
 delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_8_0/bindingx.xjb
 delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds_binding.xml
 delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_8_0/wsdl_binding.xml

diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_10_0/bindingWsdl.xml b/OMDSServiceDefinition/src/main/resources/def/r1_10_0/bindingWsdl.xml
deleted file mode 100644
index 80cc731d..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_10_0/bindingWsdl.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jaxb:bindings
-        schemaLocation="omds3Services.wsdl"
-        xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
-        xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
-        version="3.0"
->
-<!--    <jaxb:schemaBindings >-->
-<!--        <jaxb:package name="at.vvo.omds.types.omds3Types.r1_10_0.service"/>-->
-<!--    </jaxb:schemaBindings>-->
-
-    <ws:enableWrapperStyle>true</ws:enableWrapperStyle>
-    <ws:enableAsyncMapping>false</ws:enableAsyncMapping>
-</jaxb:bindings>
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_10_0/bindingx.xjb b/OMDSServiceDefinition/src/main/resources/def/r1_10_0/bindingx.xjb
deleted file mode 100644
index 92053785..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_10_0/bindingx.xjb
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bindings xmlns="https://jakarta.ee/xml/ns/jaxb"
-          xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
-          xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns:annox="urn:jaxb.jvnet.org:annox"
-          xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb https://jakarta.ee/xml/ns/jaxb/bindingschema_3_0.xsd"
-          jaxb:extensionBindingPrefixes="xjc annox"
-          xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-          version="3.0">
-
-
-
-   <!-- OMDS 2 -->
-   <jaxb:bindings schemaLocation="omds215-00.xsd" node="/xs:schema">
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds2Types.v2_15"/>
-      </jaxb:schemaBindings>
-
-      <!-- Raise theEnumMemberSizeCap limit -->
-      <jaxb:bindings>
-         <jaxb:globalBindings typesafeEnumMaxMembers="2000"/>
-      </jaxb:bindings>
-   </jaxb:bindings>
-
-   <!-- Namespace http://omds.vvo.at/types/omds3types/v1_4_0/common  -->
-   <jaxb:bindings schemaLocation="omds3CommonServiceTypes.xsd"  node="/xs:schema">
-
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_10_0.common"/>
-      </jaxb:schemaBindings>
-
-      <jaxb:bindings node="//xs:complexType[@name='Kombinationen_Type']//xs:element[@name='Kombination']">
-         <jaxb:property name="kombinationen">
-            <jaxb:javadoc><![CDATA[<p>Die Liste der zulässigen Kombinationen.</p>]]></jaxb:javadoc>
-         </jaxb:property>
-      </jaxb:bindings>
-
-      <jaxb:bindings node="//xs:complexType[@name='Kombination_Type']//xs:element[@name='TarifId']">
-         <jaxb:property name="tarifids">
-            <jaxb:javadoc><![CDATA[<p>Die Liste der zulässigen Baustein-Ids.</p>]]></jaxb:javadoc>
-         </jaxb:property>
-      </jaxb:bindings>
-
-      <jaxb:bindings node="//xs:complexType[@name='KonvertierungsumfangVertrag_Type']//xs:element[@name='Baustein']">
-         <jaxb:property name="bausteine">
-            <jaxb:javadoc><![CDATA[<p>Die Liste der Bausteine, die in der Konvertierungsanforderung behandelt werden.</p>]]></jaxb:javadoc>
-         </jaxb:property>
-      </jaxb:bindings>
-
-      <jaxb:bindings node="//xs:complexType[@name='KonvertierungBaustein_Type']//xs:element[@name='ZulaessigeAktion']">
-         <jaxb:property name="zulaessigeAktionen">
-            <jaxb:javadoc><![CDATA[<p>Die Liste der Aktionen, die für einen Vertragsbaustein zulässig sind.
-         Die zulässigen Aktionen müssen nur im Response vom ServiceProvider (VU) befüllt werden.
-         Im Request eines Konvertierungsvorschlags durch den Consumer, können sie leer bleiben. </p>]]></jaxb:javadoc>
-         </jaxb:property>
-      </jaxb:bindings>
-
-      <jaxb:bindings node="//xs:complexType[@name='KonvertierungsaktionUebernehmen_Type']//xs:element[@name='Baustein']">
-         <jaxb:property name="bausteine">
-            <jaxb:javadoc><![CDATA[<p>Die Liste der Bausteine, die in der Konvertierungsaktion behandelt werden.</p>]]></jaxb:javadoc>
-         </jaxb:property>
-      </jaxb:bindings>
-
-   </jaxb:bindings>
-
-   <!-- "Quick-wins" Namespace http://omds.vvo.at/types/omds3types/v1_4_0/servicetypes -->
-   <jaxb:bindings schemaLocation="omds3ServiceTypes.xsd" node="/xs:schema">
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_10_0.servicetypes"/>
-      </jaxb:schemaBindings>
-   </jaxb:bindings>
-
-   <!-- Basisfuntkionen Namespace http://omds.vvo.at/types/omds3types/v1_4_0/on1basis -->
-   <jaxb:bindings schemaLocation="omds3_ON1_Basisfunktionen.xsd" node="/xs:schema" >
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_10_0.on1basis" />
-      </jaxb:schemaBindings>
-
-   </jaxb:bindings>
-
-   <!-- Antrag-Common Namespace http://omds.vvo.at/types/omds3types/v1_4_0/on2antrag/common" -->
-   <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Common.xsd" node="/xs:schema" >
-
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_10_0.on2antrag.common"/>
-      </jaxb:schemaBindings>
-
-      <jaxb:bindings node="//xs:element[@name='ConversionScopeRequest']//xs:element[@name='Vertrag']">
-         <jaxb:property name="vertraege">
-            <jaxb:javadoc><![CDATA[<p>Die Liste der Verträge, die in der Konvertierung behandelt werden sollen.</p>]]></jaxb:javadoc>
-         </jaxb:property>
-      </jaxb:bindings>
-
-      <jaxb:bindings node="//xs:complexType[@name='Konvertierungsumfang_Type']//xs:element[@name='Vertrag']">
-         <jaxb:property name="vertraege">
-            <jaxb:javadoc><![CDATA[<p>Die Liste der Verträge, die in der Konvertierungsanforderung behandelt werden.</p>]]></jaxb:javadoc>
-         </jaxb:property>
-      </jaxb:bindings>
-   </jaxb:bindings>
-
-   <!-- Antrag Kfz -->
-   <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Kfz.xsd" node="/xs:schema">
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_10_0.on2antrag.kfz"/>
-      </jaxb:schemaBindings>
-   </jaxb:bindings>
-
-   <!-- Antrag Kranken Namespace urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken  -->
-   <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Kranken.xsd" node="/xs:schema">
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_10_0.on2antrag.kranken"/>
-      </jaxb:schemaBindings>
-   </jaxb:bindings>
-
-   <!-- Antrag Leben Namespace urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben  -->
-   <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Leben.xsd" node="/xs:schema">
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_10_0.on2antrag.leben"/>
-      </jaxb:schemaBindings>
-   </jaxb:bindings>
-
-   <!-- Antrag Sach-Privat Namespace urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat -->
-   <jaxb:bindings schemaLocation="omds3_ON2_Antrag_SachPrivat.xsd" node="/xs:schema" >
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_10_0.on2antrag.sachPrivat"/>
-      </jaxb:schemaBindings>
-   </jaxb:bindings>
-
-   <!-- Antrag Unfall Namespace urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall  -->
-   <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Unfall.xsd" node="/xs:schema">
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_10_0.on2antrag.unfall"/>
-      </jaxb:schemaBindings>
-      <bindings node="xs:complexType[@name='CalculateUnfallRequest_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateUnfallRequest"/>
-         </annox:annotate>
-      </bindings>
-      <bindings node="xs:complexType[@name='CalculateUnfallResponse_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateUnfallResponse"/>
-         </annox:annotate>
-      </bindings>
-      <bindings node="xs:complexType[@name='CreateOfferUnfallRequest_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferUnfallRequest"/>
-         </annox:annotate>
-      </bindings>
-      <bindings node="xs:complexType[@name='CreateOfferUnfallResponse_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferUnfallResponse"/>
-         </annox:annotate>
-      </bindings>
-      <bindings node="xs:complexType[@name='CreateApplicationUnfallRequest_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationUnfallRequest"/>
-         </annox:annotate>
-      </bindings>
-      <bindings node="xs:complexType[@name='CreateApplicationUnfallResponse_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationUnfallResponse"/>
-         </annox:annotate>
-      </bindings>
-      <bindings node="xs:complexType[@name='SubmitApplicationUnfallRequest_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationUnfallRequest"/>
-         </annox:annotate>
-      </bindings>
-      <bindings node="xs:complexType[@name='SubmitApplicationUnfallResponse_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationUnfallResponse"/>
-         </annox:annotate>
-      </bindings>
-   </jaxb:bindings>
-
-   <!-- Schaden Namespace "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden" -->
-   <jaxb:bindings schemaLocation="omds3_ON7_Schaden.xsd" node="/xs:schema">
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_10_0.on7schaden"/>
-      </jaxb:schemaBindings>
-   </jaxb:bindings>
-
-
-</bindings>
\ No newline at end of file
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_11_0/omds_binding.xml b/OMDSServiceDefinition/src/main/resources/def/r1_11_0/omds_binding.xml
deleted file mode 100644
index b723295e..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_11_0/omds_binding.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jaxb:bindings
-   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-   xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
-   xmlns:jaxws="https://jakarta.ee/xml/ns/jaxws"
-   version="3.0" >
-
-  <!-- OMDS 2 -->
-  <jaxb:bindings schemaLocation="omds216-00.xsd" node="/xs:schema">
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds2Types.v2_16"/>
-    </jaxb:schemaBindings>
-
-    <!-- Raise theEnumMemberSizeCap limit -->
-    <jaxb:bindings>
-      <jaxb:globalBindings typesafeEnumMaxMembers="2000"/>
-    </jaxb:bindings>
-  </jaxb:bindings>
-
-  <!-- Namespace http://omds.vvo.at/types/omds3types/v1_4_0/common  -->
-  <jaxb:bindings schemaLocation="omds3CommonServiceTypes.xsd"  node="/xs:schema">
-
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_11_0.common"/>
-    </jaxb:schemaBindings>
-
-    <jaxb:bindings node="//xs:complexType[@name='Kombinationen_Type']//xs:element[@name='Kombination']">
-      <jaxb:property name="kombinationen">
-        <jaxb:javadoc><![CDATA[<p>Die Liste der zulässigen Kombinationen.</p>]]></jaxb:javadoc>
-      </jaxb:property>
-    </jaxb:bindings>
-
-    <jaxb:bindings node="//xs:complexType[@name='Kombination_Type']//xs:element[@name='TarifId']">
-      <jaxb:property name="tarifids">
-        <jaxb:javadoc><![CDATA[<p>Die Liste der zulässigen Baustein-Ids.</p>]]></jaxb:javadoc>
-      </jaxb:property>
-    </jaxb:bindings>
-
-    <jaxb:bindings node="//xs:complexType[@name='KonvertierungsumfangVertrag_Type']//xs:element[@name='Baustein']">
-      <jaxb:property name="bausteine">
-        <jaxb:javadoc><![CDATA[<p>Die Liste der Bausteine, die in der Konvertierungsanforderung behandelt werden.</p>]]></jaxb:javadoc>
-      </jaxb:property>
-    </jaxb:bindings>
-
-    <jaxb:bindings node="//xs:complexType[@name='KonvertierungBaustein_Type']//xs:element[@name='ZulaessigeAktion']">
-      <jaxb:property name="zulaessigeAktionen">
-        <jaxb:javadoc><![CDATA[<p>Die Liste der Aktionen, die für einen Vertragsbaustein zulässig sind.
-         Die zulässigen Aktionen müssen nur im Response vom ServiceProvider (VU) befüllt werden.
-         Im Request eines Konvertierungsvorschlags durch den Consumer, können sie leer bleiben. </p>]]></jaxb:javadoc>
-      </jaxb:property>
-    </jaxb:bindings>
-
-    <jaxb:bindings node="//xs:complexType[@name='KonvertierungsaktionUebernehmen_Type']//xs:element[@name='Baustein']">
-      <jaxb:property name="bausteine">
-        <jaxb:javadoc><![CDATA[<p>Die Liste der Bausteine, die in der Konvertierungsaktion behandelt werden.</p>]]></jaxb:javadoc>
-      </jaxb:property>
-    </jaxb:bindings>
-  </jaxb:bindings>
-
-  <!-- "Quick-wins" Namespace http://omds.vvo.at/types/omds3types/v1_4_0/servicetypes -->
-  <jaxb:bindings schemaLocation="omds3ServiceTypes.xsd" node="/xs:schema">
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_11_0.servicetypes"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings>
-
-  <!-- Basisfuntkionen Namespace http://omds.vvo.at/types/omds3types/v1_4_0/on1basis -->
-  <jaxb:bindings schemaLocation="omds3_ON1_Basisfunktionen.xsd" node="/xs:schema" >
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_11_0.on1basis" />
-    </jaxb:schemaBindings>
-  </jaxb:bindings>
-
-  <!-- Antrag-Common Namespace http://omds.vvo.at/types/omds3types/v1_4_0/on2antrag/common" -->
-  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Common.xsd" node="/xs:schema" >
-
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_11_0.on2antrag.common"/>
-    </jaxb:schemaBindings>
-
-    <jaxb:bindings node="//xs:element[@name='ConversionScopeRequest']//xs:element[@name='Vertrag']">
-      <jaxb:property name="vertraege">
-        <jaxb:javadoc><![CDATA[<p>Die Liste der Verträge, die in der Konvertierung behandelt werden sollen.</p>]]></jaxb:javadoc>
-      </jaxb:property>
-    </jaxb:bindings>
-
-    <jaxb:bindings node="//xs:complexType[@name='Konvertierungsumfang_Type']//xs:element[@name='Vertrag']">
-      <jaxb:property name="vertraege">
-        <jaxb:javadoc><![CDATA[<p>Die Liste der Verträge, die in der Konvertierungsanforderung behandelt werden.</p>]]></jaxb:javadoc>
-      </jaxb:property>
-    </jaxb:bindings>
-
-    <jaxb:bindings node="//xs:complexType[@name='CreateOfferRequest_Type']//xs:element[@name='DokAnfordVermittler']">
-      <jaxb:property name="dokumentenAnforderungenVermittler">
-        <jaxb:javadoc><![CDATA[<p>Die Dokumente, welche der Vermittler für den Response anfordert.</p>]]></jaxb:javadoc>
-      </jaxb:property>
-    </jaxb:bindings>
-    <jaxb:bindings node="//xs:complexType[@name='CreateApplicationRequest_Type']//xs:element[@name='DokAnfordVermittler']">
-      <jaxb:property name="dokumentenAnforderungenVermittler">
-        <jaxb:javadoc><![CDATA[<p>Die Dokumente, welche der Vermittler für den Response anfordert.</p>]]></jaxb:javadoc>
-      </jaxb:property>
-    </jaxb:bindings>
-
-  </jaxb:bindings>
-
-  <!-- Antrag Kfz -->
-  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Kfz.xsd" node="/xs:schema">
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_11_0.on2antrag.kfz"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings>
-
-  <!-- Antrag Kranken Namespace urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken  -->
-  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Kranken.xsd" node="/xs:schema">
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_11_0.on2antrag.kranken"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings>
-
-  <!-- Antrag Leben Namespace urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben  -->
-  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Leben.xsd" node="/xs:schema">
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_11_0.on2antrag.leben"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings>
-
-  <!-- Produktfinder Namespace urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.produktfinder  -->
-<!--  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Produktfinder.xsd">-->
-<!--    <jaxb:schemaBindings>-->
-<!--      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_11_0.on2antrag.produktfinder"/>-->
-<!--    </jaxb:schemaBindings>-->
-<!--  </jaxb:bindings>-->
-
-  <!-- Antrag Rechtsschutz Namespace urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs
-  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Rechtsschutz.xsd" node="/xs:schema" >
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_11_0.on2antrag.rs"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings>-->
-
-  <!-- Antrag Sach-Privat Namespace urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat -->
-  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_SachPrivat.xsd" node="/xs:schema" >
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_11_0.on2antrag.sachPrivat"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings>
-
-  <!-- Antrag Unfall Namespace urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall  -->
-  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Unfall.xsd" node="/xs:schema">
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_11_0.on2antrag.unfall"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings>
-
-  <!-- Vertrag Namespace http://omds.vvo.at/types/omds3types/v1_4_0/on3vertrag  -->
-<!--  <jaxb:bindings schemaLocation="omds3_ON3_Vertrag.xsd">-->
-<!--    <jaxb:schemaBindings>-->
-<!--      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_11_0.on3vertrag"/>-->
-<!--    </jaxb:schemaBindings>-->
-<!--  </jaxb:bindings>-->
-
-  <!-- Partner Namespace http://omds.vvo.at/types/omds3types/v1_4_0/on4partner -->
-<!--  <jaxb:bindings schemaLocation="omds3_ON4_Partner.xsd">-->
-<!--    <jaxb:schemaBindings>-->
-<!--      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_11_0.on4partner"/>-->
-<!--    </jaxb:schemaBindings>-->
-<!--  </jaxb:bindings>-->
-
-  <!-- Schaden Namespace "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden" -->
-  <jaxb:bindings schemaLocation="omds3_ON7_Schaden.xsd" node="/xs:schema">
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_11_0.on7schaden"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings>
-
-
-</jaxb:bindings>
\ No newline at end of file
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_11_0/wsdl_binding.xml b/OMDSServiceDefinition/src/main/resources/def/r1_11_0/wsdl_binding.xml
deleted file mode 100644
index f01dc63d..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_11_0/wsdl_binding.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bindings
-	wsdlLocation="omds3Services.wsdl"
-	xmlns="https://jakarta.ee/xml/ns/jaxws"
-	>
-
-    	<package name="at.vvo.omds.types.omds3Types.r1_11_0.service"/>
-    	<enableWrapperStyle>true</enableWrapperStyle>
-    	<enableAsyncMapping>false</enableAsyncMapping>
-  
-</bindings> 
- 
- 
-	
-
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/bindingWsdl.xml b/OMDSServiceDefinition/src/main/resources/def/r1_8_0/bindingWsdl.xml
deleted file mode 100644
index 80cc731d..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/bindingWsdl.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jaxb:bindings
-        schemaLocation="omds3Services.wsdl"
-        xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
-        xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
-        version="3.0"
->
-<!--    <jaxb:schemaBindings >-->
-<!--        <jaxb:package name="at.vvo.omds.types.omds3Types.r1_10_0.service"/>-->
-<!--    </jaxb:schemaBindings>-->
-
-    <ws:enableWrapperStyle>true</ws:enableWrapperStyle>
-    <ws:enableAsyncMapping>false</ws:enableAsyncMapping>
-</jaxb:bindings>
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/bindingx.xjb b/OMDSServiceDefinition/src/main/resources/def/r1_8_0/bindingx.xjb
deleted file mode 100644
index 0f45d8d7..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/bindingx.xjb
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bindings xmlns="https://jakarta.ee/xml/ns/jaxb"
-          xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
-          xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns:annox="urn:jaxb.jvnet.org:annox"
-          xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb https://jakarta.ee/xml/ns/jaxb/bindingschema_3_0.xsd"
-          extensionBindingPrefixes="xjc annox"
-          xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-          version="3.0">
-
-   <!-- OMDS 2 -->
-   <bindings schemaLocation="omds214-00.xsd" node="/xs:schema">
-      <schemaBindings>
-         <package name="at.vvo.omds.types.omds2Types.v2_14"/>
-      </schemaBindings>
-
-      <!-- Raise theEnumMemberSizeCap limit -->
-      <bindings>
-         <globalBindings typesafeEnumMaxMembers="2000"/>
-      </bindings>
-   </bindings>
-
-   <!-- Namespace http://omds.vvo.at/types/omds3types/v1_4_0/common  -->
-   <jaxb:bindings schemaLocation="omds3CommonServiceTypes.xsd"  node="/xs:schema">
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.common"/>
-      </jaxb:schemaBindings>
-   </jaxb:bindings>
-
-   <!-- "Quick-wins" Namespace http://omds.vvo.at/types/omds3types/v1_4_0/servicetypes -->
-   <jaxb:bindings schemaLocation="omds3ServiceTypes.xsd" node="/xs:schema">
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.servicetypes"/>
-      </jaxb:schemaBindings>
-   </jaxb:bindings>
-
-   <!-- Basisfuntkionen Namespace http://omds.vvo.at/types/omds3types/v1_4_0/on1basis -->
-   <jaxb:bindings schemaLocation="omds3_ON1_Basisfunktionen.xsd" node="/xs:schema" >
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on1basis" />
-      </jaxb:schemaBindings>
-
-   </jaxb:bindings>
-
-   <!-- Antrag-Common Namespace http://omds.vvo.at/types/omds3types/v1_4_0/on2antrag/common" -->
-   <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Common.xsd" node="/xs:schema" >
-
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common"/>
-      </jaxb:schemaBindings>
-   </jaxb:bindings>
-
-   <!-- Antrag Kfz -->
-   <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Kfz.xsd" node="/xs:schema">
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kfz"/>
-      </jaxb:schemaBindings>
-   </jaxb:bindings>
-
-   <!-- Antrag Leben Namespace urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben  -->
-   <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Leben.xsd" node="/xs:schema">
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben"/>
-      </jaxb:schemaBindings>
-   </jaxb:bindings>
-
-   <!-- Antrag Sach-Privat Namespace urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat -->
-   <jaxb:bindings schemaLocation="omds3_ON2_Antrag_SachPrivat.xsd" node="/xs:schema" >
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat"/>
-      </jaxb:schemaBindings>
-   </jaxb:bindings>
-
-   <!-- Antrag Unfall Namespace urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall  -->
-   <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Unfall.xsd" node="/xs:schema">
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall"/>
-      </jaxb:schemaBindings>
-      <bindings node="xs:complexType[@name='CalculateUnfallRequest_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateUnfallRequest"/>
-         </annox:annotate>
-      </bindings>
-      <bindings node="xs:complexType[@name='CalculateUnfallResponse_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateUnfallResponse"/>
-         </annox:annotate>
-      </bindings>
-      <bindings node="xs:complexType[@name='CreateOfferUnfallRequest_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferUnfallRequest"/>
-         </annox:annotate>
-      </bindings>
-      <bindings node="xs:complexType[@name='CreateOfferUnfallResponse_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferUnfallResponse"/>
-         </annox:annotate>
-      </bindings>
-      <bindings node="xs:complexType[@name='CreateApplicationUnfallRequest_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationUnfallRequest"/>
-         </annox:annotate>
-      </bindings>
-      <bindings node="xs:complexType[@name='CreateApplicationUnfallResponse_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationUnfallResponse"/>
-         </annox:annotate>
-      </bindings>
-      <bindings node="xs:complexType[@name='SubmitApplicationUnfallRequest_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationUnfallRequest"/>
-         </annox:annotate>
-      </bindings>
-      <bindings node="xs:complexType[@name='SubmitApplicationUnfallResponse_Type']">
-         <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationUnfallResponse"/>
-         </annox:annotate>
-      </bindings>
-   </jaxb:bindings>
-
-   <!-- Schaden Namespace "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden" -->
-   <jaxb:bindings schemaLocation="omds3_ON7_Schaden.xsd" node="/xs:schema">
-      <jaxb:schemaBindings>
-         <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on7schaden"/>
-      </jaxb:schemaBindings>
-   </jaxb:bindings>
-
-</bindings>
\ No newline at end of file
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds_binding.xml b/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds_binding.xml
deleted file mode 100644
index fc9df31e..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds_binding.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jaxb:bindings
-   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-   xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
-   xmlns:jaxws="https://jakarta.ee/xml/ns/jaxws"
-   version="3.0" >
-
-  <!-- OMDS 2 -->
-  <jaxb:bindings schemaLocation="omds214-00.xsd" node="/xs:schema">
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds2Types.v2_14"/>
-    </jaxb:schemaBindings>
-
-    <!-- Raise theEnumMemberSizeCap limit -->
-    <jaxb:bindings>
-      <jaxb:globalBindings typesafeEnumMaxMembers="2000"/>
-    </jaxb:bindings>
-  </jaxb:bindings>
-
-  <!-- Namespace http://omds.vvo.at/types/omds3types/v1_4_0/common  -->
-  <jaxb:bindings schemaLocation="omds3CommonServiceTypes.xsd"  node="/xs:schema">
-
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.common"/>
-    </jaxb:schemaBindings>
-
-<!--    <jaxb:bindings node="//xs:complexType[@name='Kombinationen_Type']//xs:element[@name='Kombination']">-->
-<!--      <jaxb:property name="kombinationen">-->
-<!--        <jaxb:javadoc><![CDATA[<p>Die Liste der zulässigen Kombinationen.</p>]]></jaxb:javadoc>-->
-<!--      </jaxb:property>-->
-<!--    </jaxb:bindings>-->
-
-<!--    <jaxb:bindings node="//xs:complexType[@name='Kombination_Type']//xs:element[@name='TarifId']">-->
-<!--      <jaxb:property name="tarifids">-->
-<!--        <jaxb:javadoc><![CDATA[<p>Die Liste der zulässigen Baustein-Ids.</p>]]></jaxb:javadoc>-->
-<!--      </jaxb:property>-->
-<!--    </jaxb:bindings>-->
-
-<!--    <jaxb:bindings node="//xs:complexType[@name='KonvertierungsumfangVertrag_Type']//xs:element[@name='Baustein']">-->
-<!--      <jaxb:property name="bausteine">-->
-<!--        <jaxb:javadoc><![CDATA[<p>Die Liste der Bausteine, die in der Konvertierungsanforderung behandelt werden.</p>]]></jaxb:javadoc>-->
-<!--      </jaxb:property>-->
-<!--    </jaxb:bindings>-->
-
-<!--    <jaxb:bindings node="//xs:complexType[@name='KonvertierungBaustein_Type']//xs:element[@name='ZulaessigeAktion']">-->
-<!--      <jaxb:property name="zulaessigeAktionen">-->
-<!--        <jaxb:javadoc><![CDATA[<p>Die Liste der Aktionen, die für einen Vertragsbaustein zulässig sind.-->
-<!--         Die zulässigen Aktionen müssen nur im Response vom ServiceProvider (VU) befüllt werden.-->
-<!--         Im Request eines Konvertierungsvorschlags durch den Consumer, können sie leer bleiben. </p>]]></jaxb:javadoc>-->
-<!--      </jaxb:property>-->
-<!--    </jaxb:bindings>-->
-
-<!--    <jaxb:bindings node="//xs:complexType[@name='KonvertierungsaktionUebernehmen_Type']//xs:element[@name='Baustein']">-->
-<!--      <jaxb:property name="bausteine">-->
-<!--        <jaxb:javadoc><![CDATA[<p>Die Liste der Bausteine, die in der Konvertierungsaktion behandelt werden.</p>]]></jaxb:javadoc>-->
-<!--      </jaxb:property>-->
-<!--    </jaxb:bindings>-->
-  </jaxb:bindings>
-
-  <!-- "Quick-wins" Namespace http://omds.vvo.at/types/omds3types/v1_4_0/servicetypes -->
-  <jaxb:bindings schemaLocation="omds3ServiceTypes.xsd" node="/xs:schema">
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.servicetypes"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings>
-
-  <!-- Basisfuntkionen Namespace http://omds.vvo.at/types/omds3types/v1_4_0/on1basis -->
-  <jaxb:bindings schemaLocation="omds3_ON1_Basisfunktionen.xsd" node="/xs:schema" >
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on1basis" />
-    </jaxb:schemaBindings>
-  </jaxb:bindings>
-
-  <!-- Antrag-Common Namespace http://omds.vvo.at/types/omds3types/v1_4_0/on2antrag/common" -->
-  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Common.xsd" node="/xs:schema" >
-
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common"/>
-    </jaxb:schemaBindings>
-
-<!--    <jaxb:bindings node="//xs:element[@name='ConversionScopeRequest']//xs:element[@name='Vertrag']">-->
-<!--      <jaxb:property name="vertraege">-->
-<!--        <jaxb:javadoc><![CDATA[<p>Die Liste der Verträge, die in der Konvertierung behandelt werden sollen.</p>]]></jaxb:javadoc>-->
-<!--      </jaxb:property>-->
-<!--    </jaxb:bindings>-->
-
-<!--    <jaxb:bindings node="//xs:complexType[@name='Konvertierungsumfang_Type']//xs:element[@name='Vertrag']">-->
-<!--      <jaxb:property name="vertraege">-->
-<!--        <jaxb:javadoc><![CDATA[<p>Die Liste der Verträge, die in der Konvertierungsanforderung behandelt werden.</p>]]></jaxb:javadoc>-->
-<!--      </jaxb:property>-->
-<!--    </jaxb:bindings>-->
-
-
-  </jaxb:bindings>
-
-  <!-- Antrag Kfz -->
-  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Kfz.xsd" node="/xs:schema">
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kfz"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings>
-
-  <!-- Antrag Kranken Namespace urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken
-  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Kranken.xsd" node="/xs:schema">
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings>-->
-
-  <!-- Antrag Leben Namespace urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben  -->
-  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Leben.xsd" node="/xs:schema">
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings>
-
-  <!-- Produktfinder Namespace urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.produktfinder  -->
-<!--  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Produktfinder.xsd">-->
-<!--    <jaxb:schemaBindings>-->
-<!--      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.produktfinder"/>-->
-<!--    </jaxb:schemaBindings>-->
-<!--  </jaxb:bindings>-->
-
-  <!-- Antrag Rechtsschutz Namespace urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs
-  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Rechtsschutz.xsd" node="/xs:schema" >
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings> -->
-
-  <!-- Antrag Sach-Privat Namespace urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat -->
-  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_SachPrivat.xsd" node="/xs:schema" >
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings>
-
-  <!-- Antrag Unfall Namespace urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall  -->
-  <jaxb:bindings schemaLocation="omds3_ON2_Antrag_Unfall.xsd" node="/xs:schema">
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings>
-
-  <!-- Vertrag Namespace http://omds.vvo.at/types/omds3types/v1_4_0/on3vertrag  -->
-<!--  <jaxb:bindings schemaLocation="omds3_ON3_Vertrag.xsd">-->
-<!--    <jaxb:schemaBindings>-->
-<!--      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on3vertrag"/>-->
-<!--    </jaxb:schemaBindings>-->
-<!--  </jaxb:bindings>-->
-
-  <!-- Partner Namespace http://omds.vvo.at/types/omds3types/v1_4_0/on4partner -->
-<!--  <jaxb:bindings schemaLocation="omds3_ON4_Partner.xsd">-->
-<!--    <jaxb:schemaBindings>-->
-<!--      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on4partner"/>-->
-<!--    </jaxb:schemaBindings>-->
-<!--  </jaxb:bindings>-->
-
-  <!-- Schaden Namespace "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden" -->
-  <jaxb:bindings schemaLocation="omds3_ON7_Schaden.xsd" node="/xs:schema">
-    <jaxb:schemaBindings>
-      <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.on7schaden"/>
-    </jaxb:schemaBindings>
-  </jaxb:bindings>
-
-
-</jaxb:bindings>
\ No newline at end of file
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/wsdl_binding.xml b/OMDSServiceDefinition/src/main/resources/def/r1_8_0/wsdl_binding.xml
deleted file mode 100644
index afdf4464..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/wsdl_binding.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bindings
-	wsdlLocation="omds3Services.wsdl"
-	xmlns="https://jakarta.ee/xml/ns/jaxws"	>
-    	<package name="at.vvo.omds.types.omds3Types.r1_8_0.service"/>
-    	<enableWrapperStyle>true</enableWrapperStyle>
-    	<enableAsyncMapping>false</enableAsyncMapping>
-</bindings>
diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_05/binding.xjb b/OMDSServiceDefinition/src/main/resources/def/r2025_05/binding.xjb
index d503beb5..554e5d90 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r2025_05/binding.xjb
+++ b/OMDSServiceDefinition/src/main/resources/def/r2025_05/binding.xjb
@@ -99,6 +99,12 @@
          </jaxb:property>
       </jaxb:bindings>
 
+      <bindings node="xs:complexType[@name='ServiceFault']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="serviceFault"/>
+         </annox:annotate>
+      </bindings>
+
    </jaxb:bindings>
 
    <!-- "Quick-wins" Namespace http://omds.vvo.at/types/omds3types/v1_4_0/servicetypes -->
@@ -106,6 +112,108 @@
       <jaxb:schemaBindings>
          <jaxb:package name="at.vvo.omds.types.omds3Types.r2025_05.servicetypes"/>
       </jaxb:schemaBindings>
+
+      <bindings node="xs:complexType[@name='LoginRequestType']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="loginRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='DeepLinkBusinessObjectResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="loginResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='UserDataRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getUserDataRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='UserDataResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getUserDataResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='OMDSPackageListRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getOMDSPackageListRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='OMDSPackageListResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getOMDSPackageListResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='OMDSPackageRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getOMDSPackageRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='OMDSPackageResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getOMDSPackageResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='ArcImageInfosRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getArcImageInfosRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='ArcImageInfosResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getArcImageInfosResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='ArcImageRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getArcImageRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='ArcImageResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getArcImageResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='DeepLinkClaimRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getDeepLinkClaimRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='DeepLinkBusinessObjectResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getDeepLinkClaimResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='DeepLinkPartnerRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getDeepLinkPartnerRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='DeepLinkBusinessObjectResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getDeepLinkPartnerResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='DeepLinkOfferRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getDeepLinkOfferRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='DeepLinkBusinessObjectResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getDeepLinkOfferResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='DeepLinkPolicyRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getDeepLinkPolicyRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='DeepLinkBusinessObjectResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="getDeepLinkPolicyResponse"/>
+         </annox:annotate>
+      </bindings>
+
    </jaxb:bindings>
 
    <!-- Basisfunktionen Namespace http://omds.vvo.at/types/omds3types/v1_4_0/on1basis -->
@@ -114,6 +222,66 @@
          <jaxb:package name="at.vvo.omds.types.omds3Types.r2025_05.on1basis" />
       </jaxb:schemaBindings>
 
+      <bindings node="xs:complexType[@name='AddDocToBusinessCaseRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="AddDocToBusinessCaseRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='AddDocToBusinessCaseResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="AddDocToBusinessCaseResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='GetNumberOfDocumentsRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="GetNumberOfDocumentsRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='GetNumberOfDocumentsResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="GetNumberOfDocumentsResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='GetDocumentsOfObjectRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="GetDocumentsOfObjectRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='GetDocumentsOfObjectResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="GetDocumentsOfObjectResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='GetDocumentsOfPeriodRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="GetDocumentsOfPeriodRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='GetDocumentsOfPeriodResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="GetDocumentsOfPeriodResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='AcknowledgeDocumentsRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="AcknowledgeDocumentsRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='AcknowledgeDocumentsResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="AcknowledgeDocumentsResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='GetStateChangesRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="GetStateChangesRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='GetStateChangesResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="GetStateChangesResponse"/>
+         </annox:annotate>
+      </bindings>
    </jaxb:bindings>
 
    <!-- Antrag-Common Namespace http://omds.vvo.at/types/omds3types/v1_4_0/on2antrag/common" -->
@@ -146,6 +314,76 @@
          </jaxb:property>
       </jaxb:bindings>
 
+      <bindings node="xs:element[@name='ConversionScopeRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="ConversionScopeRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='ConversionScopeResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="ConversionScopeResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='ConversionProposalRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="ConversionProposalRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='ConversionProposalResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="ConversionProposalResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='ProductProposalRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="ProductProposalRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='ProductProposalResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="ProductProposalResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CalculateRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CalculateResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CreateOfferRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CreateOfferResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CreateApplicationRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CreateApplicationResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='SubmitApplicationRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='SubmitApplicationResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationResponse"/>
+         </annox:annotate>
+      </bindings>
    </jaxb:bindings>
 
    <!-- Antrag Kfz -->
@@ -153,6 +391,56 @@
       <jaxb:schemaBindings>
          <jaxb:package name="at.vvo.omds.types.omds3Types.r2025_05.on2antrag.kfz"/>
       </jaxb:schemaBindings>
+      <bindings node="xs:complexType[@name='CalculateKfzRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateKfzRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CalculateKfzResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateKfzResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CreateOfferKfzRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferKfzRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CreateOfferKfzResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferKfzResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CreateApplicationKfzRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationKfzRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CreateApplicationKfzResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationKfzResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='SubmitApplicationKfzRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationKfzRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='SubmitApplicationKfzResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationKfzResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CreateVBRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateVBRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CreateVBResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateVBResponse"/>
+         </annox:annotate>
+      </bindings>
    </jaxb:bindings>
 
    <!-- Antrag Kranken Namespace urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken  -->
@@ -160,6 +448,46 @@
       <jaxb:schemaBindings>
          <jaxb:package name="at.vvo.omds.types.omds3Types.r2025_05.on2antrag.kranken"/>
       </jaxb:schemaBindings>
+      <bindings node="xs:element[@name='CalculateKrankenRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateKrankenRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CalculateKrankenResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateKrankenResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CreateOfferKrankenRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferKrankenRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CreateOfferKrankenResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferKrankenResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CreateApplicationKrankenRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationKrankenRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CreateApplicationKrankenResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationKrankenResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='SubmitApplicationKrankenRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationKrankenRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='SubmitApplicationKrankenResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationKrankenResponse"/>
+         </annox:annotate>
+      </bindings>
    </jaxb:bindings>
 
    <!-- Antrag Leben Namespace urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben  -->
@@ -167,6 +495,46 @@
       <jaxb:schemaBindings>
          <jaxb:package name="at.vvo.omds.types.omds3Types.r2025_05.on2antrag.leben"/>
       </jaxb:schemaBindings>
+      <bindings node="xs:complexType[@name='CalculateLebenRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateLebenRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CalculateLebenResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateLebenResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CreateOfferLebenRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferLebenRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CreateOfferLebenResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferLebenResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CreateApplicationLebenRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationLebenRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CreateApplicationLebenResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationLebenResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='SubmitApplicationLebenRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationLebenRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='SubmitApplicationLebenResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationLebenResponse"/>
+         </annox:annotate>
+      </bindings>
    </jaxb:bindings>
 
    <!-- Produktfinder Namespace urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.produktfinder  -->
@@ -181,6 +549,46 @@
       <jaxb:schemaBindings>
          <jaxb:package name="at.vvo.omds.types.omds3Types.r2025_05.on2antrag.rs"/>
       </jaxb:schemaBindings>
+      <bindings node="xs:element[@name='CalculateRechtsschutzRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateRechtsschutzRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CalculateRechtsschutzResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateRechtsschutzResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CreateOfferRechtsschutzRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferRechtsschutzRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CreateOfferRechtsschutzResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferRechtsschutzResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CreateApplicationRechtsschutzRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationRechtsschutzRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CreateApplicationRechtsschutzResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationRechtsschutzResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='SubmitApplicationRechtsschutzRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationRechtsschutzRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='SubmitApplicationRechtsschutzResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationRechtsschutzResponse"/>
+         </annox:annotate>
+      </bindings>
    </jaxb:bindings>
 
    <!-- Antrag Sach-Privat Namespace urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat -->
@@ -188,6 +596,46 @@
       <jaxb:schemaBindings>
          <jaxb:package name="at.vvo.omds.types.omds3Types.r2025_05.on2antrag.sachPrivat"/>
       </jaxb:schemaBindings>
+      <bindings node="xs:complexType[@name='CalculateSachPrivatRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateSachPrivatRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CalculateSachPrivatResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CalculateSachPrivatResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CreateOfferSachPrivatRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferSachPrivatRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CreateOfferSachPrivatResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateOfferSachPrivatResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CreateApplicationSachPrivatRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationSachPrivatRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CreateApplicationSachPrivatResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CreateApplicationSachPrivatResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='SubmitApplicationSachPrivatRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationSachPrivatRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='SubmitApplicationSachPrivatResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitApplicationSachPrivatResponse"/>
+         </annox:annotate>
+      </bindings>
    </jaxb:bindings>
 
    <!-- Antrag Unfall Namespace urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall  -->
@@ -256,6 +704,76 @@
       <jaxb:schemaBindings>
          <jaxb:package name="at.vvo.omds.types.omds3Types.r2025_05.on7schaden"/>
       </jaxb:schemaBindings>
+      <bindings node="xs:complexType[@name='CheckClaimRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CheckClaimRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='CheckClaimResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CheckClaimResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='SubmitClaimRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitClaimRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='SubmitClaimResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitClaimResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='AddInformationToClaimRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="AddInformationToClaimRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='AddInformationToClaimResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="AddInformationToClaimResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='GetClaimRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="GetClaimRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='GetClaimResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="GetClaimResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='SearchClaimRequest_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SearchClaimRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:complexType[@name='SearchClaimResponse_Type']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SearchClaimResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CheckCoverageRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CheckCoverageRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='CheckCoverageResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="CheckCoverageResponse"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='SubmitReceiptRequest']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitReceiptRequest"/>
+         </annox:annotate>
+      </bindings>
+      <bindings node="xs:element[@name='SubmitReceiptResponse']">
+         <annox:annotate>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="SubmitReceiptResponse"/>
+         </annox:annotate>
+      </bindings>
    </jaxb:bindings>
 
 </bindings>
\ No newline at end of file