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/16 16:07:56 UTC
svn commit: r1373842 [2/5] - in /webservices/wss4j/trunk: cxf-integration/
cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/
cxf-integration/src/test/java/org/swssf/cxfIntegration/test/integration/
cxf-integration/src/test/resources/i...
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IncludeTimeStampAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IncludeTimeStampAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IncludeTimeStampAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IncludeTimeStampAssertionState.java Thu Aug 16 14:07:45 2012
@@ -24,7 +24,7 @@ import org.apache.ws.security.policy.mod
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.ws.security.policy.stax.Assertable;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
/**
* WSP1.3, 6.2 Timestamp Property
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IssuedTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IssuedTokenAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IssuedTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IssuedTokenAssertionState.java Thu Aug 16 14:07:45 2012
@@ -24,8 +24,8 @@ import org.apache.ws.security.policy.mod
import org.apache.ws.security.policy.model.IssuedToken;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
-import org.swssf.wss.securityEvent.IssuedTokenSecurityEvent;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.securityEvent.IssuedTokenSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
/**
* WSP1.3, 5.4.2 IssuedToken Assertion
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KerberosTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KerberosTokenAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KerberosTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KerberosTokenAssertionState.java Thu Aug 16 14:07:45 2012
@@ -24,8 +24,8 @@ import org.apache.ws.security.policy.mod
import org.apache.ws.security.policy.model.KerberosToken;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
-import org.swssf.wss.securityEvent.KerberosTokenSecurityEvent;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.securityEvent.KerberosTokenSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
/**
* WSP1.3, 5.4.4 KerberosToken Assertion
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KeyValueTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KeyValueTokenAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KeyValueTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KeyValueTokenAssertionState.java Thu Aug 16 14:07:45 2012
@@ -25,7 +25,7 @@ import org.apache.ws.security.policy.mod
import org.apache.xml.security.stax.securityEvent.KeyValueTokenSecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
/**
* WSP1.3, 5.4.11 KeyValueToken Assertion
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/LayoutAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/LayoutAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/LayoutAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/LayoutAssertionState.java Thu Aug 16 14:07:45 2012
@@ -25,7 +25,7 @@ import org.apache.ws.security.policy.mod
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.ws.security.policy.stax.Assertable;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
import java.util.ArrayList;
import java.util.List;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/OnlySignEntireHeadersAndBodyAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/OnlySignEntireHeadersAndBodyAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/OnlySignEntireHeadersAndBodyAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/OnlySignEntireHeadersAndBodyAssertionState.java Thu Aug 16 14:07:45 2012
@@ -25,10 +25,10 @@ import org.apache.ws.security.policy.mod
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.ws.security.policy.stax.Assertable;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSUtils;
-import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSUtils;
+import org.apache.ws.security.wss.securityEvent.SignedPartSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
/**
* WSP1.3, 6.6 Entire Header and Body Signatures Property
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ProtectionOrderAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ProtectionOrderAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ProtectionOrderAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ProtectionOrderAssertionState.java Thu Aug 16 14:07:45 2012
@@ -23,8 +23,8 @@ import org.apache.ws.security.policy.WSS
import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
import org.apache.ws.security.policy.model.AbstractSymmetricAsymmetricBinding;
import org.apache.ws.security.policy.stax.Assertable;
-import org.swssf.wss.ext.WSSUtils;
-import org.swssf.wss.securityEvent.*;
+import org.apache.ws.security.wss.ext.WSSUtils;
+import org.apache.ws.security.wss.securityEvent.*;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RelTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RelTokenAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RelTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RelTokenAssertionState.java Thu Aug 16 14:07:45 2012
@@ -24,8 +24,8 @@ import org.apache.ws.security.policy.mod
import org.apache.ws.security.policy.model.RelToken;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
-import org.swssf.wss.securityEvent.RelTokenSecurityEvent;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.securityEvent.RelTokenSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
/**
* WSP1.3, 5.4.9 RelToken Assertion
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredElementsAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredElementsAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredElementsAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredElementsAssertionState.java Thu Aug 16 14:07:45 2012
@@ -27,9 +27,9 @@ import org.apache.xml.security.stax.secu
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.ws.security.policy.stax.Assertable;
import org.apache.ws.security.policy.stax.PolicyUtils;
-import org.swssf.wss.ext.WSSUtils;
-import org.swssf.wss.securityEvent.RequiredElementSecurityEvent;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.ext.WSSUtils;
+import org.apache.ws.security.wss.securityEvent.RequiredElementSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
import javax.xml.namespace.QName;
import java.util.HashMap;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredPartsAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredPartsAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredPartsAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredPartsAssertionState.java Thu Aug 16 14:07:45 2012
@@ -26,10 +26,10 @@ import org.apache.ws.security.policy.mod
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.ws.security.policy.stax.Assertable;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSUtils;
-import org.swssf.wss.securityEvent.RequiredPartSecurityEvent;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSUtils;
+import org.apache.ws.security.wss.securityEvent.RequiredPartSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
import javax.xml.namespace.QName;
import java.util.*;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SamlTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SamlTokenAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SamlTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SamlTokenAssertionState.java Thu Aug 16 14:07:45 2012
@@ -23,9 +23,9 @@ import org.apache.ws.security.policy.mod
import org.apache.ws.security.policy.model.AbstractToken;
import org.apache.ws.security.policy.model.SamlToken;
import org.opensaml.common.SAMLVersion;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.securityEvent.SamlTokenSecurityEvent;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.securityEvent.SamlTokenSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import org.apache.xml.security.stax.impl.securityToken.AbstractSecurityToken;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SecureConversationTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SecureConversationTokenAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SecureConversationTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SecureConversationTokenAssertionState.java Thu Aug 16 14:07:45 2012
@@ -24,8 +24,8 @@ import org.apache.ws.security.policy.mod
import org.apache.ws.security.policy.model.SecureConversationToken;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
-import org.swssf.wss.securityEvent.SecureConversationTokenSecurityEvent;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.securityEvent.SecureConversationTokenSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
/**
* WSP1.3, 5.4.7 SecureConversationToken Assertion
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SecurityContextTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SecurityContextTokenAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SecurityContextTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SecurityContextTokenAssertionState.java Thu Aug 16 14:07:45 2012
@@ -24,8 +24,8 @@ import org.apache.ws.security.policy.mod
import org.apache.ws.security.policy.model.SecurityContextToken;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
-import org.swssf.wss.securityEvent.SecurityContextTokenSecurityEvent;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.securityEvent.SecurityContextTokenSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
/**
* WSP1.3, 5.4.6 SecurityContextToken Assertion
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignatureProtectionAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignatureProtectionAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignatureProtectionAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignatureProtectionAssertionState.java Thu Aug 16 14:07:45 2012
@@ -26,9 +26,9 @@ import org.apache.xml.security.stax.secu
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.ws.security.policy.stax.Assertable;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSUtils;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSUtils;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
import javax.xml.namespace.QName;
import java.util.ArrayList;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignedElementsAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignedElementsAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignedElementsAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignedElementsAssertionState.java Thu Aug 16 14:07:45 2012
@@ -28,7 +28,7 @@ import org.apache.xml.security.stax.secu
import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent;
import org.apache.ws.security.policy.stax.Assertable;
import org.apache.ws.security.policy.stax.PolicyUtils;
-import org.swssf.wss.ext.WSSUtils;
+import org.apache.ws.security.wss.ext.WSSUtils;
import javax.xml.namespace.QName;
import java.util.ArrayList;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignedPartsAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignedPartsAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignedPartsAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignedPartsAssertionState.java Thu Aug 16 14:07:45 2012
@@ -26,10 +26,10 @@ import org.apache.ws.security.policy.mod
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.ws.security.policy.stax.Assertable;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSUtils;
-import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSUtils;
+import org.apache.ws.security.wss.securityEvent.SignedPartSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
import javax.xml.namespace.QName;
import java.util.LinkedList;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java Thu Aug 16 14:07:45 2012
@@ -24,8 +24,8 @@ import org.apache.ws.security.policy.mod
import org.apache.ws.security.policy.model.SpnegoContextToken;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
-import org.swssf.wss.securityEvent.SpnegoContextTokenSecurityEvent;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.securityEvent.SpnegoContextTokenSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
/**
* WSP1.3, 5.4.5 SpnegoContextToken Assertion
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/TokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/TokenAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/TokenAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/TokenAssertionState.java Thu Aug 16 14:07:45 2012
@@ -23,7 +23,7 @@ import org.apache.ws.security.policy.SPC
import org.apache.ws.security.policy.WSSPolicyException;
import org.apache.ws.security.policy.model.*;
import org.apache.ws.security.policy.stax.Assertable;
-import org.swssf.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSConstants;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/TokenProtectionAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/TokenProtectionAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/TokenProtectionAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/TokenProtectionAssertionState.java Thu Aug 16 14:07:45 2012
@@ -23,9 +23,9 @@ import org.apache.ws.security.policy.Ass
import org.apache.ws.security.policy.WSSPolicyException;
import org.apache.ws.security.policy.model.AbstractSymmetricAsymmetricBinding;
import org.apache.ws.security.policy.stax.Assertable;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSUtils;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSUtils;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/UsernameTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/UsernameTokenAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/UsernameTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/UsernameTokenAssertionState.java Thu Aug 16 14:07:45 2012
@@ -22,10 +22,10 @@ import org.apache.ws.security.policy.WSS
import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
import org.apache.ws.security.policy.model.AbstractToken;
import org.apache.ws.security.policy.model.UsernameToken;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.impl.securityToken.UsernameSecurityToken;
-import org.swssf.wss.securityEvent.UsernameTokenSecurityEvent;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.impl.securityToken.UsernameSecurityToken;
+import org.apache.ws.security.wss.securityEvent.UsernameTokenSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/X509TokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/X509TokenAssertionState.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/X509TokenAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/X509TokenAssertionState.java Thu Aug 16 14:07:45 2012
@@ -22,7 +22,7 @@ import org.apache.ws.security.policy.WSS
import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
import org.apache.ws.security.policy.model.AbstractToken;
import org.apache.ws.security.policy.model.X509Token;
-import org.swssf.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSConstants;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import org.apache.xml.security.stax.impl.securityToken.AbstractSecurityToken;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AbstractPolicyTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AbstractPolicyTestBase.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AbstractPolicyTestBase.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AbstractPolicyTestBase.java Thu Aug 16 14:07:45 2012
@@ -22,9 +22,9 @@ import org.apache.ws.security.policy.SPC
import org.apache.ws.security.policy.WSSPolicyException;
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyEnforcerFactory;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.impl.securityToken.X509SecurityToken;
-import org.swssf.wss.test.AbstractTestBase;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.impl.securityToken.X509SecurityToken;
+import org.apache.ws.security.wss.test.AbstractTestBase;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import org.w3c.dom.Document;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AlgorithmSuiteTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AlgorithmSuiteTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AlgorithmSuiteTest.java Thu Aug 16 14:07:45 2012
@@ -21,9 +21,9 @@ package org.apache.ws.security.policy.st
import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AsymmetricBindingIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AsymmetricBindingIntegrationTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AsymmetricBindingIntegrationTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AsymmetricBindingIntegrationTest.java Thu Aug 16 14:07:45 2012
@@ -22,12 +22,12 @@ import org.apache.ws.security.saml.ext.b
import org.opensaml.common.SAMLVersion;
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyInputProcessor;
-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.swssf.wss.crypto.CryptoType;
-import org.swssf.wss.crypto.Merlin;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSSecurityProperties;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.test.CallbackHandlerImpl;
+import org.apache.ws.security.wss.crypto.CryptoType;
+import org.apache.ws.security.wss.crypto.Merlin;
import org.apache.xml.security.stax.ext.SecurePart;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AsymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AsymmetricBindingTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AsymmetricBindingTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AsymmetricBindingTest.java Thu Aug 16 14:07:45 2012
@@ -20,9 +20,9 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.*;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.securityEvent.*;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/ContentEncryptedElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/ContentEncryptedElementsTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/ContentEncryptedElementsTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/ContentEncryptedElementsTest.java Thu Aug 16 14:07:45 2012
@@ -20,9 +20,9 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
import org.testng.Assert;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/DerivedKeyTests.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/DerivedKeyTests.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/DerivedKeyTests.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/DerivedKeyTests.java Thu Aug 16 14:07:45 2012
@@ -20,10 +20,10 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.WSSPolicyException;
import org.apache.ws.security.policy.stax.PolicyEnforcer;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.impl.securityToken.X509SecurityToken;
-import org.swssf.wss.securityEvent.*;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.impl.securityToken.X509SecurityToken;
+import org.apache.ws.security.wss.securityEvent.*;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/EncryptedElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/EncryptedElementsTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/EncryptedElementsTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/EncryptedElementsTest.java Thu Aug 16 14:07:45 2012
@@ -20,9 +20,9 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent;
import org.testng.Assert;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/EncryptedPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/EncryptedPartsTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/EncryptedPartsTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/EncryptedPartsTest.java Thu Aug 16 14:07:45 2012
@@ -20,10 +20,10 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.EncryptedPartSecurityEvent;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.securityEvent.EncryptedPartSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/HttpsTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/HttpsTokenTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/HttpsTokenTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/HttpsTokenTest.java Thu Aug 16 14:07:45 2012
@@ -20,10 +20,10 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.HttpsTokenSecurityEvent;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.securityEvent.HttpsTokenSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/IssuedTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/IssuedTokenTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/IssuedTokenTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/IssuedTokenTest.java Thu Aug 16 14:07:45 2012
@@ -21,11 +21,11 @@ package org.apache.ws.security.policy.st
import org.opensaml.common.SAMLVersion;
import org.apache.ws.security.policy.stax.PolicyEnforcer;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.impl.securityToken.SAMLSecurityToken;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
-import org.swssf.wss.securityEvent.SamlTokenSecurityEvent;
-import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.impl.securityToken.SAMLSecurityToken;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SamlTokenSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SignedPartSecurityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/KerberosTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/KerberosTokenTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/KerberosTokenTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/KerberosTokenTest.java Thu Aug 16 14:07:45 2012
@@ -19,10 +19,10 @@
package org.apache.ws.security.policy.stax.test;
import org.apache.ws.security.policy.stax.PolicyEnforcer;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.securityEvent.KerberosTokenSecurityEvent;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
-import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.securityEvent.KerberosTokenSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SignedPartSecurityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/KeyValueTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/KeyValueTokenTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/KeyValueTokenTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/KeyValueTokenTest.java Thu Aug 16 14:07:45 2012
@@ -20,10 +20,10 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
-import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SignedPartSecurityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/ProtectionOrderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/ProtectionOrderTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/ProtectionOrderTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/ProtectionOrderTest.java Thu Aug 16 14:07:45 2012
@@ -20,9 +20,9 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.*;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.securityEvent.*;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/RelTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/RelTokenTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/RelTokenTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/RelTokenTest.java Thu Aug 16 14:07:45 2012
@@ -19,10 +19,10 @@
package org.apache.ws.security.policy.stax.test;
import org.apache.ws.security.policy.stax.PolicyEnforcer;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
-import org.swssf.wss.securityEvent.RelTokenSecurityEvent;
-import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.RelTokenSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SignedPartSecurityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/RequiredElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/RequiredElementsTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/RequiredElementsTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/RequiredElementsTest.java Thu Aug 16 14:07:45 2012
@@ -20,9 +20,9 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.WSSPolicyException;
import org.apache.ws.security.policy.stax.PolicyEnforcer;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
-import org.swssf.wss.securityEvent.RequiredElementSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.RequiredElementSecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/RequiredPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/RequiredPartsTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/RequiredPartsTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/RequiredPartsTest.java Thu Aug 16 14:07:45 2012
@@ -20,9 +20,9 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.WSSPolicyException;
import org.apache.ws.security.policy.stax.PolicyEnforcer;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
-import org.swssf.wss.securityEvent.RequiredPartSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.RequiredPartSecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SamlTokenTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SamlTokenTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SamlTokenTest.java Thu Aug 16 14:07:45 2012
@@ -21,12 +21,12 @@ package org.apache.ws.security.policy.st
import org.opensaml.common.SAMLVersion;
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.impl.securityToken.SAMLSecurityToken;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
-import org.swssf.wss.securityEvent.SamlTokenSecurityEvent;
-import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.impl.securityToken.SAMLSecurityToken;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SamlTokenSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SignedPartSecurityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SecureConversationTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SecureConversationTokenTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SecureConversationTokenTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SecureConversationTokenTest.java Thu Aug 16 14:07:45 2012
@@ -20,11 +20,11 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
-import org.swssf.wss.securityEvent.SecureConversationTokenSecurityEvent;
-import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SecureConversationTokenSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SignedPartSecurityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SecurityContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SecurityContextTokenTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SecurityContextTokenTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SecurityContextTokenTest.java Thu Aug 16 14:07:45 2012
@@ -21,11 +21,11 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
-import org.swssf.wss.securityEvent.SecurityContextTokenSecurityEvent;
-import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SecurityContextTokenSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SignedPartSecurityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SignedElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SignedElementsTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SignedElementsTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SignedElementsTest.java Thu Aug 16 14:07:45 2012
@@ -20,9 +20,9 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent;
import org.testng.Assert;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SignedPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SignedPartsTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SignedPartsTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SignedPartsTest.java Thu Aug 16 14:07:45 2012
@@ -20,10 +20,10 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
-import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SignedPartSecurityEvent;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SpnegoContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SpnegoContextTokenTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SpnegoContextTokenTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SpnegoContextTokenTest.java Thu Aug 16 14:07:45 2012
@@ -19,10 +19,10 @@
package org.apache.ws.security.policy.stax.test;
import org.apache.ws.security.policy.stax.PolicyEnforcer;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
-import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
-import org.swssf.wss.securityEvent.SpnegoContextTokenSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SignedPartSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SpnegoContextTokenSecurityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SupportingTokensTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SupportingTokensTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SupportingTokensTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SupportingTokensTest.java Thu Aug 16 14:07:45 2012
@@ -21,13 +21,13 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.WSSPolicyException;
import org.opensaml.common.SAMLVersion;
import org.apache.ws.security.policy.stax.PolicyEnforcer;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityContext;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.impl.securityToken.SAMLSecurityToken;
-import org.swssf.wss.impl.securityToken.UsernameSecurityToken;
-import org.swssf.wss.impl.securityToken.X509SecurityToken;
-import org.swssf.wss.securityEvent.*;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityContext;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.impl.securityToken.SAMLSecurityToken;
+import org.apache.ws.security.wss.impl.securityToken.UsernameSecurityToken;
+import org.apache.ws.security.wss.impl.securityToken.X509SecurityToken;
+import org.apache.ws.security.wss.securityEvent.*;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.securityEvent.KeyValueTokenSecurityEvent;
import org.apache.xml.security.stax.securityEvent.X509TokenSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SymmetricBindingTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SymmetricBindingTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/SymmetricBindingTest.java Thu Aug 16 14:07:45 2012
@@ -20,10 +20,10 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.impl.securityToken.SecureConversationSecurityToken;
-import org.swssf.wss.securityEvent.*;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.impl.securityToken.SecureConversationSecurityToken;
+import org.apache.ws.security.wss.securityEvent.*;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/TokenProtectionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/TokenProtectionTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/TokenProtectionTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/TokenProtectionTest.java Thu Aug 16 14:07:45 2012
@@ -20,10 +20,10 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.impl.securityToken.X509SecurityToken;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.impl.securityToken.X509SecurityToken;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/TransportBindingIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/TransportBindingIntegrationTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/TransportBindingIntegrationTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/TransportBindingIntegrationTest.java Thu Aug 16 14:07:45 2012
@@ -20,12 +20,12 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyInputProcessor;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSSecurityProperties;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.impl.securityToken.HttpsSecurityToken;
-import org.swssf.wss.securityEvent.HttpsTokenSecurityEvent;
-import org.swssf.wss.test.CallbackHandlerImpl;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSSecurityProperties;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.impl.securityToken.HttpsSecurityToken;
+import org.apache.ws.security.wss.securityEvent.HttpsTokenSecurityEvent;
+import org.apache.ws.security.wss.test.CallbackHandlerImpl;
import org.apache.xml.security.stax.ext.SecurePart;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/TransportBindingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/TransportBindingTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/TransportBindingTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/TransportBindingTest.java Thu Aug 16 14:07:45 2012
@@ -20,10 +20,10 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.impl.securityToken.HttpsSecurityToken;
-import org.swssf.wss.securityEvent.*;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.impl.securityToken.HttpsSecurityToken;
+import org.apache.ws.security.wss.securityEvent.*;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/UsernameTokenTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/UsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/UsernameTokenTest.java Thu Aug 16 14:07:45 2012
@@ -20,13 +20,13 @@ package org.apache.ws.security.policy.st
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyViolationException;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityContext;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.impl.securityToken.UsernameSecurityToken;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
-import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
-import org.swssf.wss.securityEvent.UsernameTokenSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityContext;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.impl.securityToken.UsernameSecurityToken;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SignedPartSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.UsernameTokenSecurityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/VulnerabliltyVectorsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/VulnerabliltyVectorsTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/VulnerabliltyVectorsTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/VulnerabliltyVectorsTest.java Thu Aug 16 14:07:45 2012
@@ -22,11 +22,11 @@ import org.apache.ws.security.handler.WS
import org.apache.ws.security.policy.stax.PolicyEnforcer;
import org.apache.ws.security.policy.stax.PolicyEnforcerFactory;
import org.apache.ws.security.policy.stax.PolicyInputProcessor;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSSecurityProperties;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.test.AbstractTestBase;
-import org.swssf.wss.test.CallbackHandlerImpl;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSSecurityProperties;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.test.AbstractTestBase;
+import org.apache.ws.security.wss.test.CallbackHandlerImpl;
import org.apache.xml.security.stax.ext.SecurePart;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/WSP13SpecTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/WSP13SpecTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/WSP13SpecTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/WSP13SpecTest.java Thu Aug 16 14:07:45 2012
@@ -22,9 +22,9 @@ import org.apache.ws.security.policy.WSS
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.ws.security.policy.stax.PolicyEnforcer;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.WSSecurityEventConstants;
-import org.swssf.wss.test.InboundWSSecurityContextImplTest;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.wss.test.InboundWSSecurityContextImplTest;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/X509TokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/X509TokenTest.java?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/X509TokenTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/X509TokenTest.java Thu Aug 16 14:07:45 2012
@@ -19,10 +19,10 @@
package org.apache.ws.security.policy.stax.test;
import org.apache.ws.security.policy.stax.PolicyEnforcer;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
-import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.apache.ws.security.wss.ext.WSSConstants;
+import org.apache.ws.security.wss.ext.WSSecurityException;
+import org.apache.ws.security.wss.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.wss.securityEvent.SignedPartSecurityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-policy/src/test/resources/log4j-wsp.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/test/resources/log4j-wsp.xml?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/resources/log4j-wsp.xml (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/test/resources/log4j-wsp.xml Thu Aug 16 14:07:45 2012
@@ -12,7 +12,7 @@
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
</layout>
</appender>
- <logger name="org.swssf.policy.PolicyEnforcer">
+ <logger name="org.apache.ws.security.policy.PolicyEnforcer">
<level value="INFO"/>
</logger>
<root>
Modified: webservices/wss4j/trunk/streaming-ws-security/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/pom.xml?rev=1373842&r1=1373841&r2=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/pom.xml (original)
+++ webservices/wss4j/trunk/streaming-ws-security/pom.xml Thu Aug 16 14:07:45 2012
@@ -28,8 +28,8 @@
<relativePath>../parent/pom.xml</relativePath>
<version>2.0-SNAPSHOT</version>
</parent>
- <groupId>org.swssf</groupId>
- <artifactId>streaming-ws-security</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-streaming-ws-security</artifactId>
<version>2.0-SNAPSHOT</version>
<name>Apache WSS4J Streaming WS-Security</name>
Copied: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/WSSec.java (from r1373826, webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/WSSec.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/WSSec.java?p2=webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/WSSec.java&p1=webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/WSSec.java&r1=1373826&r2=1373842&rev=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/WSSec.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/WSSec.java Thu Aug 16 14:07:45 2012
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.wss;
+package org.apache.ws.security.wss;
-import org.swssf.wss.ext.*;
+import org.apache.ws.security.wss.ext.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xml.security.stax.config.Init;
@@ -74,9 +74,9 @@ public class WSSec {
*
* @param securityProperties The user-defined security configuration
* @return A new OutboundWSSec
- * @throws org.swssf.wss.ext.WSSecurityException
+ * @throws org.apache.ws.security.wss.ext.WSSecurityException
* if the initialisation failed
- * @throws org.swssf.wss.ext.WSSConfigurationException
+ * @throws org.apache.ws.security.wss.ext.WSSConfigurationException
* if the configuration is invalid
*/
public static OutboundWSSec getOutboundWSSec(WSSSecurityProperties securityProperties) throws WSSecurityException {
@@ -93,9 +93,9 @@ public class WSSec {
*
* @param securityProperties The user-defined security configuration
* @return A new InboundWSSec
- * @throws org.swssf.wss.ext.WSSecurityException
+ * @throws org.apache.ws.security.wss.ext.WSSecurityException
* if the initialisation failed
- * @throws org.swssf.wss.ext.WSSConfigurationException
+ * @throws org.apache.ws.security.wss.ext.WSSConfigurationException
* if the configuration is invalid
*/
public static InboundWSSec getInboundWSSec(WSSSecurityProperties securityProperties) throws WSSecurityException {
@@ -112,7 +112,7 @@ public class WSSec {
*
* @param securityProperties The configuration to validate
* @return The validated configuration
- * @throws org.swssf.wss.ext.WSSConfigurationException
+ * @throws org.apache.ws.security.wss.ext.WSSConfigurationException
* if the configuration is invalid
*/
public static WSSSecurityProperties validateAndApplyDefaultsToOutboundSecurityProperties(WSSSecurityProperties securityProperties) throws WSSConfigurationException {
@@ -315,7 +315,7 @@ public class WSSec {
*
* @param securityProperties The configuration to validate
* @return The validated configuration
- * @throws org.swssf.wss.ext.WSSConfigurationException
+ * @throws org.apache.ws.security.wss.ext.WSSConfigurationException
* if the configuration is invalid
*/
public static WSSSecurityProperties validateAndApplyDefaultsToInboundSecurityProperties(WSSSecurityProperties securityProperties) throws WSSConfigurationException {
Copied: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/Crypto.java (from r1373826, webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Crypto.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/Crypto.java?p2=webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/Crypto.java&p1=webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Crypto.java&r1=1373826&r2=1373842&rev=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Crypto.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/Crypto.java Thu Aug 16 14:07:45 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.wss.crypto;
+package org.apache.ws.security.wss.crypto;
import org.apache.xml.security.stax.ext.XMLSecurityException;
Copied: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/CryptoBase.java (from r1373826, webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoBase.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/CryptoBase.java?p2=webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/CryptoBase.java&p1=webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoBase.java&r1=1373826&r2=1373842&rev=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoBase.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/CryptoBase.java Thu Aug 16 14:07:45 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.swssf.wss.crypto;
+package org.apache.ws.security.wss.crypto;
import org.apache.xml.security.stax.ext.XMLSecurityException;
Copied: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/CryptoType.java (from r1373826, webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoType.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/CryptoType.java?p2=webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/CryptoType.java&p1=webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoType.java&r1=1373826&r2=1373842&rev=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/crypto/CryptoType.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/CryptoType.java Thu Aug 16 14:07:45 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.swssf.wss.crypto;
+package org.apache.ws.security.wss.crypto;
import java.math.BigInteger;
Copied: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/DERDecoder.java (from r1373826, webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/crypto/DERDecoder.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/DERDecoder.java?p2=webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/DERDecoder.java&p1=webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/crypto/DERDecoder.java&r1=1373826&r2=1373842&rev=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/crypto/DERDecoder.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/DERDecoder.java Thu Aug 16 14:07:45 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.swssf.wss.crypto;
+package org.apache.ws.security.wss.crypto;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/Loader.java (from r1373826, webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Loader.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/Loader.java?p2=webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/Loader.java&p1=webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Loader.java&r1=1373826&r2=1373842&rev=1373842&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/crypto/Loader.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/apache/ws/security/wss/crypto/Loader.java Thu Aug 16 14:07:45 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.swssf.wss.crypto;
+package org.apache.ws.security.wss.crypto;
import java.lang.reflect.InvocationTargetException;
import java.net.URL;