Author: dkulp Date: Fri Feb 17 17:25:10 2012 New Revision: 1245669 URL: http://svn.apache.org/viewvc?rev=1245669&view=rev Log: Merged revisions 1245666 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1245666 | dkulp | 2012-02-17 12:24:16 -0500 (Fri, 17 Feb 2012) | 9 lines Merged revisions 1245664 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1245664 | dkulp | 2012-02-17 12:22:04 -0500 (Fri, 17 Feb 2012) | 2 lines Use a valid policy ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml Propchange: cxf/branches/2.4.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml?rev=1245669&r1=1245668&r2=1245669&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml (original) +++ cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml Fri Feb 17 17:25:10 2012 @@ -20,6 +20,8 @@ <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";> <!-- interface --> <wsp:All> - <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"/> + <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata";> + <wsp:Policy/> + </wsam:Addressing> </wsp:All> </wsp:Policy> \ No newline at end of file
