[jboss-cvs] JBossAS SVN: r66148 - projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss.

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

Author: scott.stark at jboss.org
Date: 2007-10-15 21:10:31 -0400 (Mon, 15 Oct 2007)
New Revision: 66148

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java
Log:
Correct the merged enterprise beans view from the wrapper

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java	2007-10-16 00:58:26 UTC (rev 66147)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java	2007-10-16 01:10:31 UTC (rev 66148)
@@ -21,6 +21,8 @@
  */
 package org.jboss.metadata.ejb.jboss;
 
+import javax.xml.bind.annotation.XmlTransient;
+
 import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
 import org.jboss.metadata.ejb.jboss.ContainerConfigurationMetaData;
 import org.jboss.metadata.ejb.jboss.ContainerConfigurationsMetaData;
@@ -34,6 +36,7 @@
 import org.jboss.metadata.ejb.jboss.ResourceManagersMetaData;
 import org.jboss.metadata.ejb.jboss.WebservicesMetaData;
 import org.jboss.metadata.ejb.spec.EjbJarMetaData;
+import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
 import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
 
 /**
@@ -49,6 +52,9 @@
    private JBossMetaData primary;
    private JBossMetaData defaults;
    private ContainerConfigurationsMetaData configurationsWrapper;
+   /** The merged enterprise beans */
+   private transient JBossEnterpriseBeansMetaData mergedEnterpriseBeans;
+   
 
    public JBossMetaDataWrapper(JBossMetaData primary, JBossMetaData defaults)
    {
@@ -138,7 +144,12 @@
    @Override
    public JBossEnterpriseBeansMetaData getMergedEnterpriseBeans()
    {
-      return primary.getMergedEnterpriseBeans();
+      if (mergedEnterpriseBeans != null)
+         return mergedEnterpriseBeans;
+      EnterpriseBeansMetaData stdBeans = primary.getOverridenMetaData().getEnterpriseBeans();
+      mergedEnterpriseBeans = JBossEnterpriseBeansMetaData.merge(primary.getEnterpriseBeans(), stdBeans);
+      mergedEnterpriseBeans.setJBossMetaData(this);
+      return mergedEnterpriseBeans;
    }
 
    @Override