[jboss-cvs] JBossAS SVN: r75219 - in projects/metadata/trunk/src/main: resources/schema and 1 other directory.

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

Author: emuckenhuber
Date: 2008-06-30 10:49:56 -0400 (Mon, 30 Jun 2008)
New Revision: 75219

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossConsumerBeanMetaData.java
   projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
Log:
[JBMETA-20] missing attributes for consumer beans

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossConsumerBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossConsumerBeanMetaData.java	2008-06-30 13:44:49 UTC (rev 75218)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossConsumerBeanMetaData.java	2008-06-30 14:49:56 UTC (rev 75219)
@@ -22,6 +22,7 @@
 package org.jboss.metadata.ejb.jboss;
 
 import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.spec.ActivationConfigMetaData;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,13 +44,42 @@
    @SuppressWarnings("unused")
    private static final Logger log = Logger.getLogger(JBossConsumerBeanMetaData.class);
    
+   /** The activation config */
+   private ActivationConfigMetaData activationConfig;
+   
+   /** The destiation. */ 
    private String destination = null;
+   
+   /** The destination type. */
    private String destinationType = null;
+   
+   /** The current message. */
    private MethodAttributesMetaData currentMessage = null;
+   
+   /** The message properties. */
    private List<MessagePropertiesMetaData> messageProperties = null;
+   
+   /** The producers. */
    private List<ProducerMetaData> producers = null;
+
+   /** The local producers. */
    private List<LocalProducerMetaData> localProducers = null;
    
+   /** The default activation config. */
+   private ActivationConfigMetaData defaultActivationConfig;
+   
+   public ActivationConfigMetaData getActivationConfig()
+   {
+      return activationConfig;
+   }
+
+   public void setActivationConfig(ActivationConfigMetaData activationConfig)
+   {
+      if (activationConfig == null)
+         throw new IllegalArgumentException("Null activationConfig");
+      this.activationConfig = activationConfig;
+   }
+   
    public String getMessageDestination()
    {
       return destination;
@@ -112,6 +142,18 @@
       this.localProducers = producers;
    }
    
+   public ActivationConfigMetaData getDefaultActivationConfig()
+   {
+      return defaultActivationConfig;
+   }
+
+   public void setDefaultActivationConfig(ActivationConfigMetaData defaultActivationConfig)
+   {
+      if (defaultActivationConfig == null)
+         throw new IllegalArgumentException("Null defaultActivationConfig");
+      this.defaultActivationConfig = defaultActivationConfig;
+   }
+   
    @Override
    public boolean isConsumer()
    {
@@ -188,6 +230,12 @@
          overrideLocalProducers = override.localProducers;
       }
       
+      if((override != null && override.activationConfig != null) || (original != null && original.activationConfig != null))
+      {
+         activationConfig = new ActivationConfigMetaData();
+         activationConfig.merge(override != null ? override.activationConfig : null, original != null ? original.activationConfig : null);
+      }
+      
       if(originalMsg != null || overrideMsg != null)
       {
          if(currentMessage == null)

Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd	2008-06-30 13:44:49 UTC (rev 75218)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd	2008-06-30 14:49:56 UTC (rev 75219)
@@ -771,6 +771,7 @@
          <xsd:element name="aop-domain-name" type="jboss:aop-domain-nameType" minOccurs="0"/>
          <xsd:element name="pool-config" type="jboss:pool-configType" minOccurs="0"/>
          <xsd:element name="jndi-ref" type="jboss:jndi-refType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="default-activation-config" type="jboss:default-activation-configType" minOccurs="0"/>
       </xsd:sequence>
       <xsd:attribute name="id" type="xsd:ID"/>
    </xsd:complexType>