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

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

Author: ALRubinger
Date: 2007-12-10 22:57:05 -0500 (Mon, 10 Dec 2007)
New Revision: 68130

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
Log:
[JBCTS-718] Handle "jndi-name" definitions configured via XML as @RemoteBinding(jndiBinding="x")

Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-12-11 03:37:10 UTC (rev 68129)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-12-11 03:57:05 UTC (rev 68130)
@@ -1744,12 +1744,25 @@
          JBossSessionBeanMetaData enterpriseBean) throws ClassNotFoundException
    {
 	  String homeJndiName = enterpriseBean.getHomeJndiName();
-	  if (homeJndiName != null)
+	  if (homeJndiName != null && !homeJndiName.trim().equals(""))
       {
          RemoteHomeBindingImpl homeBinding = new RemoteHomeBindingImpl(homeJndiName);
          addClassAnnotation(container, RemoteHomeBinding.class, homeBinding);
       } 
 	  
+	  // JBCTS-718
+      // If jndi-name is defined, use the value specified
+      String jndiName = enterpriseBean.getJndiName();
+      if (jndiName != null && !jndiName.trim().equals(""))
+      {
+         RemoteBindingImpl remoteBindingAnnotation = new RemoteBindingImpl();
+         remoteBindingAnnotation.setJndiBinding(jndiName);
+         addClassAnnotation(container, RemoteBinding.class, remoteBindingAnnotation);
+         log.debug("Adding " + RemoteBinding.class.getName() + " to " + container.toString() + ": "
+               + remoteBindingAnnotation.toString());
+         return;
+      }
+	  
       List<RemoteBindingMetaData> bindingsList = enterpriseBean.getRemoteBindings();
       if (bindingsList == null || bindingsList.size() == 0)
       {