[jboss-cvs] JBossAS SVN: r71295 - 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-03-26 07:12:41 -0400 (Wed, 26 Mar 2008)
New Revision: 71295

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EJBLocalReferenceMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
Log:
JBMETA-9

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EJBLocalReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EJBLocalReferenceMetaData.java	2008-03-26 09:25:05 UTC (rev 71294)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EJBLocalReferenceMetaData.java	2008-03-26 11:12:41 UTC (rev 71295)
@@ -139,7 +139,7 @@
       else if (original != null && original.localHome != null)
          setLocalHome(original.localHome);
       if (override != null && override.local != null)
-         setLocal(local);
+         setLocal(override.local);
       else if (original != null && original.local != null)
          setLocal(original.local);
    }

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java	2008-03-26 09:25:05 UTC (rev 71294)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java	2008-03-26 11:12:41 UTC (rev 71295)
@@ -48,6 +48,7 @@
 import org.jboss.metadata.ejb.spec.EjbJarMetaData;
 import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
 import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
+import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
 import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
 
@@ -215,6 +216,19 @@
       assertEquals("en-session2-override", descGroup.getDescription());
    }
 
+   public void testEJBLocalReferenceMerge() throws Exception
+   {
+      EJBLocalReferenceMetaData original = new EJBLocalReferenceMetaData();
+      original.setEjbRefName("crucialEjb");
+      EJBLocalReferenceMetaData override = new EJBLocalReferenceMetaData();
+      override.setLocal("CrucialLocal");
+
+      EJBLocalReferenceMetaData merged = new EJBLocalReferenceMetaData();
+      merged.merge(override, original);
+      assertEquals("crucialEjb", merged.getEjbRefName());
+      assertEquals("CrucialLocal", merged.getLocal());
+   }
+   
    private Collection<Class<?>> loadClassesFromCurrentClassDir()
    {
       // In real life the deployer will pass probably pass a class scanner