svn commit: r702809 - /portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java

[cd...@apache.org]

Author: cdoremus
Date: Wed Oct  8 04:21:08 2008
New Revision: 702809

URL: http://svn.apache.org/viewvc?rev=702809&view=rev
Log:
Applied patch submitted in PLUTO_507 with a small change to make it compatible. Thanks Brian!

Modified:
    portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java

Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java?rev=702809&r1=702808&r2=702809&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java Wed Oct  8 04:21:08 2008
@@ -16,7 +16,14 @@
  */
 package org.apache.pluto.driver;
 
-import java.io.IOException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.PortletContainer;
+import org.apache.pluto.PortletContainerException;
+import org.apache.pluto.driver.core.PortalRequestContext;
+import org.apache.pluto.driver.core.PortletWindowImpl;
+import org.apache.pluto.driver.services.portal.PortletWindowConfig;
+import org.apache.pluto.driver.url.PortalURL;
 
 import javax.portlet.PortletException;
 import javax.servlet.Filter;
@@ -28,18 +35,12 @@
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.driver.core.PortalRequestContext;
-import org.apache.pluto.driver.core.PortletWindowImpl;
-import org.apache.pluto.driver.services.portal.PortletWindowConfig;
-import org.apache.pluto.driver.url.PortalURL;
+import java.io.IOException;
 
 /**
- * The controller filter used to drive static portlet pages.
+ * The controller filter used to drive static portlet pages (see
+ * <a href="http://portals.apache.org/pluto/faq.html#simple-embed">
+ * http://portals.apache.org/pluto/faq.html#simple-embed</a> in Pluto FAQ).
  *
  * @version 1.0
  * @since March 28, 2006
@@ -105,11 +106,10 @@
             //  filter dispatchers.  B/C of this, we make sure we haven't
             //  allready processed this request. No infinite loops for us!!!!
             if (PortalRequestContext.getContext(req) == null) {
-                PortalRequestContext ctx = doPortletPrepare(req, (HttpServletResponse) response);
-                LOG.debug("Render Path: " + ctx.getRequestedPortalURL().getRenderPath());
-                LOG.debug("Servlet Path: " + ctx.getRequestedPortalURL().getServletPath());
-                PortalURL url = ctx.getRequestedPortalURL();
-                if (url.getActionWindow() != null) {
+                boolean actionRequestProcessed = 
+                	doPortletPrepare(req, (HttpServletResponse) response);
+
+                if (actionRequestProcessed) {
                     return;
                 }
 
@@ -137,10 +137,16 @@
      * @param response
      * @throws java.io.IOException            if an io exception occurs
      * @throws javax.servlet.ServletException if a servlet exception occurs
+     * @return A boolean flag indicating whether or not an action request was
+     * processed. A value of true indicates than an action request was 
+     * processed while a value of false indicates that an action request was
+     * NOT processed.
      */
-    public PortalRequestContext doPortletPrepare(HttpServletRequest request, HttpServletResponse response)
+    public boolean doPortletPrepare(HttpServletRequest request, HttpServletResponse response)
         throws IOException, ServletException {
 
+    	boolean actionRequestProcessed = false;
+    	
         PortalRequestContext portalRequestContext =
             new PortalRequestContext(getServletContext(), request, response);
 
@@ -170,8 +176,15 @@
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Action request processed.\n\n");
             }
+            
+            actionRequestProcessed = true;
+        }
+        
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Render Path: " + portalURL.getRenderPath());
+            LOG.debug("Servlet Path: " + portalURL.getServletPath());        	
         }
 
-        return portalRequestContext;
+        return actionRequestProcessed;
     }
 }