You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by dl...@apache.org on 2006/12/29 01:53:34 UTC

svn commit: r490895 - /portals/wsrp4j/trunk/consumer-proxyportlet/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/ProxyPortlet.java

Author: dlouzan
Date: Thu Dec 28 16:53:34 2006
New Revision: 490895

URL: http://svn.apache.org/viewvc?view=rev&rev=490895
Log:
Modified superclass and methods for being able to use the portlet filter framework implemented on commons-consumer.

Modified:
    portals/wsrp4j/trunk/consumer-proxyportlet/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/ProxyPortlet.java

Modified: portals/wsrp4j/trunk/consumer-proxyportlet/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/ProxyPortlet.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-proxyportlet/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/ProxyPortlet.java?view=diff&rev=490895&r1=490894&r2=490895
==============================================================================
--- portals/wsrp4j/trunk/consumer-proxyportlet/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/ProxyPortlet.java (original)
+++ portals/wsrp4j/trunk/consumer-proxyportlet/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/ProxyPortlet.java Thu Dec 28 16:53:34 2006
@@ -24,7 +24,6 @@
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
-import javax.portlet.GenericPortlet;
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletContext;
 import javax.portlet.PortletException;
@@ -57,7 +56,7 @@
 
 import org.apache.wsrp4j.commons.util.Modes;
 import org.apache.wsrp4j.commons.util.ParameterChecker;
-import org.apache.wsrp4j.commons.consumer.util.PortletUtils;
+import org.apache.wsrp4j.commons.consumer.util.portlet.PortletUtils;
 import org.apache.wsrp4j.commons.util.Utility;
 import org.apache.wsrp4j.commons.util.WindowStates;
 import org.apache.wsrp4j.commons.util.configuration.ConfigurationParametersManager;
@@ -87,6 +86,7 @@
 import org.apache.wsrp4j.commons.consumer.driver.portlet.WSRPPortletImpl;
 
 import org.apache.wsrp4j.commons.consumer.util.ConsumerConstants;
+import org.apache.wsrp4j.commons.consumer.util.portlet.ControllerPortlet;
 
 import org.apache.wsrp4j.consumer.proxyportlet.SessionHandler;
 
@@ -98,7 +98,7 @@
  *
  * @version $Id$
  **/
-public class ProxyPortlet extends GenericPortlet {
+public class ProxyPortlet extends ControllerPortlet {
     
     // stores consumer specific information
     private ConsumerEnvironment consumerEnv;
@@ -134,16 +134,14 @@
      * @param config a <code>PortletConfig</code> object containing the portlet
      * configuration and initialization parameters
      **/
-    public void init(PortletConfig config) throws PortletException {
+    public void doInit(PortletConfig config) throws PortletException {
         
-        final String MN = "init";
+        final String MN = "doInit";
         
         if (log.isDebugEnabled()) {
             log.debug(Utility.strEnter(MN));
         }
         
-        super.init(config);
-        
         checker = new ParameterChecker();
         
         try {
@@ -205,10 +203,10 @@
      * @param request the portlet request
      * @param actionResponse the action response
      **/
-    public void processAction(ActionRequest request,
+    public void doProcessAction(ActionRequest request,
             ActionResponse actionResponse) throws PortletException {
         
-        String MN = "processAction";
+        String MN = "doProcessAction";
         
         if (log.isDebugEnabled()) {
             log.debug(Utility.strEnter(MN));
@@ -341,7 +339,7 @@
             }
             
         } catch (WSRPException e) {
-            handleProcessActionException(request, actionResponse, e);
+            throw new PortletException(e);
         } finally {
             if (log.isDebugEnabled()) {
                 log.debug(Utility.strExit(MN));
@@ -365,27 +363,15 @@
      * @param request the portlet request
      * @param renderResponse the render response
      **/
-    public void render(RenderRequest request, RenderResponse renderResponse)
+    public void doRender(RenderRequest request, RenderResponse renderResponse)
     throws PortletException, IOException {
         
-        String MN = "render";
+        String MN = "doRender";
 
         if (log.isDebugEnabled()) {
             log.debug(Utility.strEnter(MN));
         }
         
-        /**
-         * Check if we come from a previous call and there was an exception
-         */
-        String actionParam = request.getParameter(Constants.PROXYPORTLET_PARAM_ACTION);
-        String action = (actionParam == null) ? new String() : actionParam;
-        if (action.equals(Constants.PROXYPORTLET_ACTION_EXCEPTION)) {
-            request.setAttribute(Constants.PROXYPORTLET_ATTR_EXCEPTION,
-                    request.getParameter(Constants.PROXYPORTLET_PARAM_EXCEPTION));
-            PortletUtils.delegateToJSP(request, renderResponse,
-                    getPortletContext(), "/jsp/proxyportlet/errorPage.jsp");
-        }
-        
         /* This call assures that the ConsumerConstants.WSRP_PORTLET_CONTEXT_PATH
            attribute is created on the PortletContext */
         PortletUtils.setPortletContextPath(request, 
@@ -473,7 +459,7 @@
             }
             
         } catch (WSRPException e) {
-            handleRenderException(request, renderResponse, e);
+            throw new PortletException(e);
         }
 
         if (log.isDebugEnabled()) {
@@ -792,25 +778,6 @@
     
     protected ConsumerEnvironment getConsumerEnvironment() {
         return consumerEnv;
-    }
-    
-    private void handleRenderException(RenderRequest request, 
-            RenderResponse response, WSRPException e)
-    throws PortletException, IOException {
-        log.error(e.getMessage());
-        request.setAttribute(Constants.PROXYPORTLET_ATTR_EXCEPTION, 
-                e.toHTMLString());
-        PortletUtils.delegateToJSP(request, response, 
-                getPortletContext(), "/jsp/proxyportlet/errorPage.jsp");
-    }
-    
-    private void handleProcessActionException(ActionRequest request, 
-            ActionResponse response, WSRPException e) {
-        log.error(e.getMessage());
-        response.setRenderParameter(Constants.PROXYPORTLET_PARAM_ACTION, 
-                Constants.PROXYPORTLET_ACTION_EXCEPTION);
-        response.setRenderParameter(Constants.PROXYPORTLET_PARAM_EXCEPTION, 
-                e.toHTMLString());
     }
     
 }