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

[Julien Viet]

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

  Modified:    federation/src/main/org/jboss/portal/federation/impl  
                        FederatedPortletInvokerService.java
                        FederatingPortletInvokerService.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.4       +2 -9      jboss-portal/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FederatedPortletInvokerService.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- FederatedPortletInvokerService.java	30 Jul 2006 12:36:22 -0000	1.3
  +++ FederatedPortletInvokerService.java	31 Jul 2006 19:29:51 -0000	1.4
  @@ -39,7 +39,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    * @since 2.4
    */
   public class FederatedPortletInvokerService implements FederatedPortletInvoker
  @@ -92,15 +92,8 @@
         Portlet portlet = portletInvoker.getPortlet(portletId);
   
         // Return correct result
  -      if (portlet == null)
  -      {
  -         return null;
  -      }
  -      else
  -      {
            return new FederatedPortlet(compoundPortletId, portlet);
         }
  -   }
   
      private class FederatedInstanceContext implements InstanceContext
      {
  
  
  
  1.2       +1 -5      jboss-portal/federation/src/main/org/jboss/portal/federation/impl/FederatingPortletInvokerService.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FederatingPortletInvokerService.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/federation/src/main/org/jboss/portal/federation/impl/FederatingPortletInvokerService.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- FederatingPortletInvokerService.java	18 Jul 2006 20:33:51 -0000	1.1
  +++ FederatingPortletInvokerService.java	31 Jul 2006 19:29:51 -0000	1.2
  @@ -42,7 +42,7 @@
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
    * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    * @since 2.4
    */
   public class FederatingPortletInvokerService extends AbstractJBossService implements FederatingPortletInvoker
  @@ -143,10 +143,6 @@
   
         //
         Portlet portlet = federated.getPortlet(compoundPortletId);
  -      if (portlet == null)
  -      {
  -         return null;
  -      }
   
         //
         return new FederatedPortlet(compoundPortletId, portlet);