You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2016/05/18 15:36:03 UTC
[1/4] cxf git commit: [CXF-6900] Get Colm's tests working....
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 0ceb6a1d9 -> 01bf5f841
[CXF-6900] Get Colm's tests working....
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a1e4b880
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a1e4b880
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a1e4b880
Branch: refs/heads/3.1.x-fixes
Commit: a1e4b88063404e25e75db25d1022a484300a8ca1
Parents: 0ceb6a1
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue May 17 12:13:14 2016 -0400
Committer: Alessio Soldano <as...@redhat.com>
Committed: Wed May 18 14:35:52 2016 +0200
----------------------------------------------------------------------
.../cxf/binding/soap/saaj/SAAJStreamWriter.java | 4 ++++
.../apache/cxf/binding/soap/saaj/ParseBodyTest.java | 14 ++++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a1e4b880/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index 14b5c2e..d29276c 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -52,6 +52,9 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
if (namespace != null
&& namespace.equals(part.getEnvelope().getElementName().getURI())) {
adjustPrefix((SOAPElement)nd2, pfx);
+ if ("Envelope".equals(nd2.getLocalName())) {
+ adjustPrefix(part.getEnvelope().getHeader(), pfx);
+ }
}
} catch (SOAPException e) {
//ignore, fallback
@@ -146,6 +149,7 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
el = ((SOAPElement)cur).addChildElement(local, "", "");
} else {
el = ((SOAPElement)cur).addChildElement(local, pfx == null ? "" : pfx, ns);
+ adjustPrefix((SOAPElement)el, pfx);
}
cur.removeChild(el);
return el;
http://git-wip-us.apache.org/repos/asf/cxf/blob/a1e4b880/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index bcdb6f9..1f6eeb4 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -30,6 +30,7 @@ import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
@@ -39,6 +40,7 @@ import org.apache.cxf.helpers.DOMUtils.NullResolver;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.staxutils.StaxSource;
import org.apache.cxf.staxutils.StaxUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -87,26 +89,30 @@ public class ParseBodyTest extends Assert {
// TODO - See CXF-6900
@Test
- @org.junit.Ignore
public void testReadSOAPFault() throws Exception {
InputStream inStream = getClass().getResourceAsStream("soap12-fault.xml");
Document doc = StaxUtils.read(inStream);
-
+
SoapMessage msg = new SoapMessage(new MessageImpl());
Exchange ex = new ExchangeImpl();
ex.setInMessage(msg);
SOAPMessage saajMsg = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL).createMessage();
SOAPPart part = saajMsg.getSOAPPart();
- part.setContent(new DOMSource(doc));
+ SAAJStreamWriter writer = new SAAJStreamWriter(part);
+ StaxUtils.copy(doc, writer);
+ //Source s = new StaxSource(StaxUtils.createXMLStreamReader(doc));
+ //part.setContent(s);
saajMsg.saveChanges();
-
+
msg.setContent(SOAPMessage.class, saajMsg);
doc = part;
// System.out.println("OUTPUT: " + StaxUtils.toString(doc));
byte[] docbytes = getMessageBytes(doc);
+
+ // System.out.println("OUTPUT: " + new String(docbytes));
XMLStreamReader reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(docbytes));
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
[3/4] cxf git commit: Fix unused imports
Posted by as...@apache.org.
Fix unused imports
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fa2c6249
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fa2c6249
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fa2c6249
Branch: refs/heads/3.1.x-fixes
Commit: fa2c6249224db7107ca0b92a60851310fdb6dfdf
Parents: 1046894
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue May 17 12:24:18 2016 -0400
Committer: Alessio Soldano <as...@redhat.com>
Committed: Wed May 18 17:33:27 2016 +0200
----------------------------------------------------------------------
.../test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/fa2c6249/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index 1f6eeb4..c6b2087 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -30,7 +30,6 @@ import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
@@ -40,7 +39,6 @@ import org.apache.cxf.helpers.DOMUtils.NullResolver;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.staxutils.StaxSource;
import org.apache.cxf.staxutils.StaxUtils;
import org.junit.Assert;
import org.junit.Test;
[2/4] cxf git commit: [CXF-6900] More SAAJ fixes
Posted by as...@apache.org.
[CXF-6900] More SAAJ fixes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1046894b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1046894b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1046894b
Branch: refs/heads/3.1.x-fixes
Commit: 1046894b83582303820c1b43b03bbdf2b4cbe571
Parents: a1e4b88
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue May 17 13:26:31 2016 -0400
Committer: Alessio Soldano <as...@redhat.com>
Committed: Wed May 18 14:36:09 2016 +0200
----------------------------------------------------------------------
.../apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java | 2 +-
.../apache/cxf/binding/soap/saaj/SAAJStreamWriter.java | 10 ++++++++++
.../cxf/ws/security/wss4j/AbstractPolicySecurityTest.java | 5 ++---
.../cxf/ws/security/wss4j/AbstractSecurityTest.java | 8 ++++----
.../cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java | 3 +++
5 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1046894b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
index 74de7a3..d30bf4f 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
@@ -38,9 +38,9 @@ import org.apache.cxf.common.util.StringUtils;
* location, it will just walk into it instead of creating a new element
*/
public class OverlayW3CDOMStreamWriter extends W3CDOMStreamWriter {
+ protected boolean isOverlaid = true;
List<Boolean> isOverlaidStack = new LinkedList<Boolean>();
- boolean isOverlaid = true;
Boolean textOverlay;
public OverlayW3CDOMStreamWriter(Document document) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/1046894b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index d29276c..393a553 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -40,6 +40,10 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
public SAAJStreamWriter(SOAPPart part) {
super(part);
this.part = part;
+ Node nd = part.getFirstChild();
+ if (nd == null) {
+ isOverlaid = false;
+ }
}
public SAAJStreamWriter(SOAPPart part, Element current) {
super(part, current);
@@ -69,8 +73,14 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
if ("Envelope".equals(local)) {
setChild(adjustPrefix(part.getEnvelope(), prefix), false);
adjustPrefix(part.getEnvelope().getHeader(), prefix);
+ adjustPrefix(part.getEnvelope().getBody(), prefix);
+ part.getEnvelope().removeChild(part.getEnvelope().getHeader());
+ part.getEnvelope().removeChild(part.getEnvelope().getBody());
return;
} else if ("Body".equals(local)) {
+ if (part.getEnvelope().getBody() == null) {
+ part.getEnvelope().addBody();
+ }
setChild(adjustPrefix(part.getEnvelope().getBody(), prefix), false);
return;
} else if ("Header".equals(local)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/1046894b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
index 5702b5e..b627081 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
@@ -30,7 +30,6 @@ import java.util.concurrent.Executor;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
import javax.xml.soap.Node;
-import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
@@ -405,7 +404,7 @@ public abstract class AbstractPolicySecurityTest extends AbstractSecurityTest {
* @see #getSoapMessageForDom(Document, AssertionInfoMap)
*/
protected SoapMessage getOutSoapMessageForDom(Document doc, AssertionInfoMap aim)
- throws SOAPException {
+ throws Exception {
SoapMessage msg = this.getSoapMessageForDom(doc, aim);
msg.put(SecurityConstants.SIGNATURE_PROPERTIES, "outsecurity.properties");
msg.put(SecurityConstants.ENCRYPT_PROPERTIES, "outsecurity.properties");
@@ -421,7 +420,7 @@ public abstract class AbstractPolicySecurityTest extends AbstractSecurityTest {
}
protected SoapMessage getSoapMessageForDom(Document doc, AssertionInfoMap aim)
- throws SOAPException {
+ throws Exception {
SoapMessage msg = this.getSoapMessageForDom(doc);
if (aim != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/1046894b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
index e5e531d..38bc2be 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
@@ -32,17 +32,16 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.apache.cxf.binding.soap.Soap11;
import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.binding.soap.saaj.SAAJStreamWriter;
import org.apache.cxf.helpers.DOMUtils.NullResolver;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
@@ -81,10 +80,11 @@ public abstract class AbstractSecurityTest extends AbstractCXFTest {
* Creates a {@link SoapMessage} from the contents of a document.
* @param doc the document containing the SOAP content.
*/
- protected SoapMessage getSoapMessageForDom(Document doc) throws SOAPException {
+ protected SoapMessage getSoapMessageForDom(Document doc) throws Exception {
SOAPMessage saajMsg = MessageFactory.newInstance().createMessage();
SOAPPart part = saajMsg.getSOAPPart();
- part.setContent(new DOMSource(doc));
+ SAAJStreamWriter writer = new SAAJStreamWriter(part);
+ StaxUtils.copy(doc, writer);
saajMsg.saveChanges();
MessageImpl message = new MessageImpl();
http://git-wip-us.apache.org/repos/asf/cxf/blob/1046894b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
index 71e7bb3..879ec0d 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
@@ -27,6 +27,8 @@ import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
+import javax.xml.soap.SOAPMessage;
+
import org.w3c.dom.Document;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.MustUnderstandInterceptor;
@@ -37,6 +39,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.phase.PhaseInterceptor;
import org.apache.cxf.phase.PhaseInterceptorChain;
+import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageChecker.XPathExpression;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageScope;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType;
[4/4] cxf git commit: Recording .gitmergeinfo Changes
Posted by as...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/01bf5f84
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/01bf5f84
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/01bf5f84
Branch: refs/heads/3.1.x-fixes
Commit: 01bf5f841d27d94485018912a575e4d9b50caab9
Parents: fa2c624
Author: Alessio Soldano <as...@redhat.com>
Authored: Wed May 18 17:34:55 2016 +0200
Committer: Alessio Soldano <as...@redhat.com>
Committed: Wed May 18 17:34:55 2016 +0200
----------------------------------------------------------------------
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/01bf5f84/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index cd299ef..d93b361 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -54,8 +54,10 @@ B f98785bd8490c4717353f1a9688cae3e7a823ec2
B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37
M 0222768baf6b60742c4a8332308edf2be0f4a2e4
M 0578e16146527b0782530c40ba2db17531756d96
+M 0e5fd5a54cb271ba494e7e30b45d4228b33364a9
M 1184e08f0d1c40c754e39fd5d6340d1057fbdd17
M 1afeea8bdc0ef96df1d52ea343957dc396723f8c
+M 2538ae42fb0c774023deed5264291b2fe6658cb8
M 26edcd457ea507075a4c82e2787f11f11a432876
M 2e8219cf3d047abc3a7e2611bf284aadbc20b7d6
M 386805560479b35276d88605c5acf805e3004aa5
@@ -78,5 +80,6 @@ M a1710bdd783afcd667d9e72ccb031480d3806850
M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
M b2b6f0137cd9f1bafff5d487e8383453692a2ff0
M b2e5fb6583d64deeb8a42d2eeb6935c5f33dc0c6
+M cf8ac102e728b8745da265ec969f7b5160829fdb
M fa973bd7ab43099151f83beea351b80c7140eaab
M fe89bf0fb8379428667f66312e6942e906142d6f