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 15:32:21 UTC
svn commit: r1373826 [5/6] - in /webservices/wss4j/trunk: ./ policy/
policy/src/ policy/src/main/ policy/src/main/java/
policy/src/main/java/org/ policy/src/main/java/org/apache/
policy/src/main/java/org/apache/ws/ policy/src/main/java/org/apache/ws/se...
Copied: webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/normalized/Trust13.xml (from r1373765, webservices/wss4j/trunk/rampart-policy/src/test/resources/policy/model/sp13/normalized/Trust13.xml)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/normalized/Trust13.xml?p2=webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/normalized/Trust13.xml&p1=webservices/wss4j/trunk/rampart-policy/src/test/resources/policy/model/sp13/normalized/Trust13.xml&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
(empty)
Copied: webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/normalized/UsernameToken.xml (from r1373765, webservices/wss4j/trunk/rampart-policy/src/test/resources/policy/model/sp13/normalized/UsernameToken.xml)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/normalized/UsernameToken.xml?p2=webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/normalized/UsernameToken.xml&p1=webservices/wss4j/trunk/rampart-policy/src/test/resources/policy/model/sp13/normalized/UsernameToken.xml&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
(empty)
Copied: webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/serialized/EncryptedParts.xml (from r1373765, webservices/wss4j/trunk/rampart-policy/src/test/resources/policy/model/sp13/serialized/EncryptedParts.xml)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/serialized/EncryptedParts.xml?p2=webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/serialized/EncryptedParts.xml&p1=webservices/wss4j/trunk/rampart-policy/src/test/resources/policy/model/sp13/serialized/EncryptedParts.xml&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
(empty)
Copied: webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/serialized/SignedElements.xml (from r1373765, webservices/wss4j/trunk/rampart-policy/src/test/resources/policy/model/sp13/serialized/SignedElements.xml)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/serialized/SignedElements.xml?p2=webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/serialized/SignedElements.xml&p1=webservices/wss4j/trunk/rampart-policy/src/test/resources/policy/model/sp13/serialized/SignedElements.xml&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
(empty)
Copied: webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/serialized/SignedParts.xml (from r1373765, webservices/wss4j/trunk/rampart-policy/src/test/resources/policy/model/sp13/serialized/SignedParts.xml)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/serialized/SignedParts.xml?p2=webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/serialized/SignedParts.xml&p1=webservices/wss4j/trunk/rampart-policy/src/test/resources/policy/model/sp13/serialized/SignedParts.xml&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
(empty)
Copied: webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/serialized/Trust13.xml (from r1373765, webservices/wss4j/trunk/rampart-policy/src/test/resources/policy/model/sp13/serialized/Trust13.xml)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/serialized/Trust13.xml?p2=webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/serialized/Trust13.xml&p1=webservices/wss4j/trunk/rampart-policy/src/test/resources/policy/model/sp13/serialized/Trust13.xml&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
(empty)
Copied: webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/serialized/UsernameToken.xml (from r1373765, webservices/wss4j/trunk/rampart-policy/src/test/resources/policy/model/sp13/serialized/UsernameToken.xml)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/serialized/UsernameToken.xml?p2=webservices/wss4j/trunk/policy/src/test/resources/policy/model/sp13/serialized/UsernameToken.xml&p1=webservices/wss4j/trunk/rampart-policy/src/test/resources/policy/model/sp13/serialized/UsernameToken.xml&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
(empty)
Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1373826&r1=1373825&r2=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Thu Aug 16 13:32:03 2012
@@ -101,9 +101,9 @@
<modules>
<module>parent</module>
<module>bindings</module>
+ <module>policy</module>
<module>wss4j-dom</module>
<module>streaming-ws-security</module>
- <module>rampart-policy</module>
<module>streaming-ws-policy</module>
<module>cxf-integration</module>
</modules>
Modified: webservices/wss4j/trunk/streaming-ws-policy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/pom.xml?rev=1373826&r1=1373825&r2=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/pom.xml (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/pom.xml Thu Aug 16 13:32:03 2012
@@ -28,8 +28,8 @@
<relativePath>../parent/pom.xml</relativePath>
<version>2.0-SNAPSHOT</version>
</parent>
- <groupId>org.swssf</groupId>
- <artifactId>streaming-ws-policy</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-streaming-ws-policy</artifactId>
<version>2.0-SNAPSHOT</version>
<name>Apache WSS4J Streaming WS-SecurityPolicy</name>
@@ -40,8 +40,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.swssf</groupId>
- <artifactId>rampart-policy</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-policy</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/Assertable.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/Assertable.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/Assertable.java?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/Assertable.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/Assertable.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/Assertable.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/Assertable.java Thu Aug 16 13:32:03 2012
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy;
+package org.apache.ws.security.policy.stax;
-import org.apache.ws.secpolicy.WSSPolicyException;
+import org.apache.ws.security.policy.WSSPolicyException;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/OperationPolicy.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/OperationPolicy.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/OperationPolicy.java?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/OperationPolicy.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/OperationPolicy.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/OperationPolicy.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/OperationPolicy.java Thu Aug 16 13:32:03 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy;
+package org.apache.ws.security.policy.stax;
import org.apache.neethi.Policy;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyConstants.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyConstants.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyConstants.java?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyConstants.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyConstants.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyConstants.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyConstants.java Thu Aug 16 13:32:03 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy;
+package org.apache.ws.security.policy.stax;
/**
* @author $Author$
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcer.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcer.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcer.java?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcer.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcer.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcer.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcer.java Thu Aug 16 13:32:03 2012
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy;
+package org.apache.ws.security.policy.stax;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.neethi.*;
import org.apache.neethi.builders.PrimitiveAssertion;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.*;
-import org.swssf.policy.assertionStates.*;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.*;
+import org.apache.ws.security.policy.stax.assertionStates.*;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityException;
import org.swssf.wss.securityEvent.OperationSecurityEvent;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcerFactory.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcerFactory.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcerFactory.java?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcerFactory.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcerFactory.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcerFactory.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcerFactory.java Thu Aug 16 13:32:03 2012
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy;
+package org.apache.ws.security.policy.stax;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyBuilder;
-import org.apache.ws.secpolicy.WSSPolicyException;
+import org.apache.ws.security.policy.WSSPolicyException;
import org.swssf.wss.ext.WSSConstants;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyInputProcessor.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyInputProcessor.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyInputProcessor.java?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyInputProcessor.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyInputProcessor.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyInputProcessor.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyInputProcessor.java Thu Aug 16 13:32:03 2012
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy;
+package org.apache.ws.security.policy.stax;
-import org.apache.ws.secpolicy.WSSPolicyException;
+import org.apache.ws.security.policy.WSSPolicyException;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSSecurityProperties;
import org.swssf.wss.ext.WSSUtils;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyUtils.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyUtils.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyUtils.java?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyUtils.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyUtils.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyUtils.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyUtils.java Thu Aug 16 13:32:03 2012
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy;
+package org.apache.ws.security.policy.stax;
import org.apache.commons.lang.StringUtils;
-import org.apache.ws.secpolicy.model.XPath;
+import org.apache.ws.security.policy.model.XPath;
import javax.xml.namespace.QName;
import java.util.LinkedList;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyViolationException.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyViolationException.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyViolationException.java?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyViolationException.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyViolationException.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyViolationException.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/PolicyViolationException.java Thu Aug 16 13:32:03 2012
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy;
+package org.apache.ws.security.policy.stax;
-import org.apache.ws.secpolicy.WSSPolicyException;
+import org.apache.ws.security.policy.WSSPolicyException;
/**
* Exception for PolicyViolation
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/AlgorithmSuiteAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/AlgorithmSuiteAssertionState.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/AlgorithmSuiteAssertionState.java?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/AlgorithmSuiteAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/AlgorithmSuiteAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/AlgorithmSuiteAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/AlgorithmSuiteAssertionState.java Thu Aug 16 13:32:03 2012
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.AssertionState;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AlgorithmSuite;
-import org.swssf.policy.Assertable;
+import org.apache.ws.security.policy.AssertionState;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.AlgorithmSuite;
+import org.apache.ws.security.policy.stax.Assertable;
import org.swssf.wss.ext.WSSConstants;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ContentEncryptedElementsAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ContentEncryptedElementsAssertionState.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ContentEncryptedElementsAssertionState.java?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ContentEncryptedElementsAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ContentEncryptedElementsAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ContentEncryptedElementsAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ContentEncryptedElementsAssertionState.java Thu Aug 16 13:32:03 2012
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.AssertionState;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.ContentEncryptedElements;
-import org.apache.ws.secpolicy.model.XPath;
+import org.apache.ws.security.policy.AssertionState;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.ContentEncryptedElements;
+import org.apache.ws.security.policy.model.XPath;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
-import org.swssf.policy.Assertable;
-import org.swssf.policy.PolicyUtils;
+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.WSSecurityEventConstants;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedElementsAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/EncryptedElementsAssertionState.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedElementsAssertionState.java?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedElementsAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/EncryptedElementsAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/EncryptedElementsAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedElementsAssertionState.java Thu Aug 16 13:32:03 2012
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.AssertionState;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.EncryptedElements;
-import org.apache.ws.secpolicy.model.XPath;
+import org.apache.ws.security.policy.AssertionState;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.EncryptedElements;
+import org.apache.ws.security.policy.model.XPath;
import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
-import org.swssf.policy.Assertable;
-import org.swssf.policy.PolicyUtils;
+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.WSSecurityEventConstants;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedPartsAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/EncryptedPartsAssertionState.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedPartsAssertionState.java?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedPartsAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/EncryptedPartsAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/EncryptedPartsAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedPartsAssertionState.java Thu Aug 16 13:32:03 2012
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.AssertionState;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.EncryptedParts;
-import org.apache.ws.secpolicy.model.Header;
+import org.apache.ws.security.policy.AssertionState;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.EncryptedParts;
+import org.apache.ws.security.policy.model.Header;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
-import org.swssf.policy.Assertable;
+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.EncryptedPartSecurityEvent;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/HttpsTokenAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/HttpsTokenAssertionState.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/HttpsTokenAssertionState.java?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/HttpsTokenAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/HttpsTokenAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/HttpsTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/HttpsTokenAssertionState.java Thu Aug 16 13:32:03 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AbstractToken;
-import org.apache.ws.secpolicy.model.HttpsToken;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.AbstractToken;
+import org.apache.ws.security.policy.model.HttpsToken;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
import org.swssf.wss.securityEvent.HttpsTokenSecurityEvent;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IncludeTimeStampAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IncludeTimeStampAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/IncludeTimeStampAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.AssertionState;
-import org.apache.ws.secpolicy.model.AbstractBinding;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.AssertionState;
+import org.apache.ws.security.policy.model.AbstractBinding;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
-import org.swssf.policy.Assertable;
+import org.apache.ws.security.policy.stax.Assertable;
import org.swssf.wss.securityEvent.WSSecurityEventConstants;
/**
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IssuedTokenAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IssuedTokenAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/IssuedTokenAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AbstractToken;
-import org.apache.ws.secpolicy.model.IssuedToken;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.AbstractToken;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KerberosTokenAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KerberosTokenAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/KerberosTokenAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AbstractToken;
-import org.apache.ws.secpolicy.model.KerberosToken;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.AbstractToken;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KeyValueTokenAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KeyValueTokenAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/KeyValueTokenAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AbstractToken;
-import org.apache.ws.secpolicy.model.KeyValueToken;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.AbstractToken;
+import org.apache.ws.security.policy.model.KeyValueToken;
import org.apache.xml.security.stax.securityEvent.KeyValueTokenSecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/LayoutAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/LayoutAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/LayoutAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.AssertionState;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.Layout;
+import org.apache.ws.security.policy.AssertionState;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.Layout;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
-import org.swssf.policy.Assertable;
+import org.apache.ws.security.policy.stax.Assertable;
import org.swssf.wss.securityEvent.WSSecurityEventConstants;
import java.util.ArrayList;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/OnlySignEntireHeadersAndBodyAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/OnlySignEntireHeadersAndBodyAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/OnlySignEntireHeadersAndBodyAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.AssertionState;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AbstractSymmetricAsymmetricBinding;
+import org.apache.ws.security.policy.AssertionState;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.AbstractSymmetricAsymmetricBinding;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
-import org.swssf.policy.Assertable;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ProtectionOrderAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ProtectionOrderAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ProtectionOrderAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.AssertionState;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AbstractSymmetricAsymmetricBinding;
-import org.swssf.policy.Assertable;
+import org.apache.ws.security.policy.AssertionState;
+import org.apache.ws.security.policy.WSSPolicyException;
+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.xml.security.stax.ext.XMLSecurityConstants;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RelTokenAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RelTokenAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/RelTokenAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AbstractToken;
-import org.apache.ws.secpolicy.model.RelToken;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.AbstractToken;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredElementsAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredElementsAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/RequiredElementsAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.AssertionState;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.RequiredElements;
-import org.apache.ws.secpolicy.model.XPath;
+import org.apache.ws.security.policy.AssertionState;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.RequiredElements;
+import org.apache.ws.security.policy.model.XPath;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
-import org.swssf.policy.Assertable;
-import org.swssf.policy.PolicyUtils;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredPartsAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredPartsAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/RequiredPartsAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.AssertionState;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.Header;
-import org.apache.ws.secpolicy.model.RequiredParts;
+import org.apache.ws.security.policy.AssertionState;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.Header;
+import org.apache.ws.security.policy.model.RequiredParts;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
-import org.swssf.policy.Assertable;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SamlTokenAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SamlTokenAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SamlTokenAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AbstractToken;
-import org.apache.ws.secpolicy.model.SamlToken;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SecureConversationTokenAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SecureConversationTokenAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SecureConversationTokenAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AbstractToken;
-import org.apache.ws.secpolicy.model.SecureConversationToken;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.AbstractToken;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SecurityContextTokenAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SecurityContextTokenAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SecurityContextTokenAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AbstractToken;
-import org.apache.ws.secpolicy.model.SecurityContextToken;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.AbstractToken;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignatureProtectionAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignatureProtectionAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SignatureProtectionAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.AssertionState;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AbstractSymmetricAsymmetricBinding;
+import org.apache.ws.security.policy.AssertionState;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.AbstractSymmetricAsymmetricBinding;
import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
-import org.swssf.policy.Assertable;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignedElementsAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignedElementsAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SignedElementsAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.AssertionState;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.SignedElements;
-import org.apache.ws.secpolicy.model.XPath;
+import org.apache.ws.security.policy.AssertionState;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.SignedElements;
+import org.apache.ws.security.policy.model.XPath;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent;
-import org.swssf.policy.Assertable;
-import org.swssf.policy.PolicyUtils;
+import org.apache.ws.security.policy.stax.Assertable;
+import org.apache.ws.security.policy.stax.PolicyUtils;
import org.swssf.wss.ext.WSSUtils;
import javax.xml.namespace.QName;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignedPartsAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignedPartsAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SignedPartsAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.AssertionState;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.Header;
-import org.apache.ws.secpolicy.model.SignedParts;
+import org.apache.ws.security.policy.AssertionState;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.Header;
+import org.apache.ws.security.policy.model.SignedParts;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
-import org.swssf.policy.Assertable;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SpnegoContextTokenAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AbstractToken;
-import org.apache.ws.secpolicy.model.SpnegoContextToken;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
+import org.apache.ws.security.policy.model.AbstractToken;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/TokenAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/TokenAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/TokenAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.AssertionState;
-import org.apache.ws.secpolicy.SPConstants;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.*;
-import org.swssf.policy.Assertable;
+import org.apache.ws.security.policy.AssertionState;
+import org.apache.ws.security.policy.SPConstants;
+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.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityException;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/TokenProtectionAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/TokenProtectionAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/TokenProtectionAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
import org.apache.neethi.Assertion;
-import org.apache.ws.secpolicy.AssertionState;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSymmetricAsymmetricBinding;
-import org.swssf.policy.Assertable;
+import org.apache.ws.security.policy.AssertionState;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/UsernameTokenAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/UsernameTokenAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/UsernameTokenAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AbstractToken;
-import org.apache.ws.secpolicy.model.UsernameToken;
+import org.apache.ws.security.policy.WSSPolicyException;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/X509TokenAssertionState.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/apache/ws/security/policy/stax/assertionStates/X509TokenAssertionState.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/X509TokenAssertionState.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/main/java/org/swssf/policy/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 13:32:03 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.assertionStates;
+package org.apache.ws.security.policy.stax.assertionStates;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AbstractToken;
-import org.apache.ws.secpolicy.model.X509Token;
+import org.apache.ws.security.policy.WSSPolicyException;
+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.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.XMLSecurityException;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AbstractPolicyTestBase.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AbstractPolicyTestBase.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/swssf/policy/test/AbstractPolicyTestBase.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/swssf/policy/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 13:32:03 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.test;
+package org.apache.ws.security.policy.stax.test;
-import org.apache.ws.secpolicy.SPConstants;
-import org.apache.ws.secpolicy.WSSPolicyException;
-import org.swssf.policy.PolicyEnforcer;
-import org.swssf.policy.PolicyEnforcerFactory;
+import org.apache.ws.security.policy.SPConstants;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AlgorithmSuiteTest.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AlgorithmSuiteTest.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/swssf/policy/test/AlgorithmSuiteTest.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/swssf/policy/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 13:32:03 2012
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.test;
+package org.apache.ws.security.policy.stax.test;
import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
-import org.swssf.policy.PolicyEnforcer;
-import org.swssf.policy.PolicyViolationException;
+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;
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AsymmetricBindingIntegrationTest.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AsymmetricBindingIntegrationTest.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/swssf/policy/test/AsymmetricBindingIntegrationTest.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/swssf/policy/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 13:32:03 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.test;
+package org.apache.ws.security.policy.stax.test;
import org.apache.ws.security.saml.ext.builder.SAML2Constants;
import org.opensaml.common.SAMLVersion;
-import org.swssf.policy.PolicyEnforcer;
-import org.swssf.policy.PolicyInputProcessor;
+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;
@@ -398,7 +398,7 @@ public class AsymmetricBindingIntegratio
} catch (XMLStreamException e) {
Assert.assertTrue(e.getCause() instanceof WSSecurityException);
Assert.assertEquals(e.getCause().getMessage(), "An error was discovered processing the <wsse:Security> header; nested exception is: \n" +
- "\torg.swssf.policy.PolicyViolationException: \n" +
+ "\torg.apache.ws.security.policy.stax.PolicyViolationException: \n" +
"Timestamp must not be present");
}
}
@@ -640,7 +640,7 @@ public class AsymmetricBindingIntegratio
} catch (XMLStreamException e) {
Assert.assertTrue(e.getCause() instanceof WSSecurityException);
Assert.assertEquals(e.getCause().getMessage(), "An error was discovered processing the <wsse:Security> header; nested exception is: \n" +
- "\torg.swssf.policy.PolicyViolationException: \n" +
+ "\torg.apache.ws.security.policy.stax.PolicyViolationException: \n" +
"Element /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Security/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp must be signed");
}
}
@@ -765,7 +765,7 @@ public class AsymmetricBindingIntegratio
} catch (XMLStreamException e) {
Assert.assertTrue(e.getCause() instanceof WSSecurityException);
Assert.assertEquals(e.getCause().getMessage(), "An error was discovered processing the <wsse:Security> header; nested exception is: \n" +
- "\torg.apache.ws.secpolicy.WSSPolicyException: Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}UsernameToken not satisfied");
+ "\torg.apache.ws.security.policy.WSSPolicyException: Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}UsernameToken not satisfied");
}
}
@@ -990,7 +990,7 @@ public class AsymmetricBindingIntegratio
} catch (XMLStreamException e) {
Assert.assertTrue(e.getCause() instanceof WSSecurityException);
Assert.assertEquals(e.getCause().getMessage(), "An error was discovered processing the <wsse:Security> header; nested exception is: \n" +
- "\torg.swssf.policy.PolicyViolationException: \n" +
+ "\torg.apache.ws.security.policy.stax.PolicyViolationException: \n" +
"Asymmetric algorithm http://www.w3.org/2001/04/xmldsig-more#rsa-sha512 does not meet policy");
}
}
@@ -1107,7 +1107,7 @@ public class AsymmetricBindingIntegratio
} catch (XMLStreamException e) {
Assert.assertTrue(e.getCause() instanceof WSSecurityException);
Assert.assertEquals(e.getCause().getMessage(), "An error was discovered processing the <wsse:Security> header; nested exception is: \n" +
- "\torg.swssf.policy.PolicyViolationException: \n" +
+ "\torg.apache.ws.security.policy.stax.PolicyViolationException: \n" +
"C14N algorithm http://www.w3.org/2006/12/xml-c14n11 does not meet policy");
}
}
@@ -1222,7 +1222,7 @@ public class AsymmetricBindingIntegratio
} catch (XMLStreamException e) {
Assert.assertTrue(e.getCause() instanceof WSSecurityException);
Assert.assertEquals(e.getCause().getMessage(), "An error was discovered processing the <wsse:Security> header; nested exception is: \n" +
- "\torg.swssf.policy.PolicyViolationException: \n" +
+ "\torg.apache.ws.security.policy.stax.PolicyViolationException: \n" +
"Digest algorithm http://www.w3.org/2001/04/xmldsig-more#md5 does not meet policy");
}
}
@@ -1336,7 +1336,7 @@ public class AsymmetricBindingIntegratio
} catch (XMLStreamException e) {
Assert.assertTrue(e.getCause() instanceof WSSecurityException);
Assert.assertEquals(e.getCause().getMessage(), "An error was discovered processing the <wsse:Security> header; nested exception is: \n" +
- "\torg.swssf.policy.PolicyViolationException: \n" +
+ "\torg.apache.ws.security.policy.stax.PolicyViolationException: \n" +
"Encryption algorithm http://www.w3.org/2001/04/xmlenc#tripledes-cbc does not meet policy\n" +
"Symmetric encryption algorithm key length 192 does not meet policy");
}
@@ -1556,7 +1556,7 @@ public class AsymmetricBindingIntegratio
} catch (XMLStreamException e) {
Assert.assertTrue(e.getCause() instanceof WSSecurityException);
Assert.assertEquals(e.getCause().getMessage(), "An error was discovered processing the <wsse:Security> header; nested exception is: \n" +
- "\torg.swssf.policy.PolicyViolationException: \n" +
+ "\torg.apache.ws.security.policy.stax.PolicyViolationException: \n" +
"Element /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Security/{http://www.w3.org/2000/09/xmldsig#}Signature must be encrypted");
}
}
@@ -1669,7 +1669,7 @@ public class AsymmetricBindingIntegratio
} catch (XMLStreamException e) {
Assert.assertTrue(e.getCause() instanceof WSSecurityException);
Assert.assertEquals(e.getCause().getMessage(), "An error was discovered processing the <wsse:Security> header; nested exception is: \n" +
- "\torg.swssf.policy.PolicyViolationException: \n" +
+ "\torg.apache.ws.security.policy.stax.PolicyViolationException: \n" +
"Element /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Security/{http://www.w3.org/2000/09/xmldsig#}Signature must not be encrypted");
}
}
@@ -1900,7 +1900,7 @@ public class AsymmetricBindingIntegratio
} catch (XMLStreamException e) {
Assert.assertTrue(e.getCause() instanceof WSSecurityException);
Assert.assertEquals(e.getCause().getMessage(), "An error was discovered processing the <wsse:Security> header; nested exception is: \n" +
- "\torg.swssf.policy.PolicyViolationException: \n" +
+ "\torg.apache.ws.security.policy.stax.PolicyViolationException: \n" +
"Element /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://schemas.xmlsoap.org/wsdl/}definitions must be signed");
}
}
@@ -2012,7 +2012,7 @@ public class AsymmetricBindingIntegratio
} catch (XMLStreamException e) {
Assert.assertTrue(e.getCause() instanceof WSSecurityException);
Assert.assertEquals(e.getCause().getMessage(), "An error was discovered processing the <wsse:Security> header; nested exception is: \n" +
- "\torg.swssf.policy.PolicyViolationException: \n" +
+ "\torg.apache.ws.security.policy.stax.PolicyViolationException: \n" +
"Policy enforces LaxTsFirst but X509Token occured first");
}
}*/
Copied: webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AsymmetricBindingTest.java (from r1373765, webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/swssf/policy/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?p2=webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/apache/ws/security/policy/stax/test/AsymmetricBindingTest.java&p1=webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/swssf/policy/test/AsymmetricBindingTest.java&r1=1373765&r2=1373826&rev=1373826&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-policy/src/test/java/org/swssf/policy/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 13:32:03 2012
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.policy.test;
+package org.apache.ws.security.policy.stax.test;
-import org.swssf.policy.PolicyEnforcer;
-import org.swssf.policy.PolicyViolationException;
+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.*;