[jboss-cvs] Picketlink SVN: r1010 - in trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws: jaas and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2011-06-17 16:10:37 -0400 (Fri, 17 Jun 2011)
New Revision: 1010

Modified:
   trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java
   trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java
Log:
revert the change back to use Source

Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java
===================================================================
--- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java	2011-06-17 18:37:01 UTC (rev 1009)
+++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java	2011-06-17 20:10:37 UTC (rev 1010)
@@ -43,6 +43,8 @@
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPFactory;
 import javax.xml.soap.SOAPMessage;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
 import javax.xml.ws.AsyncHandler;
 import javax.xml.ws.Binding;
 import javax.xml.ws.BindingProvider;
@@ -56,6 +58,7 @@
 
 import org.picketlink.identity.federation.core.saml.v2.common.IDGenerator;
 import org.picketlink.identity.federation.core.util.Base64;
+import org.picketlink.identity.federation.core.util.SOAPUtil;
 import org.picketlink.identity.federation.core.util.StringUtil;
 
 /**
@@ -71,7 +74,7 @@
  * @author Anil.Saldhana at redhat.com
  * @since May 10, 2011
  */
-public class PicketLinkDispatch implements Dispatch<SOAPMessage>
+public class PicketLinkDispatch implements Dispatch<Source>
 {
    @SuppressWarnings("rawtypes")
    private Dispatch parent;
@@ -123,7 +126,7 @@
    }
 
    @SuppressWarnings({"unchecked", "rawtypes"})
-   public SOAPMessage invoke(SOAPMessage soapMessage)
+   public Source invoke(Source requestMessage)
    { 
       PLMessageContext msgContext = new PLMessageContext();
       msgContext.put(MessageContext.MESSAGE_OUTBOUND_PROPERTY, Boolean.TRUE);
@@ -142,6 +145,15 @@
       }
       msgContext.put(MessageContext.SERVLET_REQUEST, request); 
       
+      SOAPMessage soapMessage = null;
+      try
+      {
+         soapMessage = SOAPUtil.create();
+      }
+      catch (SOAPException e2)
+      {
+         throw new RuntimeException(e2);
+      }
       String userName = (String) parent.getRequestContext().get(BindingProvider.USERNAME_PROPERTY);
       String passwd = (String) parent.getRequestContext().get(BindingProvider.PASSWORD_PROPERTY);
       if( StringUtil.isNotNull(userName))
@@ -165,6 +177,14 @@
          }
       }
       
+      try
+      {
+         SOAPUtil.addData(requestMessage, soapMessage);
+      }
+      catch (SOAPException e1)
+      {
+         throw new RuntimeException(e1);
+      }
       msgContext.setMessage(soapMessage);
       
       List<Handler> handlers = getBinding().getHandlerChain();
@@ -195,23 +215,30 @@
          throw new RuntimeException(e);
       }
       
-      return response;
+      try
+      {
+         return new DOMSource(SOAPUtil.getSOAPData(response));
+      }
+      catch (SOAPException e)
+      {
+         throw new RuntimeException(e);
+      }
    }
 
    @SuppressWarnings("unchecked")
-   public Response<SOAPMessage> invokeAsync(SOAPMessage msg)
+   public Response<Source> invokeAsync(Source msg)
    { 
       return parent.invokeAsync(msg);
    }
 
    @SuppressWarnings("unchecked")
-   public Future<?> invokeAsync(SOAPMessage msg, AsyncHandler<SOAPMessage> handler)
+   public Future<?> invokeAsync(Source msg, AsyncHandler<Source> handler)
    {
       return parent.invokeAsync(msg, handler);
    }
 
    @SuppressWarnings("unchecked")
-   public void invokeOneWay(SOAPMessage msg)
+   public void invokeOneWay(Source msg)
    {
       parent.invokeOneWay(msg);
    }

Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java
===================================================================
--- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java	2011-06-17 18:37:01 UTC (rev 1009)
+++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java	2011-06-17 20:10:37 UTC (rev 1010)
@@ -28,7 +28,7 @@
 
 import javax.net.ssl.SSLSocketFactory;
 import javax.security.auth.login.LoginException;
-import javax.xml.soap.SOAPMessage;
+import javax.xml.transform.Source;
 import javax.xml.ws.Binding;
 import javax.xml.ws.Dispatch;
 import javax.xml.ws.handler.Handler;
@@ -129,7 +129,7 @@
          super(config); 
          
          //Get pre-constructed Dispatch from super
-         Dispatch<SOAPMessage> dispatch = super.getDispatch();
+         Dispatch<Source> dispatch = super.getDispatch();
           
          String overrideDispatchStr = (String) options.get("overrideDispatch");
          if( StringUtil.isNotNull(overrideDispatchStr))