You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2003/10/20 05:49:46 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet ServletObjectAccess.java
weaver 2003/10/19 20:49:46
Modified: portal/src/java/org/apache/jetspeed/engine/servlet
ServletObjectAccess.java
Log:
change in method signatures
Revision Changes Path
1.2 +32 -10 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletObjectAccess.java
Index: ServletObjectAccess.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletObjectAccess.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletObjectAccess.java 28 Jul 2003 23:47:39 -0000 1.1
+++ ServletObjectAccess.java 20 Oct 2003 03:49:46 -0000 1.2
@@ -53,9 +53,16 @@
*/
package org.apache.jetspeed.engine.servlet;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+import org.apache.pluto.core.CoreUtils;
+import org.apache.pluto.core.InternalPortletRequest;
+import org.apache.pluto.core.InternalPortletResponse;
+import org.apache.pluto.om.window.PortletWindow;
import org.apache.pluto.services.factory.FactoryManager;
/**
@@ -67,20 +74,35 @@
*/
public abstract class ServletObjectAccess
{
- public static HttpServletRequest getServletRequest(HttpServletRequest request)
+ public static HttpServletRequest getServletRequest(HttpServletRequest request, PortletWindow window)
{
- return requestFactory.getServletRequest(request);
+ System.out.println("n");
+ return requestFactory.getServletRequest(request, window);
}
- public static HttpServletResponse getServletResponse(HttpServletResponse response)
+ public static HttpServletResponse getServletResponse(HttpServletResponse response, PortletWindow window)
{
return responseFactory.getServletResponse(response);
}
-
- private static ServletRequestFactory requestFactory =
- (ServletRequestFactory)FactoryManager.getFactory(javax.servlet.http.HttpServletRequest.class);
- private static ServletResponseFactory responseFactory =
- (ServletResponseFactory)FactoryManager.getFactory(javax.servlet.http.HttpServletResponse.class);
-
+ public static HttpServletRequest getServletRequest(PortletRequest request)
+ {
+ InternalPortletRequest internalPortletRequest = CoreUtils.getInternalRequest(request);
+
+ return (HttpServletRequest) ((javax.servlet.http.HttpServletRequestWrapper) internalPortletRequest).getRequest();
+
+ }
+
+ public static HttpServletResponse getServletResponse(PortletResponse response)
+ {
+ InternalPortletResponse internalPortletResponse = CoreUtils.getInternalResponse(response);
+ return (HttpServletResponse) ((HttpServletResponseWrapper) internalPortletResponse).getResponse();
+
+ }
+
+ private static ServletRequestFactory requestFactory =
+ (ServletRequestFactory) FactoryManager.getFactory(javax.servlet.http.HttpServletRequest.class);
+ private static ServletResponseFactory responseFactory =
+ (ServletResponseFactory) FactoryManager.getFactory(javax.servlet.http.HttpServletResponse.class);
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org