You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2016/02/02 19:11:10 UTC
[1/2] cxf git commit: log warning when the addressing policy's
namespace is not normalized
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 0efd99c5e -> 5329ac50f
log warning when the addressing policy's namespace is not normalized
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d4d75a09
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d4d75a09
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d4d75a09
Branch: refs/heads/3.0.x-fixes
Commit: d4d75a09cc8438a122e8e9ff57eaef8edef2fb44
Parents: 0efd99c
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Tue Feb 2 15:42:49 2016 +0100
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Tue Feb 2 15:50:22 2016 +0100
----------------------------------------------------------------------
.../ws/addressing/policy/AddressingAssertionBuilder.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d4d75a09/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
index 4f147e3..e49dac9 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
@@ -20,12 +20,14 @@
package org.apache.cxf.ws.addressing.policy;
import java.util.Map;
+import java.util.logging.Logger;
import javax.xml.namespace.QName;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.ws.policy.PolicyConstants;
import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
import org.apache.neethi.Assertion;
@@ -39,6 +41,8 @@ import org.apache.neethi.builders.xml.XMLPrimitiveAssertionBuilder;
*
*/
public class AddressingAssertionBuilder implements AssertionBuilder<Element> {
+ private static final Logger LOG =
+ LogUtils.getL7dLogger(AddressingAssertionBuilder.class);
private static final QName[] KNOWN_ELEMENTS = {
MetadataConstants.ADDRESSING_ASSERTION_QNAME,
@@ -80,7 +84,11 @@ public class AddressingAssertionBuilder implements AssertionBuilder<Element> {
mp,
policy);
}
- } .build(elem, factory);
+ }.build(elem, factory);
+ if (!MetadataConstants.ADDRESSING_ASSERTION_QNAME.equals(nap.getName())) {
+ // this happens when neethi fails to recognize the specified addressing policy
+ LOG.warning("Unable to recognize the addressing policy");
+ }
return nap;
} else if (MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME.equals(qn)
|| MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705.equals(qn)) {
[2/2] cxf git commit: change the warning-log condition to handle both
wsam-namespaces equally
Posted by ay...@apache.org.
change the warning-log condition to handle both wsam-namespaces equally
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5329ac50
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5329ac50
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5329ac50
Branch: refs/heads/3.0.x-fixes
Commit: 5329ac50f77f29c2b5a26427d0af0fcf6a6cb7dd
Parents: d4d75a0
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Tue Feb 2 18:51:43 2016 +0100
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Tue Feb 2 19:10:40 2016 +0100
----------------------------------------------------------------------
.../cxf/ws/addressing/policy/AddressingAssertionBuilder.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5329ac50/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
index e49dac9..318463d 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
@@ -85,8 +85,8 @@ public class AddressingAssertionBuilder implements AssertionBuilder<Element> {
policy);
}
}.build(elem, factory);
- if (!MetadataConstants.ADDRESSING_ASSERTION_QNAME.equals(nap.getName())) {
- // this happens when neethi fails to recognize the specified addressing policy
+ if (!(nap instanceof PolicyContainingPrimitiveAssertion || nap instanceof PrimitiveAssertion)) {
+ // this happens when neethi fails to recognize the specified addressing policy element
LOG.warning("Unable to recognize the addressing policy");
}
return nap;