Author: coheigea Date: Fri Nov 23 10:25:32 2012 New Revision: 1412812 URL: http://svn.apache.org/viewvc?rev=1412812&view=rev Log: Merged revisions 1412810 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1412810 | coheigea | 2012-11-23 10:21:46 +0000 (Fri, 23 Nov 2012) | 10 lines Merged revisions 1412804 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1412804 | coheigea | 2012-11-23 10:01:01 +0000 (Fri, 23 Nov 2012) | 2 lines Make sure Santuario provider is installed for the SAML case ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java?rev=1412812&r1=1412811&r2=1412812&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java Fri Nov 23 10:25:32 2012 @@ -173,7 +173,6 @@ public class SamlTokenInterceptor extend private List<WSSecurityEngineResult> processToken(Element tokenElement, final SoapMessage message) throws WSSecurityException { - SAMLTokenProcessor p = new SAMLTokenProcessor(); WSDocInfo wsDocInfo = new WSDocInfo(tokenElement.getOwnerDocument()); RequestData data = new RequestData() { public CallbackHandler getCallbackHandler() { @@ -208,6 +207,8 @@ public class SamlTokenInterceptor extend } }; data.setWssConfig(WSSConfig.getNewInstance()); + + SAMLTokenProcessor p = new SAMLTokenProcessor(); List<WSSecurityEngineResult> results = p.handleToken(tokenElement, data, wsDocInfo); return results; @@ -234,6 +235,7 @@ public class SamlTokenInterceptor extend private void addSamlToken(SoapMessage message) { + WSSConfig.init(); SamlToken tok = assertSamlTokens(message); Header h = findSecurityHeader(message, true);
