Anpassung an Version 1.3.0,
Packages und Directories von v nach r umbenannt, damit Naming-convention zu neuem Versions-Dokument passt Code-Generierung im Pom angepasst
This commit is contained in:
@@ -14,18 +14,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
|
||||
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
|
||||
<timestamp>${maven.build.timestamp}</timestamp>
|
||||
|
||||
|
||||
<!--<currentOmds3VersionDir>v1-3-0</currentOmds3VersionDir>-->
|
||||
<bindings.location.rel>/src/main/resources/bind/${currentOmds3VersionDir}</bindings.location.rel>
|
||||
<target.generation.path>${basedir}/src/main/java</target.generation.path>
|
||||
<bindings.location.rel>/src/main/resources/bind/v1-4-0</bindings.location.rel>
|
||||
<bindings.location>${basedir}${bindings.location.rel}</bindings.location>
|
||||
|
||||
<wsdl.location>src/main/resources/def/v1-4-0/omds3Services.wsdl</wsdl.location>
|
||||
<brokerwsdl.location>src/main/resources/def/v1-4-0/broker/omds3ServicesBroker.wsdl</brokerwsdl.location>
|
||||
|
||||
<maven.compiler.source>1.7</maven.compiler.source>
|
||||
<maven.compiler.target>1.7</maven.compiler.target>
|
||||
<jdk.version>1.7</jdk.version>
|
||||
|
||||
<!--<wsdl.location>src/main/resources/def/v1-3-0/omds3Services.wsdl</wsdl.location>
|
||||
<brokerwsdl.location>src/main/resources/def/v1-3-0/broker/omds3ServicesBroker.wsdl</brokerwsdl.location>-->
|
||||
<bindings.location.rel>/src/main/resources/bind/${currentOmds3VersionDir}</bindings.location.rel>
|
||||
<wsdl.location>src/main/resources/def/${currentOmds3VersionDir}/${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>
|
||||
|
||||
<cxf.version>3.2.0</cxf.version>
|
||||
</properties>
|
||||
|
||||
@@ -109,9 +113,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
|
||||
</manifest>
|
||||
<manifestEntries>
|
||||
<Revision>${SVN_REVISION}</Revision>
|
||||
<BuildTag>${BUILD_TAG}</BuildTag>
|
||||
<BuildTimestamp>${build.timestamp}</BuildTimestamp>
|
||||
<!-- <Revision>${SVN_REVISION}</Revision>-->
|
||||
<!-- <BuildTag>${BUILD_TAG}</BuildTag>-->
|
||||
<BuildTimestamp>${maven.build.timestamp}</BuildTimestamp>
|
||||
<JDKVersion>${jdk.version}</JDKVersion>
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
@@ -234,48 +238,47 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
|
||||
<!-- Spezielles Profil um Java-Code aus dem WSDL zu generieren -->
|
||||
<profile>
|
||||
<id>genJavaFromWsdl</id>
|
||||
<id>genJavaFromWsdl_r1_4_0_VU</id>
|
||||
<activation>
|
||||
<activeByDefault>false</activeByDefault>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
<property>
|
||||
<name>codeGen</name>
|
||||
</property>
|
||||
</activation>
|
||||
<properties>
|
||||
<currentOmds3VersionDir>r1_4_0</currentOmds3VersionDir>
|
||||
<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-java2ws-plugin</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>process-classes</id>
|
||||
<phase>process-classes</phase>
|
||||
<configuration>
|
||||
<className>at.ergo.plr.Calculator</className>
|
||||
<genWsdl>true</genWsdl>
|
||||
<verbose>true</verbose>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>java2ws</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin> -->
|
||||
|
||||
|
||||
<!-- plugin um Code von WSDL-File zu generieren -->
|
||||
<!--
|
||||
<plugin>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-java2ws-plugin</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>process-classes</id>
|
||||
<phase>process-classes</phase>
|
||||
<configuration>
|
||||
<className>at.ergo.plr.Calculator</className>
|
||||
<genWsdl>true</genWsdl>
|
||||
<verbose>true</verbose>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>java2ws</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin> -->
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-codegen-plugin</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
<configuration>
|
||||
<vmArgs>
|
||||
<vmArg>-Djavax.xml.accessExternalSchema=all</vmArg>
|
||||
</vmArgs>
|
||||
<additionalJvmArgs>-Djavax.xml.accessExternalSchema=all</additionalJvmArgs>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
@@ -286,7 +289,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
<wsdlOptions>
|
||||
<wsdlOption>
|
||||
<wsdl>${wsdl.location}</wsdl>
|
||||
<!-- <wsdl>${brokerwsdl.location}</wsdl> -->
|
||||
<extendedSoapHeaders>true</extendedSoapHeaders>
|
||||
|
||||
<!-- wsdl/jaxb Binding wie der Code generiert werden soll -->
|
||||
@@ -302,8 +304,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
<!-- <bindingFile>${bindings.location}/omds3_ON2_Antrag_Unfall_binding.xml</bindingFile> -->
|
||||
<bindingFile>${bindings.location}/omds3_ON3_Vertrag_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON4_Partner_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/wsdl_binding.xml</bindingFile>
|
||||
<!-- <bindingFile>${bindings.location}/wsdl_broker_binding.xml</bindingFile> -->
|
||||
<bindingFile>${bindings.location}/${wsdl.binding.xml}</bindingFile>
|
||||
<!-- <bindingFile>${bindings.location}/omdsExampleVuExtension_binding.xml</bindingFile> -->
|
||||
</bindingFiles>
|
||||
|
||||
@@ -326,8 +327,71 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>genJavaFromWsdl_r1_4_0_Broker</id>
|
||||
<activation>
|
||||
<activeByDefault>false</activeByDefault>
|
||||
<property>
|
||||
<name>codeGen</name>
|
||||
</property>
|
||||
</activation>
|
||||
<properties>
|
||||
<currentOmds3VersionDir>r1_4_0</currentOmds3VersionDir>
|
||||
<wsdl.name>omds3ServicesBroker.wsdl</wsdl.name>
|
||||
<wsdl.binding.xml>wsdl_broker_binding.xml</wsdl.binding.xml>
|
||||
</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>
|
||||
<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}/${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>
|
||||
|
||||
|
||||
</profiles>
|
||||
|
||||
</project>
|
||||
|
||||
Reference in New Issue
Block a user