[jboss-cvs] Picketlink SVN: r305 - in federation/trunk: picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/wsdl and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: sguilhen at redhat.com
Date: 2010-06-15 12:31:29 -0400 (Tue, 15 Jun 2010)
New Revision: 305

Modified:
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java
   federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/wsdl/PicketLinkSTS.wsdl
Log:
PLFED-85: Fixed PicketLinkSTS.wsdl and made PicketLinkSTS implement Provider<Source> directly. These two changes allow PicketLinkSTS to run on top of JBossWS-CXF.

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java	2010-06-15 10:38:47 UTC (rev 304)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java	2010-06-15 16:31:29 UTC (rev 305)
@@ -28,6 +28,7 @@
 import javax.annotation.Resource;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
+import javax.xml.ws.Provider;
 import javax.xml.ws.Service;
 import javax.xml.ws.ServiceMode;
 import javax.xml.ws.WebServiceContext;
@@ -54,7 +55,7 @@
  */
 @WebServiceProvider(serviceName = "PicketLinkSTS", portName = "PicketLinkSTSPort", targetNamespace = "urn:picketlink:identity-federation:sts", wsdlLocation = "WEB-INF/wsdl/PicketLinkSTS.wsdl")
 @ServiceMode(value = Service.Mode.PAYLOAD)
-public class PicketLinkSTS implements SecurityTokenService
+public class PicketLinkSTS implements Provider<Source>//SecurityTokenService
 {
    private static Logger logger = Logger.getLogger(PicketLinkSTS.class);
 

Modified: federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/wsdl/PicketLinkSTS.wsdl
===================================================================
--- federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/wsdl/PicketLinkSTS.wsdl	2010-06-15 10:38:47 UTC (rev 304)
+++ federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/wsdl/PicketLinkSTS.wsdl	2010-06-15 16:31:29 UTC (rev 305)
@@ -9,12 +9,14 @@
     <xs:schema targetNamespace="urn:picketlink:identity-federation:sts" 
       xmlns:tns="urn:picketlink:identity-federation:sts" 
       xmlns:xs="http://www.w3.org/2001/XMLSchema"
-      version="1.0">
-      <xs:complexType name="MessageBody">
-        <xs:sequence>
+      version="1.0" elementFormDefault="qualified">
+      <xs:element name="MessageBody">
+        <xs:complexType>
+          <xs:sequence>
             <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any"/>
-        </xs:sequence>
-      </xs:complexType>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
     </xs:schema>
   </wsdl:types>
   <wsdl:message name="RequestSecurityToken">