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

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

Author: adrian at jboss.org
Date: 2007-10-19 08:39:44 -0400 (Fri, 19 Oct 2007)
New Revision: 66283

Modified:
   trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossJMSMessageEndpointFactory.java
   trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossMessageEndpointFactory.java
Log:
Revert the change that hardwires JMS stuff the generic MEF

Modified: trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossJMSMessageEndpointFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossJMSMessageEndpointFactory.java	2007-10-19 12:38:58 UTC (rev 66282)
+++ trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossJMSMessageEndpointFactory.java	2007-10-19 12:39:44 UTC (rev 66283)
@@ -41,6 +41,7 @@
    /** The JBoss resource adapter deployment name */
    protected static String jmsra = "jms-ra.rar";
 
+   @Override
    protected String resolveResourceAdapterName() throws DeploymentException
    {
       // No resource adapter specified assume jms
@@ -50,6 +51,7 @@
       return result;
    }
    
+   @Override
    protected void resolveMessageListener() throws DeploymentException
    {
       // No messaging type use jms

Modified: trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossMessageEndpointFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossMessageEndpointFactory.java	2007-10-19 12:38:58 UTC (rev 66282)
+++ trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossMessageEndpointFactory.java	2007-10-19 12:39:44 UTC (rev 66283)
@@ -62,7 +62,6 @@
  * @author <a href="mailto:adrian at jboss.com">Adrian Brock</a> .
  * @version <tt>$Revision$</tt>
  */
- at SuppressWarnings("deprecation")
 public class JBossMessageEndpointFactory extends ServiceMBeanSupport
    implements EJBProxyFactory, MessageEndpointFactory, JBossMessageEndpointFactoryMBean
 {
@@ -287,8 +286,6 @@
    protected void resolveMessageListener() throws DeploymentException
    {
       String messagingType = metaData.getMessagingType();
-      if(messagingType == null || messagingType.length() == 0)
-         messagingType = metaData.DEFAULT_MESSAGING_TYPE;
       try
       {
          messagingTypeClass = GetTCLAction.getContextClassLoader().loadClass(messagingType);
@@ -318,9 +315,6 @@
    protected void resolveResourceAdapter() throws DeploymentException
    {
       resourceAdapterName = resolveResourceAdapterName();
-      // TODO: where was this default coming from before?
-      if(resourceAdapterName == null || resourceAdapterName.length() == 0)
-         resourceAdapterName = "jms-ra.rar";
       try
       {
          resourceAdapterObjectName = new ObjectName("jboss.jca:service=RARDeployment,name='" + resourceAdapterName + "'");
@@ -432,30 +426,6 @@
             }
          }
       }
-      // Another hack for pre-ejb 2.1 deployments?
-      else if(properties.containsKey("destination") == false)
-      {
-         String jndiName = metaData.getDestinationJndiName();
-         if(jndiName != null)
-         {
-            org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData acpmd = new
-            org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData();
-            acpmd.setActivationConfigPropertyName("destination");
-            acpmd.setValue(jndiName);
-            ActivationConfigPropertyMetaData wrapper = new ActivationConfigPropertyMetaData(acpmd);
-            properties.put("destination", wrapper);
-         }
-         String type = metaData.getDestinationType();
-         if(type != null)
-         {
-            org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData acpmd = new
-            org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData();
-            acpmd.setActivationConfigPropertyName("destinationType");
-            acpmd.setValue(type);
-            ActivationConfigPropertyMetaData wrapper = new ActivationConfigPropertyMetaData(acpmd);
-            properties.put("destinationType", wrapper);
-         }
-      }
    }   
    
    /**