[jboss-cvs] JBossAS SVN: r66268 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/javaee/spec and 1 other directories.

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

Author: scott.stark at jboss.org
Date: 2007-10-18 23:30:05 -0400 (Thu, 18 Oct 2007)
New Revision: 66268

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceReferenceMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
Log:
Fix the ResourceReferenceMetaData merge

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:36:46 UTC (rev 66267)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java	2007-10-19 03:30:05 UTC (rev 66268)
@@ -122,7 +122,7 @@
       if (mergedEjbLocalRefs != null)
          merged.setEjbLocalReferences(mergedEjbLocalRefs);
       
-      // Need to set the
+      // Need to set the jndi name from resource mgr if referenced
       if(jbossResRefs != null && resourceMgrs != null)
       {
          for(ResourceReferenceMetaData ref : jbossResRefs)

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceReferenceMetaData.java	2007-10-19 02:36:46 UTC (rev 66267)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceReferenceMetaData.java	2007-10-19 03:30:05 UTC (rev 66268)
@@ -201,6 +201,10 @@
          merged.setType(type);
       else if (original.type != null)
          merged.setType(original.type);
+      if (resourceName != null)
+         merged.setResourceName(resourceName);
+      else if(original.resourceName != null)
+         merged.setResourceName(original.resourceName);
       if (authority != null)
          merged.setResAuth(authority);
       else if (original.authority != null)

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2007-10-19 02:36:46 UTC (rev 66267)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2007-10-19 03:30:05 UTC (rev 66268)
@@ -44,6 +44,8 @@
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaDataWrapper;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.ejb.jboss.ResourceManagerMetaData;
+import org.jboss.metadata.ejb.jboss.ResourceManagersMetaData;
 import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
 import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
 import org.jboss.metadata.ejb.spec.EjbJar2xMetaData;
@@ -411,6 +413,23 @@
       JBossMetaData jbossMetaData = unmarshal();
       jbossMetaData.setOverridenMetaData(specData);
 
+      // Validate the resource managers
+      ResourceManagersMetaData resourceMgrs = jbossMetaData.getResourceManagers();
+      assertEquals(5, resourceMgrs.size());
+      ResourceManagerMetaData qfmgr = resourceMgrs.get("queuefactoryref");
+      assertNotNull(qfmgr);
+      assertEquals("java:/JmsXA", qfmgr.getResJndiName());
+      ResourceManagerMetaData qmgr = resourceMgrs.get("queueref");
+      assertNotNull(qmgr);
+      assertEquals("queue/testQueue", qmgr.getResJndiName());
+      ResourceManagerMetaData tfmgr = resourceMgrs.get("topicfactoryref");
+      assertNotNull(tfmgr);
+      assertEquals("java:/JmsXA", tfmgr.getResJndiName());
+      ResourceManagerMetaData tmgr = resourceMgrs.get("topicref");
+      assertNotNull(tmgr);
+      assertEquals("topic/testTopic", tmgr.getResJndiName());
+      
+
       JBossEnterpriseBeanMetaData mdb = jbossMetaData.getMergedEnterpriseBean("TopicPublisher");
       
       ResourceReferencesMetaData resources = mdb.getResourceReferences();
@@ -419,14 +438,14 @@
       assertEquals("jms/MyTopicConnection", jmsRef1.getResourceRefName());
       assertEquals("javax.jms.TopicConnectionFactory", jmsRef1.getType());
       assertEquals(ResourceAuthorityType.Container, jmsRef1.getResAuth());
-      assertEquals("queuefactoryref", jmsRef1.getResourceName());
+      assertEquals("topicfactoryref", jmsRef1.getResourceName());
       assertEquals("java:/JmsXA", jmsRef1.getJndiName());
       ResourceReferenceMetaData jmsRef2 = resources.get("jms/TopicName");
       assertNotNull(jmsRef2);
       assertEquals("jms/TopicName", jmsRef2.getResourceRefName());
       assertEquals("javax.jms.Topic", jmsRef2.getType());
       assertEquals(ResourceAuthorityType.Container, jmsRef2.getResAuth());
-      assertEquals("queueref", jmsRef2.getResourceName());
-      assertEquals("queue/testQueue", jmsRef2.getJndiName());
+      assertEquals("topicref", jmsRef2.getResourceName());
+      assertEquals("topic/testTopic", jmsRef2.getJndiName());
    }
 }