Changeset 5029

Timestamp:

01/28/10 11:48:37 (2 years ago)

Author:

mtld

Message:

support setting cookies at webservice responses

Location:

branches/release-0.14.x

Files:

• ChangeLog (modified) (1 diff)
• pustefix-core/src/main/java/de/schlund/pfixcore/workflow/ContextImpl.java (modified) (2 diffs)
• pustefix-core/src/main/java/de/schlund/pfixcore/workflow/context/RequestContextImpl.java (modified) (1 diff)
• pustefix-webservices/pustefix-webservices-jaxws/src/main/java/org/pustefixframework/webservices/jaxws/JAXWSProcessor.java (modified) (4 diffs)
• pustefix-webservices/pustefix-webservices-jsonws/src/main/java/org/pustefixframework/webservices/jsonws/JSONWSProcessor.java (modified) (3 diffs)

branches/release-0.14.x/ChangeLog

@@ +1 @@
+2010-01-28  Martin Leidig  <mleidig@schlund.de>
+
+        Added support for setting cookies at webservice responses.
+
+        Therefore cookies set at the context during processing of a
+        webservice request are added to the HttpServletResponse
+        after the service object's method invocation and right before
+        writing the response.
+
 2010-01-13  Martin Leidig  <mleidig@schlund.de>
 

branches/release-0.14.x/pustefix-core/src/main/java/de/schlund/pfixcore/workflow/ContextImpl.java

@@ -19 +19 @@
 package de.schlund.pfixcore.workflow;
 
+import java.util.List;
 import java.util.Properties;
 
@@ -70 +71 @@
     }
     
+    public List<Cookie> getCookies() {
+        return getRequestContextForCurrentThreadWithError().getCookies();
+    }
+    
     public Cookie[] getRequestCookies() {
         return getRequestContextForCurrentThreadWithError().getRequestCookies();

branches/release-0.14.x/pustefix-core/src/main/java/de/schlund/pfixcore/workflow/context/RequestContextImpl.java

@@ -890 +890 @@
 
     public void addCookie(Cookie cookie) {
-        if (currentpservreq == null) {
-            throw new IllegalStateException("Cookies are only available witihin request handling");
-        }
         cookielist.add(cookie);
+    }
+    
+    public List<Cookie> getCookies() {
+        return cookielist;
     }
 

branches/release-0.14.x/pustefix-webservices/pustefix-webservices-jaxws/src/main/java/org/pustefixframework/webservices/jaxws/JAXWSProcessor.java

@@ -26 +26 @@
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -40 +41 @@
 import org.pustefixframework.webservices.ProcessingInfo;
 import org.pustefixframework.webservices.SOAPActionRequestWrapper;
+import org.pustefixframework.webservices.ServiceCallContext;
 import org.pustefixframework.webservices.ServiceException;
 import org.pustefixframework.webservices.ServiceProcessor;
@@ -59 +61 @@
 import com.sun.xml.ws.transport.http.servlet.ServletAdapterList;
 import com.sun.xml.ws.transport.http.servlet.WSServletDelegate;
+
+import de.schlund.pfixcore.workflow.Context;
+import de.schlund.pfixcore.workflow.ContextImpl;
 
 /**
@@ -220 +225 @@
             } finally {
                 ctx.endInvocation();
+                ServiceResponse res = ServiceCallContext.getCurrentContext().getServiceResponse();
+                if(res.getUnderlyingResponse() instanceof HttpServletResponse) {
+                    HttpServletResponse httpRes = (HttpServletResponse)res.getUnderlyingResponse();
+                    Context context = ServiceCallContext.getCurrentContext().getContext();
+                    if(context != null) {
+                        List<Cookie> cookies = ((ContextImpl)context).getCookies();
+                        for(Cookie cookie: cookies) {
+                            httpRes.addCookie(cookie);
+                        }
+                    }
+                }
             }
         }

branches/release-0.14.x/pustefix-webservices/pustefix-webservices-jsonws/src/main/java/org/pustefixframework/webservices/jsonws/JSONWSProcessor.java

@@ -29 +29 @@
 import java.util.List;
 
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.log4j.Logger;
-import org.pustefixframework.webservices.json.JSONArray;
-import org.pustefixframework.webservices.json.JSONObject;
-import org.pustefixframework.webservices.json.parser.JSONParser;
-
-import de.schlund.pfixcore.beans.BeanDescriptorFactory;
-import de.schlund.pfixcore.beans.InitException;
-import de.schlund.pfixcore.beans.metadata.DefaultLocator;
 import org.pustefixframework.webservices.ProcessingInfo;
 import org.pustefixframework.webservices.ServiceCallContext;
@@ -49 +45 @@
 import org.pustefixframework.webservices.fault.Fault;
 import org.pustefixframework.webservices.fault.FaultHandler;
+import org.pustefixframework.webservices.json.JSONArray;
+import org.pustefixframework.webservices.json.JSONObject;
+import org.pustefixframework.webservices.json.parser.JSONParser;
+
+import de.schlund.pfixcore.beans.BeanDescriptorFactory;
+import de.schlund.pfixcore.beans.InitException;
+import de.schlund.pfixcore.beans.metadata.DefaultLocator;
+import de.schlund.pfixcore.workflow.Context;
+import de.schlund.pfixcore.workflow.ContextImpl;
 
 /**
@@ -186 +191 @@
                 }
                 
+                if(res.getUnderlyingResponse() instanceof HttpServletResponse){
+                    HttpServletResponse httpRes = (HttpServletResponse)res.getUnderlyingResponse();
+                    Context context = ServiceCallContext.getCurrentContext().getContext();
+                    if(context != null) {
+                        List<Cookie> cookies = ((ContextImpl)context).getCookies();
+                        for(Cookie cookie: cookies) {
+                                httpRes.addCookie(cookie);
+                        }
+                    }
+                }
+                
                 res.setContentType("text/plain");
                 res.setCharacterEncoding("utf-8");