[jboss-cvs] JBossAS SVN: r59234 - in projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization: . modules

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2006-12-26 16:11:55 -0500 (Tue, 26 Dec 2006)
New Revision: 59234

Modified:
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/AuthorizationContext.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/EJBResource.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/AbstractAuthorizationModule.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/DelegatingAuthorizationModule.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/JACCAuthorizationModule.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/XACMLAuthorizationModule.java
Log:
use of ResourceType

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/AuthorizationContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/AuthorizationContext.java	2006-12-26 21:09:02 UTC (rev 59233)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/AuthorizationContext.java	2006-12-26 21:11:55 UTC (rev 59234)
@@ -291,7 +291,7 @@
    
    private AuthorizationInfo getAuthorizationInfo(String domainName, Resource resource)
    {
-      String layer = resource.getLayer();
+      ResourceType layer = resource.getLayer();
       
       //Check if an instance of ApplicationPolicy is available 
       if(this.applicationPolicy != null)
@@ -304,10 +304,10 @@
          if(trace)
             log.trace("Application Policy not obtained for domain="+ domainName +
                          ". Trying to obtain the App policy for the default domain of the layer:");
-         if(Resource.EJB.equals(layer))
+         if(layer == ResourceType.EJB)
             aPolicy = Util.getApplicationPolicy(SecurityConstants.DEFAULT_EJB_APPLICATION_POLICY); 
          else
-            if(Resource.WEB.equals(layer))
+            if(layer == ResourceType.WEB)
                aPolicy = Util.getApplicationPolicy(SecurityConstants.DEFAULT_WEB_APPLICATION_POLICY); 
       }
       if(aPolicy == null)

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/EJBResource.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/EJBResource.java	2006-12-26 21:09:02 UTC (rev 59233)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/EJBResource.java	2006-12-26 21:11:55 UTC (rev 59234)
@@ -49,9 +49,9 @@
    /**
     * @see Resource#getLayer()
     */
-   public String getLayer()
+   public ResourceType getLayer()
    {
-      return Resource.EJB;
+      return ResourceType.EJB;
    }
 
    /**

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/AbstractAuthorizationModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/AbstractAuthorizationModule.java	2006-12-26 21:09:02 UTC (rev 59233)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/AbstractAuthorizationModule.java	2006-12-26 21:11:55 UTC (rev 59234)
@@ -33,6 +33,7 @@
 import org.jboss.security.authorization.AuthorizationException;
 import org.jboss.security.authorization.AuthorizationModule;
 import org.jboss.security.authorization.Resource;
+import org.jboss.security.authorization.ResourceType;
 
 //$Id$
 
@@ -125,7 +126,7 @@
    {
       int authorizationDecision = AuthorizationContext.DENY;
 
-      String layer = resource.getLayer();
+      ResourceType layer = resource.getLayer();
       String delegateStr = (String)delegateMap.get(layer);
       if(delegateStr == null)
          throw new IllegalStateException("Delegate is missing for layer="+layer);

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/DelegatingAuthorizationModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/DelegatingAuthorizationModule.java	2006-12-26 21:09:02 UTC (rev 59233)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/DelegatingAuthorizationModule.java	2006-12-26 21:11:55 UTC (rev 59234)
@@ -23,6 +23,7 @@
 
 import org.jboss.logging.Logger;
 import org.jboss.security.authorization.Resource;
+import org.jboss.security.authorization.ResourceType;
 
 //$Id$
 
@@ -38,9 +39,9 @@
    public DelegatingAuthorizationModule()
    { 
       log = Logger.getLogger(getClass());
-      delegateMap.put(Resource.WEB,
+      delegateMap.put(ResourceType.WEB,
           "org.jboss.web.tomcat.security.authorization.delegates.WebPolicyModuleDelegate");
-      delegateMap.put(Resource.EJB,
+      delegateMap.put(ResourceType.EJB,
          "org.jboss.security.authorization.modules.ejb.EJBPolicyModuleDelegate");
    }
 

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/JACCAuthorizationModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/JACCAuthorizationModule.java	2006-12-26 21:09:02 UTC (rev 59233)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/JACCAuthorizationModule.java	2006-12-26 21:11:55 UTC (rev 59234)
@@ -23,6 +23,7 @@
   
 import org.jboss.logging.Logger; 
 import org.jboss.security.authorization.Resource;
+import org.jboss.security.authorization.ResourceType;
 
 //$Id$
 
@@ -37,9 +38,9 @@
    public JACCAuthorizationModule()
    { 
       log = Logger.getLogger(getClass());
-      delegateMap.put(Resource.WEB,
+      delegateMap.put(ResourceType.WEB,
           "org.jboss.web.tomcat.security.authorization.delegates.WebJACCPolicyModuleDelegate");
-      delegateMap.put(Resource.EJB,
+      delegateMap.put(ResourceType.EJB,
          "org.jboss.security.authorization.modules.ejb.EJBJACCPolicyModuleDelegate");
    }
 

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/XACMLAuthorizationModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/XACMLAuthorizationModule.java	2006-12-26 21:09:02 UTC (rev 59233)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/modules/XACMLAuthorizationModule.java	2006-12-26 21:11:55 UTC (rev 59234)
@@ -24,6 +24,7 @@
 import org.jboss.logging.Logger; 
 import org.jboss.security.authorization.AuthorizationModule;
 import org.jboss.security.authorization.Resource; 
+import org.jboss.security.authorization.ResourceType;
 
 //$Id$
 
@@ -40,9 +41,9 @@
    public XACMLAuthorizationModule()
    {
       log = Logger.getLogger(getClass());
-      delegateMap.put(Resource.WEB,
+      delegateMap.put(ResourceType.WEB,
           "org.jboss.web.tomcat.security.authorization.delegates.WebXACMLPolicyModuleDelegate");
-      delegateMap.put(Resource.EJB,
+      delegateMap.put(ResourceType.EJB,
       "org.jboss.security.authorization.modules.ejb.EJBXACMLPolicyModuleDelegate");
    }