svn commit: r1053321 - in /geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests: jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSTopicSenderReceiver.java

[ge...@apache.org]

Author: genspring
Date: Tue Dec 28 12:08:28 2010
New Revision: 1053321

URL: http://svn.apache.org/viewvc?rev=1053321&view=rev
Log:
clean up jms testsuite.

Modified:
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSTopicSenderReceiver.java

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml?rev=1053321&r1=1053320&r2=1053321&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml Tue Dec 28 12:08:28 2010
@@ -32,7 +32,7 @@
         <dep:dependencies>
             <dep:dependency>
                 <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                <dep:artifactId>activemq-broker</dep:artifactId>
+                <dep:artifactId>activemq-broker-blueprint</dep:artifactId>
                 <dep:version>${version}</dep:version>
                 <dep:type>car</dep:type>
             </dep:dependency>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSTopicSenderReceiver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSTopicSenderReceiver.java?rev=1053321&r1=1053320&r2=1053321&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSTopicSenderReceiver.java (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSTopicSenderReceiver.java Tue Dec 28 12:08:28 2010
@@ -24,11 +24,10 @@ import javax.jms.Session;
 import javax.jms.MessageListener;
 import javax.jms.JMSException;
 import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicSubscriber;
-import javax.jms.TopicPublisher;
-import javax.jms.TopicSession;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
 
 import javax.jms.TextMessage;
 import javax.servlet.Servlet;
@@ -45,7 +44,8 @@ public class JMSTopicSenderReceiver exte
 
 
     @Resource(name="MSConnectionFactory")
-    TopicConnectionFactory tcf = null;
+    ConnectionFactory tcf = null;
+    
     @Resource(name="TestTopic")
     Topic topic = null;
 
@@ -73,15 +73,15 @@ public class JMSTopicSenderReceiver exte
 
             String type = arg0.getParameter("type");
 
-            TopicConnection connection = tcf.createTopicConnection();
-            TopicSession session = connection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
-            TopicSubscriber topicSubscriber = session.createSubscriber(topic);
+            Connection connection = tcf.createConnection();
+            Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            MessageConsumer topicSubscriber = session.createConsumer(topic);
             TestListener test = new TestListener(latch);
             topicSubscriber.setMessageListener(test);
             connection.start();
-            TopicPublisher topicPublisher = session.createPublisher(topic);
+            MessageProducer topicPublisher = session.createProducer(topic);
             TextMessage tmsg = session.createTextMessage("JMS - Test Topic Message");
-            topicPublisher.publish(tmsg);
+            topicPublisher.send(tmsg);
             latch.await(1, TimeUnit.SECONDS);
             out.println("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>");
             out.println("<head><title>JMS Topic Sender Receiver</title></head>");