[jboss-cvs] JBossAS SVN: r66933 - trunk/server/src/main/org/jboss/ejb/plugins/inflow.

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

Author: adrian at jboss.org
Date: 2007-11-09 13:10:10 -0500 (Fri, 09 Nov 2007)
New Revision: 66933

Modified:
   trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossJMSMessageEndpointFactory.java
Log:
[JBAS-4957] - Always look at the legacy MDB tags when deploying JMS mdbs

Modified: trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossJMSMessageEndpointFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossJMSMessageEndpointFactory.java	2007-11-09 18:08:44 UTC (rev 66932)
+++ trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossJMSMessageEndpointFactory.java	2007-11-09 18:10:10 UTC (rev 66933)
@@ -73,23 +73,19 @@
       // Hack for old style deployments (jms)
       if (messagingTypeClass.equals(MessageListener.class))
       {
-         // Old style deployment
-         if (metaData.getMessagingType() == null)
-         {
-            checkActivationConfig("destination", metaData.getDestinationJndiName());
-            checkActivationConfig("destinationType", metaData.getDestinationType());
-            checkActivationConfig("messageSelector", metaData.getMessageSelector());
-            if (Session.DUPS_OK_ACKNOWLEDGE == metaData.getAcknowledgeMode())
-               checkActivationConfig("acknowledgeMode", "DUPS_OK_ACKNOWLEDGE");
-            else
-               checkActivationConfig("acknowledgeMode", "AUTO_ACKNOWLEDGE");
-            if (MessageDrivenMetaData.DURABLE_SUBSCRIPTION == metaData.getSubscriptionDurability())
-               checkActivationConfig("subscriptionDurability", "Durable");
-            else
-               checkActivationConfig("subscriptionDurability", "NonDurable");
-            checkActivationConfig("clientID", metaData.getClientId());
-            checkActivationConfig("subscriptionName", metaData.getSubscriptionId());
-         }
+         checkActivationConfig("destination", metaData.getDestinationJndiName());
+         checkActivationConfig("destinationType", metaData.getDestinationType());
+         checkActivationConfig("messageSelector", metaData.getMessageSelector());
+         if (Session.DUPS_OK_ACKNOWLEDGE == metaData.getAcknowledgeMode())
+            checkActivationConfig("acknowledgeMode", "DUPS_OK_ACKNOWLEDGE");
+         else
+            checkActivationConfig("acknowledgeMode", "AUTO_ACKNOWLEDGE");
+         if (MessageDrivenMetaData.DURABLE_SUBSCRIPTION == metaData.getSubscriptionDurability())
+            checkActivationConfig("subscriptionDurability", "Durable");
+         else
+            checkActivationConfig("subscriptionDurability", "NonDurable");
+         checkActivationConfig("clientID", metaData.getClientId());
+         checkActivationConfig("subscriptionName", metaData.getSubscriptionId());
          
          // Only for JBoss's resource adapter
          if (jmsra.equals(resourceAdapterName))