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

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

Author: wolfc
Date: 2007-11-15 06:13:29 -0500 (Thu, 15 Nov 2007)
New Revision: 67120

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MessageDrivenBeanMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
Log:
JBAS-4506: don't instantiate unspecified activation config

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java	2007-11-15 10:57:19 UTC (rev 67119)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java	2007-11-15 11:13:29 UTC (rev 67120)
@@ -58,7 +58,7 @@
    private String messageDestinationLink;
 
    /** The activation config */
-   private ActivationConfigMetaData activationConfig = new ActivationConfigMetaData();
+   private ActivationConfigMetaData activationConfig;
    
    /** The around invokes */
    private AroundInvokesMetaData aroundInvokes;

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MessageDrivenBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MessageDrivenBeanMetaData.java	2007-11-15 10:57:19 UTC (rev 67119)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MessageDrivenBeanMetaData.java	2007-11-15 11:13:29 UTC (rev 67120)
@@ -53,7 +53,7 @@
    private String messageDestinationLink;
 
    /** The activation config */
-   private ActivationConfigMetaData activationConfig = new ActivationConfigMetaData();
+   private ActivationConfigMetaData activationConfig;
    
    /** The around invokes */
    private AroundInvokesMetaData aroundInvokes;

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java	2007-11-15 10:57:19 UTC (rev 67119)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java	2007-11-15 11:13:29 UTC (rev 67120)
@@ -469,7 +469,7 @@
       MessageDrivenBeanMetaData mdb = assertMDB(ejbName + "EjbName", enterpriseBeansMetaData);
       assertEquals(ejbName+"EjbClass", mdb.getEjbClass());
       assertEquals(TransactionType.Container, mdb.getTransactionType());
-      assertNotNull(mdb.getActivationConfig());
+      assertNull(mdb.getActivationConfig());
       assertNull(mdb.getMessagingType());
       assertNull(mdb.getId());
       assertNull(mdb.getMappedName());

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 10:57:19 UTC (rev 67119)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2007-11-15 11:13:29 UTC (rev 67120)
@@ -51,12 +51,16 @@
 import org.jboss.metadata.ejb.jboss.RemoteBindingMetaData;
 import org.jboss.metadata.ejb.jboss.ResourceManagerMetaData;
 import org.jboss.metadata.ejb.jboss.ResourceManagersMetaData;
+import org.jboss.metadata.ejb.spec.ActivationConfigMetaData;
+import org.jboss.metadata.ejb.spec.ActivationConfigPropertiesMetaData;
+import org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData;
 import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
 import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
 import org.jboss.metadata.ejb.spec.EjbJar2xMetaData;
 import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
 import org.jboss.metadata.ejb.spec.EjbJarMetaData;
 import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
+import org.jboss.metadata.ejb.spec.MessageDrivenBeanMetaData;
 import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
 import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
 import org.jboss.metadata.ejb.spec.SubscriptionDurability;
@@ -716,6 +720,36 @@
       JBossMetaData jbossXmlMetaData = unmarshal();
    }
 
+   public void testMDBActivationConfigMerge()
+   {
+      EjbJar30MetaData ejbJar = new EjbJar30MetaData();
+      ejbJar.setEnterpriseBeans(new EnterpriseBeansMetaData());
+      MessageDrivenBeanMetaData messageBean = new MessageDrivenBeanMetaData();
+      messageBean.setEjbName("MyMDB");
+      // Do not add an activationConfig
+//      ActivationConfigMetaData activationConfig = new ActivationConfigMetaData();
+//      ActivationConfigPropertiesMetaData activationConfigProperties = new ActivationConfigPropertiesMetaData();
+//      ActivationConfigPropertyMetaData activationConfigProperty = new ActivationConfigPropertyMetaData();
+//      activationConfigProperty.setName("aName");
+//      activationConfigProperty.setValue("aValue");
+//      activationConfigProperties.add(activationConfigProperty);
+//      activationConfig.setActivationConfigProperties(activationConfigProperties);
+//      messageBean.setActivationConfig(activationConfig);
+      ejbJar.getEnterpriseBeans().add(messageBean);
+      
+      JBoss50MetaData metaData = new JBoss50MetaData();
+      metaData.setEnterpriseBeans(new JBossEnterpriseBeansMetaData());
+      JBossMessageDrivenBeanMetaData jMessageBean = new JBossMessageDrivenBeanMetaData();
+      jMessageBean.setEjbName("MyMDB");
+      jMessageBean.setDestinationJndiName("destinationJndiName");
+      metaData.getEnterpriseBeans().add(jMessageBean);
+      
+      metaData.merge(null, ejbJar);
+      
+      JBossMessageDrivenBeanMetaData mergedBean = (JBossMessageDrivenBeanMetaData) metaData.getEnterpriseBean("MyMDB");
+      assertNull(mergedBean.getActivationConfig());
+   }
+   
    protected void validateResourceRefs(JBossMetaData jbossMetaData)
    {
       // Validate the resource managers