[jboss-cvs] JBossAS SVN: r79080 - in projects/metadata/trunk/src: main/resources/schema and 2 other directories.

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

Author: emuckenhuber
Date: 2008-10-03 09:12:06 -0400 (Fri, 03 Oct 2008)
New Revision: 79080

Added:
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testCreateDestination.xml
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java
   projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
Log:
[JBMETA-110] add CreateDestination for JBossMessageDrivenMetaData (create-destination)

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	2008-10-03 12:56:43 UTC (rev 79079)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java	2008-10-03 13:12:06 UTC (rev 79080)
@@ -96,6 +96,10 @@
 
    /** The default activation config */
    private ActivationConfigMetaData defaultActivationConfig;
+   
+   /** The create destination */
+   private Boolean createDestination;
+   private static final boolean createDestinationDefault = false;
 
    /**
     * Create a new MessageDrivenBeanMetaData.
@@ -573,6 +577,30 @@
          throw new IllegalArgumentException("Null ejbTimeoutIdentity");
       this.ejbTimeoutIdentity = ejbTimeoutIdentity;
    }
+   
+   /**
+    * Is create destination
+    * 
+    * @return createDestination == true
+    */
+   @XmlElement(name = "create-destination")
+   public boolean isCreateDestination()
+   {
+      if(createDestination == null)
+         return createDestinationDefault;
+      
+      return createDestination.booleanValue();
+   }
+   
+   /**
+    * Set the create destination
+    * 
+    * @param createDestination
+    */
+   public void setCreateDestination(boolean createDestination)
+   {
+      this.createDestination = Boolean.valueOf(createDestination);
+   }
 
    @Override
    public void merge(JBossEnterpriseBeanMetaData override, EnterpriseBeanMetaData original, String overridenFile, String overrideFile, boolean mustOverride)
@@ -741,6 +769,10 @@
          overrideAInvokes = override.aroundInvokes;
          overrideEjbTimeoutIdentity = override.ejbTimeoutIdentity;
       }
+      if(override != null && override.createDestination != null)
+         this.createDestination = override.createDestination;
+      else if (original != null && original.createDestination != null)
+         this.createDestination = original.createDestination;
       
       if(originalAConfig != null || overrideAConfig != 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-10-03 12:56:43 UTC (rev 79079)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd	2008-10-03 13:12:06 UTC (rev 79080)
@@ -432,6 +432,7 @@
          <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:element name="create-destination" type="xsd:boolean" minOccurs="0"/>
       </xsd:sequence>
       <xsd:attribute name="id" type="xsd:ID"/>
    </xsd:complexType>

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java	2008-10-03 12:56:43 UTC (rev 79079)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java	2008-10-03 13:12:06 UTC (rev 79080)
@@ -275,6 +275,14 @@
       assertBeanLoadBalancePolicy(config, "container");
       assertSessionStateManagerJndiName(config, "standard");
    }
+   
+   
+   public void testCreateDestination() throws Exception
+   {
+      JBossMetaData metaData = unmarshal();
+      JBossMessageDrivenBeanMetaData mdb = (JBossMessageDrivenBeanMetaData) metaData.getEnterpriseBean("MessageDriven");
+      assertTrue(mdb.isCreateDestination());
+   }
 
    public void assertCacheConfig(String prefix, int num, CacheConfigMetaData cacheConfig)
    {

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testCreateDestination.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testCreateDestination.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testCreateDestination.xml	2008-10-03 13:12:06 UTC (rev 79080)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<jboss
+    xmlns="http://www.jboss.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+    http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+    version="3.0">
+    
+    
+    <enterprise-beans>
+		<message-driven>
+			<ejb-name>MessageDriven</ejb-name>
+			<create-destination>true</create-destination>
+		</message-driven>
+    </enterprise-beans>
+</jboss>