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

[Julien Viet]

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

  Modified:    core/src/main/org/jboss/portal/core/impl/model/instance  
                        InstanceImpl.java PersistentInstanceContainer.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.31      +2 -4      jboss-portal/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InstanceImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- InstanceImpl.java	30 Jul 2006 12:36:21 -0000	1.30
  +++ InstanceImpl.java	31 Jul 2006 19:29:48 -0000	1.31
  @@ -24,7 +24,6 @@
   import org.hibernate.Query;
   import org.hibernate.Session;
   import org.hibernate.HibernateException;
  -import org.hibernate.Transaction;
   import org.jboss.portal.common.value.ValueMap;
   import org.jboss.portal.core.model.instance.Instance;
   import org.jboss.portal.core.model.instance.InstanceContainer;
  @@ -33,9 +32,8 @@
   import org.jboss.portal.portlet.PortletInvokerException;
   import org.jboss.portal.portlet.invocation.PortletInvocation;
   import org.jboss.portal.portlet.spi.UserContext;
  -import org.jboss.portal.portlet.spi.InstanceContext;
   import org.jboss.portal.portlet.state.AccessMode;
  -import org.jboss.portal.portlet.Mode;
  +import org.jboss.portal.Mode;
   import org.jboss.portal.jems.hibernate.ContextObject;
   import org.apache.log4j.Logger;
   
  @@ -46,7 +44,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.30 $
  + * @version $Revision: 1.31 $
    */
   public class InstanceImpl implements Instance, ContextObject
   {
  
  
  
  1.50      +3 -6      jboss-portal/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PersistentInstanceContainer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -b -r1.49 -r1.50
  --- PersistentInstanceContainer.java	30 Jul 2006 15:49:45 -0000	1.49
  +++ PersistentInstanceContainer.java	31 Jul 2006 19:29:48 -0000	1.50
  @@ -61,7 +61,7 @@
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
    * @author Anil.Saldhana at jboss.org
  - * @version $Revision: 1.49 $
  + * @version $Revision: 1.50 $
    */
   public class PersistentInstanceContainer extends AbstractJBossService
      implements InstanceContainer, AuthorizationDomain, DomainConfigurator,
  @@ -197,11 +197,8 @@
         //
         log.debug("Creating instance " + id + " of portlet " + portletId);
   
  -      // Check the portlet exists
  -      if (portletInvoker.getPortlet(portletId) == null)
  -      {
  -         throw new NoSuchPortletException(portletId);
  -      }
  +      // Check that the portlet exist before creating an instance of it
  +      portletInvoker.getPortlet(portletId);
   
         //
         InstanceImpl instance = null;