Merge tag '1.8' into develop

# Conflicts:
#	OMDSServiceDefinition/doc/ON_7 Schaden/ON_7.02_Schadenmeldung/ON_7.02.1_Schadenmeldung.docx
#	OMDSServiceDefinition/doc/ON_7 Schaden/ON_7.04_Belegeinreichung/ON_7.04.1_Deckungsauskunft_Belegeinreichung.docx
#	OMDSServiceDefinition/doc/ON_7 Schaden/ON_7.04_Deckungsauskunft/ON_7.04.1_Deckungsauskunft.docx
#	OMDSServiceDefinition/docEntw/ON_7 Schaden/ON_7.04_Belegeinreichung/ON_7.04.1_Deckungsauskunft_Belegeinreichung.docx
#	OMDSServiceDefinition/pom.xml
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ObjectFactory.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ObjectFactory.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SpezOffertType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsService.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortImpl.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType_OmdsServicePort_Client.java
#	OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/ServiceFaultMsg.java
#	OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3CommonServiceTypes.xsd
#	OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3Services.wsdl
#	OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3_ON2_Antrag_Kfz.xsd
This commit is contained in:
2022-08-20 07:12:43 +02:00
184 changed files with 1105 additions and 1004 deletions

View File

@@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<modelVersion>4.0.0</modelVersion>
<groupId>at.vvo.omds</groupId>
<artifactId>OMDSServiceDefinition</artifactId>
<version>1.8.0-SNAPSHOT</version><!-- Development Branch -->
<version>1.8.0</version>
<name>OMDS Service Definition</name>
<description>Dieses Projekt enthaelt die Definitionen fuer die OMDS Services.</description>
@@ -261,12 +261,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<repository>
<id>omdsaccess</id><!-- Username-Passwort in servers im settings.xml unter dieser id -->
<name>OMDS Release Repository</name>
<url>http://entw.kapdion.com:8081/repository/omdsReleases/</url>
<url>https://entw.kapdion.com/nexus/repository/omdsReleases/</url>
</repository>
<snapshotRepository>
<id>omdsaccess</id><!-- Username-Passwort in servers im settings.xml unter dieser id -->
<name>OMDS Snapshot Repository</name>
<url>http://entw.kapdion.com:8081/repository/omdsSnapshots/</url>
<url>https://entw.kapdion.com/nexus/repository/omdsSnapshots/</url>
</snapshotRepository>
</distributionManagement>
@@ -307,7 +307,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>
@@ -316,10 +316,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<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_Unfall_binding.xml</bindingFile>
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Leben_binding.xml</bindingFile>
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Kranken_binding.xml</bindingFile>
<bindingFile>${bindings.location}/omds3_ON2_Antrag_RS_binding.xml</bindingFile>
<bindingFile>${bindings.location}/omds3_ON7_Schaden_binding.xml</bindingFile>
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Leben_binding.xml</bindingFile>
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Kranken_binding.xml</bindingFile>
<bindingFile>${bindings.location}/omds3_ON2_Antrag_RS_binding.xml</bindingFile>
<bindingFile>${bindings.location}/omds3_ON7_Schaden_binding.xml</bindingFile>
<bindingFile>${bindings.location}/${wsdl.binding.xml}</bindingFile>
</bindingFiles>