Author: dkulp Date: Fri Feb 17 17:26:18 2012 New Revision: 1245670 URL: http://svn.apache.org/viewvc?rev=1245670&view=rev Log: Merged revisions 1245669 via svn merge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........ r1245669 | dkulp | 2012-02-17 12:25:10 -0500 (Fri, 17 Feb 2012) | 17 lines 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.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertion.java cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertion.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertion.java?rev=1245670&r1=1245669&r2=1245670&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertion.java (original) +++ cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertion.java Fri Feb 17 17:26:18 2012 @@ -100,6 +100,7 @@ public class NestedPrimitiveAssertion ex } } if (null == policyElem) { + System.out.println(elem.getLocalName()); throw new PolicyException(new Message("UNEXPECTED_CHILD_ELEMENT_EXC", BUNDLE, PolicyConstants.POLICY_ELEM_NAME)); } Modified: cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java?rev=1245670&r1=1245669&r2=1245670&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java (original) +++ cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java Fri Feb 17 17:26:18 2012 @@ -91,7 +91,7 @@ public class PolicyAnnotationTest extend "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";); ns.put("wsp", PolicyConstants.NAMESPACE_XMLSOAP_200409); XPathUtils xpu = new XPathUtils(ns); - //org.apache.cxf.helpers.XMLUtils.printDOM(wsdl); + org.apache.cxf.helpers.XMLUtils.printDOM(wsdl); check(xpu, wsdl, "/wsdl:definitions/wsdl:service/", "TestImplServiceServicePolicy"); check(xpu, wsdl, "/wsdl:definitions/wsdl:service/wsdl:port", "TestImplPortPortPolicy"); check(xpu, wsdl, "/wsdl:definitions/wsdl:portType/", "TestInterfacePortTypePolicy"); Modified: cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml?rev=1245670&r1=1245669&r2=1245670&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml (original) +++ cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml Fri Feb 17 17:26:18 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
