You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/07/08 22:28:12 UTC
svn commit: r792296 - in /cxf/branches/2.2.x-fixes: ./
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
systests/src/test/resources/wsdl_systest/DoubleIt.wsdl
Author: dkulp
Date: Wed Jul 8 20:28:12 2009
New Revision: 792296
URL: http://svn.apache.org/viewvc?rev=792296&view=rev
Log:
Merged revisions 792271 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r792271 | dkulp | 2009-07-08 15:13:58 -0400 (Wed, 08 Jul 2009) | 1 line
[CXF-2333] Add test (and fix) for the SignedElements token
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
cxf/branches/2.2.x-fixes/systests/src/test/resources/wsdl_systest/DoubleIt.wsdl
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 8 20:28:12 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=792296&r1=792295&r2=792296&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java (original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java Wed Jul 8 20:28:12 2009
@@ -333,6 +333,17 @@
}
}
}
+ if (!found && "signed".equals(type)) {
+ for (int x = 0; x < list.getLength(); x++) {
+ Element el = (Element)list.item(x);
+ for (WSDataRef r : refs) {
+ if (r.getName().equals(new QName(el.getNamespaceURI(),
+ el.getLocalName()))) {
+ found = true;
+ }
+ }
+ }
+ }
if (!found) {
ai.setNotAsserted("No " + type
+ " element found matching XPath " + expression);
Modified: cxf/branches/2.2.x-fixes/systests/src/test/resources/wsdl_systest/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/src/test/resources/wsdl_systest/DoubleIt.wsdl?rev=792296&r1=792295&r2=792296&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/src/test/resources/wsdl_systest/DoubleIt.wsdl (original)
+++ cxf/branches/2.2.x-fixes/systests/src/test/resources/wsdl_systest/DoubleIt.wsdl Wed Jul 8 20:28:12 2009
@@ -392,6 +392,10 @@
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
<sp:XPath xmlns:example1="http://cxf.apache.org/policytest/DoubleIt">//example1:DoubleIt/numberToDouble</sp:XPath>
</sp:EncryptedElements>
+ <sp:SignedElements
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <sp:XPath xmlns:example1="http://cxf.apache.org/policytest/DoubleIt">//example1:DoubleIt/numberToDouble</sp:XPath>
+ </sp:SignedElements>
<sp:RequiredElements
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
<sp:XPath xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">wsse:Security</sp:XPath>