[jboss-cvs] JBossAS SVN: r63070 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

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

Author: anil.saldhana at jboss.com
Date: 2007-05-15 23:28:59 -0400 (Tue, 15 May 2007)
New Revision: 63070

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment2.java
Log:
SECURITY-26:rename Util to SecurityUtil

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-05-16 03:27:46 UTC (rev 63069)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-05-16 03:28:59 UTC (rev 63070)
@@ -59,6 +59,7 @@
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.naming.NonSerializableFactory;
 import org.jboss.security.AuthorizationManager;
+import org.jboss.security.SecurityUtil;
 import org.jboss.security.authorization.PolicyRegistration;
 import org.jboss.virtual.VirtualFile;
 import org.jboss.web.WebApplication;
@@ -383,7 +384,7 @@
 
       if (metaData.getSecurityDomain() != null)
       {
-         String secDomain = org.jboss.security.Util.unprefixSecurityDomain(metaData.getSecurityDomain());
+         String secDomain = SecurityUtil.unprefixSecurityDomain(metaData.getSecurityDomain());
          // Associate the Context Id with the Security Domain
          String contextID = metaData.getJaccContextID();
 
@@ -391,7 +392,7 @@
          URL xacmlPolicyFile = this.config.getXacmlPolicyURL();
          if (xacmlPolicyFile != null)
          {
-            AuthorizationManager authzmgr = org.jboss.security.Util.getAuthorizationManager(secDomain);
+            AuthorizationManager authzmgr =  SecurityUtil.getAuthorizationManager(secDomain);
             if (authzmgr instanceof PolicyRegistration)
             {
                PolicyRegistration xam = (PolicyRegistration)authzmgr;

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment2.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment2.java	2007-05-16 03:27:46 UTC (rev 63069)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment2.java	2007-05-16 03:28:59 UTC (rev 63070)
@@ -56,6 +56,7 @@
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.naming.NonSerializableFactory;
 import org.jboss.security.AuthorizationManager;
+import org.jboss.security.SecurityUtil;
 import org.jboss.security.authorization.PolicyRegistration;
 import org.jboss.virtual.VirtualFile;
 import org.jboss.web.WebApplication;
@@ -458,7 +459,7 @@
 
       if (metaData.getSecurityDomain() != null)
       {
-         String secDomain = org.jboss.security.Util.unprefixSecurityDomain(metaData.getSecurityDomain());
+         String secDomain = SecurityUtil.unprefixSecurityDomain(metaData.getSecurityDomain());
          // Associate the Context Id with the Security Domain
          String contextID = metaData.getJaccContextID();
 
@@ -466,7 +467,7 @@
          URL xacmlPolicyFile = this.config.getXacmlPolicyURL();
          if (xacmlPolicyFile != null)
          {
-            AuthorizationManager authzmgr = org.jboss.security.Util.getAuthorizationManager(secDomain);
+            AuthorizationManager authzmgr =  SecurityUtil.getAuthorizationManager(secDomain);
             if (authzmgr instanceof PolicyRegistration)
             {
                PolicyRegistration xam = (PolicyRegistration)authzmgr;