[jboss-cvs] JBossAS SVN: r72621 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ejb and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2008-04-23 10:01:12 -0400 (Wed, 23 Apr 2008)
New Revision: 72621

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
Log:
JBMETA-25

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-04-23 11:54:09 UTC (rev 72620)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-04-23 14:01:12 UTC (rev 72621)
@@ -633,6 +633,8 @@
          name = jndiName;
       if(name == null)
          name = getMappedName();
+      if(name == null && getRemoteBindings() != null && getRemoteBindings().size() > 0)
+         name = getRemoteBindings().get(0).getJndiName();
       // TODO: JBMETA-6, this should be the policy with ejb2 metadata defaulting to an ejb-name policy
       if(name == null)
          name = getEjbName();

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2008-04-23 11:54:09 UTC (rev 72620)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2008-04-23 14:01:12 UTC (rev 72621)
@@ -331,12 +331,17 @@
       assertEquals(1, jboss.getEnterpriseBeans().size());
       
       JBossSessionBeanMetaData sessionBean = (JBossSessionBeanMetaData) jboss.getEnterpriseBean("StatefulBean");
+      String determinedJndiName = sessionBean.determineJndiName();
+      boolean determinedValid = false;
       for(int i = 0; i < 2; i++)
       {
          RemoteBindingMetaData remoteBinding = sessionBean.getRemoteBindings().get(i);
-         assertEquals("jndiName" + (i + 1), remoteBinding.getJndiName());
+         String jndiName = "jndiName" + (i + 1);
+         assertEquals(jndiName, remoteBinding.getJndiName());
          assertEquals("clientBindUrl" + (i + 1), remoteBinding.getClientBindUrl());
+         determinedValid |= jndiName.equals(determinedJndiName);
       }
+      assertTrue("determinedJndiName is one of the remote-binding values", determinedValid);
    }
    
    /**