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/06/20 19:13:25 UTC
[2/3] cxf git commit: [CXF-7416] Switch to using thread safe
collections for the RM types since we send them directly into the marshal
routines
[CXF-7416] Switch to using thread safe collections for the RM types since we send them directly into the marshal routines
# Conflicts:
# rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6f48d4a7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6f48d4a7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6f48d4a7
Branch: refs/heads/3.1.x-fixes
Commit: 6f48d4a7bc8ab908f3d6d977d3f68d1a0f20f8f4
Parents: 3aa082f
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Jun 20 13:55:36 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Jun 20 14:30:24 2017 -0400
----------------------------------------------------------------------
.../main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java | 2 +-
rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb | 3 ++-
rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb | 3 ++-
rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xjb | 3 ++-
4 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f48d4a7/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
index a85971c..c41948c 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
@@ -164,7 +164,7 @@ public class RMCaptureOutInterceptor extends AbstractRMInterceptor<Message> {
seq = getManager().getSequence(inSeqId, msg, maps);
}
assert null != seq;
-
+
// increase message number and store a sequence type object in
// context
seq.nextMessageNumber(inSeqId, inMessageNumber, isLastMessage);
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f48d4a7/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb b/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb
index b355d5a..ea1d8a7 100644
--- a/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb
+++ b/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb
@@ -22,6 +22,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
jaxb:extensionBindingPrefixes="xjc">
+
<jaxb:bindings schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd" node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.ws.addressing"/>
@@ -31,7 +32,7 @@
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.ws.rm.v200502wsa15"/>
</jaxb:schemaBindings>
- <jaxb:globalBindings generateIsSetMethod="true"/>
+ <jaxb:globalBindings generateIsSetMethod="true" collectionType="java.util.concurrent.CopyOnWriteArrayList"/>
</jaxb:bindings>
<jaxb:bindings schemaLocation="wsrm-1.0-wsa15.xsd" node="//xs:element[@name='Nack']">
<jaxb:property>
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f48d4a7/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb b/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb
index bae1955..547568e 100644
--- a/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb
+++ b/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb
@@ -22,6 +22,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
jaxb:extensionBindingPrefixes="xjc">
+
<jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/ws/2004/08/addressing" node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.ws.addressing.v200408"/>
@@ -31,7 +32,7 @@
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.ws.rm.v200502"/>
</jaxb:schemaBindings>
- <jaxb:globalBindings generateIsSetMethod="true"/>
+ <jaxb:globalBindings generateIsSetMethod="true" collectionType="java.util.concurrent.CopyOnWriteArrayList"/>
</jaxb:bindings>
<jaxb:bindings schemaLocation="wsrm-1.0.xsd" node="//xs:element[@name='Nack']">
<jaxb:property>
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f48d4a7/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xjb
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xjb b/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xjb
index 8e5858a..4ba7041 100644
--- a/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xjb
+++ b/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xjb
@@ -22,6 +22,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
jaxb:extensionBindingPrefixes="xjc">
+
<jaxb:bindings schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd" node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.ws.addressing"/>
@@ -31,7 +32,7 @@
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.ws.rm.v200702"/>
</jaxb:schemaBindings>
- <jaxb:globalBindings generateIsSetMethod="true"/>
+ <jaxb:globalBindings generateIsSetMethod="true" collectionType="java.util.concurrent.CopyOnWriteArrayList"/>
</jaxb:bindings>
<jaxb:bindings schemaLocation="wsrm-1.1.xsd" node="//xs:element[@name='Nack']">
<jaxb:property>