You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2012/07/11 18:14:27 UTC

svn commit: r1360258 - in /webservices/wss4j/branches/swssf: streaming-ws-policy/src/test/java/org/swssf/policy/test/ streaming-ws-security/src/main/java/org/swssf/wss/crypto/ streaming-ws-security/src/main/java/org/swssf/wss/ext/ streaming-ws-security...

Author: coheigea
Date: Wed Jul 11 16:14:26 2012
New Revision: 1360258

URL: http://svn.apache.org/viewvc?rev=1360258&view=rev
Log:
Updating Crypto package names

Modified:
    webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AsymmetricBindingIntegrationTest.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Crypto.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoBase.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoType.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/DERDecoder.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Loader.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Merlin.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/MerlinBase.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/X509SubjectPublicKeyInfo.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSSecurityProperties.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSUtils.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/BinarySecurityTokenInputHandler.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SAMLTokenOutputProcessor.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/saml/SAMLAssertionWrapper.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/saml/SAMLCallback.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SAMLSecurityToken.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecureConversationSecurityToken.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenFactoryImpl.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/ThumbprintSHA1SecurityToken.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509DataSecurityToken.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509DefaultSecurityToken.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509PKIPathv1SecurityToken.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SecurityToken.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SubjectKeyIdentifierSecurityToken.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509_V3SecurityToken.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/CallbackHandlerImpl.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/saml/SAMLTokenHOKTest.java
    webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/saml/SAMLTokenReferenceTest.java

Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AsymmetricBindingIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AsymmetricBindingIntegrationTest.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AsymmetricBindingIntegrationTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AsymmetricBindingIntegrationTest.java Wed Jul 11 16:14:26 2012
@@ -26,8 +26,8 @@ import org.swssf.wss.ext.WSSConstants;
 import org.swssf.wss.ext.WSSSecurityProperties;
 import org.swssf.wss.ext.WSSecurityException;
 import org.swssf.wss.test.CallbackHandlerImpl;
-import org.apache.xml.security.stax.crypto.CryptoType;
-import org.apache.xml.security.stax.crypto.Merlin;
+import org.swssf.wss.crypto.CryptoType;
+import org.swssf.wss.crypto.Merlin;
 import org.apache.xml.security.stax.ext.SecurePart;
 import org.testng.Assert;
 import org.testng.annotations.Test;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Crypto.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Crypto.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Crypto.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Crypto.java Wed Jul 11 16:14:26 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.xml.security.stax.crypto;
+package org.swssf.wss.crypto;
 
 import org.apache.xml.security.stax.ext.XMLSecurityException;
 

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoBase.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoBase.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoBase.java Wed Jul 11 16:14:26 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.xml.security.stax.crypto;
+package org.swssf.wss.crypto;
 
 import org.apache.xml.security.stax.ext.XMLSecurityException;
 

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoType.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoType.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoType.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoType.java Wed Jul 11 16:14:26 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.xml.security.stax.crypto;
+package org.swssf.wss.crypto;
 
 import java.math.BigInteger;
 

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/DERDecoder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/DERDecoder.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/DERDecoder.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/DERDecoder.java Wed Jul 11 16:14:26 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.xml.security.stax.crypto;
+package org.swssf.wss.crypto;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Loader.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Loader.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Loader.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Loader.java Wed Jul 11 16:14:26 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.xml.security.stax.crypto;
+package org.swssf.wss.crypto;
 
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Merlin.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Merlin.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Merlin.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Merlin.java Wed Jul 11 16:14:26 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.xml.security.stax.crypto;
+package org.swssf.wss.crypto;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/MerlinBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/MerlinBase.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/MerlinBase.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/MerlinBase.java Wed Jul 11 16:14:26 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.xml.security.stax.crypto;
+package org.swssf.wss.crypto;
 
 import org.apache.xml.security.stax.ext.XMLSecurityException;
 

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/X509SubjectPublicKeyInfo.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/X509SubjectPublicKeyInfo.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/X509SubjectPublicKeyInfo.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/crypto/X509SubjectPublicKeyInfo.java Wed Jul 11 16:14:26 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.xml.security.stax.crypto;
+package org.swssf.wss.crypto;
 
 import org.apache.xml.security.stax.ext.XMLSecurityException;
 

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSSecurityProperties.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSSecurityProperties.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSSecurityProperties.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSSecurityProperties.java Wed Jul 11 16:14:26 2012
@@ -24,11 +24,11 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.xml.security.stax.crypto.Crypto;
-import org.apache.xml.security.stax.crypto.MerlinBase;
 import org.apache.xml.security.stax.ext.XMLSecurityConfigurationException;
 import org.apache.xml.security.stax.ext.XMLSecurityException;
 import org.apache.xml.security.stax.ext.XMLSecurityProperties;
+import org.swssf.wss.crypto.Crypto;
+import org.swssf.wss.crypto.MerlinBase;
 
 /**
  * Main configuration class to supply keys etc.
@@ -185,7 +185,7 @@ public class WSSSecurityProperties exten
         if (signatureCryptoClass != null) {
             return signatureCryptoClass;
         }
-        signatureCryptoClass = org.apache.xml.security.stax.crypto.Merlin.class;
+        signatureCryptoClass = org.swssf.wss.crypto.Merlin.class;
         return signatureCryptoClass;
     }
 
@@ -236,7 +236,7 @@ public class WSSSecurityProperties exten
         if (signatureVerificationCryptoClass != null) {
             return signatureVerificationCryptoClass;
         }
-        signatureVerificationCryptoClass = org.apache.xml.security.stax.crypto.Merlin.class;
+        signatureVerificationCryptoClass = org.swssf.wss.crypto.Merlin.class;
         return signatureVerificationCryptoClass;
     }
 
@@ -304,7 +304,7 @@ public class WSSSecurityProperties exten
         if (decryptionCryptoClass != null) {
             return decryptionCryptoClass;
         }
-        decryptionCryptoClass = org.apache.xml.security.stax.crypto.Merlin.class;
+        decryptionCryptoClass = org.swssf.wss.crypto.Merlin.class;
         return decryptionCryptoClass;
     }
 
@@ -384,7 +384,7 @@ public class WSSSecurityProperties exten
         if (encryptionCryptoClass != null) {
             return encryptionCryptoClass;
         }
-        encryptionCryptoClass = org.apache.xml.security.stax.crypto.Merlin.class;
+        encryptionCryptoClass = org.swssf.wss.crypto.Merlin.class;
         return encryptionCryptoClass;
     }
 

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSUtils.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSUtils.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSUtils.java Wed Jul 11 16:14:26 2012
@@ -19,7 +19,6 @@
 package org.swssf.wss.ext;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.xml.security.stax.crypto.Merlin;
 import org.apache.xml.security.stax.ext.*;
 import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
 import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
@@ -27,6 +26,7 @@ import org.apache.xml.security.stax.ext.
 import org.apache.xml.security.stax.securityEvent.KeyValueTokenSecurityEvent;
 import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
 import org.apache.xml.security.stax.securityEvent.X509TokenSecurityEvent;
+import org.swssf.wss.crypto.Merlin;
 import org.swssf.wss.securityEvent.DerivedKeyTokenSecurityEvent;
 import org.swssf.wss.securityEvent.EncryptedKeyTokenSecurityEvent;
 import org.swssf.wss.securityEvent.HttpsTokenSecurityEvent;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/BinarySecurityTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/BinarySecurityTokenInputHandler.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/BinarySecurityTokenInputHandler.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/BinarySecurityTokenInputHandler.java Wed Jul 11 16:14:26 2012
@@ -24,7 +24,7 @@ import org.swssf.wss.ext.WSSSecurityProp
 import org.swssf.wss.ext.WSSecurityContext;
 import org.swssf.wss.ext.WSSecurityException;
 import org.swssf.wss.impl.securityToken.SecurityTokenFactoryImpl;
-import org.apache.xml.security.stax.crypto.Crypto;
+import org.swssf.wss.crypto.Crypto;
 import org.apache.xml.security.stax.ext.*;
 import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
 import org.apache.xml.security.stax.impl.util.IDGenerator;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java Wed Jul 11 16:14:26 2012
@@ -19,7 +19,7 @@
 package org.swssf.wss.impl.processor.output;
 
 import org.swssf.wss.ext.*;
-import org.apache.xml.security.stax.crypto.CryptoType;
+import org.swssf.wss.crypto.CryptoType;
 import org.apache.xml.security.stax.ext.*;
 import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
 import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SAMLTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SAMLTokenOutputProcessor.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SAMLTokenOutputProcessor.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SAMLTokenOutputProcessor.java Wed Jul 11 16:14:26 2012
@@ -27,7 +27,7 @@ import org.swssf.wss.impl.saml.SAMLKeyIn
 import org.swssf.wss.impl.saml.bean.KeyInfoBean;
 import org.swssf.wss.impl.saml.bean.SubjectBean;
 import org.swssf.wss.impl.securityToken.SAMLSecurityToken;
-import org.apache.xml.security.stax.crypto.CryptoType;
+import org.swssf.wss.crypto.CryptoType;
 import org.apache.xml.security.stax.ext.*;
 import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
 import org.apache.xml.security.stax.ext.stax.XMLSecEvent;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/saml/SAMLAssertionWrapper.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/saml/SAMLAssertionWrapper.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/saml/SAMLAssertionWrapper.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/saml/SAMLAssertionWrapper.java Wed Jul 11 16:14:26 2012
@@ -40,8 +40,8 @@ import org.opensaml.xml.validation.Valid
 import org.swssf.wss.ext.*;
 import org.swssf.wss.impl.saml.builder.SAML1ComponentBuilder;
 import org.swssf.wss.impl.saml.builder.SAML2ComponentBuilder;
-import org.apache.xml.security.stax.crypto.Crypto;
-import org.apache.xml.security.stax.crypto.CryptoType;
+import org.swssf.wss.crypto.Crypto;
+import org.swssf.wss.crypto.CryptoType;
 import org.apache.xml.security.stax.ext.XMLSecurityException;
 import org.apache.xml.security.stax.impl.util.IDGenerator;
 import org.w3c.dom.Document;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/saml/SAMLCallback.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/saml/SAMLCallback.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/saml/SAMLCallback.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/saml/SAMLCallback.java Wed Jul 11 16:14:26 2012
@@ -21,7 +21,7 @@ package org.swssf.wss.impl.saml;
 
 import org.opensaml.common.SAMLVersion;
 import org.swssf.wss.impl.saml.bean.*;
-import org.apache.xml.security.stax.crypto.Crypto;
+import org.swssf.wss.crypto.Crypto;
 import org.w3c.dom.Element;
 
 import javax.security.auth.callback.Callback;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SAMLSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SAMLSecurityToken.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SAMLSecurityToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SAMLSecurityToken.java Wed Jul 11 16:14:26 2012
@@ -22,7 +22,7 @@ import org.opensaml.common.SAMLVersion;
 import org.swssf.wss.ext.WSSConstants;
 import org.swssf.wss.ext.WSSecurityContext;
 import org.swssf.wss.impl.saml.SAMLKeyInfo;
-import org.apache.xml.security.stax.crypto.Crypto;
+import org.swssf.wss.crypto.Crypto;
 import org.apache.xml.security.stax.ext.SecurityToken;
 import org.apache.xml.security.stax.ext.XMLSecurityConstants;
 import org.apache.xml.security.stax.ext.XMLSecurityException;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecureConversationSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecureConversationSecurityToken.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecureConversationSecurityToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecureConversationSecurityToken.java Wed Jul 11 16:14:26 2012
@@ -20,7 +20,7 @@ package org.swssf.wss.impl.securityToken
 
 import org.swssf.wss.ext.WSSConstants;
 import org.swssf.wss.ext.WSSecurityContext;
-import org.apache.xml.security.stax.crypto.Crypto;
+import org.swssf.wss.crypto.Crypto;
 import org.apache.xml.security.stax.ext.SecurityToken;
 import org.apache.xml.security.stax.ext.XMLSecurityConstants;
 import org.apache.xml.security.stax.ext.XMLSecurityException;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenFactoryImpl.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenFactoryImpl.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenFactoryImpl.java Wed Jul 11 16:14:26 2012
@@ -25,7 +25,7 @@ import org.swssf.binding.wss10.SecurityT
 import org.apache.xml.security.binding.xmldsig.*;
 import org.apache.xml.security.binding.xmldsig11.ECKeyValueType;
 import org.swssf.wss.ext.*;
-import org.apache.xml.security.stax.crypto.Crypto;
+import org.swssf.wss.crypto.Crypto;
 import org.apache.xml.security.stax.ext.*;
 import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
 import org.apache.xml.security.stax.impl.securityToken.DsaKeyValueSecurityToken;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/ThumbprintSHA1SecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/ThumbprintSHA1SecurityToken.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/ThumbprintSHA1SecurityToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/ThumbprintSHA1SecurityToken.java Wed Jul 11 16:14:26 2012
@@ -20,8 +20,8 @@ package org.swssf.wss.impl.securityToken
 
 import org.swssf.wss.ext.WSSConstants;
 import org.swssf.wss.ext.WSSecurityContext;
-import org.apache.xml.security.stax.crypto.Crypto;
-import org.apache.xml.security.stax.crypto.CryptoType;
+import org.swssf.wss.crypto.Crypto;
+import org.swssf.wss.crypto.CryptoType;
 import org.apache.xml.security.stax.ext.XMLSecurityException;
 
 import javax.security.auth.callback.CallbackHandler;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509DataSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509DataSecurityToken.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509DataSecurityToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509DataSecurityToken.java Wed Jul 11 16:14:26 2012
@@ -23,8 +23,8 @@ import org.apache.xml.security.binding.x
 import org.swssf.wss.ext.WSSConstants;
 import org.swssf.wss.ext.WSSecurityContext;
 import org.swssf.wss.ext.WSSecurityException;
-import org.apache.xml.security.stax.crypto.Crypto;
-import org.apache.xml.security.stax.crypto.CryptoType;
+import org.swssf.wss.crypto.Crypto;
+import org.swssf.wss.crypto.CryptoType;
 import org.apache.xml.security.stax.ext.XMLSecurityException;
 import org.apache.xml.security.stax.ext.XMLSecurityUtils;
 

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509DefaultSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509DefaultSecurityToken.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509DefaultSecurityToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509DefaultSecurityToken.java Wed Jul 11 16:14:26 2012
@@ -20,7 +20,7 @@ package org.swssf.wss.impl.securityToken
 
 import org.swssf.wss.ext.WSSConstants;
 import org.swssf.wss.ext.WSSecurityContext;
-import org.apache.xml.security.stax.crypto.Crypto;
+import org.swssf.wss.crypto.Crypto;
 import org.apache.xml.security.stax.ext.XMLSecurityException;
 
 import javax.security.auth.callback.CallbackHandler;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509PKIPathv1SecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509PKIPathv1SecurityToken.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509PKIPathv1SecurityToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509PKIPathv1SecurityToken.java Wed Jul 11 16:14:26 2012
@@ -20,7 +20,7 @@ package org.swssf.wss.impl.securityToken
 
 import org.swssf.wss.ext.WSSConstants;
 import org.swssf.wss.ext.WSSecurityContext;
-import org.apache.xml.security.stax.crypto.Crypto;
+import org.swssf.wss.crypto.Crypto;
 import org.apache.xml.security.stax.ext.XMLSecurityException;
 
 import javax.security.auth.callback.CallbackHandler;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SecurityToken.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SecurityToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SecurityToken.java Wed Jul 11 16:14:26 2012
@@ -26,11 +26,11 @@ import java.security.cert.X509Certificat
 
 import javax.security.auth.callback.CallbackHandler;
 
-import org.apache.xml.security.stax.crypto.Crypto;
-import org.apache.xml.security.stax.crypto.CryptoType;
 import org.apache.xml.security.stax.ext.XMLSecurityConstants;
 import org.apache.xml.security.stax.ext.XMLSecurityException;
 import org.apache.xml.security.stax.ext.XMLSecurityUtils;
+import org.swssf.wss.crypto.Crypto;
+import org.swssf.wss.crypto.CryptoType;
 import org.swssf.wss.ext.WSPasswordCallback;
 import org.swssf.wss.ext.WSSConstants;
 import org.swssf.wss.ext.WSSecurityContext;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SubjectKeyIdentifierSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SubjectKeyIdentifierSecurityToken.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SubjectKeyIdentifierSecurityToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SubjectKeyIdentifierSecurityToken.java Wed Jul 11 16:14:26 2012
@@ -18,10 +18,10 @@
  */
 package org.swssf.wss.impl.securityToken;
 
+import org.swssf.wss.crypto.Crypto;
+import org.swssf.wss.crypto.CryptoType;
 import org.swssf.wss.ext.WSSConstants;
 import org.swssf.wss.ext.WSSecurityContext;
-import org.apache.xml.security.stax.crypto.Crypto;
-import org.apache.xml.security.stax.crypto.CryptoType;
 import org.apache.xml.security.stax.ext.XMLSecurityException;
 
 import javax.security.auth.callback.CallbackHandler;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509_V3SecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509_V3SecurityToken.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509_V3SecurityToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509_V3SecurityToken.java Wed Jul 11 16:14:26 2012
@@ -20,7 +20,7 @@ package org.swssf.wss.impl.securityToken
 
 import org.swssf.wss.ext.WSSConstants;
 import org.swssf.wss.ext.WSSecurityContext;
-import org.apache.xml.security.stax.crypto.Crypto;
+import org.swssf.wss.crypto.Crypto;
 import org.apache.xml.security.stax.ext.XMLSecurityException;
 
 import javax.security.auth.callback.CallbackHandler;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/CallbackHandlerImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/CallbackHandlerImpl.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/CallbackHandlerImpl.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/CallbackHandlerImpl.java Wed Jul 11 16:14:26 2012
@@ -26,8 +26,8 @@ import org.swssf.wss.impl.saml.SAMLCallb
 import org.swssf.wss.impl.saml.bean.*;
 import org.swssf.wss.impl.saml.builder.SAML1Constants;
 import org.swssf.wss.impl.saml.builder.SAML2Constants;
-import org.apache.xml.security.stax.crypto.Merlin;
-import org.apache.xml.security.stax.crypto.MerlinBase;
+import org.swssf.wss.crypto.Merlin;
+import org.swssf.wss.crypto.MerlinBase;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/saml/SAMLTokenHOKTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/saml/SAMLTokenHOKTest.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/saml/SAMLTokenHOKTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/saml/SAMLTokenHOKTest.java Wed Jul 11 16:14:26 2012
@@ -31,8 +31,8 @@ import org.swssf.wss.test.AbstractTestBa
 import org.swssf.wss.test.CallbackHandlerImpl;
 import org.swssf.wss.test.utils.StAX2DOM;
 import org.swssf.wss.test.utils.XmlReaderToWriter;
-import org.apache.xml.security.stax.crypto.CryptoType;
-import org.apache.xml.security.stax.crypto.Merlin;
+import org.swssf.wss.crypto.CryptoType;
+import org.swssf.wss.crypto.Merlin;
 import org.apache.xml.security.stax.securityEvent.SecurityEvent;
 import org.testng.Assert;
 import org.testng.annotations.Test;

Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/saml/SAMLTokenReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/saml/SAMLTokenReferenceTest.java?rev=1360258&r1=1360257&r2=1360258&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/saml/SAMLTokenReferenceTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/saml/SAMLTokenReferenceTest.java Wed Jul 11 16:14:26 2012
@@ -31,8 +31,8 @@ import org.swssf.wss.test.AbstractTestBa
 import org.swssf.wss.test.CallbackHandlerImpl;
 import org.swssf.wss.test.utils.StAX2DOM;
 import org.swssf.wss.test.utils.XmlReaderToWriter;
-import org.apache.xml.security.stax.crypto.CryptoType;
-import org.apache.xml.security.stax.crypto.Merlin;
+import org.swssf.wss.crypto.CryptoType;
+import org.swssf.wss.crypto.Merlin;
 import org.apache.xml.security.stax.securityEvent.SecurityEvent;
 import org.testng.Assert;
 import org.testng.annotations.Test;