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

[Julien Viet]

  User: julien  
  Date: 06/07/30 10:38:36

  Modified:    core/src/main/org/jboss/portal/core/command  
                        RenderWindowCommand.java WindowCommand.java
  Log:
  move the non check to window commands higher in the hierarchy
  
  Revision  Changes    Path
  1.50      +1 -12     jboss-portal/core/src/main/org/jboss/portal/core/command/RenderWindowCommand.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RenderWindowCommand.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/RenderWindowCommand.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -b -r1.49 -r1.50
  --- RenderWindowCommand.java	9 Jul 2006 12:04:14 -0000	1.49
  +++ RenderWindowCommand.java	30 Jul 2006 14:38:36 -0000	1.50
  @@ -38,7 +38,7 @@
    * Render a single window.
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.49 $
  + * @version $Revision: 1.50 $
    */
   public class RenderWindowCommand extends WindowCommand
   {
  @@ -77,17 +77,6 @@
         return info;
      }
   
  -   /**
  -    * We only enforce security at instance and component level.
  -    *
  -    * @param pam
  -    * @throws SecurityException
  -    * @throws PortalSecurityException
  -    */
  -   public void enforceSecurity(PortalAuthorizationManager pam) throws SecurityException, PortalSecurityException
  -   {
  -   }
  -
      public void execute() throws CommandException
      {
         ServerInvocation sinv = context.getExecutionContext().getServerInvocation();
  
  
  
  1.31      +15 -1     jboss-portal/core/src/main/org/jboss/portal/core/command/WindowCommand.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WindowCommand.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/WindowCommand.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- WindowCommand.java	26 May 2006 14:12:52 -0000	1.30
  +++ WindowCommand.java	30 Jul 2006 14:38:36 -0000	1.31
  @@ -26,12 +26,14 @@
   import org.jboss.portal.core.model.portal.Window;
   import org.jboss.portal.core.model.portal.PortalObject;
   import org.jboss.portal.core.model.instance.Instance;
  +import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
  +import org.jboss.portal.security.PortalSecurityException;
   
   /**
    * A superclass for command that target a specific window.
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.30 $
  + * @version $Revision: 1.31 $
    */
   public abstract class WindowCommand extends PortalObjectCommand
   {
  @@ -120,4 +122,16 @@
            throw new ObjectNotFoundException(window.getInstanceRef());
         }
      }
  +
  +
  +   /**
  +    * We only enforce security at instance and component level.
  +    *
  +    * @param pam
  +    * @throws SecurityException
  +    * @throws org.jboss.portal.security.PortalSecurityException
  +    */
  +   public void enforceSecurity(PortalAuthorizationManager pam) throws SecurityException, PortalSecurityException
  +   {
  +   }
   }