[jboss-cvs] jboss-portal/portlet/src/main/org/jboss/portal/portlet/test ...

[Julien Viet]

  User: julien  
  Date: 06/07/31 15:29:55

  Modified:    portlet/src/main/org/jboss/portal/portlet/test   
                        PortletController.java TestPortalContext.java
                        TestPortletInvoker.java
  Log:
  - moved the portal api in the api module in order to have a standalone jar
  - JBPORTAL-631 : Try to move org.jboss.portlet package to the api module
  - IPC support in 2.4 (only for local portlets)
  
  Revision  Changes    Path
  1.77      +5 -9      jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortletController.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -b -r1.76 -r1.77
  --- PortletController.java	31 Jul 2006 00:20:51 -0000	1.76
  +++ PortletController.java	31 Jul 2006 19:29:55 -0000	1.77
  @@ -21,8 +21,8 @@
   */
   package org.jboss.portal.portlet.test;
   
  -import org.jboss.portal.portlet.Mode;
  -import org.jboss.portal.portlet.WindowState;
  +import org.jboss.portal.Mode;
  +import org.jboss.portal.WindowState;
   import org.jboss.portal.common.system.AbstractJBossService;
   import org.jboss.portal.common.util.Tools;
   import org.jboss.portal.portlet.ActionURL;
  @@ -83,7 +83,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.76 $
  + * @version $Revision: 1.77 $
    */
   public class PortletController extends AbstractJBossService implements RequestController
   {
  @@ -127,10 +127,6 @@
               // Get the portlet
               String portletId = requestPath.substring("/portlet/".length());
               Portlet portlet = portletInvoker.getPortlet(portletId);
  -            if (portlet == null)
  -            {
  -               throw new IllegalArgumentException("Unknow portlet " + portletId);
  -            }
   
               PortletRequestDecoder decoder = new PortletRequestDecoder();
               decoder.decode(req.getContext().getParameterMap());
  @@ -656,7 +652,7 @@
               ParametersStateString interactionState = (ParametersStateString)((ActionURL)portletURL).getInteractionState();
               if (interactionState != null)
               {
  -               parameters = interactionState.getParametersValue();
  +               parameters = interactionState.getParameters();
               }
            }
            else
  @@ -664,7 +660,7 @@
               ParametersStateString navState = (ParametersStateString)((RenderURL)portletURL).getNavigationalState();
               if (navState != null)
               {
  -               parameters = navState.getParametersValue();
  +               parameters = navState.getParameters();
               }
            }
   
  
  
  
  1.3       +3 -3      jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TestPortalContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- TestPortalContext.java	9 Jul 2006 12:04:17 -0000	1.2
  +++ TestPortalContext.java	31 Jul 2006 19:29:55 -0000	1.3
  @@ -21,8 +21,8 @@
   */
   package org.jboss.portal.portlet.test;
   
  -import org.jboss.portal.portlet.WindowState;
  -import org.jboss.portal.portlet.Mode;
  +import org.jboss.portal.WindowState;
  +import org.jboss.portal.Mode;
   import org.jboss.portal.common.util.CollectionBuilder;
   import org.jboss.portal.portlet.spi.PortalContext;
   
  @@ -32,7 +32,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class TestPortalContext implements PortalContext
   {
  
  
  
  1.10      +1 -16     jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TestPortletInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- TestPortletInvoker.java	2 Jul 2006 17:50:36 -0000	1.9
  +++ TestPortletInvoker.java	31 Jul 2006 19:29:55 -0000	1.10
  @@ -37,7 +37,7 @@
    * A simple consumer.
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.10 $
    */
   public class TestPortletInvoker extends AbstractJBossService implements PortletInvoker
   {
  @@ -112,26 +112,11 @@
   
      public Portlet getPortlet(String portletId) throws PortletInvokerException
      {
  -      if (portletId == null)
  -      {
  -         throw new IllegalArgumentException("No null portlet id accepted");
  -      }
         return producer.getPortlet(portletId);
      }
   
      public void invoke(PortletInvocation invocation) throws PortletInvokerException
      {
  -      String portletId = (String)invocation.getAttribute(PortletInvocation.PORTLET_ID_ATTRIBUTE);
  -      if (portletId == null)
  -      {
  -         throw new PortletInvokerException("No portlet id provided");
  -      }
  -      Portlet portlet = producer.getPortlet(portletId);
  -      if (portlet == null)
  -      {
  -         throw new NoSuchPortletException("No such portlet " + portletId);
  -      }
  -
         try
         {
            invocation.setDispatcher(dispatcher);