[jboss-cvs] JBossAS SVN: r66263 - in projects/metadata/trunk/src/main/java/org/jboss/metadata: web/jboss and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2007-10-18 22:26:33 -0400 (Thu, 18 Oct 2007)
New Revision: 66263

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
Log:
Need to consider the resource-manager metadata when merging resource-refs

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2007-10-19 02:25:55 UTC (rev 66262)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2007-10-19 02:26:33 UTC (rev 66263)
@@ -641,7 +641,10 @@
       
       try
       {
-         mergedEnvironment = JBossEnvironmentRefsGroupMetaData.merge(jndiEnvironmentRefsGroup, getOverridenMetaDataWithCheck().getJndiEnvironmentRefsGroup(), "ejb-jar.xml", "jboss.xml");
+         mergedEnvironment = JBossEnvironmentRefsGroupMetaData.merge(jndiEnvironmentRefsGroup,
+               getOverridenMetaDataWithCheck().getJndiEnvironmentRefsGroup(),
+               this.getJBossMetaData().getResourceManagers(),
+               "ejb-jar.xml", "jboss.xml");
 
          // Fixup the invoker binding references on ejb refs
          InvokerBindingsMetaData invokerBindings = getInvokerBindings();

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java	2007-10-19 02:25:55 UTC (rev 66262)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java	2007-10-19 02:26:33 UTC (rev 66263)
@@ -31,6 +31,7 @@
 import org.jboss.metadata.javaee.spec.PersistenceContextReferencesMetaData;
 import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
 import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
 import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
 import org.jboss.xb.annotations.JBossXmlModelGroup;
 
@@ -63,7 +64,10 @@
     * @param overrideFile the override file
     * @return the merged environment
     */
-   public static JBossEnvironmentRefsGroupMetaData merge(JBossEnvironmentRefsGroupMetaData jbossEnvironmentRefsGroup, EnvironmentRefsGroupMetaData environmentRefsGroup, String overridenFile, String overrideFile)
+   public static JBossEnvironmentRefsGroupMetaData merge(JBossEnvironmentRefsGroupMetaData jbossEnvironmentRefsGroup,
+            EnvironmentRefsGroupMetaData environmentRefsGroup,
+            ResourceManagersMetaData resourceMgrs,
+            String overridenFile, String overrideFile)
    {
       JBossEnvironmentRefsGroupMetaData merged = new JBossEnvironmentRefsGroupMetaData();
       
@@ -118,6 +122,21 @@
       if (mergedEjbLocalRefs != null)
          merged.setEjbLocalReferences(mergedEjbLocalRefs);
       
+      // Need to set the
+      if(jbossResRefs != null && resourceMgrs != null)
+      {
+         for(ResourceReferenceMetaData ref : jbossResRefs)
+         {
+            ResourceManagerMetaData mgr = resourceMgrs.get(ref.getResourceName());
+            if(mgr != null)
+            {
+               if(mgr.getResJndiName() != null)
+                  ref.setJndiName(mgr.getResJndiName());
+               else if(mgr.getResUrl() != null)
+                  ref.setResUrl(mgr.getResUrl());
+            }
+         }
+      }
       ResourceReferencesMetaData mergedResRefs = ResourceReferencesMetaData.merge(jbossResRefs, resRefs, overridenFile, overrideFile);
       if (mergedResRefs != null)
          merged.setResourceReferences(mergedResRefs);

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2007-10-19 02:25:55 UTC (rev 66262)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2007-10-19 02:26:33 UTC (rev 66263)
@@ -543,6 +543,8 @@
       {
          mergedEnvironment = JBossEnvironmentRefsGroupMetaData.merge(jndiEnvironmentRefsGroup,
                this.getOverridenMetaData().getJndiEnvironmentRefsGroup(),
+               // jboss-web does not use resource-managers
+               null,
                "web.xml", "jboss-web.xml");
       }
       catch (Exception e)