[jboss-cvs] JBossAS SVN: r58349 - in trunk/server/src/main/org/jboss: deployment metadata

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

Author: anil.saldhana at jboss.com
Date: 2006-11-14 12:54:51 -0500 (Tue, 14 Nov 2006)
New Revision: 58349

Modified:
   trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
   trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java
Log:
merge in the security roles from jboss-app

Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2006-11-14 17:42:09 UTC (rev 58348)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2006-11-14 17:54:51 UTC (rev 58349)
@@ -120,7 +120,7 @@
          // Merge security domain/roles
          if( metaData.getSecurityDomain() == null )
             metaData.setSecurityDomain(earMetaData.getSecurityDomain());
-         //metaData.mergeSecurityRoles(earMetaData.getSecurityRoles());
+         metaData.mergeSecurityRoles(earMetaData.getSecurityRoles());
       }
 
    }

Modified: trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java	2006-11-14 17:42:09 UTC (rev 58348)
+++ trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java	2006-11-14 17:54:51 UTC (rev 58349)
@@ -34,6 +34,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -44,7 +45,7 @@
  * @author <a href="mailto:Scott.Stark at jboss.org">Scott Stark</a>
  * @author <a href="mailto:criege at riege.com">Christian Riege</a>
  * @author <a href="mailto:Christoph.Jung at infor.de">Christoph G. Jung</a>.
- * @author <a href="mailto:Thomas.Diesler at jboss.org">Thomas Diesler</a>.
+ * @author <a href="mailto:Thomas.Diesler at jboss.org">Thomas Diesler</a>. 
  *
  * @version $Revision$
  */
@@ -1131,6 +1132,15 @@
          throw new IllegalStateException("Container configuration must have a non-null name!");
       }
       configurations.put(name, container);
+   } 
+   
+   /**
+    * Merge the security role/principal mapping defined in jboss.xml
+    * with the one defined at jboss-app.xml.
+    */
+   public void mergeSecurityRoles(Map<String, SecurityRoleMetaData> applRoles)
+   {
+      this.assemblyDescriptor.mergeSecurityRoles(applRoles);
    }
 }