[jboss-cvs] JBossAS SVN: r74059 - projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss.

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

Author: scott.stark at jboss.org
Date: 2008-06-03 22:21:05 -0400 (Tue, 03 Jun 2008)
New Revision: 74059

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
Log:
Fix merging JBossSessionBeanMetaData with two JBossSessionBeanMetaData

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java	2008-06-04 01:59:02 UTC (rev 74058)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java	2008-06-04 02:21:05 UTC (rev 74059)
@@ -272,6 +272,7 @@
                else
                   mbean = new JBossMessageDrivenBeanMetaData();
                mbean.merge(bean, annBean);
+               add(mbean);
             }
             else
                add(bean);

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-04 01:59:02 UTC (rev 74058)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-06-04 02:21:05 UTC (rev 74059)
@@ -928,6 +928,121 @@
    }
    
    @Override
+   public void merge(JBossEnterpriseBeanMetaData override,
+         JBossEnterpriseBeanMetaData original)
+   {
+      super.merge(override, original);
+
+      JBossSessionBeanMetaData joverride = (JBossSessionBeanMetaData) override;
+      JBossSessionBeanMetaData soriginal = (JBossSessionBeanMetaData) original;
+      // home
+      if(joverride != null && joverride.getHome() != null)
+         home = joverride.getHome();
+      else if(soriginal != null && soriginal.getHome() != null)
+         home = soriginal.getHome();
+      // remote
+      if(joverride != null && joverride.getRemote() != null)
+         remote = joverride.getRemote();
+      else if(soriginal != null && soriginal.getRemote() != null)
+         remote = soriginal.getRemote();
+      // localHome
+      if(joverride != null && joverride.getLocalHome() != null)
+         localHome = joverride.getLocalHome();
+      else if(soriginal != null && soriginal.getLocalHome() != null)
+         localHome = soriginal.getLocalHome();
+      // local
+      if(joverride != null && joverride.getLocal() != null)
+         local = joverride.getLocal();
+      else if(soriginal != null && soriginal.getLocal() != null)
+         local = soriginal.getLocal();
+      // businessLocals
+      if(joverride != null && joverride.getBusinessLocals() != null)
+         businessLocals = joverride.getBusinessLocals();
+      else if(soriginal != null && soriginal.getBusinessLocals() != null)
+         businessLocals = soriginal.getBusinessLocals();
+      // businessRemotes
+      if(joverride != null && joverride.getBusinessRemotes() != null)
+         businessRemotes = joverride.getBusinessRemotes();
+      else if(soriginal != null && soriginal.getBusinessRemotes() != null)
+         businessRemotes = soriginal.getBusinessRemotes();
+      // serviceEndpoint
+      if(joverride != null && joverride.getServiceEndpoint() != null)
+         serviceEndpoint = joverride.getServiceEndpoint();
+      else if(soriginal != null && soriginal.getServiceEndpoint() != null)
+         serviceEndpoint = soriginal.getServiceEndpoint();
+      // sessionType
+      if(joverride != null && joverride.getSessionType() != null)
+         sessionType = joverride.getSessionType();
+      else if(soriginal != null && soriginal.getSessionType() != null)
+         sessionType = soriginal.getSessionType();
+      // timeoutMethod
+      if(joverride != null && joverride.getTimeoutMethod() != null)
+         timeoutMethod = joverride.getTimeoutMethod();
+      else if(soriginal != null && soriginal.getTimeoutMethod() != null)
+         timeoutMethod = soriginal.getTimeoutMethod();
+      // initMethods
+      if(joverride != null && joverride.getInitMethods() != null)
+         initMethods = joverride.getInitMethods();
+      else if(soriginal != null && soriginal.getInitMethods() != null)
+         initMethods = soriginal.getInitMethods();
+      // removeMethods
+      if(joverride != null && joverride.getRemoveMethods() != null)
+         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();
+      else if(soriginal != null && soriginal.getPostActivates() != null)
+         postActivates = soriginal.getPostActivates();
+      // prePassivates
+      if(joverride != null && joverride.getPrePassivates() != null)
+         prePassivates = joverride.getPrePassivates();
+      else if(soriginal != null && soriginal.getPrePassivates() != null)
+         prePassivates = soriginal.getPrePassivates();
+      // securityRoleRefs
+      if(joverride != null && joverride.getSecurityRoleRefs() != null)
+         securityRoleRefs = joverride.getSecurityRoleRefs();
+      else if(soriginal != null && soriginal.getSecurityRoleRefs() != null)
+         securityRoleRefs = soriginal.getSecurityRoleRefs();
+
+      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
+         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();
+      }
+
+   }
+
+   @Override
    public void checkValid()
    {
       if(getEnterpriseBeansMetaData() != null && getEjbJarMetaData() != null)