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

[Julien Viet]

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

  Modified:    core/src/main/org/jboss/portal/core/model/portal  
                        PortalObjectCommandFactory.java
                        PortalObjectURLFactory.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.21      +3 -3      jboss-portal/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortalObjectCommandFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- PortalObjectCommandFactory.java	20 Jul 2006 23:48:39 -0000	1.20
  +++ PortalObjectCommandFactory.java	31 Jul 2006 19:29:49 -0000	1.21
  @@ -21,8 +21,8 @@
   */
   package org.jboss.portal.core.model.portal;
   
  -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.ControllerCommand;
   import org.jboss.portal.core.command.InvokeWindowActionCommand;
   import org.jboss.portal.core.command.InvokeWindowRenderCommand;
  @@ -40,7 +40,7 @@
    * This command mapper is used to map portal objects living in a container to <code>org.jboss.portal.core.command.RenderPageCommand</code>
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.20 $
  + * @version $Revision: 1.21 $
    */
   public class PortalObjectCommandFactory extends AbstractCommandFactory
   {
  
  
  
  1.24      +5 -5      jboss-portal/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortalObjectURLFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- PortalObjectURLFactory.java	31 Jul 2006 00:20:50 -0000	1.23
  +++ PortalObjectURLFactory.java	31 Jul 2006 19:29:49 -0000	1.24
  @@ -31,8 +31,8 @@
   import org.jboss.portal.portlet.ParametersStateString;
   import org.jboss.portal.portlet.StateString;
   import org.jboss.portal.portlet.PortletRequestDecoder;
  -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.server.AbstractServerURL;
   import org.jboss.portal.server.ServerInvocation;
   import org.jboss.portal.server.ServerURL;
  @@ -43,7 +43,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.23 $
  + * @version $Revision: 1.24 $
    */
   public class PortalObjectURLFactory extends URLFactoryDelegate
   {
  @@ -121,7 +121,7 @@
                     }
   
                     //
  -                  parameters = ((ParametersStateString)interactionState).getParametersValue();
  +                  parameters = ((ParametersStateString)interactionState).getParameters();
                  }
                  else
                  {
  @@ -150,7 +150,7 @@
               {
                  if (navigationalState instanceof ParametersStateString)
                  {
  -                  parameters = ((ParametersStateString)navigationalState).getParametersValue();
  +                  parameters = ((ParametersStateString)navigationalState).getParameters();
                  }
                  else
                  {