Merge branch 'release/1.7'

# Conflicts:
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AdresseArtCdType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AntragsartType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BerechnungsvarianteType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsrechtType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BonusMalusVorversicherungType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonProcessRequestType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonProcessResponseType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonRequestType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonResponseType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonSearchRequestType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonSearchResponseType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DateianhangType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DirectionCdType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentDataType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentInfoType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementarproduktGenerischType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementarproduktType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ErsatzpolizzeType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/GeschaeftsobjektArtType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/KontierungType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ObjectFactory.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PartnerRoleType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PolizzenversandType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PraemieType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktGenerischType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktMitVpType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokHandoutType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokRequirementType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokToReturnType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokumentBasisType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokumentType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/StatusType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VerkaufsproduktGenerischType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VerkaufsproduktType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertesInteresseMitAttributMetadatenType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertesInteresseType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersicherungssteuerType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlungsdatenType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheRisikodatenType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusatzproduktGenerischType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/ObjectFactory.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateRequestGenType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateRequestType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateResponseGenType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateResponseType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationRequestGenType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationRequestType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationResponseGenType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationResponseType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferRequestGenType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferRequestType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferResponseGenType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferResponseType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/ObjectFactory.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragPersonenType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezBerechnungType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezOffertType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationRequestGenType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationRequestType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationResponseGenType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationResponseType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ArtBesichtigungType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/InsassenUnfallSystemType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ObjectFactory.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SchaedenAmFahrzeugType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SchaedenAnScheibenKleinglasType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezAntragKfzType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VarianteLeihwagenType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VorversicherungenKfzType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/leben/RentenoptionType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/leben/WartefristType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/leben/ZusatzproduktLebenType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/NebengebaeudeType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ObjectFactory.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoVorschaedenType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/VerkaufsproduktSachPrivatType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ObjectFactory.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsService.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsServicePortImpl.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsServicePortType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsServicePortType_OmdsServicePort_Client.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/ServiceFaultMsg.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ObjectFactory.java
#	OMDSServiceDefinition/src/main/resources/def/r1_7_0/ReleaseNotes-1-7-0.txt
#	OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds214-00.xsd
#	OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3CommonServiceTypes.xsd
#	OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3ServiceTypes.xsd
#	OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3Services.wsdl
#	OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON1_Basisfunktionen.xsd
#	OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Common.xsd
#	OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Kfz.xsd
#	OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Leben.xsd
#	OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_SachPrivat.xsd
#	OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Unfall.xsd
#	OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON7_Schaden.xsd
This commit is contained in:
2022-01-17 08:53:45 +01:00
14512 changed files with 34948 additions and 38719 deletions

View File

@@ -17,20 +17,27 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<wsdl.name>omds3Services.wsdl</wsdl.name>
<bindings.location.rel>/src/main/resources/bind/${currentReleaseDir}</bindings.location.rel>
<target.generation.path>${basedir}/src/main/java</target.generation.path>
<bindings.location>${basedir}${bindings.location.rel}</bindings.location>
<target.generation.path>${basedir}/src/main/java</target.generation.path>
<bindings.location>${basedir}${bindings.location.rel}</bindings.location>
<wsdl.location>src/main/resources/def/${currentReleaseDir}/${wsdl.name}</wsdl.location>
<jdk.version>1.7</jdk.version>
<maven.compiler.source>${jdk.version}</maven.compiler.source>
<maven.compiler.target>${jdk.version}</maven.compiler.target>
<jdk.version>1.8</jdk.version>
<maven.compiler.source>${jdk.version}</maven.compiler.source>
<maven.compiler.target>${jdk.version}</maven.compiler.target>
<cxf.version>3.2.0</cxf.version>
<!-- Typischer Pfad zu wsdl.exe: "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\wsdl.exe" -->
<cxf.version>3.5.0</cxf.version>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${cxf.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
@@ -152,64 +159,113 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</plugin>
</plugins>
</build>
</build>
<dependencyManagement>
<dependencies>
<!-- CFX Start -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
<!-- Jetty is needed if you're are not using the CXFServlet -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-logging</artifactId>
<version>${cxf.version}</version>
</dependency>
<!-- CFX Ende -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- CFX Start -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
<!-- Jetty is needed if you're are not using the CXFServlet -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-logging</artifactId>
<version>${cxf.version}</version>
</dependency>
<!-- CFX Ende -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.12</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>log4j</groupId>-->
<!-- <artifactId>log4j</artifactId>-->
<!-- <version>1.2.12</version>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>test</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>junit</groupId>-->
<!-- <artifactId>junit</artifactId>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
</dependencies>
<!-- Zielordner fuer Deploy unter OMDS-Entwicklung -->
@@ -245,12 +301,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${cxf.version}</version>
<configuration>
<additionalJvmArgs>-Djavax.xml.accessExternalSchema=all</additionalJvmArgs>
</configuration>
@@ -266,7 +319,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<extendedSoapHeaders>true</extendedSoapHeaders>
<!-- wsdl/jaxb Binding wie der Code generiert werden soll -->
<bindingFiles>
<bindingFiles>
<bindingFile>${bindings.location}/omds20Types_binding.xml</bindingFile>
<bindingFile>${bindings.location}/omdsServiceTypes_binding.xml</bindingFile>
<bindingFile>${bindings.location}/omdsCommonServiceTypes_binding.xml</bindingFile>
@@ -274,16 +327,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Common_binding.xml</bindingFile>
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Kfz_binding.xml</bindingFile>
<bindingFile>${bindings.location}/omds3_ON2_Antrag_SachPrivat_binding.xml</bindingFile>
<!-- <bindingFile>${bindings.location}/omds3_ON2_Antrag_RS_binding.xml</bindingFile>-->
<!-- <bindingFile>${bindings.location}/omds3_ON2_Antrag_Unfall_binding.xml</bindingFile>-->
<!-- <bindingFile>${bindings.location}/omds3_ON2_Antrag_Kranken_binding.xml</bindingFile>-->
<!-- <bindingFile>${bindings.location}/omds3_ON2_Antrag_Leben_binding.xml</bindingFile>-->
<!-- <bindingFile>${bindings.location}/omds3_ON2_Antrag_Produktfinder_binding.xml</bindingFile>-->
<!-- <bindingFile>${bindings.location}/omds3_ON3_Vertrag_binding.xml</bindingFile>-->
<!-- <bindingFile>${bindings.location}/omds3_ON4_Partner_binding.xml</bindingFile>-->
<bindingFile>${bindings.location}/omds3_ON7_Schaden_binding.xml</bindingFile>
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Unfall_binding.xml</bindingFile>
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Leben_binding.xml</bindingFile>
<bindingFile>${bindings.location}/omds3_ON7_Schaden_binding.xml</bindingFile>
<bindingFile>${bindings.location}/${wsdl.binding.xml}</bindingFile>
<!-- <bindingFile>${bindings.location}/omdsExampleVuExtension_binding.xml</bindingFile> -->
</bindingFiles>
<!-- you can set the options of wsdl2java command by using the <extraargs> -->
@@ -324,7 +371,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${cxf.version}</version>
<configuration>
<additionalJvmArgs>-Djavax.xml.accessExternalSchema=all</additionalJvmArgs>
</configuration>