[jboss-cvs] JBossAS SVN: r58328 - trunk/server/src/main/org/jboss/web/deployers

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

Author: scott.stark at jboss.org
Date: 2006-11-13 23:06:14 -0500 (Mon, 13 Nov 2006)
New Revision: 58328

Modified:
   trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
Log:
Move the ear level settings to the jboss-web.xml deployer

Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java	2006-11-14 04:04:54 UTC (rev 58327)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java	2006-11-14 04:06:14 UTC (rev 58328)
@@ -327,15 +327,6 @@
          log.debug("webContext: " + webContext);
          log.debug("warURL: " + warURLString);
    
-         // Merge any ear security domain info
-         J2eeApplicationMetaData appMetaData = di.getAttachment(J2eeApplicationMetaData.class);
-         if( appMetaData != null )
-         {
-            if( metaData.getSecurityDomain() == null )
-               metaData.setSecurityDomain(appMetaData.getSecurityDomain());
-            metaData.mergeSecurityRoles(appMetaData.getSecurityRoles());
-         }
-
          // Register the permissions with the JACC layer
          String contextID = metaData.getJaccContextID();
          if( contextID == null )