Author: alessio.soldano(a)jboss.com Date: 2013-04-16 12:18:19 -0400 (Tue, 16 Apr 2013) New Revision: 17497 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl stack/cxf/trunk/modules/testsuite/pom.xml Log: [CXF-4875] Restoring tests after having moved to cxf 2.7.4 + fixing few policy namespaces Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2013-04-16 16:09:54 UTC (rev 17496) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2013-04-16 16:18:19 UTC (rev 17497) @@ -2,10 +2,10 @@ xmlns:jaxws='http://cxf.apache.org/jaxws' xmlns:p="http://cxf.apache.org/policy" xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd - http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd + http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> - <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> <wsp:Policy/> </wsam:Addressing> @@ -17,7 +17,7 @@ <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-rpc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpointImpl'> <jaxws:features> <p:policies> - <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> + <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/ns/ws-policy"/> </p:policies> </jaxws:features> </jaxws:endpoint> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl 2013-04-16 16:09:54 UTC (rev 17496) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl 2013-04-16 16:18:19 UTC (rev 17497) @@ -3,7 +3,7 @@ xmlns:tns="http://org.jboss.ws.jaxws.cxf/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="RMService" targetNamespace="http://org.jboss.ws.jaxws.cxf/wsrm"> - <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> <wsp:Policy/> </wsam:Addressing> @@ -43,7 +43,7 @@ <wsdl:service name="RMService"> <wsdl:port binding="tns:RMServiceSoapBinding" name="RMEndpointPort"> <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-rpc"/> - <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> + <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/ns/ws-policy"/> </wsdl:port> </wsdl:service> </wsdl:definitions> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-16 16:09:54 UTC (rev 17496) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-16 16:18:19 UTC (rev 17497) @@ -656,10 +656,6 @@ <!--# [JBWS-3441] Support CDI interceptors for POJO JAX-WS services --> <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> - <!-- # [CXF-4875] NPE resolving policy reference --> - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase*</exclude> - <!--# [AS7-537] Fixed on AS 8 or greater --> <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes> @@ -721,10 +717,6 @@ <!--# [JBWS-3441] Support CDI interceptors for POJO JAX-WS services --> <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> - <!-- # [CXF-4875] NPE resolving policy reference --> - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase*</exclude> - <!--# [AS7-537] Fixed on AS 8 or greater --> <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes> @@ -783,10 +775,6 @@ <!-- # [PLFED-390] PicketLink STS chokes on WS-Policy 1.5 tags --> <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> - <!-- # [CXF-4875] NPE resolving policy reference --> - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase*</exclude> - <!--# [AS7-537] Fixed on AS 8 or greater --> <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes> @@ -859,10 +847,6 @@ <!-- # [PLFED-390] PicketLink STS chokes on WS-Policy 1.5 tags --> <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> - <!-- # [CXF-4875] NPE resolving policy reference --> - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase*</exclude> - <!-- # [AS7-6850] Undertow: Missing Start Boundary, or boundary does not start on a new line --> <exclude>org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase*</exclude>