[servicemix-scm] [1059] trunk/servicemix-jms/src/test/java/org/servicemix/jms: updated for amq4.0

Mon, 12 Dec 2005 05:33:34 -0800

Title: [1059] trunk/servicemix-jms/src/test/java/org/servicemix/jms: updated for amq4.0

Diff

Modified: trunk/servicemix-jms/src/test/java/org/servicemix/jms/CopyOfJMSComponentTest.java (1058 => 1059)

--- trunk/servicemix-jms/src/test/java/org/servicemix/jms/CopyOfJMSComponentTest.java	2005-12-12 13:06:35 UTC (rev 1058)
+++ trunk/servicemix-jms/src/test/java/org/servicemix/jms/CopyOfJMSComponentTest.java	2005-12-12 13:34:19 UTC (rev 1059)
@@ -1,46 +1,18 @@
 package org.servicemix.jms;
 
-import org.activemq.ActiveMQConnectionFactory;
-import org.activemq.ActiveMQPrefetchPolicy;
-import org.activemq.broker.BrokerContainer;
-import org.activemq.jndi.ActiveMQInitialContextFactory;
-import org.activemq.pool.PooledConnectionFactory;
-import org.activemq.spring.BrokerFactoryBean;
-import org.activemq.spring.SpringBrokerContainerFactory;
-import org.servicemix.client.DefaultServiceMixClient;
-import org.servicemix.components.jms.JmsReceiverComponent;
-import org.servicemix.components.jms.JmsServiceComponent;
-import org.servicemix.components.util.EchoComponent;
-import org.servicemix.jbi.container.ActivationSpec;
-import org.servicemix.jbi.container.JBIContainer;
-import org.servicemix.jbi.jaxp.SourceTransformer;
-import org.servicemix.jbi.jaxp.StringSource;
-import org.servicemix.tck.Receiver;
-import org.servicemix.tck.ReceiverComponent;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.jms.core.JmsTemplate;
-import org.springframework.jms.core.MessageCreator;
-
-import javax.jbi.messaging.InOnly;
-import javax.jbi.messaging.InOut;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
 import java.io.File;
 import java.net.URI;
 import java.net.URL;
-
 import junit.framework.TestCase;
+import org.activemq.broker.BrokerService;
+import org.activemq.xbean.BrokerFactoryBean;
+import org.servicemix.jbi.container.JBIContainer;
+import org.springframework.core.io.ClassPathResource;
 
 public class CopyOfJMSComponentTest extends TestCase {
 
     protected JBIContainer container;
-    protected BrokerContainer broker;
+    protected BrokerService broker;
     
     public void setUp() throws Exception {
         container = new JBIContainer();
@@ -48,7 +20,10 @@
         container.init();
         //container.start();
         
-        broker = SpringBrokerContainerFactory.newInstance(new ClassPathResource("org/servicemix/jms/activemq.xml"));
+       
+        BrokerFactoryBean bfb = new BrokerFactoryBean(new ClassPathResource("org/servicemix/jms/activemq.xml"));
+        bfb.afterPropertiesSet();
+        broker = bfb.getBroker();
         broker.start();
     }

Modified: trunk/servicemix-jms/src/test/java/org/servicemix/jms/JMSComponentTest.java (1058 => 1059)

--- trunk/servicemix-jms/src/test/java/org/servicemix/jms/JMSComponentTest.java	2005-12-12 13:06:35 UTC (rev 1058)
+++ trunk/servicemix-jms/src/test/java/org/servicemix/jms/JMSComponentTest.java	2005-12-12 13:34:19 UTC (rev 1059)
@@ -17,11 +17,22 @@
  **/
 package org.servicemix.jms;
 
+import java.io.File;
+import java.net.URI;
+import java.net.URL;
+import javax.jbi.messaging.InOnly;
+import javax.jbi.messaging.InOut;
+import javax.jbi.messaging.NormalizedMessage;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+import junit.framework.TestCase;
 import org.activemq.ActiveMQConnectionFactory;
-import org.activemq.broker.BrokerContainer;
+import org.activemq.broker.BrokerService;
 import org.activemq.jndi.ActiveMQInitialContextFactory;
 import org.activemq.pool.PooledConnectionFactory;
-import org.activemq.spring.SpringBrokerContainerFactory;
+import org.activemq.xbean.BrokerFactoryBean;
 import org.servicemix.client.DefaultServiceMixClient;
 import org.servicemix.components.jms.JmsReceiverComponent;
 import org.servicemix.components.jms.JmsServiceComponent;
@@ -35,31 +46,20 @@
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.jms.core.JmsTemplate;
 
-import javax.jbi.messaging.InOnly;
-import javax.jbi.messaging.InOut;
-import javax.jbi.messaging.NormalizedMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
 public class JMSComponentTest extends TestCase {
 
     protected JBIContainer container;
-    protected BrokerContainer broker;
+    protected BrokerService broker;
     protected ActiveMQConnectionFactory connectionFactory;
     
     protected void setUp() throws Exception {
         System.setProperty(Context.INITIAL_CONTEXT_FACTORY, ActiveMQInitialContextFactory.class.getName());
         System.setProperty(Context.PROVIDER_URL, "tcp://localhost:61216");
 
-        broker = SpringBrokerContainerFactory.newInstance(new ClassPathResource("org/servicemix/jms/activemq.xml"));
+      
+        BrokerFactoryBean bfb = new BrokerFactoryBean(new ClassPathResource("org/servicemix/jms/activemq.xml"));
+        bfb.afterPropertiesSet();
+        broker = bfb.getBroker();
         broker.start();
         
         container = new JBIContainer();

Modified: trunk/servicemix-jms/src/test/resources/org/servicemix/jms/activemq.xml (1058 => 1059)

--- trunk/servicemix-jms/src/test/resources/org/servicemix/jms/activemq.xml	2005-12-12 13:06:35 UTC (rev 1058)
+++ trunk/servicemix-jms/src/test/resources/org/servicemix/jms/activemq.xml	2005-12-12 13:34:19 UTC (rev 1059)
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC  "-//ACTIVEMQ//DTD//EN" "http://activemq.org/dtd/activemq.dtd">
-<beans>
-  <broker>
-    <connector>
-      <tcpServerTransport uri="tcp://localhost:61216" backlog="1000" useAsyncSend="true" maxOutstandingMessages="50"/>
-    </connector>
 
-    <persistence>
-      <vmPersistence/>
-    </persistence>
+<!-- this file can only be parsed using the xbean-spring library -->
+<!-- START SNIPPET: xbean -->
+<beans xmlns="http://activemq.org/config/1.0">
+
+  <broker persistent="false">
+
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:61216" />
+    </transportConnectors>
+
   </broker>
 
 </beans>
+<!-- END SNIPPET: xbean -->
\ No newline at end of file

Reply via email to