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

[Julien Viet]

  User: julien  
  Date: 06/08/03 13:06:47

  Modified:    core/src/main/org/jboss/portal/core/metadata 
                        PortalObjectMetaData.java
  Log:
  - make an instance creation faillure not prevent the creational of other instances
  - removed theme portlet as it changes the theme globally and is rather confusing as we have the new feature of having per user theme configuration in the profile
  
  Revision  Changes    Path
  1.35      +7 -2      jboss-portal/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortalObjectMetaData.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -b -r1.34 -r1.35
  --- PortalObjectMetaData.java	3 Aug 2006 12:52:07 -0000	1.34
  +++ PortalObjectMetaData.java	3 Aug 2006 17:06:47 -0000	1.35
  @@ -43,7 +43,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.34 $
  + * @version $Revision: 1.35 $
    */
   public abstract class PortalObjectMetaData implements MetaData
   {
  @@ -147,8 +147,13 @@
               RoleSecurityBinding binding = new RoleSecurityBinding(PortalObjectPermission.VIEW_RECURSIVE_ACTION, SecurityConstants.UNCHECKED_ROLE_NAME);
               securityConstraints.getConstraints().add(binding);
            }
  -         else if (this instanceof WindowMetaData)
  +      }
  +      else
  +      {
  +         // Skip window configuration
  +         if (this instanceof WindowMetaData)
            {
  +            securityConstraints = null;
               log.warn("Window " + getName() + " has security a " +
                  "configuration but it is not taken in account, portlet instance configuration should be done rather");
            }