Repository: cxf Updated Branches: refs/heads/master c808b17a0 -> 49162989b
Use the class name instead of the class directly as cxf-rt-ws-addr SHOULD be optional and using the class prevents that. At least log a FINE message about why the sec-policy stuff failed to load. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/49162989 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/49162989 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/49162989 Branch: refs/heads/master Commit: 49162989b4d9909149d577bb909eb9f103093e5b Parents: c808b17 Author: Daniel Kulp <dk...@apache.org> Authored: Wed Aug 27 14:25:54 2014 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Wed Aug 27 14:26:46 2014 -0400 ---------------------------------------------------------------------- .../apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java | 7 +++++++ .../org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/49162989/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java index 1339ba2..4d67ee4 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java @@ -23,12 +23,16 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.xml.namespace.QName; import org.w3c.dom.Element; + import org.apache.cxf.Bus; import org.apache.cxf.common.injection.NoJSR250Annotations; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.ws.policy.AssertionBuilderLoader; import org.apache.cxf.ws.policy.AssertionBuilderRegistry; import org.apache.cxf.ws.policy.PolicyInterceptorProviderLoader; @@ -93,6 +97,8 @@ import org.apache.wss4j.policy.model.AlgorithmSuite; @NoJSR250Annotations public final class WSSecurityPolicyLoader implements PolicyInterceptorProviderLoader, AssertionBuilderLoader { + private static final Logger LOG = LogUtils.getL7dLogger(WSSecurityPolicyLoader.class); + Bus bus; public WSSecurityPolicyLoader(Bus b) { @@ -105,6 +111,7 @@ public final class WSSecurityPolicyLoader implements PolicyInterceptorProviderLo //as the policy framework will then not find the providers //and error out at that point. If nothing uses ws-securitypolicy //no warnings/errors will display + LOG.log(Level.FINE, "Could not load or register WS-SecurityPolicy related classes.", t); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/49162989/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java index 59ec589..95b80e7 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java @@ -67,7 +67,6 @@ import org.apache.cxf.rt.security.saml.SAMLUtils; import org.apache.cxf.security.SecurityContext; import org.apache.cxf.security.transport.TLSSessionInfo; import org.apache.cxf.staxutils.StaxUtils; -import org.apache.cxf.ws.addressing.soap.MAPCodec; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.cxf.ws.security.tokenstore.TokenStore; @@ -124,7 +123,7 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor { setPhase(Phase.PRE_PROTOCOL); getAfter().add(SAAJInInterceptor.class.getName()); - getAfter().add(MAPCodec.class.getName()); + getAfter().add("org.apache.cxf.ws.addressing.soap.MAPCodec"); } public WSS4JInInterceptor(boolean ignore) { this();
