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/08/02 16:45:25 UTC
[1/4] cxf git commit: [CXF-7306] Use prefix passed in the QName of
fault subcodes
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes d8ecd66e0 -> 98c61725f
[CXF-7306] Use prefix passed in the QName of fault subcodes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a9075319
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a9075319
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a9075319
Branch: refs/heads/3.1.x-fixes
Commit: a9075319097cdfa37ab54f04f607c0a062bc4459
Parents: d8ecd66
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Aug 1 15:45:04 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Aug 2 12:44:10 2017 -0400
----------------------------------------------------------------------
.../soap/interceptor/AbstractSoapInterceptor.java | 16 ++++++++++++++--
.../soap/interceptor/SoapFaultSerializerTest.java | 8 ++++----
2 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a9075319/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
index 096ca02..9dcf556 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
@@ -32,6 +32,7 @@ import org.w3c.dom.Element;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
@@ -62,8 +63,19 @@ public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<S
String codeNs = faultCode.getNamespaceURI();
String prefix = null;
if (codeNs.length() > 0) {
- prefix = StaxUtils.getUniquePrefix(writer, codeNs, true);
- }
+ prefix = faultCode.getPrefix();
+ if (!StringUtils.isEmpty(prefix)) {
+ String boundNS = writer.getNamespaceContext().getNamespaceURI(prefix);
+ if (StringUtils.isEmpty(boundNS)) {
+ writer.writeNamespace(prefix, codeNs);
+ } else if (!codeNs.equals(boundNS)) {
+ prefix = null;
+ }
+ }
+ if (StringUtils.isEmpty(prefix)) {
+ prefix = StaxUtils.getUniquePrefix(writer, codeNs, true);
+ }
+ }
return prefix;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a9075319/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
index 4304c1c..6d8ab71 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
@@ -144,7 +144,7 @@ public class SoapFaultSerializerTest extends Assert {
assertValid("//soap12env:Fault/soap12env:Code/soap12env:Value[text()='ns1:Sender']",
faultDoc);
assertValid("//soap12env:Fault/soap12env:Code/soap12env:Subcode/"
- + "soap12env:Value[text()='ns2:invalidsoap']",
+ + "soap12env:Value[text()='cxffaultcode:invalidsoap']",
faultDoc);
assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[@xml:lang='en']",
faultDoc);
@@ -170,8 +170,8 @@ public class SoapFaultSerializerTest extends Assert {
public void testSoap12WithMultipleSubCodesOut() throws Exception {
String faultString = "Hadrian caused this Fault!";
SoapFault fault = new SoapFault(faultString, Soap12.getInstance().getSender());
-
- fault.addSubCode(new QName("http://cxf.apache.org/soap/fault", "invalidsoap", "cxffaultcode"));
+
+ fault.addSubCode(new QName("http://cxf.apache.org/soap/fault", "invalidsoap"));
fault.addSubCode(new QName("http://cxf.apache.org/soap/fault2", "invalidsoap2", "cxffaultcode2"));
SoapMessage m = new SoapMessage(new MessageImpl());
@@ -200,7 +200,7 @@ public class SoapFaultSerializerTest extends Assert {
+ "soap12env:Value[text()='ns2:invalidsoap']",
faultDoc);
assertValid("//soap12env:Fault/soap12env:Code/soap12env:Subcode/soap12env:Subcode/"
- + "soap12env:Value[text()='ns2:invalidsoap2']",
+ + "soap12env:Value[text()='cxffaultcode2:invalidsoap2']",
faultDoc);
assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[@xml:lang='en']",
faultDoc);
[2/4] cxf git commit: [CXF-7165] Fix mapping of XML names containing
_ to class names
Posted by dk...@apache.org.
[CXF-7165] Fix mapping of XML names containing _ to class names
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e899c32e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e899c32e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e899c32e
Branch: refs/heads/3.1.x-fixes
Commit: e899c32e0cd342b7b6f2a965d5c5f3dc8dfd6b9c
Parents: a907531
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Aug 1 16:30:45 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Aug 2 12:44:52 2017 -0400
----------------------------------------------------------------------
core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java | 8 ++++++--
.../src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java | 6 +++++-
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e899c32e/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index 46d0db0..0ffcac6 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -403,10 +403,12 @@ public final class JAXBUtils {
boolean legalIdentifier = false;
StringBuilder buf = new StringBuilder(name);
+ boolean hasUnderscore = false;
legalIdentifier = Character.isJavaIdentifierStart(buf.charAt(0));
for (int i = 1; i < name.length() && legalIdentifier; i++) {
- legalIdentifier = legalIdentifier && Character.isJavaIdentifierPart(buf.charAt(i));
+ legalIdentifier &= Character.isJavaIdentifierPart(buf.charAt(i));
+ hasUnderscore |= '_' == buf.charAt(i);
}
boolean conventionalIdentifier = isConventionalIdentifier(buf, type);
@@ -414,7 +416,9 @@ public final class JAXBUtils {
if (JAXBUtils.isJavaKeyword(name) && type == IdentifierType.VARIABLE) {
name = normalizePackageNamePart(name);
}
- return name;
+ if (!hasUnderscore || IdentifierType.CLASS != type) {
+ return name;
+ }
}
// split into words
http://git-wip-us.apache.org/repos/asf/cxf/blob/e899c32e/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
index 62f9070..e4c3254 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
@@ -89,7 +89,7 @@ public class JAXBUtilsTest extends Assert {
@Test
public void testNameToIdentifier() {
- assertEquals("_return",
+ assertEquals("_return",
JAXBUtils.nameToIdentifier("return", JAXBUtils.IdentifierType.VARIABLE));
assertEquals("getReturn",
JAXBUtils.nameToIdentifier("return", JAXBUtils.IdentifierType.GETTER));
@@ -146,6 +146,10 @@ public class JAXBUtilsTest extends Assert {
JAXBUtils.nameToIdentifier("other_punct-chars", JAXBUtils.IdentifierType.GETTER));
assertEquals("OTHER_PUNCT_CHARS",
JAXBUtils.nameToIdentifier("other_punct-chars", JAXBUtils.IdentifierType.CONSTANT));
+
+ assertEquals("XMLTransfer",
+ JAXBUtils.nameToIdentifier("XMLTransfer", JAXBUtils.IdentifierType.CLASS));
+
}
@Test
[3/4] cxf git commit: The latest JDK on Mac seems to throw a timeout
exception instead of a connect exception.
Posted by dk...@apache.org.
The latest JDK on Mac seems to throw a timeout exception instead of a connect exception.
# Conflicts:
# systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/69df6930
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/69df6930
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/69df6930
Branch: refs/heads/3.1.x-fixes
Commit: 69df693042703c213d7a99a75dd9aab3118690b1
Parents: e899c32
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Aug 2 11:38:01 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Aug 2 12:45:15 2017 -0400
----------------------------------------------------------------------
.../org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/69df6930/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java
index d82c6ad..ac02cce 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java
@@ -110,7 +110,8 @@ public class WSAPureWsdlTest extends AbstractWSATestBase {
} catch (Exception t) {
//expected
assertTrue(t.getCause().getCause().toString(),
- t.getCause().getCause() instanceof java.net.ConnectException);
+ t.getCause().getCause() instanceof java.net.ConnectException
+ || t.getCause().getCause() instanceof java.net.SocketTimeoutException);
}
synchronized (handler) {
port.addNumbersAsync(25, 25, handler);
@@ -280,4 +281,4 @@ public class WSAPureWsdlTest extends AbstractWSATestBase {
assertNotNull("Service is null ", service);
return service.getAddNumbersPort();
}
-}
\ No newline at end of file
+}
[4/4] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@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/98c61725
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/98c61725
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/98c61725
Branch: refs/heads/3.1.x-fixes
Commit: 98c61725f43a38a1bd8f426c139223271650daee
Parents: 69df693
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Aug 2 12:45:15 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Aug 2 12:45:15 2017 -0400
----------------------------------------------------------------------
.gitmergeinfo | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/98c61725/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7c96601..8238074 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -41,6 +41,7 @@ B 1329e2c2b2f83a7b6e80ad2f15a2602161343749
B 137485de37b3bf81e305e616a5af81741620f547
B 140ad80be96ea11d360cd7a1d8e791ca91a2220d
B 1552f881183ba35b3706dc3c8061d7c6d85c7238
+B 15d6a26ab9dc4b2aaf07f9ce23e55bfdd60bc08f
B 16672c10cf0a7bcfeeb946fd352e50fb72bda991
B 16931d7ae0cbb38e987923bf604cd403c1caee7f
B 180d0fcc5e0d061f339e1a3cb32ec53a3ab32b97
@@ -48,6 +49,7 @@ B 183a2a4022b912a6c32c1d3e268982b2f78f7631
B 18720623e9d86e68566346981cebaefc7995d910
B 189756a8ff668d39d59cb7ff1658ed40d70ec12b
B 189b6643d30eab4d79a0f7722c9277e76e92a1fd
+B 1909d85f7d0cbbfd84c8b826f4aabc3963891013
B 1ae4d6dee70587b048c0dcded9cd0b2855c2e225
B 1b2a3d0d2e1a4c8f13368fd7c3e0e1cbfabd2b32
B 1b8064f475b09323c5c11d9e8a4e1440879cae26
@@ -90,6 +92,7 @@ B 38919f57bfb2b880691950fc5f992b5649ea579e
B 39851b83af116611ce0efe70c4b9a32ee8491523
B 39a5690d7d50d8481739c290f49128be4d55f8ad
B 3a46e586b405c79a98e37d33a30b2fa22905f853
+B 3b08b6301343406f5f312fd4d0f385a6227775a2
B 3b2f2ed2db01f05fa9b648693ce33978ccc8ede8
B 3be1cef6d16eeee405b7e046c822c27dc7223f24
B 3bebf6b49283d9a9c36365c030533a3508f836c7
@@ -161,6 +164,7 @@ B 5b4275ce202777828633dbb65133d3fe44f1d404
B 5ce0b6eb1488d8ac575ee055d5f8cf83863546bf
B 5d73e20b4539bfa4c8ca607b27a1c1ea1850e095
B 5e068d215b750e3211aaaf3d0b7b366d6a220fc2
+B 5e2d2a1a60dcf11fd4bf70e592e60b7d8ddd4e41
B 5ea90a91d9148aa59aeb9b7e6611b58fb8da1fe4
B 5fa39c84511e3a329e9e84be2f7cf333b122f375
B 604167d9f0cfc67e01219a19a95353176ce38f79
@@ -185,6 +189,7 @@ B 69826a090e5f7868b9633e69b76f051fa15b65ef
B 69891e8bdb65fda1caa03810cdc3853a3f357cd1
B 699f4c03de1acb1cf9eb95ad2db792dba5a56ead
B 69c7b4c1ce4a9d131802c9a198706581eb4a3e91
+B 6a1bc29634a5328fb3d5f5927cdebbde9af63715
B 6c28faf7890b1043a1fd71a74acb5eb482eda006
B 6c324421a358919b4ecb3cfdd8a2e0e16ff81724
B 6c6cdd22e3bf46002cdb759d01224032cb0c8308
@@ -202,6 +207,7 @@ B 741c9e349e7e48d3fe278ba8d8f17dd6bf4c4370
B 7463f091dcf08fb4bbfe58c261dda6bd1900460c
B 746cd3c0b850702e5b3601d18ce81652a1f3441f
B 74b975e88c799e8d62ba319b4b5a0bb91ae7d269
+B 75b06d6d7fb1be4dfa6189d16b6d6530218bbbb6
B 762093f79fb799e3912ce572213f1a46eb02867c
B 76877054e1a86220fe1a546acde9a12e7c63e10b
B 76d165c9f7d76de1e333eded6106fa0cc186131b
@@ -291,6 +297,7 @@ B aeeb4df2e5c4133164014e15ebf221a2dcd02eec
B aeecef53263cd1d595d991654f0a783a10adfdcb
B af8a95bf93b4273822395e3e7d96d462fe9820f2
B afdf9361f1c3ce49c8440a5f2615bde2bb42c684
+B b09959c9aa05b77e40523da8574a5aa2947897cd
B b2c10cc6c18a6e6589d258436303c46b3f682f7e
B b3c49a34cd86a1966f79aed10c2df54adbdf7c5b
B b3ec59efcd10cf64a1bb8a399082071905f5baa9
@@ -329,6 +336,7 @@ B c2daeb5b45b758e9f54ce73dc4567a69c47d9170
B c3a1392d1656c41a9bbdb24698eb27fbc757628b
B c49f7a0be25d3f99a8fe81be6209139c3c0df562
B c4e9c63ba0a6b854c0b31b6f7bfdaacc32ba3264
+B c5ba9fa367756815920fe167de2bdc1cc4d26ff6
B c63f06f3782148373912c1e4dc86de0d0c312229
B c6d4592a8a5d31429333c0e539ae56f517c2523f
B c783e60a8bcea76b9fecb75364b120d39c8ea28a
@@ -422,6 +430,7 @@ B f2fe6260e87fc71e43075730bee99cf564d2711a
B f34a8146bbfd1d5fdc80adb373f56c9862f3e159
B f3bb66deb0757478a33e0c3609428e7450cf3edb
B f45612c0a60b63c5cfe7e190c54254e8a77c5e2a
+B f46d64c8d413ae13cd3baa58ebf691a17e655ba5
B f4d0b2152036c6e57f82d762464f6c96907e0a37
B f51d7557791a6d3ae0bcf7f81ceda30a2c0029d3
B f66dea949bdc3f136084115aca4e514bad426380
@@ -458,6 +467,7 @@ M 090fa6100ae3a5aa8ae894b0e238acb793f705ec
M 09fb22b25333c66514f06652ceaf7fc11bde51cc
M 0b7b18333591d6bb8e0bfcf324bbdefaa8cce21d
M 0c307b67340dcafd75a1fd40ce003869ddd4594b
+M 0db60be561bf758e3dca25d6399125c544caf458
M 0e5fd5a54cb271ba494e7e30b45d4228b33364a9
M 0eef86f37288f71fd96506fb2ac7fa27169d1e43
M 0fbd966c8495f4beccf6719eb1e6efd06eb00971
@@ -553,6 +563,7 @@ M 5724e615409916ce3176d430cb91bae44f3447d9
M 574b2a9997c94011794fa2e083181e23c9936f15
M 585df048b7730ee36644a4bb7c1a20fcf977d79e
M 5954d4ce3c9713c17c3bbb8b730fad210aebfb3a
+M 598a45d5b2add46995cbced55209be7ecacd4a51
M 59c2f5ab18b7b39f1e1cdf74910a6de03dcc8a31
M 59cab46f45733b07b1b90c4510d4466d97447323
M 5afec44d741580762fb5d6f4f4fac7d34446ae95
@@ -603,8 +614,10 @@ M 8583a24ac541dc373503d7a6c59cd90890acdae3
M 85c390abd81c0a5590e83b2d5bd9c6cfc2f3bddc
M 85e75210eda97bc9e31b6c2ace07865e4df0ef86
M 86667619dc61c8a84672fc5a583b4517f48176c5
+M 88489dd691f08d1721fe497c833d600eaa813cb4
M 88d03f562405f0b1bbdb16b336810074b853db86
M 88f8ce6eb41c557ece52b305959f6b2647bfb001
+M 894c0a35712c37b9e7a7de4376cc41d58d5f1239
M 896f1abec915897967905762d6e850cfb6bac3bc
M 8aebfa30047f32e3a6b4feb7ffdd89208ec4f435
M 8b5ad0005d5e42bb51a90c6773aae12c5022f78b
@@ -688,6 +701,7 @@ M c48c368f4622d88673dcc77c5726f5563f792b07
M c55034d9621bc904634017b552057474afb93ac2
M c7d50ca238184789412737ea0f0db4b5b5503326
M c87613b800a5b2de25d861c3c74a0fb7dcf60862
+M c8828d4e2c0e79c264301a5df08fb00cf5e51be5
M c9875c223627a17f7d8128632b25bdf6bf148918
M cbb8261fc8f7261b8ef91a5931a2b343a7177d33
M cbd4e7fa6b3e15d39f12d39a448ee3742d5d3efe