You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2020/03/31 15:10:38 UTC
[cxf] branch master updated: CXF-7998: add integration test
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new c6b87a0 CXF-7998: add integration test
c6b87a0 is described below
commit c6b87a0eadcd26dbe6341a44ec510dd039d9956f
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Tue Mar 31 18:09:55 2020 +0300
CXF-7998: add integration test
---
maven-plugins/codegen-plugin/pom.xml | 1 +
.../Cxf7998Service-1.0.0.wsdl | 43 ++++++++++++
.../pom.xml | 79 +++++++++++++---------
.../src/it/jdk-cxf-with-toolchain/pom.xml | 2 +-
.../codegen-plugin/src/it/mark-generated/pom.xml | 58 ++++++++--------
.../src/it/wsdl-artifact-resolution/pom.xml | 58 ++++++++--------
6 files changed, 152 insertions(+), 89 deletions(-)
diff --git a/maven-plugins/codegen-plugin/pom.xml b/maven-plugins/codegen-plugin/pom.xml
index 80d7c80..314d68e 100644
--- a/maven-plugins/codegen-plugin/pom.xml
+++ b/maven-plugins/codegen-plugin/pom.xml
@@ -185,6 +185,7 @@
<pomInclude>jdk-cxf-with-toolchain</pomInclude>
<pomInclude>wsdl-artifact-resolution/pom.xml</pomInclude>
<pomInclude>mark-generated/pom.xml</pomInclude>
+ <pomInclude>jaxb-xjc-runtime-sources/pom.xml</pomInclude>
</pomIncludes>
<settingsFile>src/it/settings.xml</settingsFile>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
diff --git a/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/Cxf7998Service-1.0.0.wsdl b/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/Cxf7998Service-1.0.0.wsdl
new file mode 100644
index 0000000..22860e4
--- /dev/null
+++ b/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/Cxf7998Service-1.0.0.wsdl
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:me="urn:me" xmlns:me2="http://service.com/wsdl" targetNamespace="http://service.com/wsdl">
+ <types>
+ <xs:schema targetNamespace="urn:me" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:element name="Request"/>
+ <xs:element name="Response" type="me:boolean"/>
+ <xs:simpleType name="boolean">
+ <xs:restriction base="xs:boolean">
+ <xs:pattern value="0|1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:schema>
+ </types>
+ <message name="RequestMsg">
+ <part name="request" element="me:Request"/>
+ </message>
+ <message name="ResponseMsg">
+ <part name="response" element="me:Response"/>
+ </message>
+ <portType name="MyPortType">
+ <operation name="MyOperation">
+ <input message="me2:RequestMsg"/>
+ <output message="me2:ResponseMsg"/>
+ </operation>
+ </portType>
+ <binding name="MyPortTypeBinding" type="me2:MyPortType">
+ <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="MyOperation">
+ <soap12:operation soapAction="urn:meAction"/>
+ <input>
+ <soap12:body use="literal"/>
+ </input>
+ <output>
+ <soap12:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="MyService">
+ <port name="MyPort" binding="me2:MyPortTypeBinding">
+ <soap12:address location="http://example.com"/>
+ </port>
+ </service>
+</definitions>
diff --git a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml b/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml
similarity index 63%
copy from maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
copy to maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml
index 29e3966..82cf588 100644
--- a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml
@@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf7067-codegen</artifactId>
+ <artifactId>cxf7998-codegen</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>cxf7067-codegen</name>
+ <name>cxf7998-codegen</name>
<properties>
- <wsdl.groupid>org.apache.cxf.cxf7067</wsdl.groupid>
- <wsdl.artifactid>Cxf7067Service</wsdl.artifactid>
+ <wsdl.groupid>org.apache.cxf.cxf7998</wsdl.groupid>
+ <wsdl.artifactid>Cxf7998Service</wsdl.artifactid>
<wsdl.version>1.0.0</wsdl.version>
</properties>
@@ -46,6 +46,19 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>@project.version@</version>
+ <!-- TODO: remove this deps when released version will be available -->
+ <dependencies>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.3-b02</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>2.3.3-b02</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>generate-sources</id>
@@ -74,32 +87,34 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>2.3.2</version>
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>1.3.5</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.ws</groupId>
- <artifactId>jakarta.xml.ws-api</artifactId>
- <version>2.3.3</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>jakarta.jws</groupId>
- <artifactId>jakarta.jws-api</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
-
+ <profiles>
+ <profile>
+ <id>java9</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>1.3.5</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>2.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.3</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
index 4bfb146..a839b6e 100644
--- a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
@@ -135,7 +135,7 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3</version>
</dependency>
</dependencies>
</profile>
diff --git a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
index f3d5ffb..bb54e3e 100644
--- a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
@@ -72,32 +72,34 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>2.3.2</version>
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>1.3.5</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.ws</groupId>
- <artifactId>jakarta.xml.ws-api</artifactId>
- <version>2.3.3</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>jakarta.jws</groupId>
- <artifactId>jakarta.jws-api</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
-
+ <profiles>
+ <profile>
+ <id>java9</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>1.3.5</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>2.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.3</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
index 29e3966..93ee03f 100644
--- a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
@@ -74,32 +74,34 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>2.3.2</version>
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>1.3.5</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.ws</groupId>
- <artifactId>jakarta.xml.ws-api</artifactId>
- <version>2.3.3</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>jakarta.jws</groupId>
- <artifactId>jakarta.jws-api</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
-
+ <profiles>
+ <profile>
+ <id>java9</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>1.3.5</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>2.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.3</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>