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

[Julien Viet]

  User: julien  
  Date: 06/08/03 08:52:07

  Modified:    core/src/main/org/jboss/portal/core/metadata 
                        PortalObjectMetaData.java
  Log:
  fix wrong login of window security metadata
  
  Revision  Changes    Path
  1.34      +15 -13    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.33
  retrieving revision 1.34
  diff -u -b -r1.33 -r1.34
  --- PortalObjectMetaData.java	21 Jul 2006 16:52:01 -0000	1.33
  +++ PortalObjectMetaData.java	3 Aug 2006 12:52:07 -0000	1.34
  @@ -43,7 +43,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.33 $
  + * @version $Revision: 1.34 $
    */
   public abstract class PortalObjectMetaData implements MetaData
   {
  @@ -136,30 +136,32 @@
         // Configure listener
         object.setListener(listener);
   
  -      //
  -      if (this instanceof PortalMetaData || this instanceof PageMetaData)
  -      {
            // Configure security
            SecurityConstraintsMetaData securityConstraints = getSecurityConstraints();
  -
  -         // Default is view recursive
            if (securityConstraints == null)
            {
  +         if (this instanceof PortalMetaData || this instanceof PageMetaData)
  +         {
  +            // Default is view recursive
               securityConstraints = new SecurityConstraintsMetaData();
               RoleSecurityBinding binding = new RoleSecurityBinding(PortalObjectPermission.VIEW_RECURSIVE_ACTION, SecurityConstants.UNCHECKED_ROLE_NAME);
               securityConstraints.getConstraints().add(binding);
            }
  +         else if (this instanceof WindowMetaData)
  +         {
  +            log.warn("Window " + getName() + " has security a " +
  +               "configuration but it is not taken in account, portlet instance configuration should be done rather");
  +         }
  +      }
   
  +      //
  +      if (securityConstraints != null)
  +      {
            // Apply the constraint
            PortalObjectContainer poc = buildContext.getContainer();
            DomainConfigurator domainConfigurator = poc.getAuthorizationDomain().getConfigurator();
            domainConfigurator.setBindings(object.getId(), securityConstraints.getConstraints());
         }
  -      else if (this instanceof WindowMetaData)
  -      {
  -         log.warn("Window " + getName() + " has security a " +
  -            "configuration but it is not taken in account, portlet instance configuration should be done rather");
  -      }
      }
   
      public static PortalObjectMetaData buildMetaData(Element portalObjectElt) throws Exception