taylor 2003/08/11 22:15:24
Modified: applications/demo/src/java/org/apache/jetspeed/demo/preferences
PreferencePortlet.java
container/src/java/org/apache/jetspeed/container
JetspeedContainerServlet.java
portal/src/java/org/apache/jetspeed/container
JetspeedPortletContainerWrapper.java
portal/src/java/org/apache/jetspeed/pipeline/valve/impl
ActionValveImpl.java
Log:
- Added action processing to the JetspeedContainerServlet
- Modified PreferencePortlet to check for request attributes set in action (works!)
Note: actions require another patch to Pluto
See the old Jetspeed-2 list for details on the patch
Revision Changes Path
1.3 +9 -3
jakarta-jetspeed-2/applications/demo/src/java/org/apache/jetspeed/demo/preferences/PreferencePortlet.java
Index: PreferencePortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/demo/src/java/org/apache/jetspeed/demo/preferences/PreferencePortlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PreferencePortlet.java 11 Aug 2003 23:31:34 -0000 1.2
+++ PreferencePortlet.java 12 Aug 2003 05:15:24 -0000 1.3
@@ -82,7 +82,13 @@
*/
protected void doView(RenderRequest request, RenderResponse response) throws
PortletException, IOException
{
-
+ String attribute = (String)request.getAttribute("invokeMessage");
+ if (attribute != null)
+ {
+ System.out.println("+++ Got the attribute: " + attribute);
+ response.setContentType("text/html");
+ response.getWriter().println("Got attribute set in ACTION: " +
attribute + "<br/>");
+ }
PortletContext context = getPortletContext();
PortletRequestDispatcher rd =
context.getRequestDispatcher("/WEB-INF/demo/preference/pref-view.jsp");
rd.include(request, response);
@@ -102,7 +108,7 @@
*/
public void processAction(ActionRequest request, ActionResponse response)
throws PortletException, IOException
{
- request.setAttribute("invokeMessge", "I was invoked!!!");
+ request.setAttribute("invokeMessage", "I was invoked!!!");
System.out.println("I was invoked!!!");
}
1.2 +27 -20
jakarta-jetspeed-2/container/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java
Index: JetspeedContainerServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/container/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedContainerServlet.java 28 Jul 2003 23:46:42 -0000 1.1
+++ JetspeedContainerServlet.java 12 Aug 2003 05:15:24 -0000 1.2
@@ -55,19 +55,19 @@
import java.io.IOException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.ServletException;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.Portlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.Portlet;
-
import org.apache.commons.lang.exception.ExceptionUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.factory.JetspeedPortletFactory;
@@ -231,20 +231,27 @@
return;
}
- res.getWriter().print(PHONEY_PORTLET_WINDOW);
- res.getWriter().print(portletDefinition.getName());
- res.getWriter().print(PHONEY_PORTLET_WINDOW);
-
- RenderRequest request =
(RenderRequest)req.getAttribute(ContainerConstants.PORTLET_REQUEST);
-
- RenderResponse response =
(RenderResponse)req.getAttribute(ContainerConstants.PORTLET_RESPONSE);
-
-
//res.getWriter().print("Rendering: Portlet Class = " +
entity.getPortletClass() + "<BR/>");
-
- portlet.render(request, response);
- res.getWriter().print(PHONEY_PORTLET_WINDOW);
+ if (method == ContainerConstants.METHOD_ACTION)
+ {
+ ActionRequest request =
(ActionRequest)req.getAttribute(ContainerConstants.PORTLET_REQUEST);
+ ActionResponse response =
(ActionResponse)req.getAttribute(ContainerConstants.PORTLET_RESPONSE);
+ portlet.processAction(request, response);
+ }
+ else if (method == ContainerConstants.METHOD_RENDER)
+ {
+ RenderRequest request =
(RenderRequest)req.getAttribute(ContainerConstants.PORTLET_REQUEST);
+ RenderResponse response =
(RenderResponse)req.getAttribute(ContainerConstants.PORTLET_RESPONSE);
+
+ res.getWriter().print(PHONEY_PORTLET_WINDOW);
+ res.getWriter().print(portletDefinition.getName());
+ res.getWriter().print(PHONEY_PORTLET_WINDOW);
+
+ portlet.render(request, response);
+
+ res.getWriter().print(PHONEY_PORTLET_WINDOW);
+ }
}
catch (Throwable t)
1.2 +5 -4
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/JetspeedPortletContainerWrapper.java
Index: JetspeedPortletContainerWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/JetspeedPortletContainerWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedPortletContainerWrapper.java 28 Jul 2003 23:47:37 -0000 1.1
+++ JetspeedPortletContainerWrapper.java 12 Aug 2003 05:15:24 -0000 1.2
@@ -114,9 +114,10 @@
{
PortletContainerFactory.
getPortletContainerOriginal().
- processPortletAction(portletWindow,
-
ServletObjectAccess.getServletRequest(servletRequest),
-
ServletObjectAccess.getServletResponse(servletResponse));
+ processPortletAction(portletWindow,
+ servletRequest, servletResponse);
+//
ServletObjectAccess.getServletRequest(servletRequest),
+//
ServletObjectAccess.getServletResponse(servletResponse));
}
public void portletLoad ( PortletWindow portletWindow,
1.2 +1 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/ActionValveImpl.java
Index: ActionValveImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/ActionValveImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ActionValveImpl.java 11 Aug 2003 23:30:26 -0000 1.1
+++ ActionValveImpl.java 12 Aug 2003 05:15:24 -0000 1.2
@@ -60,7 +60,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.container.PortletContainerFactory;
-import org.apache.jetspeed.exception.JetspeedException;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
import org.apache.jetspeed.pipeline.valve.ActionValve;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
