[seam-commits] Seam SVN: r14666 - in branches/community/Seam_2_3/seam-integration-tests/src/test: resources/WEB-INF and 1 other directory.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Fri May 11 08:19:09 EDT 2012


Author: maschmid
Date: 2012-05-11 08:19:09 -0400 (Fri, 11 May 2012)
New Revision: 14666

Added:
   branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/jboss-seam-integration-tests-hornetq-jms.xml
Modified:
   branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java
   branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/MessagingTest.java
   branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components-jbpm.xml
   branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components.xml
Log:
MessagingTest fix, deploy test jms destinations


Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java	2012-05-11 08:13:32 UTC (rev 14665)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java	2012-05-11 12:19:09 UTC (rev 14666)
@@ -28,7 +28,8 @@
                   .addAsWebInfResource("WEB-INF/components.xml", "components.xml")
                   .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml")
                   .addAsWebInfResource("WEB-INF/web.xml", "web.xml")
-                  .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml");
+                  .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml")
+                  .addAsWebInfResource("WEB-INF/jboss-seam-integration-tests-hornetq-jms.xml", "jboss-seam-integration-tests-hornetq-jms.xml");
    }
 
    public static WebArchive jbpmSeamDeployment() {

Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/MessagingTest.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/MessagingTest.java	2012-05-11 08:13:32 UTC (rev 14665)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/MessagingTest.java	2012-05-11 12:19:09 UTC (rev 14666)
@@ -112,7 +112,7 @@
     
     @MessageDriven(activationConfig={
         @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Topic"),
-        @ActivationConfigProperty(propertyName="destination",     propertyValue="topic/test")
+        @ActivationConfigProperty(propertyName="destination",     propertyValue="topic/seamTest")
     })
     @Name("testTopicListener")
     static public class TestTopicListener 
@@ -133,7 +133,7 @@
     
     @MessageDriven(activationConfig={
         @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination",     propertyValue="queue/test")
+        @ActivationConfigProperty(propertyName="destination",     propertyValue="queue/seamTest")
     })
     @Name("testQueueListener")
     static public class TestQueueListener 

Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components-jbpm.xml
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components-jbpm.xml	2012-05-11 08:13:32 UTC (rev 14665)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components-jbpm.xml	2012-05-11 12:19:09 UTC (rev 14666)
@@ -41,18 +41,5 @@
             <value>testProcess4.jpdl.xml</value>
         </bpm:process-definitions>
     </bpm:jbpm>
-    
 
-    <jms:topic-connection topic-connection-factory-jndi-name="/ConnectionFactory" />
-    <jms:queue-connection queue-connection-factory-jndi-name="/ConnectionFactory" />
-
-    <jms:managed-topic-publisher name="testPublisher"
-                                 auto-create="true" 
-                                 topic-jndi-name="/topic/testTopic" />
-    	                         
-    <jms:managed-queue-sender name="testSender"
-                              auto-create="true"
-                              queue-jndi-name="/queue/testQueue" />
-                       
-
 </components>

Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components.xml
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components.xml	2012-05-11 08:13:32 UTC (rev 14665)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components.xml	2012-05-11 12:19:09 UTC (rev 14666)
@@ -37,11 +37,11 @@
 
     <jms:managed-topic-publisher name="testPublisher"
                                  auto-create="true" 
-                                 topic-jndi-name="topic/test" />
+                                 topic-jndi-name="topic/seamTest" />
                              
     <jms:managed-queue-sender name="testSender"
                               auto-create="true"
-                              queue-jndi-name="queue/test" />
+                              queue-jndi-name="queue/seamTest" />
                        
 
 </components>

Added: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/jboss-seam-integration-tests-hornetq-jms.xml
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/jboss-seam-integration-tests-hornetq-jms.xml	                        (rev 0)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/jboss-seam-integration-tests-hornetq-jms.xml	2012-05-11 12:19:09 UTC (rev 14666)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<messaging-deployment xmlns="urn:jboss:messaging-deployment:1.0">
+    <hornetq-server>
+        <jms-destinations>
+            <jms-topic name="seamTestTopic">
+                <entry name="/topic/seamTest"/>
+            </jms-topic>
+            <jms-queue name="seamTestQueue">
+                <entry name="/queue/seamTest"/>
+            </jms-queue>
+        </jms-destinations>
+    </hornetq-server>
+</messaging-deployment>



More information about the seam-commits mailing list