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/08/17 13:32:38 UTC
svn commit: r1374200 [2/8] - in /webservices/wss4j/trunk:
cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/
streaming-ws-policy/src/main/java/org/apache/ws/security/stax/policy/
streaming-ws-policy/src/test/java/org/apache/ws/security...
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/DerivedKeyTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/DerivedKeyTokenInputHandler.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/DerivedKeyTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/DerivedKeyTokenInputHandler.java Fri Aug 17 11:32:32 2012
@@ -19,10 +19,10 @@
package org.apache.ws.security.stax.wss.impl.processor.input;
import org.apache.ws.security.binding.wssc.AbstractDerivedKeyTokenType;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSSecurityProperties;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.impl.derivedKey.DerivedKeyUtils;
import org.apache.ws.security.stax.wss.impl.securityToken.SAMLSecurityToken;
import org.apache.ws.security.stax.wss.impl.securityToken.SecurityTokenFactoryImpl;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SAMLTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SAMLTokenInputHandler.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SAMLTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SAMLTokenInputHandler.java Fri Aug 17 11:32:32 2012
@@ -18,6 +18,7 @@
*/
package org.apache.ws.security.stax.wss.impl.processor.input;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.*;
import org.apache.ws.security.stax.wss.impl.saml.SAMLAssertionWrapper;
import org.apache.ws.security.stax.wss.impl.saml.SAMLKeyInfo;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityContextTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityContextTokenInputHandler.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityContextTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityContextTokenInputHandler.java Fri Aug 17 11:32:32 2012
@@ -19,6 +19,8 @@
package org.apache.ws.security.stax.wss.impl.processor.input;
import org.apache.ws.security.binding.wssc.AbstractSecurityContextTokenType;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.*;
import org.apache.ws.security.stax.wss.securityEvent.SecurityContextTokenSecurityEvent;
import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityHeaderInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityHeaderInputProcessor.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityHeaderInputProcessor.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityHeaderInputProcessor.java Fri Aug 17 11:32:32 2012
@@ -20,10 +20,10 @@ package org.apache.ws.security.stax.wss.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSSecurityProperties;
import org.apache.ws.security.stax.wss.ext.WSSUtils;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
import org.apache.xml.security.stax.config.SecurityHeaderHandlerMapper;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.ext.stax.XMLSecEndElement;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityTokenReferenceInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityTokenReferenceInputHandler.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityTokenReferenceInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityTokenReferenceInputHandler.java Fri Aug 17 11:32:32 2012
@@ -20,10 +20,10 @@ package org.apache.ws.security.stax.wss.
import org.apache.ws.security.binding.wss10.KeyIdentifierType;
import org.apache.ws.security.binding.wss10.SecurityTokenReferenceType;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSSecurityProperties;
import org.apache.ws.security.stax.wss.ext.WSSUtils;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.impl.securityToken.SecurityTokenFactoryImpl;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.ext.stax.XMLSecEndElement;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SignatureConfirmationInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SignatureConfirmationInputHandler.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SignatureConfirmationInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SignatureConfirmationInputHandler.java Fri Aug 17 11:32:32 2012
@@ -19,9 +19,9 @@
package org.apache.ws.security.stax.wss.impl.processor.input;
import org.apache.ws.security.binding.wss11.SignatureConfirmationType;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
import org.apache.xml.security.stax.ext.AbstractInputSecurityHeaderHandler;
import org.apache.xml.security.stax.ext.InputProcessorChain;
import org.apache.xml.security.stax.ext.XMLSecurityException;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SignatureConfirmationInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SignatureConfirmationInputProcessor.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SignatureConfirmationInputProcessor.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SignatureConfirmationInputProcessor.java Fri Aug 17 11:32:32 2012
@@ -19,9 +19,9 @@
package org.apache.ws.security.stax.wss.impl.processor.input;
import org.apache.ws.security.binding.wss11.SignatureConfirmationType;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSSecurityProperties;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
import org.apache.xml.security.stax.ext.AbstractInputProcessor;
import org.apache.xml.security.stax.ext.InputProcessorChain;
import org.apache.xml.security.stax.ext.XMLSecurityException;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/TimestampInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/TimestampInputHandler.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/TimestampInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/TimestampInputHandler.java Fri Aug 17 11:32:32 2012
@@ -19,10 +19,10 @@
package org.apache.ws.security.stax.wss.impl.processor.input;
import org.apache.ws.security.binding.wsu10.TimestampType;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSSecurityProperties;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.securityEvent.TimestampSecurityEvent;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/UsernameTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/UsernameTokenInputHandler.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/UsernameTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/UsernameTokenInputHandler.java Fri Aug 17 11:32:32 2012
@@ -27,6 +27,8 @@ import org.apache.ws.security.binding.ws
import org.apache.ws.security.binding.wss10.PasswordString;
import org.apache.ws.security.binding.wss10.UsernameTokenType;
import org.apache.ws.security.binding.wsu10.AttributedDateTime;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.*;
import org.apache.ws.security.stax.wss.impl.securityToken.SecurityTokenFactoryImpl;
import org.apache.ws.security.stax.wss.securityEvent.UsernameTokenSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/WSSSignatureInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/WSSSignatureInputHandler.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/WSSSignatureInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/WSSSignatureInputHandler.java Fri Aug 17 11:32:32 2012
@@ -19,6 +19,7 @@
package org.apache.ws.security.stax.wss.impl.processor.input;
import org.apache.ws.security.binding.wss10.SecurityTokenReferenceType;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.xml.security.binding.excc14n.InclusiveNamespaces;
import org.apache.xml.security.binding.xmldsig.CanonicalizationMethodType;
import org.apache.xml.security.binding.xmldsig.KeyInfoType;
@@ -28,7 +29,6 @@ import org.apache.xml.security.binding.x
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSUtils;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.impl.processor.input.AbstractSignatureInputHandler;
import org.apache.xml.security.stax.impl.securityToken.SecurityTokenFactory;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java Fri Aug 17 11:32:32 2012
@@ -22,6 +22,7 @@ import org.apache.jcs.JCS;
import org.apache.jcs.access.exception.CacheException;
import org.apache.jcs.engine.ElementAttributes;
import org.apache.ws.security.binding.wss10.TransformationParametersType;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.xml.security.binding.excc14n.InclusiveNamespaces;
import org.apache.xml.security.binding.xmldsig.CanonicalizationMethodType;
import org.apache.xml.security.binding.xmldsig.ReferenceType;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java Fri Aug 17 11:32:32 2012
@@ -18,8 +18,10 @@
*/
package org.apache.ws.security.stax.wss.impl.processor.output;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.*;
-import org.apache.ws.security.stax.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/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/DerivedKeyTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/DerivedKeyTokenOutputProcessor.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/DerivedKeyTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/DerivedKeyTokenOutputProcessor.java Fri Aug 17 11:32:32 2012
@@ -19,6 +19,8 @@
package org.apache.ws.security.stax.wss.impl.processor.output;
import org.apache.commons.codec.binary.Base64;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.*;
import org.apache.ws.security.stax.wss.impl.derivedKey.AlgoFactory;
import org.apache.ws.security.stax.wss.impl.derivedKey.ConversationException;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/EncryptedKeyOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/EncryptedKeyOutputProcessor.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/EncryptedKeyOutputProcessor.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/EncryptedKeyOutputProcessor.java Fri Aug 17 11:32:32 2012
@@ -19,10 +19,10 @@
package org.apache.ws.security.stax.wss.impl.processor.output;
import org.apache.commons.codec.binary.Base64;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSSecurityProperties;
import org.apache.ws.security.stax.wss.ext.WSSUtils;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SAMLTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SAMLTokenOutputProcessor.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SAMLTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SAMLTokenOutputProcessor.java Fri Aug 17 11:32:32 2012
@@ -19,6 +19,9 @@
package org.apache.ws.security.stax.wss.impl.processor.output;
import org.opensaml.common.SAMLVersion;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.*;
import org.apache.ws.security.stax.wss.impl.saml.OpenSAMLUtil;
import org.apache.ws.security.stax.wss.impl.saml.SAMLAssertionWrapper;
@@ -27,7 +30,6 @@ import org.apache.ws.security.stax.wss.i
import org.apache.ws.security.stax.wss.impl.saml.bean.KeyInfoBean;
import org.apache.ws.security.stax.wss.impl.saml.bean.SubjectBean;
import org.apache.ws.security.stax.wss.impl.securityToken.SAMLSecurityToken;
-import org.apache.ws.security.stax.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/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SecurityContextTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SecurityContextTokenOutputProcessor.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SecurityContextTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SecurityContextTokenOutputProcessor.java Fri Aug 17 11:32:32 2012
@@ -18,10 +18,10 @@
*/
package org.apache.ws.security.stax.wss.impl.processor.output;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSSecurityProperties;
import org.apache.ws.security.stax.wss.ext.WSSUtils;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
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/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SecurityHeaderOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SecurityHeaderOutputProcessor.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SecurityHeaderOutputProcessor.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SecurityHeaderOutputProcessor.java Fri Aug 17 11:32:32 2012
@@ -18,10 +18,10 @@
*/
package org.apache.ws.security.stax.wss.impl.processor.output;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSSecurityProperties;
import org.apache.ws.security.stax.wss.ext.WSSUtils;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
import org.apache.xml.security.stax.ext.AbstractOutputProcessor;
import org.apache.xml.security.stax.ext.OutputProcessorChain;
import org.apache.xml.security.stax.ext.SecurePart;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/UsernameTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/UsernameTokenOutputProcessor.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/UsernameTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/UsernameTokenOutputProcessor.java Fri Aug 17 11:32:32 2012
@@ -19,6 +19,8 @@
package org.apache.ws.security.stax.wss.impl.processor.output;
import org.apache.commons.codec.binary.Base64;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.*;
import org.apache.ws.security.stax.wss.impl.securityToken.UsernameSecurityToken;
import org.apache.xml.security.stax.ext.*;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/WSSSignatureOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/WSSSignatureOutputProcessor.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/WSSSignatureOutputProcessor.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/WSSSignatureOutputProcessor.java Fri Aug 17 11:32:32 2012
@@ -22,9 +22,9 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.impl.transformer.TransformIdentity;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSUtils;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/OpenSAMLUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/OpenSAMLUtil.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/OpenSAMLUtil.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/OpenSAMLUtil.java Fri Aug 17 11:32:32 2012
@@ -19,12 +19,12 @@
package org.apache.ws.security.stax.wss.impl.saml;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.opensaml.xml.*;
import org.opensaml.xml.io.*;
import org.opensaml.xml.signature.Signature;
import org.opensaml.xml.signature.SignatureException;
import org.opensaml.xml.signature.Signer;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/SAMLAssertionWrapper.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/SAMLAssertionWrapper.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/SAMLAssertionWrapper.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/SAMLAssertionWrapper.java Fri Aug 17 11:32:32 2012
@@ -37,11 +37,13 @@ import org.opensaml.xml.signature.Signat
import org.opensaml.xml.signature.SignatureConstants;
import org.opensaml.xml.signature.SignatureValidator;
import org.opensaml.xml.validation.ValidationException;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.*;
import org.apache.ws.security.stax.wss.impl.saml.builder.SAML1ComponentBuilder;
import org.apache.ws.security.stax.wss.impl.saml.builder.SAML2ComponentBuilder;
-import org.apache.ws.security.stax.wss.crypto.Crypto;
-import org.apache.ws.security.stax.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/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/SAMLCallback.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/SAMLCallback.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/SAMLCallback.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/SAMLCallback.java Fri Aug 17 11:32:32 2012
@@ -20,8 +20,8 @@
package org.apache.ws.security.stax.wss.impl.saml;
import org.opensaml.common.SAMLVersion;
+import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.stax.wss.impl.saml.bean.*;
-import org.apache.ws.security.stax.wss.crypto.Crypto;
import org.w3c.dom.Element;
import javax.security.auth.callback.Callback;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/builder/SAML1ComponentBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/builder/SAML1ComponentBuilder.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/builder/SAML1ComponentBuilder.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/builder/SAML1ComponentBuilder.java Fri Aug 17 11:32:32 2012
@@ -49,7 +49,7 @@ import org.opensaml.xml.schema.impl.XSSt
import org.opensaml.xml.security.x509.BasicX509Credential;
import org.opensaml.xml.security.x509.X509KeyInfoGeneratorFactory;
import org.opensaml.xml.signature.KeyInfo;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.impl.saml.OpenSAMLUtil;
import org.apache.ws.security.stax.wss.impl.saml.bean.ActionBean;
import org.apache.ws.security.stax.wss.impl.saml.bean.AttributeBean;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/builder/SAML2ComponentBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/builder/SAML2ComponentBuilder.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/builder/SAML2ComponentBuilder.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/builder/SAML2ComponentBuilder.java Fri Aug 17 11:32:32 2012
@@ -51,7 +51,7 @@ import org.opensaml.xml.XMLObjectBuilder
import org.opensaml.xml.schema.XSString;
import org.opensaml.xml.schema.impl.XSStringBuilder;
import org.opensaml.xml.signature.KeyInfo;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.impl.saml.bean.ActionBean;
import org.apache.ws.security.stax.wss.impl.saml.bean.AttributeBean;
import org.apache.ws.security.stax.wss.impl.saml.bean.AttributeStatementBean;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/HttpsSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/HttpsSecurityToken.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/HttpsSecurityToken.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/HttpsSecurityToken.java Fri Aug 17 11:32:32 2012
@@ -18,9 +18,9 @@
*/
package org.apache.ws.security.stax.wss.impl.securityToken;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.impl.securityToken.AbstractSecurityToken;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SAMLSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SAMLSecurityToken.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SAMLSecurityToken.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SAMLSecurityToken.java Fri Aug 17 11:32:32 2012
@@ -19,10 +19,10 @@
package org.apache.ws.security.stax.wss.impl.securityToken;
import org.opensaml.common.SAMLVersion;
+import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
import org.apache.ws.security.stax.wss.impl.saml.SAMLKeyInfo;
-import org.apache.ws.security.stax.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/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SecureConversationSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SecureConversationSecurityToken.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SecureConversationSecurityToken.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SecureConversationSecurityToken.java Fri Aug 17 11:32:32 2012
@@ -18,9 +18,9 @@
*/
package org.apache.ws.security.stax.wss.impl.securityToken;
+import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
-import org.apache.ws.security.stax.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/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SecurityTokenFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SecurityTokenFactoryImpl.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SecurityTokenFactoryImpl.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SecurityTokenFactoryImpl.java Fri Aug 17 11:32:32 2012
@@ -22,10 +22,11 @@ import org.apache.commons.codec.binary.B
import org.apache.ws.security.binding.wss10.BinarySecurityTokenType;
import org.apache.ws.security.binding.wss10.KeyIdentifierType;
import org.apache.ws.security.binding.wss10.SecurityTokenReferenceType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.xml.security.binding.xmldsig.*;
import org.apache.xml.security.binding.xmldsig11.ECKeyValueType;
import org.apache.ws.security.stax.wss.ext.*;
-import org.apache.ws.security.stax.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/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/ThumbprintSHA1SecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/ThumbprintSHA1SecurityToken.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/ThumbprintSHA1SecurityToken.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/ThumbprintSHA1SecurityToken.java Fri Aug 17 11:32:32 2012
@@ -18,10 +18,10 @@
*/
package org.apache.ws.security.stax.wss.impl.securityToken;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
-import org.apache.ws.security.stax.wss.crypto.Crypto;
-import org.apache.ws.security.stax.wss.crypto.CryptoType;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import javax.security.auth.callback.CallbackHandler;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/UsernameSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/UsernameSecurityToken.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/UsernameSecurityToken.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/UsernameSecurityToken.java Fri Aug 17 11:32:32 2012
@@ -18,9 +18,9 @@
*/
package org.apache.ws.security.stax.wss.impl.securityToken;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509DataSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509DataSecurityToken.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509DataSecurityToken.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509DataSecurityToken.java Fri Aug 17 11:32:32 2012
@@ -20,11 +20,11 @@ package org.apache.ws.security.stax.wss.
import org.apache.xml.security.binding.xmldsig.X509DataType;
import org.apache.xml.security.binding.xmldsig.X509IssuerSerialType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
-import org.apache.ws.security.stax.wss.crypto.Crypto;
-import org.apache.ws.security.stax.wss.crypto.CryptoType;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import org.apache.xml.security.stax.ext.XMLSecurityUtils;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509DefaultSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509DefaultSecurityToken.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509DefaultSecurityToken.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509DefaultSecurityToken.java Fri Aug 17 11:32:32 2012
@@ -18,9 +18,9 @@
*/
package org.apache.ws.security.stax.wss.impl.securityToken;
+import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
-import org.apache.ws.security.stax.wss.crypto.Crypto;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import javax.security.auth.callback.CallbackHandler;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509PKIPathv1SecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509PKIPathv1SecurityToken.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509PKIPathv1SecurityToken.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509PKIPathv1SecurityToken.java Fri Aug 17 11:32:32 2012
@@ -18,9 +18,9 @@
*/
package org.apache.ws.security.stax.wss.impl.securityToken;
+import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
-import org.apache.ws.security.stax.wss.crypto.Crypto;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import javax.security.auth.callback.CallbackHandler;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509SecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509SecurityToken.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509SecurityToken.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509SecurityToken.java Fri Aug 17 11:32:32 2012
@@ -29,9 +29,9 @@ import javax.security.auth.callback.Call
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.apache.ws.security.stax.wss.crypto.Crypto;
-import org.apache.ws.security.stax.wss.crypto.CryptoType;
-import org.apache.ws.security.stax.wss.ext.WSPasswordCallback;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509SubjectKeyIdentifierSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509SubjectKeyIdentifierSecurityToken.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509SubjectKeyIdentifierSecurityToken.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509SubjectKeyIdentifierSecurityToken.java Fri Aug 17 11:32:32 2012
@@ -18,8 +18,8 @@
*/
package org.apache.ws.security.stax.wss.impl.securityToken;
-import org.apache.ws.security.stax.wss.crypto.Crypto;
-import org.apache.ws.security.stax.wss.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
import org.apache.xml.security.stax.ext.XMLSecurityException;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509_V3SecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509_V3SecurityToken.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509_V3SecurityToken.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509_V3SecurityToken.java Fri Aug 17 11:32:32 2012
@@ -18,9 +18,9 @@
*/
package org.apache.ws.security.stax.wss.impl.securityToken;
+import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
-import org.apache.ws.security.stax.wss.crypto.Crypto;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import javax.security.auth.callback.CallbackHandler;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/AbstractTestBase.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/AbstractTestBase.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/AbstractTestBase.java Fri Aug 17 11:32:32 2012
@@ -24,6 +24,7 @@ import org.apache.ws.security.WSConstant
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.WsuIdAllocator;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandler;
import org.apache.ws.security.handler.WSHandlerConstants;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/CallbackHandlerImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/CallbackHandlerImpl.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/CallbackHandlerImpl.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/CallbackHandlerImpl.java Fri Aug 17 11:32:32 2012
@@ -19,15 +19,14 @@
package org.apache.ws.security.stax.wss.test;
import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.common.crypto.Merlin;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
import org.apache.ws.security.message.WSSecEncryptedKey;
import org.opensaml.common.SAMLVersion;
-import org.apache.ws.security.stax.wss.ext.WSPasswordCallback;
import org.apache.ws.security.stax.wss.impl.saml.SAMLCallback;
import org.apache.ws.security.stax.wss.impl.saml.bean.*;
import org.apache.ws.security.stax.wss.impl.saml.builder.SAML1Constants;
import org.apache.ws.security.stax.wss.impl.saml.builder.SAML2Constants;
-import org.apache.ws.security.stax.wss.crypto.Merlin;
-import org.apache.ws.security.stax.wss.crypto.MerlinBase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -108,7 +107,7 @@ public class CallbackHandlerImpl impleme
SAMLCallback samlCallback = (SAMLCallback) callbacks[0];
KeyStore keyStore = KeyStore.getInstance("jks");
keyStore.load(this.getClass().getClassLoader().getResourceAsStream("saml/issuer.jks"), "default".toCharArray());
- MerlinBase crypto = new Merlin();
+ Merlin crypto = new Merlin();
crypto.setKeyStore(keyStore);
samlCallback.setIssuerCrypto(crypto);
samlCallback.setIssuerKeyName("samlissuer");
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/InboundWSSecurityContextImplTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/InboundWSSecurityContextImplTest.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/InboundWSSecurityContextImplTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/InboundWSSecurityContextImplTest.java Fri Aug 17 11:32:32 2012
@@ -19,9 +19,9 @@
package org.apache.ws.security.stax.wss.test;
import org.opensaml.common.SAMLVersion;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSecurityContext;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.impl.InboundWSSecurityContextImpl;
import org.apache.ws.security.stax.wss.impl.securityToken.SAMLSecurityToken;
import org.apache.ws.security.stax.wss.impl.securityToken.UsernameSecurityToken;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/InteroperabilityTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/InteroperabilityTest.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/InteroperabilityTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/InteroperabilityTest.java Fri Aug 17 11:32:32 2012
@@ -18,6 +18,7 @@
*/
package org.apache.ws.security.stax.wss.test;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.stax.wss.WSSec;
import org.apache.ws.security.stax.wss.ext.*;
@@ -816,7 +817,7 @@ public class InteroperabilityTest extend
));
Assert.fail("XMLStreamException expected");
} catch (XMLStreamException e) {
- Assert.assertEquals(e.getMessage(), "org.apache.ws.security.stax.wss.ext.WSSecurityException: General security error (Security header is missing)");
+ Assert.assertEquals(e.getMessage(), "org.apache.ws.security.common.ext.WSSecurityException: General security error (Security header is missing)");
}
}
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/SignatureConfirmationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/SignatureConfirmationTest.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/SignatureConfirmationTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/SignatureConfirmationTest.java Fri Aug 17 11:32:32 2012
@@ -18,6 +18,7 @@
*/
package org.apache.ws.security.stax.wss.test;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.handler.WSHandlerResult;
import org.apache.ws.security.stax.wss.WSSec;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/SignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/SignatureTest.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/SignatureTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/SignatureTest.java Fri Aug 17 11:32:32 2012
@@ -18,6 +18,7 @@
*/
package org.apache.ws.security.stax.wss.test;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.stax.wss.WSSec;
import org.apache.ws.security.stax.wss.ext.*;
@@ -1100,7 +1101,7 @@ public class SignatureTest extends Abstr
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
} catch (XMLStreamException e) {
Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(e.getMessage(), "org.apache.ws.security.stax.wss.ext.WSSecurityException: An error was discovered processing the <wsse:Security> header; nested exception is: \n" +
+ Assert.assertEquals(e.getMessage(), "org.apache.ws.security.common.ext.WSSecurityException: An error was discovered processing the <wsse:Security> header; nested exception is: \n" +
"\tjavax.xml.bind.UnmarshalException\n" +
" - with linked exception:\n" +
"[org.xml.sax.SAXParseException: cvc-datatype-valid.1.2.1: 'abc' is not a valid value for 'integer'.]; nested exception is: \n" +
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/TimestampTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/TimestampTest.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/TimestampTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/TimestampTest.java Fri Aug 17 11:32:32 2012
@@ -18,6 +18,7 @@
*/
package org.apache.ws.security.stax.wss.test;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.ws.security.stax.wss.WSSec;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/UsernameTokenTest.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/UsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/UsernameTokenTest.java Fri Aug 17 11:32:32 2012
@@ -19,6 +19,7 @@
package org.apache.ws.security.stax.wss.test;
import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventListener;
@@ -172,7 +173,7 @@ public class UsernameTokenTest extends A
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
Assert.fail("Expected XMLStreamException");
} catch (XMLStreamException e) {
- Assert.assertEquals(e.getMessage(), "org.apache.ws.security.stax.wss.ext.WSSecurityException: Wrong username");
+ Assert.assertEquals(e.getMessage(), "org.apache.ws.security.common.ext.WSSecurityException: Wrong username");
}
}
}
@@ -279,7 +280,7 @@ public class UsernameTokenTest extends A
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
Assert.fail("Expected XMLStreamException");
} catch (XMLStreamException e) {
- Assert.assertEquals(e.getMessage(), "org.apache.ws.security.stax.wss.ext.WSSecurityException: The security token could not be authenticated or authorized");
+ Assert.assertEquals(e.getMessage(), "org.apache.ws.security.common.ext.WSSecurityException: The security token could not be authenticated or authorized");
}
}
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/VulnerabliltyVectorsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/VulnerabliltyVectorsTest.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/VulnerabliltyVectorsTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/VulnerabliltyVectorsTest.java Fri Aug 17 11:32:32 2012
@@ -23,7 +23,6 @@ import org.apache.ws.security.stax.wss.W
import org.apache.ws.security.stax.wss.ext.InboundWSSec;
import org.apache.ws.security.stax.wss.ext.WSSConstants;
import org.apache.ws.security.stax.wss.ext.WSSSecurityProperties;
-import org.apache.ws.security.stax.wss.ext.WSSecurityException;
import org.apache.ws.security.stax.wss.test.utils.StAX2DOM;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import org.testng.Assert;
@@ -306,7 +305,7 @@ public class VulnerabliltyVectorsTest ex
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
Assert.fail("Expected XMLStreamException");
} catch (XMLStreamException e) {
- Assert.assertEquals(e.getMessage(), "org.apache.ws.security.stax.wss.ext.WSSecurityException: The message has expired");
+ Assert.assertEquals(e.getMessage(), "org.apache.ws.security.common.ext.WSSecurityException: The message has expired");
}
}
}
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenHOKTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenHOKTest.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenHOKTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenHOKTest.java Fri Aug 17 11:32:32 2012
@@ -18,6 +18,8 @@
*/
package org.apache.ws.security.stax.wss.test.saml;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Merlin;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.saml.ext.builder.SAML1Constants;
import org.apache.ws.security.saml.ext.builder.SAML2Constants;
@@ -31,8 +33,6 @@ import org.apache.ws.security.stax.wss.t
import org.apache.ws.security.stax.wss.test.CallbackHandlerImpl;
import org.apache.ws.security.stax.wss.test.utils.StAX2DOM;
import org.apache.ws.security.stax.wss.test.utils.XmlReaderToWriter;
-import org.apache.ws.security.stax.wss.crypto.CryptoType;
-import org.apache.ws.security.stax.wss.crypto.Merlin;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenReferenceTest.java?rev=1374200&r1=1374199&r2=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenReferenceTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenReferenceTest.java Fri Aug 17 11:32:32 2012
@@ -18,6 +18,8 @@
*/
package org.apache.ws.security.stax.wss.test.saml;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Merlin;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.saml.ext.builder.SAML1Constants;
import org.apache.ws.security.saml.ext.builder.SAML2Constants;
@@ -31,8 +33,6 @@ import org.apache.ws.security.stax.wss.t
import org.apache.ws.security.stax.wss.test.CallbackHandlerImpl;
import org.apache.ws.security.stax.wss.test.utils.StAX2DOM;
import org.apache.ws.security.stax.wss.test.utils.XmlReaderToWriter;
-import org.apache.ws.security.stax.wss.crypto.CryptoType;
-import org.apache.ws.security.stax.wss.crypto.Merlin;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
Copied: webservices/wss4j/trunk/ws-security-common/pom.xml (from r1374183, webservices/wss4j/trunk/streaming-ws-security/pom.xml)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/pom.xml?p2=webservices/wss4j/trunk/ws-security-common/pom.xml&p1=webservices/wss4j/trunk/streaming-ws-security/pom.xml&r1=1374183&r2=1374200&rev=1374200&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-common/pom.xml Fri Aug 17 11:32:32 2012
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,8 +17,8 @@
under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ 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">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,97 +28,89 @@
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j-streaming-ws-security</artifactId>
+ <artifactId>wss4j-ws-security-common</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache WSS4J DOM WS-Security</name>
<version>2.0-SNAPSHOT</version>
- <name>Apache WSS4J Streaming WS-Security</name>
+
+ <build>
+ <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+ <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.4</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Implementation-Title>Apache WSS4J</Implementation-Title>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Specification-Title>Apache WSS4J</Specification-Title>
+ <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+ <Specification-Version>${project.version}</Specification-Version>
+
+ <Export-Package>
+ org.apache.ws.security.*;version="${project.version}"
+ </Export-Package>
+ <Import-Package>
+ !org.apache.ws.security.*,
+ javax.xml.crypto.*,
+ org.apache.xml.security.*,
+ org.bouncycastle.*;resolution:=optional,
+ org.apache.jcp.xml.dsig.internal.dom.*,
+ org.opensaml.*;resolution:=optional,
+ *;resolution:=optional
+ </Import-Package>
+ <DynamicImport-Package>
+ org.bouncycastle.jce.provider,
+ org.apache.ws.security.components.crypto,
+ org.apache.ws.security.saml
+ </DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j-bindings-wss10</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j-bindings-wss11</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j-bindings-wssc</artifactId>
- <version>${project.version}</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>jcs</groupId>
- <artifactId>jcs</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.sql</groupId>
- <artifactId>jdbc-stdext</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- </exclusion>
- <exclusion>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </exclusion>
- <exclusion>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>tomcat-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xmlrpc</groupId>
- <artifactId>xmlrpc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>berkeleydb</groupId>
- <artifactId>berkeleydb</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
<scope>compile</scope>
@@ -134,6 +125,10 @@
<artifactId>velocity</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.owasp.esapi</groupId>
+ <artifactId>esapi</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
@@ -170,6 +165,10 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
@@ -189,16 +188,16 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j-dom</artifactId>
- <version>${project.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -207,47 +206,20 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <groups>${test.groups}</groups>
- <argLine>-Xmx2000m</argLine>
- <systemPropertyVariables>
- <log4j.configuration>log4j-wss.xml</log4j.configuration>
- </systemPropertyVariables>
- <!--<debugForkedProcess>true</debugForkedProcess>-->
- <excludes>
- <exclude>**/ProfilingTest.java</exclude>
- <exclude>**/PerformanceMemoryTest.java</exclude>
- <exclude>**/PerformanceTimingTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+
</project>