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

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

Author: alex.loubyansky at jboss.com
Date: 2007-11-15 10:02:37 -0500 (Thu, 15 Nov 2007)
New Revision: 67135

Added:
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testInvokerDefaultJndiName.xml
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
Log:
test for invoker default jndi-name

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java	2007-11-15 14:39:12 UTC (rev 67134)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java	2007-11-15 15:02:37 UTC (rev 67135)
@@ -525,7 +525,12 @@
    public String getInvokerBinding(String invokerName)
    {
       InvokerBindingMetaData binding = getDelegate().determineInvokerBinding(invokerName);
-      return binding.getJndiName();
+      String bindingName = binding.getJndiName();
+      if(bindingName == null)
+      {
+         bindingName = getJndiName();
+      }
+      return bindingName;
    }
    
    /**

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	2007-11-15 14:39:12 UTC (rev 67134)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2007-11-15 15:02:37 UTC (rev 67135)
@@ -753,6 +753,26 @@
       assertNull(mergedBean.getActivationConfig());
    }
    
+   public void testInvokerDefaultJndiName() throws Exception
+   {
+      JBossMetaData result = unmarshal();
+      JBossEnterpriseBeanMetaData session = (JBossSessionBeanMetaData) result.getEnterpriseBean("SessionEjbName");
+      assertNotNull(session);
+      InvokerBindingsMetaData invokerBindings = session.getInvokerBindings();
+      assertNotNull(invokerBindings);
+      assertEquals(1, invokerBindings.size());
+      InvokerBindingMetaData invokerBindingMetaData = invokerBindings.get("sessionInvokerProxyBindingName");
+      assertNotNull(invokerBindingMetaData);
+      assertEquals("sessionInvokerProxyBindingName", invokerBindingMetaData.getInvokerProxyBindingName());
+      assertNull(invokerBindingMetaData.getJndiName());
+      
+      ApplicationMetaData app = new ApplicationMetaData(result);
+      BeanMetaData bean = app.getBeanByEjbName("SessionEjbName");
+      assertNotNull(bean);
+      String invokerBinding = bean.getInvokerBinding("sessionInvokerProxyBindingName");
+      assertEquals("SessionEjbName", invokerBinding);
+   }
+
    protected void validateResourceRefs(JBossMetaData jbossMetaData)
    {
       // Validate the resource managers

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testInvokerDefaultJndiName.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testInvokerDefaultJndiName.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testInvokerDefaultJndiName.xml	2007-11-15 15:02:37 UTC (rev 67135)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC
+    "-//JBoss//DTD JBOSS 5.0//EN"
+    "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
+<jboss>
+    <enterprise-beans>
+        <session>
+            <ejb-name>SessionEjbName</ejb-name>
+            <invoker-bindings>
+               <invoker>
+                  <invoker-proxy-binding-name>sessionInvokerProxyBindingName</invoker-proxy-binding-name>
+               </invoker>
+            </invoker-bindings>
+        </session>
+    </enterprise-beans>
+</jboss>