You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/11/10 15:39:58 UTC
[cxf] branch master updated (03c608d -> 14d6259)
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 03c608d Merge branch 'master' of https://gitbox.apache.org/repos/asf/cxf
new f7f2698 Fix operation style
new 86ed6cd Add soap12 binding schema so soap12 wsdl validation can occur
new 1a11cec Fix checkstyle
new 14d6259 Fix compile failure
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/resources/schemas/wsdl/soap12-binding.xsd | 143 +++++++++++++++++++++
.../cxf/jaxrs/rx2/server/AbstractSubscriber.java | 2 -
.../jaxrs/reactive/RxJava2FlowableService.java | 6 +-
testutils/src/main/resources/wsdl/swa-mime.wsdl | 8 +-
4 files changed, 150 insertions(+), 9 deletions(-)
create mode 100644 core/src/main/resources/schemas/wsdl/soap12-binding.xsd
--
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].
[cxf] 04/04: Fix compile failure
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 14d625954edc65b81e4773d8132e9204236b4a3e
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Fri Nov 10 10:39:50 2017 -0500
Fix compile failure
---
.../apache/cxf/systest/jaxrs/reactive/RxJava2FlowableService.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2FlowableService.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2FlowableService.java
index 7812977..05b1dd0 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2FlowableService.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2FlowableService.java
@@ -29,7 +29,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.container.AsyncResponse;
import javax.ws.rs.container.Suspended;
-import org.apache.cxf.jaxrs.rx2.server.AbstractAsyncSubscriber;
+import org.apache.cxf.jaxrs.rx2.server.AbstractSubscriber;
import org.apache.cxf.jaxrs.rx2.server.JsonStreamingAsyncSubscriber;
import io.reactivex.Flowable;
@@ -84,7 +84,7 @@ public class RxJava2FlowableService {
}
- private static class StringAsyncSubscriber extends AbstractAsyncSubscriber<String> {
+ private static class StringAsyncSubscriber extends AbstractSubscriber<String> {
private StringBuilder sb = new StringBuilder();
StringAsyncSubscriber(AsyncResponse ar) {
@@ -103,7 +103,7 @@ public class RxJava2FlowableService {
}
- private static class ListAsyncSubscriber<T> extends AbstractAsyncSubscriber<T> {
+ private static class ListAsyncSubscriber<T> extends AbstractSubscriber<T> {
private List<T> beans = new LinkedList<T>();
ListAsyncSubscriber(AsyncResponse ar) {
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf] 01/04: Fix operation style
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f7f26984d401b76c71f24a20688ee1134ed48ded
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Fri Nov 10 09:11:09 2017 -0500
Fix operation style
---
testutils/src/main/resources/wsdl/swa-mime.wsdl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/testutils/src/main/resources/wsdl/swa-mime.wsdl b/testutils/src/main/resources/wsdl/swa-mime.wsdl
index 24ca459..211c740 100644
--- a/testutils/src/main/resources/wsdl/swa-mime.wsdl
+++ b/testutils/src/main/resources/wsdl/swa-mime.wsdl
@@ -114,7 +114,7 @@
<wsdl:binding name="SwAServiceBinding" type="tns:SwAServiceInterface">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="echoDataRef">
- <soap:operation soapAction="" style="literal"/>
+ <soap:operation soapAction="" style="document"/>
<wsdl:input>
<soap:body parts="data" use="literal"/>
</wsdl:input>
@@ -123,7 +123,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="echoData">
- <soap:operation soapAction="" style="literal"/>
+ <soap:operation soapAction="" style="document"/>
<wsdl:input>
<mime:multipartRelated>
<mime:part>
@@ -146,7 +146,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="echoDataWithHeader">
- <soap:operation soapAction="" style="literal"/>
+ <soap:operation soapAction="" style="document"/>
<wsdl:input>
<mime:multipartRelated>
<mime:part>
@@ -171,7 +171,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="echoAllAttachmentTypes">
- <soap:operation/>
+ <soap:operation soapAction="" style="document"/>
<wsdl:input>
<mime:multipartRelated>
<mime:part>
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf] 02/04: Add soap12 binding schema so soap12 wsdl validation
can occur
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 86ed6cdd41821e9593ab5f36192a3593afad2b2b
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Fri Nov 10 10:06:55 2017 -0500
Add soap12 binding schema so soap12 wsdl validation can occur
---
.../main/resources/schemas/wsdl/soap12-binding.xsd | 143 +++++++++++++++++++++
1 file changed, 143 insertions(+)
diff --git a/core/src/main/resources/schemas/wsdl/soap12-binding.xsd b/core/src/main/resources/schemas/wsdl/soap12-binding.xsd
new file mode 100644
index 0000000..bc17955
--- /dev/null
+++ b/core/src/main/resources/schemas/wsdl/soap12-binding.xsd
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+Copyright 2001 - 2006, International Business Machines Corporation and Microsoft Corporation
+All Rights Reserved
+
+License for WSDL 1.1 Binding Extension for SOAP 1.2 Schema Files
+
+The Authors grant permission to copy and distribute the WSDL 1.1 Binding Extension for SOAP 1.2 Schema Files in any medium without fee or royalty as long as this notice and license are distributed with them. The originals of these files can be located at:
+
+http://schemas.xmlsoap.org/wsdl/soap12/wsdl11soap12.xsd
+
+THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or publicity pertaining to these files or any program or service that uses these files, written prior permission. Title to copyright in these files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsoap12="http://schemas.xmlsoap.org/wsdl/soap12/"
+ targetNamespace="http://schemas.xmlsoap.org/wsdl/soap12/" >
+
+ <xs:import namespace = "http://schemas.xmlsoap.org/wsdl/" />
+
+ <xs:complexType name="tExtensibilityElementOpenAttrs" >
+ <xs:complexContent>
+ <xs:extension base="wsdl:tExtensibilityElement" >
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="binding" type="wsoap12:tBinding" />
+ <xs:complexType name="tBinding" >
+ <xs:complexContent>
+ <xs:extension base="wsoap12:tExtensibilityElementOpenAttrs" >
+ <xs:attribute name="transport" type="xs:anyURI" use="required" />
+ <xs:attribute name="style" type="wsoap12:tStyleChoice" use="optional" />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:simpleType name="tStyleChoice" >
+ <xs:restriction base="xs:string" >
+ <xs:enumeration value="rpc" />
+ <xs:enumeration value="document" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="operation" type="wsoap12:tOperation" />
+ <xs:complexType name="tOperation" >
+ <xs:complexContent>
+ <xs:extension base="wsoap12:tExtensibilityElementOpenAttrs" >
+ <xs:attribute name="soapAction" type="xs:anyURI" use="optional" />
+ <xs:attribute name="soapActionRequired" type="xs:boolean" use="optional" />
+ <xs:attribute name="style" type="wsoap12:tStyleChoice" use="optional" />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="body" type="wsoap12:tBody" />
+ <xs:attributeGroup name="tBodyAttributes" >
+ <!-- The encodingStyle attribute is now a single URI, instead of a list of URIs -->
+ <xs:attribute name="encodingStyle" type="xs:anyURI" use="optional" />
+ <xs:attribute name="use" type="wsoap12:useChoice" use="optional" />
+ <xs:attribute name="namespace" type="xs:anyURI" use="optional" />
+ </xs:attributeGroup>
+ <xs:simpleType name="tParts">
+ <xs:list itemType="xs:NMTOKEN"/>
+ </xs:simpleType>
+ <xs:complexType name="tBody" >
+ <xs:complexContent>
+ <xs:extension base="wsoap12:tExtensibilityElementOpenAttrs" >
+ <xs:attribute name="parts" type="wsoap12:tParts" use="optional" />
+ <xs:attributeGroup ref = "wsoap12:tBodyAttributes" />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:simpleType name="useChoice" >
+ <xs:restriction base="xs:string" >
+ <xs:enumeration value="literal" />
+ <xs:enumeration value="encoded" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="fault" type="wsoap12:tFault" />
+ <xs:complexType name="tFaultRes" abstract="true" >
+ <xs:complexContent>
+ <xs:restriction base="wsoap12:tBody" >
+ <xs:attribute ref="wsdl:required" use="optional" />
+ <xs:attribute name="parts" type="wsoap12:tParts" use="prohibited" />
+ <xs:attributeGroup ref="wsoap12:tBodyAttributes" />
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="tFault" >
+ <xs:complexContent>
+ <xs:extension base="wsoap12:tFaultRes">
+ <xs:attribute name="name" type="xs:NCName" use="required" />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+
+ <xs:element name="header" type="wsoap12:tHeader" />
+ <xs:attributeGroup name="tHeaderAttributes" >
+ <xs:attribute name="message" type="xs:QName" use="required" />
+ <xs:attribute name="part" type="xs:NMTOKEN" use="required" />
+ <xs:attribute name="use" type="wsoap12:useChoice" use="required" />
+ <xs:attribute name="encodingStyle" type="xs:anyURI" use="optional" />
+ <xs:attribute name="namespace" type="xs:anyURI" use="optional" />
+ </xs:attributeGroup>
+ <xs:complexType name="tHeader" >
+ <xs:complexContent>
+ <xs:extension base="wsoap12:tExtensibilityElementOpenAttrs" >
+ <xs:sequence>
+ <xs:element ref="wsoap12:headerfault" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ <xs:attributeGroup ref="wsoap12:tHeaderAttributes" />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="headerfault" type="wsoap12:tHeaderFault" />
+ <xs:complexType name="tHeaderFault" >
+ <xs:attributeGroup ref="wsoap12:tHeaderAttributes" />
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:element name="address" type="wsoap12:tAddress" />
+ <xs:complexType name="tAddress" >
+ <xs:complexContent>
+ <xs:extension base="wsoap12:tExtensibilityElementOpenAttrs" >
+ <xs:attribute name="location" type="xs:anyURI" use="required" />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+</xs:schema>
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf] 03/04: Fix checkstyle
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1a11cecbedd2aa0384aa340c01620ebce9742061
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Fri Nov 10 10:38:45 2017 -0500
Fix checkstyle
---
.../main/java/org/apache/cxf/jaxrs/rx2/server/AbstractSubscriber.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx2/server/AbstractSubscriber.java b/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx2/server/AbstractSubscriber.java
index 5c1ec6c..1010b3b 100644
--- a/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx2/server/AbstractSubscriber.java
+++ b/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx2/server/AbstractSubscriber.java
@@ -26,8 +26,6 @@ import org.apache.cxf.jaxrs.ext.StreamingResponse;
import org.reactivestreams.Subscriber;
import org.reactivestreams.Subscription;
-import io.reactivex.subscribers.DefaultSubscriber;
-
public abstract class AbstractSubscriber<T> implements Subscriber<T> {
private AsyncResponse ar;
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.