Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TokenProtectionTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TokenProtectionTest.java?rev=1306723&r1=1306722&r2=1306723&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TokenProtectionTest.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TokenProtectionTest.java Thu Mar 29 06:47:44 2012 @@ -45,6 +45,11 @@ public class TokenProtectionTest extends String policyString = "<sp:AsymmetricBinding xmlns:sp=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702\"; xmlns:sp3=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802\";>\n" + "<wsp:Policy xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\";>\n" + + " <sp:AlgorithmSuite>\n" + + " <wsp:Policy>\n" + + " <sp:Basic256/>\n" + + " </wsp:Policy>\n" + + " </sp:AlgorithmSuite>\n" + "<sp:ProtectTokens/>\n" + "</wsp:Policy>\n" + "</sp:AsymmetricBinding>"; @@ -118,6 +123,11 @@ public class TokenProtectionTest extends String policyString = "<sp:AsymmetricBinding xmlns:sp=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702\"; xmlns:sp3=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802\";>\n" + "<wsp:Policy xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\";>\n" + + " <sp:AlgorithmSuite>\n" + + " <wsp:Policy>\n" + + " <sp:Basic256/>\n" + + " </wsp:Policy>\n" + + " </sp:AlgorithmSuite>\n" + "</wsp:Policy>\n" + "</sp:AsymmetricBinding>"; PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString); @@ -188,6 +198,11 @@ public class TokenProtectionTest extends String policyString = "<sp:AsymmetricBinding xmlns:sp=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702\"; xmlns:sp3=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802\";>\n" + "<wsp:Policy xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\";>\n" + + " <sp:AlgorithmSuite>\n" + + " <wsp:Policy>\n" + + " <sp:Basic256/>\n" + + " </wsp:Policy>\n" + + " </sp:AlgorithmSuite>\n" + "<sp:ProtectTokens/>\n" + "</wsp:Policy>\n" + "</sp:AsymmetricBinding>"; @@ -228,6 +243,11 @@ public class TokenProtectionTest extends String policyString = "<sp:AsymmetricBinding xmlns:sp=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702\"; xmlns:sp3=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802\";>\n" + "<wsp:Policy xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\";>\n" + + " <sp:AlgorithmSuite>\n" + + " <wsp:Policy>\n" + + " <sp:Basic256/>\n" + + " </wsp:Policy>\n" + + " </sp:AlgorithmSuite>\n" + "<sp:ProtectTokens/>\n" + "</wsp:Policy>\n" + "</sp:AsymmetricBinding>"; @@ -268,6 +288,11 @@ public class TokenProtectionTest extends String policyString = "<sp:AsymmetricBinding xmlns:sp=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702\"; xmlns:sp3=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802\";>\n" + "<wsp:Policy xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\";>\n" + + " <sp:AlgorithmSuite>\n" + + " <wsp:Policy>\n" + + " <sp:Basic256/>\n" + + " </wsp:Policy>\n" + + " </sp:AlgorithmSuite>\n" + "<sp:ProtectTokens/>\n" + "</wsp:Policy>\n" + "</sp:AsymmetricBinding>"; @@ -309,6 +334,11 @@ public class TokenProtectionTest extends String policyString = "<sp:AsymmetricBinding xmlns:sp=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702\"; xmlns:sp3=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802\";>\n" + "<wsp:Policy xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\";>\n" + + " <sp:AlgorithmSuite>\n" + + " <wsp:Policy>\n" + + " <sp:Basic256/>\n" + + " </wsp:Policy>\n" + + " </sp:AlgorithmSuite>\n" + "<sp:ProtectTokens/>\n" + "</wsp:Policy>\n" + "</sp:AsymmetricBinding>"; @@ -381,6 +411,11 @@ public class TokenProtectionTest extends String policyString = "<sp:AsymmetricBinding xmlns:sp=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702\"; xmlns:sp3=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802\";>\n" + "<wsp:Policy xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\";>\n" + + " <sp:AlgorithmSuite>\n" + + " <wsp:Policy>\n" + + " <sp:Basic256/>\n" + + " </wsp:Policy>\n" + + " </sp:AlgorithmSuite>\n" + "<sp:ProtectTokens/>\n" + "</wsp:Policy>\n" + "</sp:AsymmetricBinding>";
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TransportBindingTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TransportBindingTest.java?rev=1306723&r1=1306722&r2=1306723&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TransportBindingTest.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TransportBindingTest.java Thu Mar 29 06:47:44 2012 @@ -45,6 +45,11 @@ public class TransportBindingTest extend String policyString = "<sp:TransportBinding xmlns:sp=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702\"; xmlns:sp3=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802\";>\n" + "<wsp:Policy xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\";>\n" + + " <sp:AlgorithmSuite>\n" + + " <wsp:Policy>\n" + + " <sp:Basic256/>\n" + + " </wsp:Policy>\n" + + " </sp:AlgorithmSuite>\n" + "<sp:IncludeTimestamp/>\n" + "</wsp:Policy>\n" + "</sp:TransportBinding>"; @@ -98,6 +103,11 @@ public class TransportBindingTest extend String policyString = "<sp:TransportBinding xmlns:sp=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702\"; xmlns:sp3=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802\";>\n" + "<wsp:Policy xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\";>\n" + + " <sp:AlgorithmSuite>\n" + + " <wsp:Policy>\n" + + " <sp:Basic256/>\n" + + " </wsp:Policy>\n" + + " </sp:AlgorithmSuite>\n" + "</wsp:Policy>\n" + "</sp:TransportBinding>"; PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString); @@ -129,6 +139,11 @@ public class TransportBindingTest extend String policyString = "<sp:TransportBinding xmlns:sp=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702\"; xmlns:sp3=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802\";>\n" + "<wsp:Policy xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\";>\n" + + " <sp:AlgorithmSuite>\n" + + " <wsp:Policy>\n" + + " <sp:Basic256/>\n" + + " </wsp:Policy>\n" + + " </sp:AlgorithmSuite>\n" + "<sp:IncludeTimestamp/>\n" + "</wsp:Policy>\n" + "</sp:TransportBinding>"; @@ -172,6 +187,11 @@ public class TransportBindingTest extend String policyString = "<sp:TransportBinding xmlns:sp=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702\"; xmlns:sp3=\"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802\";>\n" + "<wsp:Policy xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\";>\n" + + " <sp:AlgorithmSuite>\n" + + " <wsp:Policy>\n" + + " <sp:Basic256/>\n" + + " </wsp:Policy>\n" + + " </sp:AlgorithmSuite>\n" + "<sp:IncludeTimestamp/>\n" + "</wsp:Policy>\n" + "</sp:TransportBinding>"; Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/UsernameTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/UsernameTokenTest.java?rev=1306723&r1=1306722&r2=1306723&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/UsernameTokenTest.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/UsernameTokenTest.java Thu Mar 29 06:47:44 2012 @@ -71,6 +71,11 @@ public class UsernameTokenTest extends A " </sp:UsernameToken>\n" + " </wsp:Policy>\n" + "</sp:SignatureToken>\n" + + " <sp:AlgorithmSuite>\n" + + " <wsp:Policy>\n" + + " <sp:Basic256/>\n" + + " </wsp:Policy>\n" + + " </sp:AlgorithmSuite>\n" + "</wsp:Policy>\n" + "</sp:SymmetricBinding>"; @@ -140,6 +145,11 @@ public class UsernameTokenTest extends A " </sp:UsernameToken>\n" + " </wsp:Policy>\n" + "</sp:SignatureToken>\n" + + " <sp:AlgorithmSuite>\n" + + " <wsp:Policy>\n" + + " <sp:Basic256/>\n" + + " </wsp:Policy>\n" + + " </sp:AlgorithmSuite>\n" + "</wsp:Policy>\n" + "</sp:SymmetricBinding>"; Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/X509TokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/X509TokenTest.java?rev=1306723&r1=1306722&r2=1306723&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/X509TokenTest.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/X509TokenTest.java Thu Mar 29 06:47:44 2012 @@ -67,6 +67,11 @@ public class X509TokenTest extends Abstr " </sp:X509Token>\n" + " </wsp:Policy>\n" + "</sp:RecipientToken>\n" + + " <sp:AlgorithmSuite>\n" + + " <wsp:Policy>\n" + + " <sp:Basic256/>\n" + + " </wsp:Policy>\n" + + " </sp:AlgorithmSuite>\n" + "</wsp:Policy>\n" + "</sp:AsymmetricBinding>"; @@ -128,6 +133,11 @@ public class X509TokenTest extends Abstr " </sp:X509Token>\n" + " </wsp:Policy>\n" + "</sp:RecipientToken>\n" + + " <sp:AlgorithmSuite>\n" + + " <wsp:Policy>\n" + + " <sp:Basic256/>\n" + + " </wsp:Policy>\n" + + " </sp:AlgorithmSuite>\n" + "</wsp:Policy>\n" + "</sp:AsymmetricBinding>"; Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/asymmetricBindingPolicyC31.xml URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/asymmetricBindingPolicyC31.xml?rev=1306723&r1=1306722&r2=1306723&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/asymmetricBindingPolicyC31.xml (original) +++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/asymmetricBindingPolicyC31.xml Thu Mar 29 06:47:44 2012 @@ -5,12 +5,18 @@ <wsp:Policy> <sp:RecipientToken> <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Always"; /> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Always";> + <wsp:Policy> + </wsp:Policy> + </sp:X509Token> </wsp:Policy> </sp:RecipientToken> <sp:InitiatorToken> <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Always"; /> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Always";> + <wsp:Policy> + </wsp:Policy> + </sp:X509Token> </wsp:Policy> </sp:InitiatorToken> <sp:AlgorithmSuite> @@ -31,7 +37,10 @@ </sp:AsymmetricBinding> <sp:SignedEncryptedSupportingTokens> <wsp:Policy> - <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once"; /> + <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once";> + <wsp:Policy> + </wsp:Policy> + </sp:UsernameToken> </wsp:Policy> </sp:SignedEncryptedSupportingTokens> <sp:SignedEndorsingSupportingTokens> Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/symmetricBindingPolicyC21a.xml URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/symmetricBindingPolicyC21a.xml?rev=1306723&r1=1306722&r2=1306723&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/symmetricBindingPolicyC21a.xml (original) +++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/symmetricBindingPolicyC21a.xml Thu Mar 29 06:47:44 2012 @@ -10,6 +10,8 @@ <sp:RequestSecurityTokenTemplate> ... </sp:RequestSecurityTokenTemplate> + <wsp:Policy> + </wsp:Policy> </sp:IssuedToken> </wsp:Policy> </sp:ProtectionToken> @@ -31,7 +33,10 @@ </sp:SymmetricBinding> <sp:SignedEncryptedSupportingTokens> <wsp:Policy> - <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once"; /> + <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once";> + <wsp:Policy> + </wsp:Policy> + </sp:UsernameToken> </wsp:Policy> </sp:SignedEncryptedSupportingTokens> <sp:SignedEndorsingSupportingTokens> Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/symmetricBindingPolicyC21b.xml URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/symmetricBindingPolicyC21b.xml?rev=1306723&r1=1306722&r2=1306723&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/symmetricBindingPolicyC21b.xml (original) +++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/symmetricBindingPolicyC21b.xml Thu Mar 29 06:47:44 2012 @@ -10,6 +10,8 @@ <sp:RequestSecurityTokenTemplate> ... </sp:RequestSecurityTokenTemplate> + <wsp:Policy> + </wsp:Policy> </sp:IssuedToken> </wsp:Policy> </sp:EncryptionToken> @@ -20,6 +22,8 @@ <sp:RequestSecurityTokenTemplate> ... </sp:RequestSecurityTokenTemplate> + <wsp:Policy> + </wsp:Policy> </sp:IssuedToken> </wsp:Policy> </sp:SignatureToken> @@ -41,7 +45,10 @@ </sp:SymmetricBinding> <sp:SignedEncryptedSupportingTokens> <wsp:Policy> - <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once"; /> + <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once";> + <wsp:Policy> + </wsp:Policy> + </sp:UsernameToken> </wsp:Policy> </sp:SignedEncryptedSupportingTokens> <sp:SignedEndorsingSupportingTokens> Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/transportBindingPolicyC11.xml URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/transportBindingPolicyC11.xml?rev=1306723&r1=1306722&r2=1306723&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/transportBindingPolicyC11.xml (original) +++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/testdata/policy/transportBindingPolicyC11.xml Thu Mar 29 06:47:44 2012 @@ -5,7 +5,10 @@ <wsp:Policy> <sp:TransportToken> <wsp:Policy> - <sp:HttpsToken /> + <sp:HttpsToken> + <wsp:Policy> + </wsp:Policy> + </sp:HttpsToken> </wsp:Policy> </sp:TransportToken> <sp:AlgorithmSuite> @@ -23,7 +26,10 @@ </sp:TransportBinding> <sp:SignedSupportingTokens> <wsp:Policy> - <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once"; /> + <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once";> + <wsp:Policy> + </wsp:Policy> + </sp:UsernameToken> </wsp:Policy> </sp:SignedSupportingTokens> <sp:SignedEndorsingSupportingTokens>
