Author: richard.opalka(a)jboss.com Date: 2008-04-10 10:18:17 -0400 (Thu, 10 Apr 2008) New Revision: 6338 Modified: framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredOneWayService.wsdl framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredReqResService.wsdl framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/OneWayService.wsdl framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/ReqResService.wsdl Log: [JBWS-2097] use minimized version of WS-RM policy Modified: framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredOneWayService.wsdl =================================================================== --- framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredOneWayService.wsdl 2008-04-10 13:11:45 UTC (rev 6337) +++ framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredOneWayService.wsdl 2008-04-10 14:18:17 UTC (rev 6338) @@ -12,16 +12,12 @@ wsu:Id="wsrm11policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... <wsp:All> - <wsrmp:DeliveryAssurance xmlns:wsrmp="http://docs.oasis-open.org/ws-rx/wsrmp/200702"> - <wsp:Policy> - <wsp:ExactlyOne> - <wsp:All> - <wsrmp:ExactlyOnce/> - <wsrmp:InOrder/> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - </wsrmp:DeliveryAssurance> + <wsp:ExactlyOne> + <wsp:All> + <ns1:RMAssertion xmlns:ns1="http://docs.oasis-open.org/ws-rx/wsrmp/200702"/> + <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"/> + </wsp:All> + </wsp:ExactlyOne> </wsp:All> </wsp:Policy> <types> Modified: framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredReqResService.wsdl =================================================================== --- framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredReqResService.wsdl 2008-04-10 13:11:45 UTC (rev 6337) +++ framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredReqResService.wsdl 2008-04-10 14:18:17 UTC (rev 6338) @@ -12,16 +12,12 @@ wsu:Id="wsrm11policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... <wsp:All> - <wsrmp:DeliveryAssurance xmlns:wsrmp="http://docs.oasis-open.org/ws-rx/wsrmp/200702"> - <wsp:Policy> - <wsp:ExactlyOne> - <wsp:All> - <wsrmp:ExactlyOnce/> - <wsrmp:InOrder/> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - </wsrmp:DeliveryAssurance> + <wsp:ExactlyOne> + <wsp:All> + <ns1:RMAssertion xmlns:ns1="http://docs.oasis-open.org/ws-rx/wsrmp/200702"/> + <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"/> + </wsp:All> + </wsp:ExactlyOne> </wsp:All> </wsp:Policy> <types> Modified: framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/OneWayService.wsdl =================================================================== --- framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/OneWayService.wsdl 2008-04-10 13:11:45 UTC (rev 6337) +++ framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/OneWayService.wsdl 2008-04-10 14:18:17 UTC (rev 6338) @@ -12,16 +12,12 @@ wsu:Id="wsrm11policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... <wsp:All> - <wsrmp:DeliveryAssurance xmlns:wsrmp="http://docs.oasis-open.org/ws-rx/wsrmp/200702"> - <wsp:Policy> - <wsp:ExactlyOne> - <wsp:All> - <wsrmp:ExactlyOnce/> - <wsrmp:InOrder/> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - </wsrmp:DeliveryAssurance> + <wsp:ExactlyOne> + <wsp:All> + <ns1:RMAssertion xmlns:ns1="http://docs.oasis-open.org/ws-rx/wsrmp/200702"/> + <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"/> + </wsp:All> + </wsp:ExactlyOne> </wsp:All> </wsp:Policy> <types> Modified: framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/ReqResService.wsdl =================================================================== --- framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/ReqResService.wsdl 2008-04-10 13:11:45 UTC (rev 6337) +++ framework/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/ReqResService.wsdl 2008-04-10 14:18:17 UTC (rev 6338) @@ -12,16 +12,12 @@ wsu:Id="wsrm11policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... <wsp:All> - <wsrmp:DeliveryAssurance xmlns:wsrmp="http://docs.oasis-open.org/ws-rx/wsrmp/200702"> - <wsp:Policy> - <wsp:ExactlyOne> - <wsp:All> - <wsrmp:ExactlyOnce/> - <wsrmp:InOrder/> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - </wsrmp:DeliveryAssurance> + <wsp:ExactlyOne> + <wsp:All> + <ns1:RMAssertion xmlns:ns1="http://docs.oasis-open.org/ws-rx/wsrmp/200702"/> + <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"/> + </wsp:All> + </wsp:ExactlyOne> </wsp:All> </wsp:Policy> <types>