You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2008/04/12 14:02:46 UTC
svn commit: r647437 - in /servicemix/smx3/trunk:
common/servicemix-soap/pom.xml
common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java
common/servicemix-soap2/pom.xml pom.xml
Author: ffang
Date: Sat Apr 12 05:02:45 2008
New Revision: 647437
URL: http://svn.apache.org/viewvc?rev=647437&view=rev
Log:
[SM-1314]update wss4j version from 1.5.1 to 1.5.2
Modified:
servicemix/smx3/trunk/common/servicemix-soap/pom.xml
servicemix/smx3/trunk/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java
servicemix/smx3/trunk/common/servicemix-soap2/pom.xml
servicemix/smx3/trunk/pom.xml
Modified: servicemix/smx3/trunk/common/servicemix-soap/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-soap/pom.xml?rev=647437&r1=647436&r2=647437&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-soap/pom.xml (original)
+++ servicemix/smx3/trunk/common/servicemix-soap/pom.xml Sat Apr 12 05:02:45 2008
@@ -53,7 +53,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>wss4j</groupId>
+ <groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
</dependency>
<dependency>
Modified: servicemix/smx3/trunk/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java?rev=647437&r1=647436&r2=647437&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java (original)
+++ servicemix/smx3/trunk/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java Sat Apr 12 05:02:45 2008
@@ -123,7 +123,7 @@
try {
WSSecurityHandler handler = WSSecurityHandler.getCurrentHandler();
lastPrincipalFound = verifyXMLSignature((Element) elem,
- crypto, returnCert, returnElements, signatureValue);
+ crypto, returnCert, returnElements, null, signatureValue);
if (lastPrincipalFound instanceof WSUsernameTokenPrincipal) {
WSUsernameTokenPrincipal p = (WSUsernameTokenPrincipal) lastPrincipalFound;
handler.checkUser(p.getName(), p.getPassword());
Modified: servicemix/smx3/trunk/common/servicemix-soap2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-soap2/pom.xml?rev=647437&r1=647436&r2=647437&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-soap2/pom.xml (original)
+++ servicemix/smx3/trunk/common/servicemix-soap2/pom.xml Sat Apr 12 05:02:45 2008
@@ -53,7 +53,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>wss4j</groupId>
+ <groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
</dependency>
<dependency>
Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=647437&r1=647436&r2=647437&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Sat Apr 12 05:02:45 2008
@@ -1884,9 +1884,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>wss4j</groupId>
+ <groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2</version>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>