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 15:49:48 UTC
[1/3] cxf git commit: [CXF-7165] Fix mapping of XML names containing
_ to class names
Repository: cxf
Updated Branches:
refs/heads/master 894c0a357 -> 598a45d5b
[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/88489dd6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/88489dd6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/88489dd6
Branch: refs/heads/master
Commit: 88489dd691f08d1721fe497c833d600eaa813cb4
Parents: 0db60be
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 11:32:02 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/88489dd6/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 76d2f38..74b2fe2 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
@@ -402,10 +402,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);
@@ -413,7 +415,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/88489dd6/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 3263825..4b7cd14 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
@@ -88,7 +88,7 @@ public class JAXBUtilsTest extends Assert {
}
@Test
- public void testNameToIdentifier() {
+ public void testNameToIdentifier() {
assertEquals("_return",
JAXBUtils.nameToIdentifier("return", JAXBUtils.IdentifierType.VARIABLE));
assertEquals("getReturn",
@@ -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/3] 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.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/598a45d5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/598a45d5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/598a45d5
Branch: refs/heads/master
Commit: 598a45d5b2add46995cbced55209be7ecacd4a51
Parents: 88489dd
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 11:38:01 2017 -0400
----------------------------------------------------------------------
.../java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/598a45d5/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 25aef5f..77ea5aa 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);
[2/3] cxf git commit: [CXF-7306] Use prefix passed in the QName of
fault subcodes
Posted by dk...@apache.org.
[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/0db60be5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0db60be5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0db60be5
Branch: refs/heads/master
Commit: 0db60be561bf758e3dca25d6399125c544caf458
Parents: 894c0a3
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 11:32:02 2017 -0400
----------------------------------------------------------------------
.../soap/interceptor/AbstractSoapInterceptor.java | 14 +++++++++++++-
.../soap/interceptor/SoapFaultSerializerTest.java | 6 +++---
2 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0db60be5/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 ac96d72..8bf2fc8 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,7 +63,18 @@ 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/0db60be5/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 2e08a56..515588d 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);
@@ -171,7 +171,7 @@ public class SoapFaultSerializerTest extends Assert {
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);