Merge tag '1.8.1' into develop
Version 1.8.0 Hotfix 1 # Conflicts: # OMDSServiceDefinition/pom.xml # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SpezBerechnungType.java
This commit is contained in:
@@ -5,7 +5,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
<artifactId>OMDSServiceDefinition</artifactId>
|
||||
<version>1.8.0</version>
|
||||
<name>OMDS Service Definition</name>
|
||||
<description>Dieses Projekt enthaelt die Definitionen fuer die OMDS Services.</description>
|
||||
<description>Version 1.8.0 - Hotfix 1. Dieses Projekt enthaelt die Definitionen fuer die OMDS Services.</description>
|
||||
|
||||
<properties>
|
||||
<currentReleaseDir>r1_8_0</currentReleaseDir>
|
||||
@@ -283,66 +283,65 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
</property>
|
||||
</activation>
|
||||
<properties>
|
||||
|
||||
<wsdl.name>omds3Services.wsdl</wsdl.name>
|
||||
<wsdl.binding.xml>wsdl_binding.xml</wsdl.binding.xml>
|
||||
</properties>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-codegen-plugin</artifactId>
|
||||
<configuration>
|
||||
<additionalJvmArgs>-Djavax.xml.accessExternalSchema=all</additionalJvmArgs>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>generate-sources</id>
|
||||
<phase>generate-sources</phase>
|
||||
<configuration>
|
||||
<sourceRoot>${target.generation.path}</sourceRoot>
|
||||
<wsdlOptions>
|
||||
<wsdlOption>
|
||||
<wsdl>${wsdl.location}</wsdl>
|
||||
<extendedSoapHeaders>true</extendedSoapHeaders>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-codegen-plugin</artifactId>
|
||||
<configuration>
|
||||
<additionalJvmArgs>-Djavax.xml.accessExternalSchema=all</additionalJvmArgs>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>generate-sources</id>
|
||||
<phase>generate-sources</phase>
|
||||
<configuration>
|
||||
<sourceRoot>${target.generation.path}</sourceRoot>
|
||||
<wsdlOptions>
|
||||
<wsdlOption>
|
||||
<wsdl>${wsdl.location}</wsdl>
|
||||
<extendedSoapHeaders>true</extendedSoapHeaders>
|
||||
|
||||
<!-- wsdl/jaxb Binding wie der Code generiert werden soll -->
|
||||
<bindingFiles>
|
||||
<bindingFile>${bindings.location}/omds20Types_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omdsServiceTypes_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omdsCommonServiceTypes_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON1_Basisfunktionen_binding.xml</bindingFile>
|
||||
<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_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}/${wsdl.binding.xml}</bindingFile>
|
||||
</bindingFiles>
|
||||
|
||||
<!-- you can set the options of wsdl2java command by using the <extraargs> -->
|
||||
<extraargs>
|
||||
<!-- <extraarg>-v</extraarg> zeige Versionsnummer dieses Tools -->
|
||||
<extraarg>-impl</extraarg><!-- Implementation -->
|
||||
<extraarg>-validate</extraarg>
|
||||
<extraarg>-client</extraarg><!-- Auch Ansatzpunkt fuer Client generieren -->
|
||||
<extraarg>-verbose</extraarg>
|
||||
</extraargs>
|
||||
</wsdlOption>
|
||||
</wsdlOptions>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>wsdl2java</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<!-- wsdl/jaxb Binding wie der Code generiert werden soll -->
|
||||
<bindingFiles>
|
||||
<bindingFile>${bindings.location}/omds20Types_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omdsServiceTypes_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omdsCommonServiceTypes_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON1_Basisfunktionen_binding.xml</bindingFile>
|
||||
<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_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}/${wsdl.binding.xml}</bindingFile>
|
||||
</bindingFiles>
|
||||
|
||||
<!-- you can set the options of wsdl2java command by using the <extraargs> -->
|
||||
<extraargs>
|
||||
<!-- <extraarg>-v</extraarg> zeige Versionsnummer dieses Tools -->
|
||||
<extraarg>-impl</extraarg><!-- Implementation -->
|
||||
<extraarg>-validate</extraarg>
|
||||
<extraarg>-client</extraarg><!-- Auch Ansatzpunkt fuer Client generieren -->
|
||||
<extraarg>-verbose</extraarg>
|
||||
</extraargs>
|
||||
</wsdlOption>
|
||||
</wsdlOptions>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>wsdl2java</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>genJavaFromWsdl_Broker</id>
|
||||
|
||||
Reference in New Issue
Block a user