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/02/16 16:29:53 UTC
svn commit: r1245025 - in /webservices/wss4j/branches/swssf: rampart-policy/
rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/
streaming-ws-policy/src/main/java/org/swssf/policy/
Author: coheigea
Date: Thu Feb 16 15:29:51 2012
New Revision: 1245025
URL: http://svn.apache.org/viewvc?rev=1245025&view=rev
Log:
Removed Axiom dependency from the policy code.
Modified:
webservices/wss4j/branches/swssf/rampart-policy/pom.xml
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/AbstractTestBase.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/AlgorithmSuiteTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/AsymmetricBindingTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/ContentEncryptedElementsTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/EncryptedElementsTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/EncryptedPartsTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/HttpsTokenTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/InitiatorTokenTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/IssuedTokenTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/KerberosTokenTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/KeyValueTokenTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/LayoutTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/PolicyNormalizationTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RecipientTokenTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RelTokenTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RequiredElementsTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RequiredPartsTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SamlTokenTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SecureConversationTokenTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SecurityContextTokenTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SignedElementsTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SignedPartsTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SpnegoContextTokenTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SupportingTokensTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SymmetricBindingTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/TransportBindingTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Trust10Test.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Trust13Test.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/UsernameTokenTest.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Wss10Test.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Wss11Test.java
webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/X509TokenTest.java
webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcerFactory.java
Modified: webservices/wss4j/branches/swssf/rampart-policy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/pom.xml?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/pom.xml (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/pom.xml Thu Feb 16 15:29:51 2012
@@ -47,12 +47,6 @@
<version>2.6</version>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>1.2.13-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/AbstractTestBase.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/AbstractTestBase.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/AbstractTestBase.java Thu Feb 16 15:29:51 2012
@@ -18,21 +18,23 @@
*/
package org.apache.ws.secpolicy.tests;
-import junit.framework.TestCase;
-import org.apache.neethi.Policy;
-import org.apache.neethi.PolicyEngine;
-import org.custommonkey.xmlunit.DetailedDiff;
-import org.custommonkey.xmlunit.Diff;
-import org.custommonkey.xmlunit.XMLUnit;
-
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamWriter;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
import java.util.List;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamWriter;
+
+import junit.framework.TestCase;
+
+import org.apache.neethi.Policy;
+import org.apache.neethi.PolicyBuilder;
+import org.custommonkey.xmlunit.DetailedDiff;
+import org.custommonkey.xmlunit.Diff;
+import org.custommonkey.xmlunit.XMLUnit;
+
/**
* @author $Author$
* @version $Revision$ $Date$
@@ -53,7 +55,7 @@ public abstract class AbstractTestBase e
XMLUnit.setIgnoreWhitespace(true);
final Diff diff = new Diff(expected, actual);
DetailedDiff myDiff = new DetailedDiff(diff);
- List allDifferences = myDiff.getAllDifferences();
+ List<?> allDifferences = myDiff.getAllDifferences();
assertEquals(myDiff.toString(), 0, allDifferences.size());
}
@@ -71,6 +73,10 @@ public abstract class AbstractTestBase e
}
protected Policy loadPolicy(String policy) throws Exception {
- return PolicyEngine.getPolicy(new ByteArrayInputStream(policy.getBytes("UTF-8")));
+ return loadPolicy(policy, new PolicyBuilder());
+ }
+
+ protected Policy loadPolicy(String policy, PolicyBuilder policyBuilder) throws Exception {
+ return policyBuilder.getPolicy(new ByteArrayInputStream(policy.getBytes("UTF-8")));
}
}
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/AlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/AlgorithmSuiteTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/AlgorithmSuiteTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/AlgorithmSuiteTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class AlgorithmSuiteTest extends
public void testAlgorithmSuite() throws Exception {
String fileName = "AlgorithmSuite.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/AsymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/AsymmetricBindingTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/AsymmetricBindingTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/AsymmetricBindingTest.java Thu Feb 16 15:29:51 2012
@@ -35,11 +35,11 @@ public class AsymmetricBindingTest exten
public void testAsymmetricBinding() throws Exception {
String fileName = "AsymmetricBinding.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/ContentEncryptedElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/ContentEncryptedElementsTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/ContentEncryptedElementsTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/ContentEncryptedElementsTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class ContentEncryptedElementsTes
public void testContentEncryptedElements() throws Exception {
String fileName = "ContentEncryptedElements.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/EncryptedElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/EncryptedElementsTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/EncryptedElementsTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/EncryptedElementsTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class EncryptedElementsTest exten
public void testEncryptedElements() throws Exception {
String fileName = "EncryptedElements.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/EncryptedPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/EncryptedPartsTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/EncryptedPartsTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/EncryptedPartsTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class EncryptedPartsTest extends
public void testEncryptedParts12() throws Exception {
String fileName = "EncryptedParts.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/HttpsTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/HttpsTokenTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/HttpsTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/HttpsTokenTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class HttpsTokenTest extends Abst
public void testHttpsToken() throws Exception {
String fileName = "HttpsToken.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/InitiatorTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/InitiatorTokenTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/InitiatorTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/InitiatorTokenTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class InitiatorTokenTest extends
public void testInitiatorToken() throws Exception {
String fileName = "InitiatorToken.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/IssuedTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/IssuedTokenTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/IssuedTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/IssuedTokenTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class IssuedTokenTest extends Abs
public void testIssuedToken() throws Exception {
String fileName = "IssuedToken.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/KerberosTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/KerberosTokenTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/KerberosTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/KerberosTokenTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class KerberosTokenTest extends A
public void testKerberosToken() throws Exception {
String fileName = "KerberosToken.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/KeyValueTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/KeyValueTokenTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/KeyValueTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/KeyValueTokenTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class KeyValueTokenTest extends A
public void testKeyValueToken() throws Exception {
String fileName = "KeyValueToken.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/LayoutTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/LayoutTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/LayoutTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/LayoutTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class LayoutTest extends Abstract
public void testLayout() throws Exception {
String fileName = "Layout.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/PolicyNormalizationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/PolicyNormalizationTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/PolicyNormalizationTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/PolicyNormalizationTest.java Thu Feb 16 15:29:51 2012
@@ -33,17 +33,17 @@ public class PolicyNormalizationTest ext
public void testWSP15_432Normalization() throws Exception {
String fileName = "WSP15_432-compact.xml";
String policyFile = loadPolicyFile("policy/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/WSP15_432-serialized.xml");
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/WSP15_432-serialized.xml");
String normalizedPolicyReferenceFile = loadPolicyFile("policy/WSP15_432-normalized.xml");
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
policy = policy.normalize(true);
Iterator<List<Assertion>> iterator = policy.getAlternatives();
int count = 0;
while (iterator.hasNext()) {
- List<Assertion> next = iterator.next();
+ iterator.next();
count++;
}
assertEquals(37, count);
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RecipientTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RecipientTokenTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RecipientTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RecipientTokenTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class RecipientTokenTest extends
public void testRecipientToken() throws Exception {
String fileName = "RecipientToken.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RelTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RelTokenTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RelTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RelTokenTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class RelTokenTest extends Abstra
public void testRelToken() throws Exception {
String fileName = "RelToken.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RequiredElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RequiredElementsTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RequiredElementsTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RequiredElementsTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class RequiredElementsTest extend
public void testRequiredElements() throws Exception {
String fileName = "RequiredElements.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RequiredPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RequiredPartsTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RequiredPartsTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/RequiredPartsTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class RequiredPartsTest extends A
public void testRequiredParts() throws Exception {
String fileName = "RequiredParts.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SamlTokenTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SamlTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SamlTokenTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class SamlTokenTest extends Abstr
public void testSamlToken() throws Exception {
String fileName = "SamlToken.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SecureConversationTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SecureConversationTokenTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SecureConversationTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SecureConversationTokenTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class SecureConversationTokenTest
public void testSecureConversationToken() throws Exception {
String fileName = "SecureConversationToken.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SecurityContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SecurityContextTokenTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SecurityContextTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SecurityContextTokenTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class SecurityContextTokenTest ex
public void testSecurityContextToken() throws Exception {
String fileName = "SecurityContextToken.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SignedElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SignedElementsTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SignedElementsTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SignedElementsTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class SignedElementsTest extends
public void testSignedElements12() throws Exception {
String fileName = "SignedElements.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SignedPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SignedPartsTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SignedPartsTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SignedPartsTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class SignedPartsTest extends Abs
public void testSignedParts12() throws Exception {
String fileName = "SignedParts.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SpnegoContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SpnegoContextTokenTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SpnegoContextTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SpnegoContextTokenTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class SpnegoContextTokenTest exte
public void testSpnegoContextToken() throws Exception {
String fileName = "SpnegoContextToken.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SupportingTokensTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SupportingTokensTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SupportingTokensTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SupportingTokensTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class SupportingTokensTest extend
public void testSupportingTokens() throws Exception {
String fileName = "SupportingTokens.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SymmetricBindingTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SymmetricBindingTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/SymmetricBindingTest.java Thu Feb 16 15:29:51 2012
@@ -35,11 +35,11 @@ public class SymmetricBindingTest extend
public void testSymmetricBinding() throws Exception {
String fileName = "SymmetricBinding.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/TransportBindingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/TransportBindingTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/TransportBindingTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/TransportBindingTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class TransportBindingTest extend
public void testTransportBinding() throws Exception {
String fileName = "TransportBinding.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Trust10Test.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Trust10Test.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Trust10Test.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Trust10Test.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class Trust10Test extends Abstrac
public void testTrust10_11() throws Exception {
String fileName = "Trust10.xml";
String policyFile = loadPolicyFile("policy/model/sp11/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp11/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp11/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp11/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Trust13Test.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Trust13Test.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Trust13Test.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Trust13Test.java Thu Feb 16 15:29:51 2012
@@ -35,11 +35,11 @@ public class Trust13Test extends Abstrac
public void testTrust13_12() throws Exception {
String fileName = "Trust13.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/UsernameTokenTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/UsernameTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/UsernameTokenTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class UsernameTokenTest extends A
public void testUsernameToken12() throws Exception {
String fileName = "UsernameToken.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Wss10Test.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Wss10Test.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Wss10Test.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Wss10Test.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class Wss10Test extends AbstractT
public void testWss10() throws Exception {
String fileName = "Wss10.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Wss11Test.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Wss11Test.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Wss11Test.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/Wss11Test.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class Wss11Test extends AbstractT
public void testWss11() throws Exception {
String fileName = "Wss11.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/X509TokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/X509TokenTest.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/X509TokenTest.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/test/java/org/apache/ws/secpolicy/tests/X509TokenTest.java Thu Feb 16 15:29:51 2012
@@ -34,11 +34,11 @@ public class X509TokenTest extends Abstr
public void testX509Token() throws Exception {
String fileName = "X509Token.xml";
String policyFile = loadPolicyFile("policy/model/sp12/" + fileName);
- String serializedPolicyRefereneFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
+ String serializedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/serialized/" + fileName);
String normalizedPolicyReferenceFile = loadPolicyFile("policy/model/sp12/normalized/" + fileName);
Policy policy = loadPolicy(policyFile);
String serializedPolicy = serializePolicy(policy);
- assertXMLisEqual(serializedPolicy, serializedPolicyRefereneFile);
+ assertXMLisEqual(serializedPolicy, serializedPolicyReferenceFile);
Iterator<List<Assertion>> alternativeIterator = policy.getAlternatives();
int count = 0;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcerFactory.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcerFactory.java?rev=1245025&r1=1245024&r2=1245025&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcerFactory.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcerFactory.java Thu Feb 16 15:29:51 2012
@@ -18,28 +18,40 @@
*/
package org.swssf.policy;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.wsdl.Binding;
+import javax.wsdl.BindingOperation;
+import javax.wsdl.Definition;
+import javax.wsdl.Operation;
+import javax.wsdl.Port;
+import javax.wsdl.PortType;
+import javax.wsdl.Service;
+import javax.wsdl.WSDLElement;
+import javax.wsdl.WSDLException;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.wsdl.extensions.UnknownExtensibilityElement;
+import javax.wsdl.extensions.soap.SOAPOperation;
+import javax.wsdl.extensions.soap12.SOAP12Operation;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.neethi.Policy;
-import org.apache.neethi.PolicyEngine;
-import org.apache.neethi.builders.AssertionBuilder;
+import org.apache.neethi.PolicyBuilder;
import org.apache.ws.secpolicy.WSSPolicyException;
import org.swssf.wss.ext.WSSConstants;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import javax.wsdl.*;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.wsdl.extensions.soap12.SOAP12Operation;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-import java.net.URL;
-import java.util.*;
-
/**
* PolicyEnforcerFactory builds a map of all the possible effective Policies
* and caches them for reuse
@@ -55,14 +67,6 @@ public class PolicyEnforcerFactory {
private List<OperationPolicy> operationPolicies;
private Map<Element, Policy> elementPolicyCache;
- private static void addAssertionBuilder(AssertionBuilder assertionBuilder) {
- QName[] knownElements = assertionBuilder.getKnownElements();
- for (int i = 0; i < knownElements.length; i++) {
- QName knownElement = knownElements[i];
- PolicyEngine.registerBuilder(knownElement, assertionBuilder);
- }
- }
-
private PolicyEnforcerFactory() {
elementPolicyCache = new HashMap<Element, Policy>();
}
@@ -299,7 +303,8 @@ public class PolicyEnforcerFactory {
if (elementPolicyCache.containsKey(element)) {
return elementPolicyCache.get(element);
}
- Policy policy = PolicyEngine.getPolicy(element);
+ PolicyBuilder policyBuilder = new PolicyBuilder();
+ Policy policy = policyBuilder.getPolicy(element);
elementPolicyCache.put(element, policy);
return policy;
}