From 763644359808a212070e5c2129b77496d7fb165e Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Wed, 6 Jun 2007 03:22:16 +0000
Subject: [PATCH] Upgraded to XWSS 2.0 FCS

---
 security/pom.xml                              | 37 ++++++++++++++++---
 .../callback/KeyStoreCallbackHandler.java     |  8 +---
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/security/pom.xml b/security/pom.xml
index e72ded5c..74bce70e 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <artifactId>spring-ws</artifactId>
         <groupId>org.springframework.ws</groupId>
@@ -11,9 +12,10 @@
     <description>Spring-WS WS-Security implementation</description>
     <repositories>
         <repository>
-            <id>spring-ext</id>
-            <name>Spring External Dependencies Repository</name>
-            <url>https://svn.sourceforge.net/svnroot/springframework/repos/repo-ext/</url>
+            <id>java.net</id>
+            <name>Java.net Repository for Maven2</name>
+            <url>http://download.java.net/maven/1/</url>
+            <layout>legacy</layout>
         </repository>
     </repositories>
     <dependencies>
@@ -21,6 +23,12 @@
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-ws-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.ws</groupId>
+                    <artifactId>spring-oxm</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.ws</groupId>
@@ -57,10 +65,29 @@
         <dependency>
             <groupId>com.sun.xml.wss</groupId>
             <artifactId>xws-security</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.parsers</groupId>
+                    <artifactId>jaxp-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.xml.ws</groupId>
+                    <artifactId>jaxws-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.xml</groupId>
+                    <artifactId>jaxrpc-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.sun.org.apache.xml.security</groupId>
+            <groupId>xml-security</groupId>
             <artifactId>xmlsec</artifactId>
+            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.acegisecurity</groupId>
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandler.java
index 7105382c..46b451b6 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandler.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandler.java
@@ -34,16 +34,14 @@ import java.security.cert.X509CertSelector;
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
 import java.util.Enumeration;
-
 import javax.crypto.SecretKey;
 
-import com.sun.org.apache.xml.internal.security.utils.RFC2253Parser;
 import com.sun.xml.wss.impl.callback.CertificateValidationCallback;
 import com.sun.xml.wss.impl.callback.DecryptionKeyCallback;
 import com.sun.xml.wss.impl.callback.EncryptionKeyCallback;
 import com.sun.xml.wss.impl.callback.SignatureKeyCallback;
 import com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback;
-
+import org.apache.xml.security.utils.RFC2253Parser;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
@@ -158,9 +156,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme
         return null;
     }
 
-    /**
-     * Sets the key store alias for the default certificate and private key.
-     */
+    /** Sets the key store alias for the default certificate and private key. */
     public void setDefaultAlias(String defaultAlias) {
         this.defaultAlias = defaultAlias;
     }