Plausi verarbeitung hinzugefügt. IsNotIncluded Liste durch GUIProdukt Klasse ersetzt. View um Risikoobjekte hinzuzufügen erstellt.

This commit is contained in:
2025-10-13 09:48:22 +02:00
parent 9462bb0b94
commit be122fec9a
15 changed files with 1521 additions and 353 deletions

View File

@@ -118,48 +118,90 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</executions>
</plugin>
<!-- <plugin>-->
<!-- &lt;!&ndash; Lizenz: Berkeley Software Distribution, frei &ndash;&gt;-->
<!-- <groupId>org.jvnet.jaxb</groupId>-->
<!-- <artifactId>jaxb-maven-plugin</artifactId>-->
<!-- <version>4.0.0</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <goals>-->
<!-- <goal>generate</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- <configuration>-->
<!-- <extension>true</extension>-->
<!-- <locale>en</locale>-->
<!-- <schemaLanguage>XMLSCHEMA</schemaLanguage>-->
<!-- <schemaDirectory >${project.basedir}/src/main/resources/def/${currentReleaseDir}</schemaDirectory>-->
<!-- <schemaDirectory >${project.basedir}/src/main/resources/def/${currentReleaseDir}</schemaDirectory>-->
<!-- <bindingDirectory>${project.basedir}/src/main/resources/def/${currentReleaseDir}</bindingDirectory>-->
<!-- <schemaIncludes>-->
<!-- <include>*.xsd</include>-->
<!-- </schemaIncludes>-->
<!-- <bindingIncludes>-->
<!-- <include>*.xjb</include>-->
<!-- </bindingIncludes>-->
<!-- <args>-->
<!-- <arg>-Xannotate</arg>-->
<!-- <arg>-Xinheritance</arg>-->
<!-- </args>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.jvnet.jaxb</groupId>-->
<!-- <artifactId>jaxb-plugins</artifactId>-->
<!-- <version>3.0.0</version>-->
<!-- </plugin>-->
<!-- <plugin>-->
<!-- <groupId>org.jvnet.jaxb</groupId>-->
<!-- <artifactId>jaxb-plugin-annotate</artifactId>-->
<!-- <version>3.0.0</version>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </configuration>-->
<!-- </plugin>-->
<plugin>
<!-- Lizenz: Berkeley Software Distribution, frei -->
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
<version>4.0.0</version>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>4.1.3</version>
<executions>
<execution>
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
<sourceRoot>${project.build.directory}/generated-sources/cxf</sourceRoot>
<wsdlOptions>
<wsdlOption>
<wsdl>${project.basedir}/src/main/resources/def/${currentReleaseDir}/omds3Services.wsdl</wsdl>
<extraargs>
<extraarg>-xjc-Xannotate</extraarg>
<extraarg>-client</extraarg>
<extraarg>-impl</extraarg>
<extraarg>-server</extraarg>
<extraarg>-p</extraarg>
<extraarg>at.vvo.omds.services</extraarg>
</extraargs>
<bindingFiles>
<bindingFile>${project.basedir}/src/main/resources/def/${currentReleaseDir}/binding.xjb</bindingFile>
</bindingFiles>
</wsdlOption>
</wsdlOptions>
</configuration>
<goals>
<goal>generate</goal>
<goal>wsdl2java</goal>
</goals>
</execution>
</executions>
<configuration>
<extension>true</extension>
<locale>en</locale>
<schemaLanguage>XMLSCHEMA</schemaLanguage>
<schemaDirectory >${project.basedir}/src/main/resources/def/${currentReleaseDir}</schemaDirectory>
<schemaDirectory >${project.basedir}/src/main/resources/def/${currentReleaseDir}</schemaDirectory>
<bindingDirectory>${project.basedir}/src/main/resources/def/${currentReleaseDir}</bindingDirectory>
<schemaIncludes>
<include>*.xsd</include>
</schemaIncludes>
<bindingIncludes>
<include>*.xjb</include>
</bindingIncludes>
<args>
<arg>-Xannotate</arg>
<arg>-Xinheritance</arg>
</args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugin-annotate</artifactId>
<version>3.0.0</version>
</plugin>
</plugins>
</configuration>
<dependencies>
<dependency>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugin-annotate</artifactId>
<version>3.0.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
@@ -167,7 +209,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
<configuration>
<mainClass>at.vvo.omds.client.gui.AllinOneView</mainClass>
<mainClass>at.vvo.omds.client.gui.AllinOneView</mainClass>
</configuration>
</plugin>
</plugins>
@@ -205,12 +247,77 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<dependency>
<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-controls -->
<!-- MIT License https://openjdk.java.net/legal/gplv2+ce.html-->
<!-- GPLv2+CE License https://openjdk.java.net/legal/gplv2+ce.html-->
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>23.0.1</version>
</dependency>
<dependency>
<!-- https://mvnrepository.com/artifact/org.controlsfx/controlsfx -->
<!-- The 3-Clause BSD License http://www.opensource.org/licenses/bsd-license.php -->
<groupId>org.controlsfx</groupId>
<artifactId>controlsfx</artifactId>
<version>11.2.2</version>
</dependency>
<dependency>
<!-- https://mvnrepository.com/artifact/org.jvnet.jaxb2_commons/jaxb2-basics-annotate -->
<!-- BSD 2-Clause License http://opensource.org/licenses/BSD-2-Clause-->
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-annotate</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<!-- https://mvnrepository.com/artifact/com.sun.xml.ws/jaxws-maven-plugin -->
<!-- The Apache Software License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt -->
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-maven-plugin</artifactId>
<version>4.0.3</version>
</dependency>
<dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-restclient -->
<!-- The Apache Software License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-restclient</artifactId>
<version>4.0.0-M3</version>
</dependency>
<dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
<!-- The Apache Software License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt -->
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.20.0</version>
</dependency>
<dependency>
<!-- https://mvnrepository.com/artifact/org.eclipse.rdf4j/rdf4j-model -->
<!-- Eclipse Distribution License v1.0 https://eclipse.org/org/documents/edl-v10.php-->
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-model</artifactId>
<version>5.1.5</version>
</dependency>
<dependency>
<!-- https://mvnrepository.com/artifact/org.eclipse.rdf4j/rdf4j-rio-turtle -->
<!-- Eclipse Distribution License v1.0 https://eclipse.org/org/documents/edl-v10.php-->
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-turtle</artifactId>
<version>5.1.5</version>
</dependency>
<dependency>
<!-- https://mvnrepository.com/artifact/org.eclipse.rdf4j/rdf4j-shacl -->
<!-- Eclipse Distribution License v1.0 https://eclipse.org/org/documents/edl-v10.php-->
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-shacl</artifactId>
<version>5.1.5</version>
</dependency>
<dependency>
<!-- https://mvnrepository.com/artifact/org.eclipse.rdf4j/rdf4j-rio-jsonld -->
<!-- Eclipse Distribution License v1.0 https://eclipse.org/org/documents/edl-v10.php-->
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-jsonld</artifactId>
<version>5.1.5</version>
</dependency>
<dependency>
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter -->