[jboss-cvs] jbosssx/src/main/org/jboss/security/plugins ...

[Anil Saldhana]

  User: asaldhana
  Date: 06/07/11 15:38:36

  Modified:    src/main/org/jboss/security/plugins  
                        AuthorizationManagerService.java
                        JBossAuthorizationManager.java
  Log:
  JBAS-2624: Remove the hasPermission method to give preference to the authorize method
  
  Revision  Changes    Path
  1.5       +3 -11     jbosssx/src/main/org/jboss/security/plugins/AuthorizationManagerService.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AuthorizationManagerService.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/plugins/AuthorizationManagerService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- AuthorizationManagerService.java	28 Jun 2006 02:20:58 -0000	1.4
  +++ AuthorizationManagerService.java	11 Jul 2006 19:38:36 -0000	1.5
  @@ -38,7 +38,7 @@
   import org.jboss.util.CachePolicy;
   import org.jboss.util.TimedCachePolicy;
   
  -//$Id: AuthorizationManagerService.java,v 1.4 2006/06/28 02:20:58 asaldhana Exp $
  +//$Id: AuthorizationManagerService.java,v 1.5 2006/07/11 19:38:36 asaldhana Exp $
   
   /**
    *  Service that provides Authorization capabilities.
  @@ -47,7 +47,7 @@
    *  this can be changed via the authorizationManagerClassName property.
    *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
    *  @since  Jan 3, 2006 
  - *  @version $Revision: 1.4 $
  + *  @version $Revision: 1.5 $
    */
   public class AuthorizationManagerService 
   extends ServiceMBeanSupport
  @@ -100,14 +100,6 @@
      }
      
      /**
  -    * @see AuthorizationManager#hasPermission(Permission, Principal)
  -    */
  -   public boolean hasPermission(Permission perm, Principal principal)
  -   { 
  -      return false;
  -   }
  -   
  -   /**
       * @see AuthorizationManager#doesUserHaveRole(String)
       */
      public boolean doesUserHaveRole(String roleName)
  
  
  
  1.4       +3 -12     jbosssx/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossAuthorizationManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- JBossAuthorizationManager.java	28 Jun 2006 02:20:58 -0000	1.3
  +++ JBossAuthorizationManager.java	11 Jul 2006 19:38:36 -0000	1.4
  @@ -54,13 +54,13 @@
   //Sun's OSS XACML implementation
   import com.sun.xacml.Policy;
   
  -//$Id: JBossAuthorizationManager.java,v 1.3 2006/06/28 02:20:58 asaldhana Exp $
  +//$Id: JBossAuthorizationManager.java,v 1.4 2006/07/11 19:38:36 asaldhana Exp $
   
   /**
    *  Authorization Manager implementation
    *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
    *  @since  Jan 3, 2006 
  - *  @version $Revision: 1.3 $
  + *  @version $Revision: 1.4 $
    */
   public class JBossAuthorizationManager 
   implements AuthorizationManager,PolicyRegistration
  @@ -217,15 +217,6 @@
         return ac.authorize(resource);
      }
      
  -   /**
  -    * @see AuthorizationManager#hasPermission(Permission, Principal)
  -    */
  -   public boolean hasPermission(Permission perm, Principal principal)
  -   {
  -      throw new IllegalStateException("Unimplemented hasPermission(Permission perm, Principal principal)");
  -   }
  -   
  -   
      /** Does the current Subject have a role(a Principal) that equates to one
       of the role names. This method obtains the Group named 'Roles' from
       the principal set of the currently authenticated Subject as determined