[jboss-cvs] jboss-portal/core/src/main/org/jboss/portal/core/command ...

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


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

  Modified:    core/src/main/org/jboss/portal/core/command     
                        InvokeWindowActionCommand.java
                        InvokeWindowCommand.java
                        InvokeWindowRenderCommand.java MarkupCommand.java
                        RenderWindowCommand.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.63      +19 -9     jboss-portal/core/src/main/org/jboss/portal/core/command/InvokeWindowActionCommand.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InvokeWindowActionCommand.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/InvokeWindowActionCommand.java,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -b -r1.62 -r1.63
  --- InvokeWindowActionCommand.java	31 Jul 2006 00:20:50 -0000	1.62
  +++ InvokeWindowActionCommand.java	31 Jul 2006 19:29:47 -0000	1.63
  @@ -22,8 +22,8 @@
   package org.jboss.portal.core.command;
   
   import org.jboss.logging.Logger;
  -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.core.command.portlet.CoreActionContext;
   import org.jboss.portal.core.output.SignOutResult;
   import org.jboss.portal.portlet.StateString;
  @@ -44,7 +44,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.62 $
  + * @version $Revision: 1.63 $
    */
   public class InvokeWindowActionCommand extends InvokeWindowCommand
   {
  @@ -62,15 +62,15 @@
      private StateString interactionState;
   
      /** . */
  -   private Parameters form;
  +   private Parameters formParameters;
   
  -   public InvokeWindowActionCommand(String windowRef, Mode mode, WindowState windowState, StateString navigationalState, StateString interactionState, Parameters form)
  +   public InvokeWindowActionCommand(String windowRef, Mode mode, WindowState windowState, StateString navigationalState, StateString interactionState, Parameters formParameters)
         throws IllegalArgumentException
      {
         super(windowRef, mode, windowState);
         this.navigationalState = navigationalState;
         this.interactionState = interactionState;
  -      this.form = form;
  +      this.formParameters = formParameters;
      }
   
      public StateString getNavigationalState()
  @@ -83,9 +83,19 @@
         return interactionState;
      }
   
  -   public Parameters getForm()
  +   public void setInteractionState(StateString interactionState)
      {
  -      return form;
  +      this.interactionState = interactionState;
  +   }
  +
  +   public Parameters getFormParameters()
  +   {
  +      return formParameters;
  +   }
  +
  +   public void setFormParameters(Parameters formParameters)
  +   {
  +      this.formParameters = formParameters;
      }
   
      public CommandInfo getInfo()
  @@ -98,7 +108,7 @@
         ServerInvocation sinv = context.getExecutionContext().getServerInvocation();
   
         //
  -      CoreActionContext actionContext = new CoreActionContext(getContext().getExecutionContext(), sinv, portal, navigationalState, getWindowState(), getMode(), interactionState, form, window);
  +      CoreActionContext actionContext = new CoreActionContext(getContext().getExecutionContext(), sinv, portal, navigationalState, getWindowState(), getMode(), interactionState, formParameters, window);
   
         //
         PortletInvocation invocation = actionContext.createInvocation();
  
  
  
  1.6       +3 -3      jboss-portal/core/src/main/org/jboss/portal/core/command/InvokeWindowCommand.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InvokeWindowCommand.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/InvokeWindowCommand.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- InvokeWindowCommand.java	9 Jul 2006 12:04:14 -0000	1.5
  +++ InvokeWindowCommand.java	31 Jul 2006 19:29:47 -0000	1.6
  @@ -21,12 +21,12 @@
   */
   package org.jboss.portal.core.command;
   
  -import org.jboss.portal.portlet.Mode;
  -import org.jboss.portal.portlet.WindowState;
  +import org.jboss.portal.Mode;
  +import org.jboss.portal.WindowState;
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public abstract class InvokeWindowCommand extends WindowCommand
   {
  
  
  
  1.39      +3 -3      jboss-portal/core/src/main/org/jboss/portal/core/command/InvokeWindowRenderCommand.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InvokeWindowRenderCommand.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/InvokeWindowRenderCommand.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -b -r1.38 -r1.39
  --- InvokeWindowRenderCommand.java	9 Jul 2006 12:04:14 -0000	1.38
  +++ InvokeWindowRenderCommand.java	31 Jul 2006 19:29:47 -0000	1.39
  @@ -21,8 +21,8 @@
   */
   package org.jboss.portal.core.command;
   
  -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.portlet.StateString;
   import org.jboss.portal.common.invocation.InvocationException;
   import org.jboss.portal.core.aspects.controller.PageNavigationInterceptor;
  @@ -33,7 +33,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.38 $
  + * @version $Revision: 1.39 $
    */
   public class InvokeWindowRenderCommand extends InvokeWindowCommand
   {
  
  
  
  1.37      +3 -3      jboss-portal/core/src/main/org/jboss/portal/core/command/MarkupCommand.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MarkupCommand.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/MarkupCommand.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -b -r1.36 -r1.37
  --- MarkupCommand.java	31 Jul 2006 00:39:28 -0000	1.36
  +++ MarkupCommand.java	31 Jul 2006 19:29:47 -0000	1.37
  @@ -30,8 +30,8 @@
   import org.jboss.portal.core.model.portal.PortalObjectPermission;
   import org.jboss.portal.core.model.portal.Window;
   import org.jboss.portal.identity.User;
  -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.portlet.Properties;
   import org.jboss.portal.portlet.info.ModeInfo;
   import org.jboss.portal.portlet.info.WindowStateInfo;
  @@ -80,7 +80,7 @@
    * RenderPageCommand and the RenderRegionCommand.</p>
    *
    * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  - * @version $Revision: 1.36 $
  + * @version $Revision: 1.37 $
    */
   public abstract class MarkupCommand extends PortalObjectCommand
   {
  
  
  
  1.51      +3 -5      jboss-portal/core/src/main/org/jboss/portal/core/command/RenderWindowCommand.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RenderWindowCommand.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/RenderWindowCommand.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -b -r1.50 -r1.51
  --- RenderWindowCommand.java	30 Jul 2006 14:38:36 -0000	1.50
  +++ RenderWindowCommand.java	31 Jul 2006 19:29:47 -0000	1.51
  @@ -22,8 +22,6 @@
   package org.jboss.portal.core.command;
   
   import org.jboss.portal.core.command.portlet.CoreRenderContext;
  -import org.jboss.portal.security.PortalSecurityException;
  -import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
   import org.jboss.portal.server.ServerInvocation;
   import org.jboss.portal.portlet.StateString;
   import org.jboss.portal.portlet.PortletInvokerException;
  @@ -31,14 +29,14 @@
   import org.jboss.portal.portlet.result.Result;
   import org.jboss.portal.portlet.invocation.RenderInvocation;
   import org.jboss.portal.theme.navigation.WindowNavigationalState;
  -import org.jboss.portal.portlet.Mode;
  -import org.jboss.portal.portlet.WindowState;
  +import org.jboss.portal.Mode;
  +import org.jboss.portal.WindowState;
   
   /**
    * Render a single window.
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.50 $
  + * @version $Revision: 1.51 $
    */
   public class RenderWindowCommand extends WindowCommand
   {
  
  
  



More information about the jboss-cvs-commits mailing list