Author: ffang
Date: Wed May 20 02:43:12 2009
New Revision: 776526
URL: http://svn.apache.org/viewvc?rev=776526&view=rev
Log:
[SMXCOMP-541]Upgrade WSSJ to 1.5.5
Modified:
servicemix/components/shared-libraries/trunk/servicemix-soap/pom.xml
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java
servicemix/components/shared-libraries/trunk/servicemix-soap2/pom.xml
Modified: servicemix/components/shared-libraries/trunk/servicemix-soap/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap/pom.xml?rev=776526&r1=776525&r2=776526&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-soap/pom.xml
(original)
+++ servicemix/components/shared-libraries/trunk/servicemix-soap/pom.xml Wed
May 20 02:43:12 2009
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>1.5.2</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
Modified:
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java
URL:
http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java?rev=776526&r1=776525&r2=776526&view=diff
==============================================================================
---
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java
(original)
+++
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java
Wed May 20 02:43:12 2009
@@ -81,7 +81,8 @@
private static ThreadLocal currentHandler = new ThreadLocal();
public WSSecurityHandler() {
- WSSecurityEngine.setWssConfig(new ServiceMixWssConfig());
+ final WSSecurityEngine wssEng = new WSSecurityEngine();
+ wssEng.setWssConfig(new ServiceMixWssConfig());
}
static WSSecurityHandler getCurrentHandler() {
@@ -123,7 +124,7 @@
try {
WSSecurityHandler handler =
WSSecurityHandler.getCurrentHandler();
lastPrincipalFound = verifyXMLSignature((Element) elem,
- crypto, returnCert, returnElements, null,
signatureValue);
+ crypto, returnCert, returnElements, null,
signatureValue, null);
if (lastPrincipalFound instanceof WSUsernameTokenPrincipal) {
WSUsernameTokenPrincipal p = (WSUsernameTokenPrincipal)
lastPrincipalFound;
handler.checkUser(p.getName(), p.getPassword());
Modified: servicemix/components/shared-libraries/trunk/servicemix-soap2/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap2/pom.xml?rev=776526&r1=776525&r2=776526&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-soap2/pom.xml
(original)
+++ servicemix/components/shared-libraries/trunk/servicemix-soap2/pom.xml Wed
May 20 02:43:12 2009
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>1.5.2</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
