[jboss-cvs] JBossAS SVN: r68485 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/annotation/ejb3 and 2 other directories.

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

Author: scott.stark at jboss.org
Date: 2007-12-21 04:34:34 -0500 (Fri, 21 Dec 2007)
New Revision: 68485

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationReferenceMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/messagelistenerinterface/UnknownMessageListenerInterfaceMDB.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testMessageDrivenBeanMerge.xml
Log:
JBAS-5097, fix the merge of the MessageDestinationReferenceMetaData

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationReferenceMetaData.java	2007-12-21 09:21:37 UTC (rev 68484)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationReferenceMetaData.java	2007-12-21 09:34:34 UTC (rev 68485)
@@ -169,11 +169,11 @@
          setType(override.type);
       else if (original.type != null)
          setType(original.type);
-      if (override != null && usage != null)
+      if (override != null && override.usage != null)
          setMessageDestinationUsage(override.usage);
       else if (original.usage != null)
          setMessageDestinationUsage(original.usage);
-      if (override != null && link != null)
+      if (override != null && override.link != null)
          setLink(override.link);
       else if (original.link != null)
          setLink(original.link);

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java	2007-12-21 09:21:37 UTC (rev 68484)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java	2007-12-21 09:34:34 UTC (rev 68485)
@@ -76,6 +76,9 @@
 import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
 import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
 import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationUsageType;
 import org.jboss.metadata.javaee.spec.RunAsMetaData;
 import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
 import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
@@ -604,8 +607,16 @@
       assertEquals("none", activationConfigProperties.get("dummy").getValue());
       assertEquals("Auto-acknowledge", activationConfigProperties.get("acknowledgeMode").getValue());
       assertEquals("javax.jms.Queue", activationConfigProperties.get("destinationType").getValue());
+      assertEquals("two_ejb.jar#MsgBeanInQueue", result.getMessageDestinationLink());
+      MessageDestinationReferencesMetaData mdRefs = result.getMessageDestinationReferences();
+      assertEquals(1, mdRefs.size());
+      MessageDestinationReferenceMetaData replyQueue = mdRefs.get("replyQueue");
+      assertNotNull(replyQueue);
+      assertEquals("javax.jms.Queue", replyQueue.getType());
+      assertEquals("two_ejb.jar#MsgBeanOutQueue", replyQueue.getLink());
+      assertEquals(MessageDestinationUsageType.Produces, replyQueue.getMessageDestinationUsage());
    }
-   
+
    /**
     * EJB 3 4.6.6:
     * If bean class implements a single interface, that interface is assumed to be the busi-

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/messagelistenerinterface/UnknownMessageListenerInterfaceMDB.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/messagelistenerinterface/UnknownMessageListenerInterfaceMDB.java	2007-12-21 09:21:37 UTC (rev 68484)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/messagelistenerinterface/UnknownMessageListenerInterfaceMDB.java	2007-12-21 09:34:34 UTC (rev 68485)
@@ -21,8 +21,11 @@
  */
 package org.jboss.test.metadata.annotation.ejb3.messagelistenerinterface;
 
+import javax.annotation.Resource;
 import javax.ejb.ActivationConfigProperty;
 import javax.ejb.MessageDriven;
+import javax.jms.Queue;
+import javax.jms.QueueConnectionFactory;
 
 /**
  * This bean does not define a message listener interface or implement one,
@@ -36,5 +39,9 @@
       @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge")})
 public class UnknownMessageListenerInterfaceMDB
 {
+   @Resource(name="qFactory")
+   private QueueConnectionFactory qFactory;
 
+   @Resource(name="replyQueue")
+   private Queue replyQueue; 
 }

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testMessageDrivenBeanMerge.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testMessageDrivenBeanMerge.xml	2007-12-21 09:21:37 UTC (rev 68484)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testMessageDrivenBeanMerge.xml	2007-12-21 09:34:34 UTC (rev 68485)
@@ -7,12 +7,20 @@
       <message-driven>
          <ejb-name>UnknownMessageListenerInterfaceMDB</ejb-name>
          <messaging-type>javax.jms.MessageListener</messaging-type>
+         <message-destination-type>javax.jms.Queue</message-destination-type>
+         <message-destination-link>two_ejb.jar#MsgBeanInQueue</message-destination-link>
          <activation-config>
             <activation-config-property>
                <activation-config-property-name>dummy</activation-config-property-name>
                <activation-config-property-value>none</activation-config-property-value>
             </activation-config-property>
          </activation-config>
+         <message-destination-ref>
+            <description>test destination</description>
+            <message-destination-ref-name>replyQueue</message-destination-ref-name> <message-destination-type>javax.jms.Queue</message-destination-type>
+            <message-destination-usage>Produces</message-destination-usage>
+            <message-destination-link>two_ejb.jar#MsgBeanOutQueue</message-destination-link>
+         </message-destination-ref>
       </message-driven>
    </enterprise-beans>
 </ejb-jar>