[jboss-cvs] JBossAS SVN: r103758 - in trunk: testsuite/imports/sections and 4 other directories.

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

Author: clebert.suconic at jboss.com
Date: 2010-04-09 13:47:32 -0400 (Fri, 09 Apr 2010)
New Revision: 103758

Added:
   trunk/testsuite/src/resources/bootstrapdependencies/jbas5349/ejb3/mdb/
   trunk/testsuite/src/resources/bootstrapdependencies/jbas5349/ejb3/mdb/META-INF/
   trunk/testsuite/src/resources/bootstrapdependencies/jbas5349/ejb3/mdb/META-INF/jboss.xml
Modified:
   trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DestinationFactoryDeployerPlugin.java
   trunk/testsuite/imports/sections/bootstrapdependencies.xml
   trunk/testsuite/src/resources/bootstrapdependencies/jbas5349/ejb2/mdb/META-INF/jboss.xml
Log:
JBAS-7918 - fixing bootstrap tests to use create-destination

Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DestinationFactoryDeployerPlugin.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DestinationFactoryDeployerPlugin.java	2010-04-09 14:07:35 UTC (rev 103757)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DestinationFactoryDeployerPlugin.java	2010-04-09 17:47:32 UTC (rev 103758)
@@ -90,7 +90,12 @@
                   "destinationType");
          }
       }
-
+      
+      if (destinationName == null)
+      {
+         destinationName = mdb.getDestinationJndiName();
+      }
+      
       // TODO message-destination-link?
 
       log.info("Deploying destination " + destinationName);

Modified: trunk/testsuite/imports/sections/bootstrapdependencies.xml
===================================================================
--- trunk/testsuite/imports/sections/bootstrapdependencies.xml	2010-04-09 14:07:35 UTC (rev 103757)
+++ trunk/testsuite/imports/sections/bootstrapdependencies.xml	2010-04-09 17:47:32 UTC (rev 103758)
@@ -29,6 +29,9 @@
         </fileset>
       </jar>
       <jar destfile="${build.lib}/bootstrapdependencies-ejb3-messagebean.jar">
+        <fileset dir="${build.resources}/bootstrapdependencies/jbas5349/ejb3/mdb">
+           <include name="**/*"/>
+        </fileset>
         <fileset dir="${build.classes}">
            <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb3/DummyMessageBean.class"/>
         </fileset>
@@ -64,4 +67,4 @@
         </classes>
       </war>
    </target>
-</project>
\ No newline at end of file
+</project>

Modified: trunk/testsuite/src/resources/bootstrapdependencies/jbas5349/ejb2/mdb/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/bootstrapdependencies/jbas5349/ejb2/mdb/META-INF/jboss.xml	2010-04-09 14:07:35 UTC (rev 103757)
+++ trunk/testsuite/src/resources/bootstrapdependencies/jbas5349/ejb2/mdb/META-INF/jboss.xml	2010-04-09 17:47:32 UTC (rev 103758)
@@ -1,11 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
-
-<jboss>
+<?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>DummyMessageBean</ejb-name>                       
          <destination-jndi-name>queue/testingqueue</destination-jndi-name>
+         <create-destination>true</create-destination>
       </message-driven>
    </enterprise-beans>
 </jboss>

Added: trunk/testsuite/src/resources/bootstrapdependencies/jbas5349/ejb3/mdb/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/bootstrapdependencies/jbas5349/ejb3/mdb/META-INF/jboss.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/bootstrapdependencies/jbas5349/ejb3/mdb/META-INF/jboss.xml	2010-04-09 17:47:32 UTC (rev 103758)
@@ -0,0 +1,14 @@
+<?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>DummyMessageBean</ejb-name>                       
+         <create-destination>true</create-destination>
+      </message-driven>
+   </enterprise-beans>
+</jboss>
\ No newline at end of file