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

Julien Viet julien at jboss.com
Mon Jul 31 15:29:53 EDT 2006


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

  Modified:    portlet/src/main/org/jboss/portal/portlet/impl/jsr168      
                        ActionRequestImpl.java ActionResponseImpl.java
                        PortalContextImpl.java PortletRequestImpl.java
                        PortletURLImpl.java RenderRequestImpl.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.13      +2 -2      jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionRequestImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ActionRequestImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionRequestImpl.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- ActionRequestImpl.java	31 Jul 2006 00:20:50 -0000	1.12
  +++ ActionRequestImpl.java	31 Jul 2006 19:29:53 -0000	1.13
  @@ -36,7 +36,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.12 $
  + * @version $Revision: 1.13 $
    */
   public class ActionRequestImpl extends PortletRequestImpl implements ActionRequest
   {
  @@ -67,7 +67,7 @@
            }
   
            //
  -         parameters = parametersState.getParametersValue();
  +         parameters = parametersState.getParameters();
         }
   
         //
  
  
  
  1.10      +3 -3      jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ActionResponseImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- ActionResponseImpl.java	31 Jul 2006 00:39:29 -0000	1.9
  +++ ActionResponseImpl.java	31 Jul 2006 19:29:53 -0000	1.10
  @@ -22,7 +22,7 @@
   package org.jboss.portal.portlet.impl.jsr168;
   
   import org.apache.log4j.Logger;
  -import org.jboss.portal.portlet.Mode;
  +import org.jboss.portal.Mode;
   import org.jboss.portal.portlet.Properties;
   import org.jboss.portal.portlet.invocation.ActionInvocation;
   import org.jboss.portal.portlet.result.HTTPRedirectionResult;
  @@ -41,7 +41,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.10 $
    */
   public class ActionResponseImpl extends PortletResponseImpl implements ActionResponse
   {
  @@ -82,7 +82,7 @@
            {
               throw new WindowStateException("Not supported", windowState);
            }
  -         ((RenderResult)result).setWindowState(org.jboss.portal.portlet.WindowState.create(windowState.toString()));
  +         ((RenderResult)result).setWindowState(org.jboss.portal.WindowState.create(windowState.toString()));
            decision = WANT_RENDER;
         }
         else
  
  
  
  1.8       +3 -3      jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortalContextImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- PortalContextImpl.java	9 Jul 2006 12:04:16 -0000	1.7
  +++ PortalContextImpl.java	31 Jul 2006 19:29:53 -0000	1.8
  @@ -21,7 +21,7 @@
   */
   package org.jboss.portal.portlet.impl.jsr168;
   
  -import org.jboss.portal.portlet.Mode;
  +import org.jboss.portal.Mode;
   import org.jboss.portal.common.util.Tools;
   import org.jboss.portal.portlet.spi.PortalContext;
   import org.jboss.portal.server.PortalConstants;
  @@ -36,7 +36,7 @@
    * todo : does not provide customizable values for portlet modes and window states.
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    */
   public class PortalContextImpl implements javax.portlet.PortalContext
   {
  @@ -98,7 +98,7 @@
            supportedWindowStates = new HashSet(tmp.size());
            for (Iterator i = tmp.iterator(); i.hasNext();)
            {
  -            org.jboss.portal.portlet.WindowState windowState = (org.jboss.portal.portlet.WindowState)i.next();
  +            org.jboss.portal.WindowState windowState = (org.jboss.portal.WindowState)i.next();
               supportedWindowStates.add(PortletURLImpl.decodeWindowState(windowState.toString()));
            }
         }
  
  
  
  1.34      +3 -3      jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortletRequestImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -b -r1.33 -r1.34
  --- PortletRequestImpl.java	31 Jul 2006 00:20:50 -0000	1.33
  +++ PortletRequestImpl.java	31 Jul 2006 19:29:53 -0000	1.34
  @@ -63,7 +63,7 @@
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
    * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  - * @version $Revision: 1.33 $
  + * @version $Revision: 1.34 $
    */
   public abstract class PortletRequestImpl implements PortletRequest
   {
  @@ -413,7 +413,7 @@
         }
         else
         {
  -         return invocation.getSupportedModes().contains(org.jboss.portal.portlet.Mode.create(portletMode.toString()));
  +         return invocation.getSupportedModes().contains(org.jboss.portal.Mode.create(portletMode.toString()));
         }
      }
   
  @@ -421,7 +421,7 @@
   
      public boolean isWindowStateAllowed(WindowState windowState)
      {
  -      return invocation.getSupportedWindowStates().contains(org.jboss.portal.portlet.WindowState.create(windowState.toString()));
  +      return invocation.getSupportedWindowStates().contains(org.jboss.portal.WindowState.create(windowState.toString()));
      }
   
      //
  
  
  
  1.11      +6 -6      jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortletURLImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- PortletURLImpl.java	31 Jul 2006 00:20:50 -0000	1.10
  +++ PortletURLImpl.java	31 Jul 2006 19:29:53 -0000	1.11
  @@ -38,11 +38,11 @@
   import org.jboss.portal.portlet.invocation.PortletInvocation;
   import org.jboss.portal.portlet.spi.InvocationContext;
   import org.jboss.portal.portlet.StateString;
  -import org.jboss.portal.portlet.Mode;
  +import org.jboss.portal.Mode;
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.10 $
  + * @version $Revision: 1.11 $
    */
   public class PortletURLImpl implements PortletURL
   {
  @@ -221,11 +221,11 @@
            return null;
         }
   
  -      public org.jboss.portal.portlet.WindowState getWindowState()
  +      public org.jboss.portal.WindowState getWindowState()
         {
            if (windowState != null)
            {
  -            return org.jboss.portal.portlet.WindowState.create(windowState.toString());
  +            return org.jboss.portal.WindowState.create(windowState.toString());
            }
            return null;
         }
  @@ -241,7 +241,7 @@
   
         protected Parameters getInternalParameters()
         {
  -         return parameters.getParametersValue();
  +         return parameters.getParameters();
         }
   
         public StateString getInteractionState()
  @@ -266,7 +266,7 @@
   
         protected Parameters getInternalParameters()
         {
  -         return navigationalState.getParametersValue();
  +         return navigationalState.getParameters();
         }
   
         public StateString getNavigationalState()
  
  
  
  1.12      +3 -3      jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderRequestImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RenderRequestImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderRequestImpl.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- RenderRequestImpl.java	31 Jul 2006 00:20:51 -0000	1.11
  +++ RenderRequestImpl.java	31 Jul 2006 19:29:53 -0000	1.12
  @@ -31,7 +31,7 @@
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
    * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  - * @version $Revision: 1.11 $
  + * @version $Revision: 1.12 $
    */
   public class RenderRequestImpl extends PortletRequestImpl implements RenderRequest
   {
  @@ -56,12 +56,12 @@
         }
         else if (navigationalState instanceof ParametersStateString)
         {
  -         parameters = ((ParametersStateString)navigationalState).getParametersValue();
  +         parameters = ((ParametersStateString)navigationalState).getParameters();
         }
         else
         {
            ParametersStateString parametersState = new ParametersStateString(navigationalState.getStringValue());
  -         parameters = parametersState.getParametersValue();
  +         parameters = parametersState.getParameters();
         }
      }
   }
  
  
  



More information about the jboss-cvs-commits mailing list