KapDionOS/productmodel
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Umstellung auf aktuelle Java Version

Browse Source 
Umstellung auf aktuelle Java Version 17, verwendung aktuelle Version des Apache CXF Frameworks (4.0.3, generiert Klassen mit jakarta Bindings), Java Klassen alter Versionen entfernt, Bindings für alle Xsds in einem File zusammengefasst (omds_binding.xml) und im gleichen Verzeichnis wie Wsdl und Xsds.
Feld Vertragsnummer in Vinkularglaeubiger_Type wird optional.
This commit is contained in:
Jens Bühring
2024-02-12 18:03:02 +01:00
parent 4ba71b0dd9
commit 49595b17ce
3900 changed files with 2768 additions and 452135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

191
OMDSServiceDefinition/pom.xml
View File

@@ -1,4 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>at.vvo.omds</groupId>
@@ -6,29 +6,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<version>1.11.0-SNAPSHOT</version>
<name>OMDS Service Definition</name>
<description>Version 1.11.0. Dieses Projekt enthält die Definitionen für die OMDS-Services.</description>
<properties>
<currentReleaseDir>r1_11_0</currentReleaseDir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
<timestamp>${maven.build.timestamp}</timestamp>
<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>
<wsdl.location>src/main/resources/def/${currentReleaseDir}/${wsdl.name}</wsdl.location>
<maven.compiler.release>17</maven.compiler.release>
<cxf.version>3.6.2</cxf.version>
<cxf.version>4.0.3</cxf.version>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<!-- dieses Plugin wird fuer die Codegenerierung verwendet -->
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${cxf.version}</version>
@@ -55,7 +50,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -75,18 +70,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<verbose>true</verbose>
<!-- <fork>true</fork>-->
<!-- <compilerVersion>${jdk.version}</compilerVersion>-->
<!-- <source>${jdk.version}</source>-->
<!-- <target>${jdk.version}</target>-->
<!-- <encoding>UTF-8</encoding>-->
</configuration>
</plugin>
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-compiler-plugin</artifactId>-->
<!-- <configuration>-->
<!-- <verbose>true</verbose>-->
<!-- </configuration>-->
<!-- </plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -105,19 +96,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<excludes>
<!-- The test cases only run when a web container deploys the webservice. -->
<exclude>at/ergo/plr/CalculatorWebClientTest.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -130,19 +116,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<configuration>
<doclint>reference</doclint>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugin>
</plugins>
</build>
@@ -180,11 +170,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<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-ws-security</artifactId>-->
<!-- <version>${cxf.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -197,7 +187,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</dependencyManagement>
<dependencies>
<!-- CFX Start -->
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -218,27 +208,32 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
</dependency>
<!-- Jetty is needed if you're not using the CXFServlet -->
<!-- <dependency>-->
<!-- <groupId>org.apache.cxf</groupId>-->
<!-- <artifactId>cxf-rt-transports-http-jetty</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.cxf</groupId>-->
<!-- <artifactId>cxf-rt-ws-security</artifactId>-->
<!-- </dependency>-->
<dependency>
<!-- Jetty is needed if you're not using the CXFServlet -->
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-logging</artifactId>
</dependency>
<!-- CFX Ende -->
<!-- <dependency>-->
<!-- <groupId>org.slf4j</groupId>-->
<!-- <artifactId>slf4j-log4j12</artifactId>-->
<!-- <version>1.6.6</version>-->
<!-- </dependency>-->
</dependencies>
<!-- Zielordner fuer Deploy unter OMDS-Entwicklung -->
<distributionManagement>
<repository>
@@ -252,73 +247,69 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<url>https://entw.kapdion.com/nexus/repository/omdsSnapshots/</url>
</snapshotRepository>
</distributionManagement>
<profiles>
<!-- Spezielles Profil um Java-Code fuer die VU-Schnittstelle aus dem WSDL zu generieren -->
<profile>
<id>genJavaFromWsdl_VU</id>
<id>genJavaFromWsdl</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>codeGen</name>
</property>
</activation>
<properties>
<wsdl.name>omds3Services.wsdl</wsdl.name>
<wsdl.binding.xml>wsdl_binding.xml</wsdl.binding.xml>
<!-- <bindings.location>${basedir}/src/main/resources/wsdl</bindings.location>-->
<wsdl.dir>${basedir}/src/main/resources/def/${currentReleaseDir}</wsdl.dir>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<!-- Version wird oben festgelegt -->
<!-- Maven Plugin https://cxf.apache.org/docs/maven-cxf-codegen-plugin-wsdl-to-java.html -->
<!-- Optionen des Tools wsdl2java: https://cxf.apache.org/docs/wsdl-to-java.html -->
<configuration>
<additionalJvmArgs>-Djavax.xml.accessExternalSchema=all</additionalJvmArgs>
<!-- <encoding>UTF-8</encoding>-->
</configuration>
<executions>
<execution>
<id>generate-sources</id>
<phase>generate-sources</phase>
<phase>generate-sources</phase><!-- das ist ziemlich bald nach Clean und vor Compile -->
<configuration>
<sourceRoot>${target.generation.path}</sourceRoot>
<sourceRoot>${basedir}/src/main/java</sourceRoot> <!-- baue Klassen in den normalen Pfad -->
<!-- defaultOptions gelten für alle WSDLs -->
<!-- <defaultOptions>-->
<!-- </defaultOptions>-->
<!-- wsdlOptions gelten für das angegebene WSDL -->
<wsdlOptions>
<wsdlOption>
<wsdl>${wsdl.location}</wsdl>
<extendedSoapHeaders>true</extendedSoapHeaders>
<wsdlOption>
<wsdl>${wsdl.dir}/omds3Services.wsdl</wsdl>
<!-- 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>
<!--<extraarg>-mark-generated</extraarg> Markiere Klassen als generiert, inkl. Datum -->
</extraargs>
</wsdlOption>
<!-- <extraargs>-->
<!-- <extraarg>-v</extraarg>&lt;!&ndash; zeige Versionsnummer dieses Tools &ndash;&gt;-->
<!-- <extraarg>-impl</extraarg>&lt;!&ndash; Generates starting point code for an implementation object. &ndash;&gt;-->
<!-- <extraarg>-validate</extraarg>&lt;!&ndash; Enables validating the WSDL before generating the code. &ndash;&gt;-->
<!-- <extraarg>-client</extraarg>&lt;!&ndash; Generates starting point code for a client mainline. &ndash;&gt;-->
<!-- <extraarg>-verbose</extraarg>&lt;!&ndash; Displays comments during the code generation process. &ndash;&gt;-->
<!-- <extraarg>-mark-generated</extraarg>&lt;!&ndash; Markiere Klassen als generiert &ndash;&gt;-->
<!-- <extraarg>-suppress-generated-date</extraarg>&lt;!&ndash; aber keine Datümer einbinden &ndash;&gt;-->
<!-- </extraargs>-->
<bindingFiles>
<!-- wsdl -->
<bindingFile>${wsdl.dir}/wsdl_binding.xml</bindingFile>
<!-- xsds -->
<bindingFile>${wsdl.dir}/omds_binding.xml</bindingFile>
</bindingFiles>
</wsdlOption>
</wsdlOptions>
</configuration>
<goals>
<goal>wsdl2java</goal>
</goals>
<goals>
<goal>wsdl2java</goal>
</goals>
</execution>
</executions>
</plugin>
@@ -327,5 +318,5 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</profile>
</profiles>
</project>