[jboss-cvs] JBossAS SVN: r75556 - projects/ejb3/dev/proxy-int/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar.

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

Author: ALRubinger
Date: 2008-07-09 12:34:38 -0400 (Wed, 09 Jul 2008)
New Revision: 75556

Modified:
   projects/ejb3/dev/proxy-int/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java
Log:
[EJBTHREE-1345] Improved user readability of className for References bound to JNDI

Modified: projects/ejb3/dev/proxy-int/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java
===================================================================
--- projects/ejb3/dev/proxy-int/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java	2008-07-09 16:12:47 UTC (rev 75555)
+++ projects/ejb3/dev/proxy-int/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java	2008-07-09 16:34:38 UTC (rev 75556)
@@ -710,17 +710,37 @@
       // what will be castable from the lookup result
       StringBuffer defaultRemotes = new StringBuffer();
       int remotesCount = 0;
+      int interfaceCount = 0;
       for (RefAddr refAddr : refAddrs)
       {
          remotesCount++;
-         defaultRemotes.append(refAddr.getContent());
-         if (remotesCount < refAddrs.size())
+         String refAddrType = refAddr.getType();
+         if (isRefAddrTypeEjbInterface(refAddrType))
          {
-            defaultRemotes.append(", ");
+            if (interfaceCount > 0)
+            {
+               defaultRemotes.append(", ");
+            }
+            defaultRemotes.append(refAddr.getContent());
+            interfaceCount++;
          }
       }
       return defaultRemotes.toString();
    }
+   
+   /**
+    * Returns whether the specified RefAddr type denotes an EJB Interface 
+    * 
+    * @param refAddrType
+    * @return
+    */
+   private boolean isRefAddrTypeEjbInterface(String refAddrType)
+   {
+      return refAddrType.equals(ProxyFactoryReferenceAddressTypes.REF_ADDR_TYPE_PROXY_BUSINESS_INTERFACE_LOCAL) ||
+      refAddrType.equals(ProxyFactoryReferenceAddressTypes.REF_ADDR_TYPE_PROXY_BUSINESS_INTERFACE_REMOTE) ||
+      refAddrType.equals(ProxyFactoryReferenceAddressTypes.REF_ADDR_TYPE_PROXY_EJB2x_INTERFACE_HOME_LOCAL) ||
+      refAddrType.equals(ProxyFactoryReferenceAddressTypes.REF_ADDR_TYPE_PROXY_EJB2x_INTERFACE_HOME_REMOTE);
+   }
 
    /**
     * Registers the specified proxy factory into the registry