[jboss-cvs] JBossAS SVN: r96005 - in projects/embedded/trunk: testsuite/src/test/java/org/jboss/embedded/testsuite and 1 other directories.

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

Author: ALRubinger
Date: 2009-11-04 10:42:15 -0500 (Wed, 04 Nov 2009)
New Revision: 96005

Modified:
   projects/embedded/trunk/assembly/pom.xml
   projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerTestCase.java
   projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ejb3/mdb/MessageStoringMdb.java
Log:
[EMB-59] Test the Embedded Server using the "all" configuration

Modified: projects/embedded/trunk/assembly/pom.xml
===================================================================
--- projects/embedded/trunk/assembly/pom.xml	2009-11-04 15:34:20 UTC (rev 96004)
+++ projects/embedded/trunk/assembly/pom.xml	2009-11-04 15:42:15 UTC (rev 96005)
@@ -36,7 +36,9 @@
     <version.jboss.web>2.1.3.GA</version.jboss.web>
     <version.jboss.messaging>1.4.3.GA</version.jboss.messaging>
     <version.org.slf4j_slf4j.jboss.logging>1.0.2.GA</version.org.slf4j_slf4j.jboss.logging>
+    <version.org.jboss.cache_jbosscache.pojo>3.0.0.GA</version.org.jboss.cache_jbosscache.pojo>
     <version.org.jboss.embedded_jboss.embedded.core>0.1.0-SNAPSHOT</version.org.jboss.embedded_jboss.embedded.core>
+    <version.xerces_xercesImpl>2.9.1</version.xerces_xercesImpl>
 
   </properties>
 
@@ -123,6 +125,23 @@
       <artifactId>slf4j-jboss-logging</artifactId>
       <version>${version.org.slf4j_slf4j.jboss.logging}</version>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.cache</groupId>
+      <artifactId>jbosscache-pojo</artifactId>
+      <version>${version.org.jboss.cache_jbosscache.pojo}</version>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>${version.xerces_xercesImpl}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-varia</artifactId>
+      <classifier>snmp-adaptor</classifier>
+      <type>sar</type>
+      <version>${version.org.jboss.jbossas}</version>
+    </dependency>
 
   </dependencies>
 

Modified: projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerTestCase.java
===================================================================
--- projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerTestCase.java	2009-11-04 15:34:20 UTC (rev 96004)
+++ projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerTestCase.java	2009-11-04 15:42:15 UTC (rev 96005)
@@ -167,6 +167,11 @@
     */
    private static final String JNDI_SUFFIX_LOCAL_BUSINESS = "/local";
 
+   /**
+    * Name of the server configuration to use
+    */
+   private static final String NAME_SERVER_CONFIG = "all";
+
    //-------------------------------------------------------------------------------||
    // Lifecycle --------------------------------------------------------------------||
    //-------------------------------------------------------------------------------||
@@ -185,6 +190,7 @@
 
       // Start
       log.info("Starting Server: " + server);
+      server.getConfiguration().serverName(NAME_SERVER_CONFIG);
       server.start();
       log.info("...started.");
 

Modified: projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ejb3/mdb/MessageStoringMdb.java
===================================================================
--- projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ejb3/mdb/MessageStoringMdb.java	2009-11-04 15:34:20 UTC (rev 96004)
+++ projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ejb3/mdb/MessageStoringMdb.java	2009-11-04 15:42:15 UTC (rev 96005)
@@ -34,6 +34,8 @@
 import javax.jms.MessageListener;
 import javax.jms.TextMessage;
 
+import org.jboss.ejb3.annotation.Depends;
+
 /**
  * MessageStoringMdb
  * 
@@ -50,6 +52,7 @@
 @MessageDriven(activationConfig =
 {@ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
       @ActivationConfigProperty(propertyName = "destination", propertyValue = MessageStoringMdb.NAME_QUEUE)})
+ at Depends("jboss.messaging.destination:service=Queue,name=EmbeddedQueue") // Matches the name in the queue descriptor XML
 public class MessageStoringMdb implements MessageListener
 {
    //-------------------------------------------------------------------------------------||