[jboss-cvs] jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/consumer ...

[Chris Laprun]

  User: claprun 
  Date: 06/08/18 21:49:31

  Modified:    wsrp/src/main/org/jboss/portal/wsrp/consumer  
                        ActionHandler.java WSRPConsumerImpl.java
  Log:
  - Now exclude from offered portlets portlets which indicate they require cloning and issue warning.
  - Fixed warning when a producer returns an updated portlet handle.
  
  Revision  Changes    Path
  1.5       +4 -3      jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ActionHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ActionHandler.java	31 Jul 2006 00:20:52 -0000	1.4
  +++ ActionHandler.java	19 Aug 2006 01:49:31 -0000	1.5
  @@ -24,6 +24,7 @@
   
   import org.jboss.portal.common.util.ParameterValidation;
   import org.jboss.portal.portlet.InvokerUnavailableException;
  +import org.jboss.portal.portlet.Parameters;
   import org.jboss.portal.portlet.ParametersStateString;
   import org.jboss.portal.portlet.StateString;
   import org.jboss.portal.portlet.invocation.PortletInvocation;
  @@ -33,7 +34,6 @@
   import org.jboss.portal.portlet.spi.ActionContext;
   import org.jboss.portal.portlet.spi.InstanceContext;
   import org.jboss.portal.portlet.state.AccessMode;
  -import org.jboss.portal.portlet.Parameters;
   import org.jboss.portal.wsrp.WSRPTypeFactory;
   import org.jboss.portal.wsrp.WSRPUtils;
   import org.jboss.portal.wsrp.core.BlockingInteractionResponse;
  @@ -52,7 +52,7 @@
   
   /**
    * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    * @since 2.4 (May 31, 2006)
    */
   public class ActionHandler extends InvocationHandler
  @@ -177,7 +177,8 @@
            if (portletContext != null && !requestPrecursor.portletHandle.equals(portletContext.getPortletHandle()))
            {
               // fix-me: we don't currently handle clones
  -            log.warn("Producer '");
  +            log.warn("Implicit clone operation not currently supported: producer '" + consumer.getProducerId()
  +               + "' updated the portlet handle.");
            }
   
            invocation.setResult(result);
  
  
  
  1.52      +8 -1      jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WSRPConsumerImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -b -r1.51 -r1.52
  --- WSRPConsumerImpl.java	10 Aug 2006 19:56:47 -0000	1.51
  +++ WSRPConsumerImpl.java	19 Aug 2006 01:49:31 -0000	1.52
  @@ -68,7 +68,7 @@
   /**
    * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
    * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
  - * @version $Revision: 1.51 $
  + * @version $Revision: 1.52 $
    * @since 2.4
    */
   public class WSRPConsumerImpl extends AbstractJBossService implements WSRPConsumer
  @@ -317,6 +317,13 @@
                     + "' uses the GET method in forms. Since we don't handle this, this portlet will be excluded from " +
                     "the list of offered portlets for producer " + getProducerId());
               }
  +            else if (info.isHasUserSpecificState())
  +            {
  +               log.warn("Portlet '" + portletHandle
  +                  + "' will store persistent state for each user. To be handled properly, this would require " +
  +                  "supporting portlet cloning, which we don't currently do. This portlet will be excluded from the " +
  +                  "list of offered portlets for producer " + getProducerId());
  +            }
               else
               {
                  WSRPPortlet wsrpPortlet = new WSRPPortlet(portletHandle, info);