[jboss-cvs] JBossAS SVN: r58332 - trunk/server/src/main/org/jboss/deployment

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

Author: scott.stark at jboss.org
Date: 2006-11-13 23:44:30 -0500 (Mon, 13 Nov 2006)
New Revision: 58332

Modified:
   trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
Log:
Add ear level merging

Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2006-11-14 04:10:42 UTC (rev 58331)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2006-11-14 04:44:30 UTC (rev 58332)
@@ -21,12 +21,11 @@
  */
 package org.jboss.deployment;
 
+import org.jboss.deployers.plugins.deployers.helpers.AttachmentLocator;
 import org.jboss.deployers.plugins.deployers.helpers.ObjectModelFactoryDeployer;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.DeploymentUnit;
 import org.jboss.metadata.ApplicationMetaData;
-import org.jboss.metadata.WebMetaData;
-import org.jboss.metadata.web.JBossWebMetaDataObjectFactory;
 import org.jboss.xb.binding.ObjectModelFactory;
 import org.jboss.virtual.VirtualFile;
 import org.jboss.virtual.VFS;
@@ -109,6 +108,21 @@
 
       log.debug("deploy, unit: "+unit);
       createMetaData(unit, jbossXmlPath, null);
+
+      ApplicationMetaData metaData = getMetaData(unit, ApplicationMetaData.class.getName());
+      if( metaData == null )
+         return;
+
+      // Merge any settings from the ear level
+      J2eeApplicationMetaData earMetaData = AttachmentLocator.search(unit, J2eeApplicationMetaData.class);
+      if( earMetaData != null )
+      {
+         // Merge security domain/roles
+         if( metaData.getSecurityDomain() == null )
+            metaData.setSecurityDomain(earMetaData.getSecurityDomain());
+         //metaData.mergeSecurityRoles(earMetaData.getSecurityRoles());
+      }
+
    }
 
    protected ApplicationMetaData parse(DeploymentUnit unit,