[jbossws-commits] JBossWS SVN: r14439 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test: resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2011-05-26 10:41:58 -0400 (Thu, 26 May 2011)
New Revision: 14439

Modified:
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl
Log:
[JBWS-3302] Use WS-SecurityPolicy 1.2 and clean up namespaces in the wsdl contract


Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java	2011-05-26 13:27:17 UTC (rev 14438)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java	2011-05-26 14:41:58 UTC (rev 14439)
@@ -34,7 +34,8 @@
 import org.jboss.wsf.test.JBossWSTest;
 
 /**
- * WS-Security Policy username test case leveraging JAAS container integration
+ * WS-Security Policy username test case leveraging JAAS container integration.
+ * WS-SecurityPolicy 1.2 used for policies in the included wsdl contract .
  *
  * @author alessio.soldano at jboss.com
  * @since 26-May-2011

Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl	2011-05-26 13:27:17 UTC (rev 14438)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl	2011-05-26 14:41:58 UTC (rev 14439)
@@ -4,11 +4,9 @@
 		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
 		xmlns="http://schemas.xmlsoap.org/wsdl/"
-		xmlns:wsp="http://www.w3.org/ns/ws-policy" 
+		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" 
         xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 
-        xmlns:wsaws="http://www.w3.org/2005/08/addressing" 
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" 
-        xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy">
+        xmlns:wsaws="http://www.w3.org/2005/08/addressing">
   <types>
     <xsd:schema>
       <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" schemaLocation="SecurityService_schema1.xsd"/>
@@ -67,9 +65,9 @@
   <wsp:Policy wsu:Id="SecurityServiceUsernameUnsecureTransportPolicy">
         <wsp:ExactlyOne>
             <wsp:All>
-                <sp:SupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                <sp:SupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
                     <wsp:Policy>
-                        <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
                             <wsp:Policy>
                                 <sp:WssUsernameToken10/>
                             </wsp:Policy>