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

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

Author: sguilhen at redhat.com
Date: 2008-11-28 09:16:41 -0500 (Fri, 28 Nov 2008)
New Revision: 81769

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
Log:
JBAS-6226: Reverted changes made to TomcatDeployment.



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	2008-11-28 13:49:31 UTC (rev 81768)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2008-11-28 14:16:41 UTC (rev 81769)
@@ -54,7 +54,6 @@
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.naming.NonSerializableFactory;
 import org.jboss.security.SecurityUtil;
@@ -338,19 +337,13 @@
       if (metaDataSecurityDomain != null)
          metaDataSecurityDomain = metaDataSecurityDomain.trim();
       
-     List<SecurityConstraintMetaData> constraints = metaData.getSecurityContraints();
-     
-     //JBAS-6226: SecurityContextEstablishmentValve kicks in only with security metadata
-     if(constraints != null &&  constraints.size() > 0)
-     {   
-        // Add a valve to establish security context
-        SecurityContextEstablishmentValve scevalve = new SecurityContextEstablishmentValve(metaDataSecurityDomain,
-              SecurityUtil.unprefixSecurityDomain(config.getDefaultSecurityDomain()), 
-              SecurityActions.loadClass(config.getSecurityContextClassName()), getSecurityManagement());
-        context.addValve(scevalve); 
-     }
+      // Add a valve to establish security context
+      SecurityContextEstablishmentValve scevalve = new SecurityContextEstablishmentValve(metaDataSecurityDomain,
+            SecurityUtil.unprefixSecurityDomain(config.getDefaultSecurityDomain()), 
+            SecurityActions.loadClass(config.getSecurityContextClassName()), getSecurityManagement());
+      context.addValve(scevalve);
 
-      // Add a valve to establish the JACC context before authorization valves
+      // Add a valve to estalish the JACC context before authorization valves
       Certificate[] certs = null;
       CodeSource cs = new CodeSource(url, certs);
       JaccContextValve jaccValve = new JaccContextValve(metaData, cs);