From e79aebf2bc276523eb705ecc30ea7856dd0a1570 Mon Sep 17 00:00:00 2001
From: Tareq Abedrabbo <tareq.abedrabbo@opencredo.com>
Date: Fri, 2 Apr 2010 12:26:03 +0000
Subject: [PATCH] SWS-538 Upgraded XWSS to 3.0

---
 parent/pom.xml                                                  | 2 +-
 .../soap/security/xwss/XwssMessageInterceptorEncryptTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 072e7cf3..206a4e56 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -474,7 +474,7 @@
             <dependency>
                 <groupId>com.sun.xml.wss</groupId>
                 <artifactId>xws-security</artifactId>
-                <version>2.0-FCS</version>
+                <version>3.0</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.xml.parsers</groupId>
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java
index b45202de..9faf5e1a 100644
--- a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java
+++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java
@@ -44,7 +44,7 @@ public class XwssMessageInterceptorEncryptTest extends AbstractXwssMessageInterc
                     if (keyCallback.getRequest() instanceof EncryptionKeyCallback.AliasX509CertificateRequest) {
                         EncryptionKeyCallback.AliasX509CertificateRequest request =
                                 (EncryptionKeyCallback.AliasX509CertificateRequest) keyCallback.getRequest();
-                        assertNull("Invalid alias", request.getAlias());
+                        assertEquals("Invalid alias", "", request.getAlias());
                         request.setX509Certificate(certificate);
                     }
                     else {