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

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

Author: emuckenhuber
Date: 2008-06-09 08:22:36 -0400 (Mon, 09 Jun 2008)
New Revision: 74308

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/JBossSessionBeanOverrideUnitTestCase.java
Log:
[JBMETA-47] merge JBossSessionBeanMetaData

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-06-09 12:20:43 UTC (rev 74307)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-06-09 12:22:36 UTC (rev 74308)
@@ -940,6 +940,21 @@
          home = joverride.getHome();
       else if(soriginal != null && soriginal.getHome() != null)
          home = soriginal.getHome();
+      // jndiName
+      if(joverride != null && joverride.getJndiName() != null)
+         jndiName = joverride.getJndiName();
+      else if(soriginal != null && soriginal.getJndiName() != null)
+         jndiName = soriginal.getJndiName();
+      // homeJndiName
+      if(joverride != null && joverride.homeJndiName != null)
+         homeJndiName = joverride.homeJndiName;
+      else if(soriginal != null && soriginal.getHomeJndiName() != null)
+         homeJndiName = soriginal.homeJndiName;
+      // localHomeJndiName
+      if(joverride != null && joverride.localHomeJndiName != null)
+         localHomeJndiName = joverride.localHomeJndiName;
+      else if(soriginal != null && soriginal.localHomeJndiName != null)
+         localHomeJndiName = soriginal.localHomeJndiName;
       // remote
       if(joverride != null && joverride.getRemote() != null)
          remote = joverride.getRemote();
@@ -990,11 +1005,6 @@
          removeMethods = joverride.getRemoveMethods();
       else if(soriginal != null && soriginal.getRemoveMethods() != null)
          removeMethods = soriginal.getRemoveMethods();
-      // aroundInvokes
-      if(joverride != null && joverride.getAroundInvokes() != null)
-         aroundInvokes = joverride.getAroundInvokes();
-      else if(soriginal != null && soriginal.getAroundInvokes() != null)
-         aroundInvokes = soriginal.getAroundInvokes();
       // postActivates
       if(joverride != null && joverride.getPostActivates() != null)
          postActivates = joverride.getPostActivates();
@@ -1010,36 +1020,56 @@
          securityRoleRefs = joverride.getSecurityRoleRefs();
       else if(soriginal != null && soriginal.getSecurityRoleRefs() != null)
          securityRoleRefs = soriginal.getSecurityRoleRefs();
-
+      // remoteBindings
+      if(joverride != null && joverride.getRemoteBindings() != null)
+         remoteBindings = joverride.getRemoteBindings();
+      else if(soriginal != null && soriginal.getRemoteBindings() != null)
+         remoteBindings = soriginal.getRemoteBindings();
+      // clusterConfig
+      if(joverride != null && joverride.getClusterConfig() != null)
+         clusterConfig = joverride.getClusterConfig();
+      else if(soriginal != null && soriginal.getClusterConfig() != null)
+         clusterConfig = soriginal.getClusterConfig();
+      // portComponent
+      if(joverride != null && joverride.getPortComponent() != null)
+         portComponent = joverride.getPortComponent();
+      else if(soriginal != null && soriginal.getPortComponent() != null)
+         portComponent = soriginal.getPortComponent();
+      // ejbTimeoutIdentity
+      if(joverride != null && joverride.getEjbTimeoutIdentity() != null)
+         ejbTimeoutIdentity = joverride.getEjbTimeoutIdentity();
+      else if(soriginal != null && soriginal.getEjbTimeoutIdentity() != null)
+         ejbTimeoutIdentity = soriginal.getEjbTimeoutIdentity();
+      // Concurrent
+      if(joverride != null && joverride.isConcurrent() != null)
+         concurrent = joverride.isConcurrent();
+      else if(soriginal != null && soriginal.isConcurrent() != null)
+         concurrent = soriginal.isConcurrent();
+      
+      // CallByValue
       if(joverride != null)
-      {
-         // jndiName
-         if(joverride.getJndiName() != null)
-            jndiName = joverride.getJndiName();
-         // homeJndiName
-         if(joverride.homeJndiName != null)
-            homeJndiName = joverride.homeJndiName;
-         // localHomeJndiName
-         if(joverride.localHomeJndiName != null)
-            localHomeJndiName = joverride.localHomeJndiName;
-         // callByValue
          callByValue = joverride.isCallByValue();
-         // clustered
+      else if(soriginal != null)
+         callByValue = soriginal.isCallByValue();
+      // Clustered
+      if(joverride != null)
          clustered = joverride.isClustered();
-         // remoteBindings
-         if(joverride.getRemoteBindings() != null)
-            remoteBindings = joverride.getRemoteBindings();
-         // clusterConfig
-         if(joverride.getClusterConfig() != null)
-            clusterConfig = joverride.getClusterConfig();
-         // portComponent
-         if(joverride.getPortComponent() != null)
-            portComponent = joverride.getPortComponent();
-         // ejbTimeoutIdentity
-         if(joverride.getEjbTimeoutIdentity() != null)
-            ejbTimeoutIdentity = joverride.getEjbTimeoutIdentity();
+      else if(soriginal != null)
+         clustered = soriginal.isClustered();
+         
+      // aroundInvokes (needs to be additive)
+      AroundInvokesMetaData overrideAroundInvokes = null;
+      AroundInvokesMetaData originalAroundInvokes = null;
+      if(joverride != null)
+         overrideAroundInvokes = joverride.getAroundInvokes();
+      if(soriginal != null)
+         originalAroundInvokes = soriginal.getAroundInvokes();
+      if(overrideAroundInvokes != null || originalAroundInvokes != null)
+      {
+         if(aroundInvokes == null)
+            aroundInvokes = new AroundInvokesMetaData();
+         aroundInvokes.merge(overrideAroundInvokes, originalAroundInvokes);
       }
-
    }
 
    @Override

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBossSessionBeanOverrideUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBossSessionBeanOverrideUnitTestCase.java	2008-06-09 12:20:43 UTC (rev 74307)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBossSessionBeanOverrideUnitTestCase.java	2008-06-09 12:22:36 UTC (rev 74308)
@@ -264,10 +264,16 @@
       merged.merge(override, original);
       AroundInvokesMetaData aroundInvokes = merged.getAroundInvokes();
       assertNotNull(aroundInvokes);
-      assertEquals(1, aroundInvokes.size());
+      assertEquals(2, aroundInvokes.size());
       AroundInvokeMetaData aroundInvoke = aroundInvokes.get(0);
+      assertNotNull(aroundInvoke);
+      assertEquals("originalClassName", aroundInvoke.getClassName());
+      assertEquals("originalMethodName", aroundInvoke.getMethodName());
+      aroundInvoke = aroundInvokes.get(1);
+      assertNotNull(aroundInvoke);
       assertEquals("overrideClassName", aroundInvoke.getClassName());
       assertEquals("overrideMethodName", aroundInvoke.getMethodName());
+
    }
    
    public void testSecurityRoleRefs()