You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2008/08/06 07:42:01 UTC
svn commit: r683114 -
/servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java
Author: gertv
Date: Tue Aug 5 22:42:01 2008
New Revision: 683114
URL: http://svn.apache.org/viewvc?rev=683114&view=rev
Log:
SM-1500: Build failure after upgrade to wss4j 1.5.4
Modified:
servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java
Modified: servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java?rev=683114&r1=683113&r2=683114&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java Tue Aug 5 22:42:01 2008
@@ -81,7 +81,7 @@
private static ThreadLocal currentHandler = new ThreadLocal();
public WSSecurityHandler() {
- WSSecurityEngine.setWssConfig(new ServiceMixWssConfig());
+ WSSecurityEngine.getInstance().setWssConfig(new ServiceMixWssConfig());
}
static WSSecurityHandler getCurrentHandler() {
@@ -123,7 +123,7 @@
try {
WSSecurityHandler handler = WSSecurityHandler.getCurrentHandler();
lastPrincipalFound = verifyXMLSignature((Element) elem,
- crypto, returnCert, returnElements, null, signatureValue);
+ crypto, returnCert, returnElements, null, signatureValue, cb);
if (lastPrincipalFound instanceof WSUsernameTokenPrincipal) {
WSUsernameTokenPrincipal p = (WSUsernameTokenPrincipal) lastPrincipalFound;
handler.checkUser(p.getName(), p.getPassword());