[jboss-cvs] JBossAS SVN: r67049 - trunk/ejb3/src/main/org/jboss/ejb3.

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

Author: adrian at jboss.org
Date: 2007-11-13 17:42:51 -0500 (Tue, 13 Nov 2007)
New Revision: 67049

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
Log:
[EJBTHREE-1067] - Don't add the old jms config from the dds unless it is a jms mdb

Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-11-13 22:04:18 UTC (rev 67048)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-11-13 22:42:51 UTC (rev 67049)
@@ -603,75 +603,81 @@
    {
       if (mdb != null)
       {
-         ArrayList<ActivationConfigProperty> properties = new ArrayList<ActivationConfigProperty>();
-         if (mdb.getAcknowledgeMode() != null)
-            properties.add(new ActivationConfigPropertyImpl("acknowledgeMode", mdb.getAcknowledgeMode()));
-
-         if(mdb.getMessageDestinationType() != null)
-         {
-            properties.add(new ActivationConfigPropertyImpl("destinationType", mdb.getMessageDestinationType()));
-         }
-         SubscriptionDurability subscriptionDurability = mdb.getSubscriptionDurability();
-         if(subscriptionDurability != null)
-         {
-            String durable = "false";
-            if (subscriptionDurability.equals(SubscriptionDurability.Durable))
-               durable = "true";
-            properties.add(new ActivationConfigPropertyImpl("subscriptionDurability", durable));
-            if (subscriptionDurability.equals(SubscriptionDurability.Durable))
-               properties.add(new ActivationConfigPropertyImpl("subscriptionName", "subscriptionName"));
-         }
-         
          if (mdb.getResourceAdapterName() != null)
          {
             ResourceAdapter adapter = new ResourceAdapterImpl(mdb.getResourceAdapterName());
             addClassAnnotation(container, ResourceAdapter.class, adapter);
          }
 
-         ActivationConfigMetaData activationConfig = mdb.getActivationConfig();
-         if (activationConfig != null && activationConfig.getActivationConfigProperties() != null)
+         ArrayList<ActivationConfigProperty> properties = new ArrayList<ActivationConfigProperty>();
+
+         if (mdb.isJMS())
          {
-            for (ActivationConfigPropertyMetaData property : activationConfig.getActivationConfigProperties())
+            if (mdb.getAcknowledgeMode() != null)
+               properties.add(new ActivationConfigPropertyImpl("acknowledgeMode", mdb.getAcknowledgeMode()));
+
+            if(mdb.getMessageDestinationType() != null)
             {
-               properties.add(new ActivationConfigPropertyImpl(property
-                     .getName(), property.getValue()));
+               properties.add(new ActivationConfigPropertyImpl("destinationType", mdb.getMessageDestinationType()));
             }
-         }
+            SubscriptionDurability subscriptionDurability = mdb.getSubscriptionDurability();
+            if(subscriptionDurability != null)
+            {
+               String durable = "false";
+               if (subscriptionDurability.equals(SubscriptionDurability.Durable))
+                  durable = "true";
+               properties.add(new ActivationConfigPropertyImpl("subscriptionDurability", durable));
+               if (subscriptionDurability.equals(SubscriptionDurability.Durable))
+                  properties.add(new ActivationConfigPropertyImpl("subscriptionName", "subscriptionName"));
+            }
 
-         // prefer jndi name over message destination link
-         if (mdb.getDestinationJndiName() != null)
-         {
-            properties.add(new ActivationConfigPropertyImpl("destination", mdb
-                  .getDestinationJndiName()));
-         }
-         else if(mdb.getMessageDestinationLink() != null)
-         {
-            log.warn("Message destination link on a MDB is not yet implemented, specify a jndi name in jboss.xml");
-            /*
-            // TODO: I can't resolve here, because we're still scanning, maybe this will work:
-            // This will be picked up by MessagingContainer and then resolved to a jndi name
-            properties.add(new ActivationConfigPropertyImpl("destinationLink", mdb.getMessageDestinationLink()));
-            */
-         }
+            // prefer jndi name over message destination link
+            if (mdb.getDestinationJndiName() != null)
+            {
+               properties.add(new ActivationConfigPropertyImpl("destination", mdb
+                     .getDestinationJndiName()));
+            }
+            else if(mdb.getMessageDestinationLink() != null)
+            {
+               log.warn("Message destination link on a MDB is not yet implemented, specify a jndi name in jboss.xml");
+               /*
+               // TODO: I can't resolve here, because we're still scanning, maybe this will work:
+               // This will be picked up by MessagingContainer and then resolved to a jndi name
+               properties.add(new ActivationConfigPropertyImpl("destinationLink", mdb.getMessageDestinationLink()));
+               */
+            }
+            
+            if (mdb.getMdbSubscriptionId() != null)
+            {
+               properties.add(new ActivationConfigPropertyImpl("subscriptionName", mdb
+                     .getMdbSubscriptionId()));
 
-         if (mdb.getMdbUser() != null)
-         {
-            properties.add(new ActivationConfigPropertyImpl("user", mdb
-                  .getMdbUser()));
-         }
+            }
 
-         if (mdb.getMdbPassword() != null)
-         {
-            properties.add(new ActivationConfigPropertyImpl("password", mdb
-                  .getMdbPassword()));
+            // FIXME These properties are only for our jmsra.rar
+            
+            if (mdb.getMdbUser() != null)
+            {
+               properties.add(new ActivationConfigPropertyImpl("user", mdb
+                     .getMdbUser()));
+            }
 
+            if (mdb.getMdbPassword() != null)
+            {
+               properties.add(new ActivationConfigPropertyImpl("password", mdb
+                     .getMdbPassword()));
+
+            }
          }
-         
-         if (mdb.getMdbSubscriptionId() != null)
+
+         ActivationConfigMetaData activationConfig = mdb.getActivationConfig();
+         if (activationConfig != null && activationConfig.getActivationConfigProperties() != null)
          {
-            properties.add(new ActivationConfigPropertyImpl("subscriptionName", mdb
-                  .getMdbSubscriptionId()));
-
+            for (ActivationConfigPropertyMetaData property : activationConfig.getActivationConfigProperties())
+            {
+               properties.add(new ActivationConfigPropertyImpl(property
+                     .getName(), property.getValue()));
+            }
          }
 
          ActivationConfigPropertyImpl[] propsArray = new ActivationConfigPropertyImpl[properties