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 2026/05/29 12:55:58 UTC
(ws-wss4j) branch 2_4_x-fixes updated: Fixing policy tests
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 2_4_x-fixes
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/2_4_x-fixes by this push:
new a8e1450bc Fixing policy tests
a8e1450bc is described below
commit a8e1450bc1f46ff256859727c54553db2d2065fb
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri May 29 13:55:43 2026 +0100
Fixing policy tests
---
policy/src/test/resources/policy/model/sp12/IssuedToken.xml | 6 +++++-
policy/src/test/resources/policy/model/sp12/SamlToken.xml | 3 +--
.../test/resources/policy/model/sp12/normalized/IssuedToken.xml | 7 ++++++-
.../test/resources/policy/model/sp12/serialized/IssuedToken.xml | 6 +++++-
.../src/test/resources/policy/model/sp12/serialized/SamlToken.xml | 3 +--
5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/policy/src/test/resources/policy/model/sp12/IssuedToken.xml b/policy/src/test/resources/policy/model/sp12/IssuedToken.xml
index 50fa03b90..4ccfa7f71 100644
--- a/policy/src/test/resources/policy/model/sp12/IssuedToken.xml
+++ b/policy/src/test/resources/policy/model/sp12/IssuedToken.xml
@@ -3,7 +3,11 @@
xmlns:wsp="http://www.w3.org/ns/ws-policy">
<sp:IssuedToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never" wsp:Optional="true" wsp:Ignorable="true">
<sp:IssuerName>issuerName</sp:IssuerName>
- <sp:RequestSecurityTokenTemplate TrustVersion="http://trust/sowieso">
+ <sp:RequestSecurityTokenTemplate>
+ <wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512">
+ <wst:TokenType>tokenType</wst:TokenType>
+ <wst:RequestType>requestType</wst:RequestType>
+ </wst:RequestSecurityToken>
</sp:RequestSecurityTokenTemplate>
<wsp:Policy>
<sp:RequireImpliedDerivedKeys/>
diff --git a/policy/src/test/resources/policy/model/sp12/SamlToken.xml b/policy/src/test/resources/policy/model/sp12/SamlToken.xml
index d02ba4e2e..22c0914f1 100644
--- a/policy/src/test/resources/policy/model/sp12/SamlToken.xml
+++ b/policy/src/test/resources/policy/model/sp12/SamlToken.xml
@@ -1,10 +1,9 @@
<wsp:Policy
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
- xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512"
xmlns:wsp="http://www.w3.org/ns/ws-policy">
<sp:SamlToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once" wsp:Optional="true" wsp:Ignorable="true">
<sp:IssuerName>issuerName</sp:IssuerName>
- <wst:Claims>...</wst:Claims>
+ <wst:Claims xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</wst:Claims>
<wsp:Policy>
<sp:RequireDerivedKeys/>
<sp:RequireKeyIdentifierReference/>
diff --git a/policy/src/test/resources/policy/model/sp12/normalized/IssuedToken.xml b/policy/src/test/resources/policy/model/sp12/normalized/IssuedToken.xml
index 995d7a260..d688344ad 100644
--- a/policy/src/test/resources/policy/model/sp12/normalized/IssuedToken.xml
+++ b/policy/src/test/resources/policy/model/sp12/normalized/IssuedToken.xml
@@ -6,7 +6,12 @@
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never"
wsp:Ignorable="true">
<sp:IssuerName>issuerName</sp:IssuerName>
- <sp:RequestSecurityTokenTemplate TrustVersion="http://trust/sowieso"/>
+ <sp:RequestSecurityTokenTemplate>
+ <wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512">
+ <wst:TokenType>tokenType</wst:TokenType>
+ <wst:RequestType>requestType</wst:RequestType>
+ </wst:RequestSecurityToken>
+ </sp:RequestSecurityTokenTemplate>
<wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy">
<wsp:ExactlyOne>
<wsp:All>
diff --git a/policy/src/test/resources/policy/model/sp12/serialized/IssuedToken.xml b/policy/src/test/resources/policy/model/sp12/serialized/IssuedToken.xml
index 50fa03b90..4ccfa7f71 100644
--- a/policy/src/test/resources/policy/model/sp12/serialized/IssuedToken.xml
+++ b/policy/src/test/resources/policy/model/sp12/serialized/IssuedToken.xml
@@ -3,7 +3,11 @@
xmlns:wsp="http://www.w3.org/ns/ws-policy">
<sp:IssuedToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never" wsp:Optional="true" wsp:Ignorable="true">
<sp:IssuerName>issuerName</sp:IssuerName>
- <sp:RequestSecurityTokenTemplate TrustVersion="http://trust/sowieso">
+ <sp:RequestSecurityTokenTemplate>
+ <wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512">
+ <wst:TokenType>tokenType</wst:TokenType>
+ <wst:RequestType>requestType</wst:RequestType>
+ </wst:RequestSecurityToken>
</sp:RequestSecurityTokenTemplate>
<wsp:Policy>
<sp:RequireImpliedDerivedKeys/>
diff --git a/policy/src/test/resources/policy/model/sp12/serialized/SamlToken.xml b/policy/src/test/resources/policy/model/sp12/serialized/SamlToken.xml
index d02ba4e2e..22c0914f1 100644
--- a/policy/src/test/resources/policy/model/sp12/serialized/SamlToken.xml
+++ b/policy/src/test/resources/policy/model/sp12/serialized/SamlToken.xml
@@ -1,10 +1,9 @@
<wsp:Policy
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
- xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512"
xmlns:wsp="http://www.w3.org/ns/ws-policy">
<sp:SamlToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once" wsp:Optional="true" wsp:Ignorable="true">
<sp:IssuerName>issuerName</sp:IssuerName>
- <wst:Claims>...</wst:Claims>
+ <wst:Claims xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</wst:Claims>
<wsp:Policy>
<sp:RequireDerivedKeys/>
<sp:RequireKeyIdentifierReference/>