From ac8739860faec8967de50a2acb899d92486f2ab6 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Tue, 20 Dec 2005 18:06:28 +0000 Subject: [PATCH] the useEmbeddedBroker property not needed anymore. git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358057 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/project.xml | 1 + .../org/activemq/benchmark/BenchmarkSupport.java | 12 ------------ .../activemq/config/BrokerXmlConfigFromJNDITest.java | 1 - .../org/activemq/config/BrokerXmlConfigTest.java | 1 - .../SubscribeClosePublishThenConsumeTest.java | 1 - .../usecases/TransactionRollbackOrderTest.java | 1 - .../test/org/activemq/usecases/TransactionTest.java | 2 -- .../usecases/TwoBrokerTopicSendReceiveTest.java | 1 - ...erTopicSendReceiveUsingJavaConfigurationTest.java | 2 -- .../TwoBrokerTopicSendReceiveUsingTcpTest.java | 2 -- .../org/activemq/usecases/receiver-discovery.xml | 2 +- .../test/org/activemq/usecases/sender-discovery.xml | 2 +- 12 files changed, 3 insertions(+), 25 deletions(-) diff --git a/assembly/project.xml b/assembly/project.xml index 21d1da3ed4..716d37cda8 100755 --- a/assembly/project.xml +++ b/assembly/project.xml @@ -315,6 +315,7 @@ **/QueueConsumerCloseAndReconnectTest.* **/ChangeSessionDeliveryModeTest.* **/DeadLetterTest.* + **/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.* **/TwoBrokerTopicSendReceiveUsingHttpTest.* diff --git a/assembly/src/test/org/activemq/benchmark/BenchmarkSupport.java b/assembly/src/test/org/activemq/benchmark/BenchmarkSupport.java index ecf63113dd..11a9c95e3f 100755 --- a/assembly/src/test/org/activemq/benchmark/BenchmarkSupport.java +++ b/assembly/src/test/org/activemq/benchmark/BenchmarkSupport.java @@ -42,7 +42,6 @@ public class BenchmarkSupport { protected int connectionCount = 1; protected int batch = 1000; protected Destination destination; - protected boolean embeddedBroker = false; private boolean topic = true; private boolean durable = false; @@ -112,14 +111,6 @@ public class BenchmarkSupport { this.durable = durable; } - public boolean isEmbeddedBroker() { - return embeddedBroker; - } - - public void setEmbeddedBroker(boolean embeddedBroker) { - this.embeddedBroker = embeddedBroker; - } - public int getConnectionCount() { return connectionCount; } @@ -148,9 +139,6 @@ public class BenchmarkSupport { protected ActiveMQConnectionFactory createFactory() { ActiveMQConnectionFactory answer = new ActiveMQConnectionFactory(getUrl()); - if (embeddedBroker) { - answer.setUseEmbeddedBroker(true); - } return answer; } diff --git a/assembly/src/test/org/activemq/config/BrokerXmlConfigFromJNDITest.java b/assembly/src/test/org/activemq/config/BrokerXmlConfigFromJNDITest.java index d1c75beed9..e8bd0d2411 100755 --- a/assembly/src/test/org/activemq/config/BrokerXmlConfigFromJNDITest.java +++ b/assembly/src/test/org/activemq/config/BrokerXmlConfigFromJNDITest.java @@ -40,7 +40,6 @@ public class BrokerXmlConfigFromJNDITest extends JmsTopicSendReceiveWithTwoConne // on the classpath instead Hashtable properties = new Hashtable(); properties.put("java.naming.factory.initial", "org.activemq.jndi.ActiveMQInitialContextFactory"); - properties.put("useEmbeddedBroker", Boolean.TRUE); // configure the embedded broker using an XML config file // which is either a URL or a resource on the classpath diff --git a/assembly/src/test/org/activemq/config/BrokerXmlConfigTest.java b/assembly/src/test/org/activemq/config/BrokerXmlConfigTest.java index 4fb95b481d..2cf5529ea6 100755 --- a/assembly/src/test/org/activemq/config/BrokerXmlConfigTest.java +++ b/assembly/src/test/org/activemq/config/BrokerXmlConfigTest.java @@ -32,7 +32,6 @@ public class BrokerXmlConfigTest extends JmsTopicSendReceiveWithTwoConnectionsTe // configure the connection factory using // normal Java Bean property methods ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(); - connectionFactory.setUseEmbeddedBroker(true); // configure the embedded broker using an XML config file // which is either a URL or a resource on the classpath diff --git a/assembly/src/test/org/activemq/usecases/SubscribeClosePublishThenConsumeTest.java b/assembly/src/test/org/activemq/usecases/SubscribeClosePublishThenConsumeTest.java index 83692edc84..58f8c4532f 100755 --- a/assembly/src/test/org/activemq/usecases/SubscribeClosePublishThenConsumeTest.java +++ b/assembly/src/test/org/activemq/usecases/SubscribeClosePublishThenConsumeTest.java @@ -37,7 +37,6 @@ public class SubscribeClosePublishThenConsumeTest extends TestSupport { public void testDurableTopic() throws Exception { ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://locahost"); - connectionFactory.setUseEmbeddedBroker(true); String topicName = "TestTopic"; String clientID = getName(); diff --git a/assembly/src/test/org/activemq/usecases/TransactionRollbackOrderTest.java b/assembly/src/test/org/activemq/usecases/TransactionRollbackOrderTest.java index cc57039656..14eb98485e 100644 --- a/assembly/src/test/org/activemq/usecases/TransactionRollbackOrderTest.java +++ b/assembly/src/test/org/activemq/usecases/TransactionRollbackOrderTest.java @@ -64,7 +64,6 @@ public final class TransactionRollbackOrderTest extends TestCase { ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false"); - factory.setUseEmbeddedBroker(true); connection = factory.createConnection(); queue = new ActiveMQQueue(getClass().getName() + "." + getName()); diff --git a/assembly/src/test/org/activemq/usecases/TransactionTest.java b/assembly/src/test/org/activemq/usecases/TransactionTest.java index b033a69b26..e9157320db 100755 --- a/assembly/src/test/org/activemq/usecases/TransactionTest.java +++ b/assembly/src/test/org/activemq/usecases/TransactionTest.java @@ -54,8 +54,6 @@ public final class TransactionTest extends TestCase { public void testTransaction() throws Exception { ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost"); - - factory.setUseEmbeddedBroker(true); connection = factory.createConnection(); queue = new ActiveMQQueue(getClass().getName() + "." + getName()); diff --git a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java index d1ad3eeb2a..76c899af6d 100644 --- a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java +++ b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java @@ -68,7 +68,6 @@ public class TwoBrokerTopicSendReceiveTest extends JmsTopicSendReceiveWithTwoCon BrokerService broker = brokerFactory.getBroker(); ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(((TransportConnector)broker.getTransportConnectors().get(0)).getConnectUri()); - factory.setUseEmbeddedBroker(false); return factory; diff --git a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java index 098ab2efc1..0022d5e3b6 100644 --- a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java +++ b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java @@ -39,7 +39,6 @@ public class TwoBrokerTopicSendReceiveUsingJavaConfigurationTest extends TwoBrok receiveBroker.start(); ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:62002"); - factory.setUseEmbeddedBroker(false); return factory; } catch (Exception e) { e.printStackTrace(); @@ -56,7 +55,6 @@ public class TwoBrokerTopicSendReceiveUsingJavaConfigurationTest extends TwoBrok sendBroker.start(); ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:62001"); - factory.setUseEmbeddedBroker(false); return factory; } catch (Exception e) { e.printStackTrace(); diff --git a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java index 3064762ca5..c48b96880e 100644 --- a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java +++ b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java @@ -65,7 +65,6 @@ public class TwoBrokerTopicSendReceiveUsingTcpTest extends TwoBrokerTopicSendRec protected ActiveMQConnectionFactory createReceiverConnectionFactory() throws JMSException { try { ActiveMQConnectionFactory fac = new ActiveMQConnectionFactory(((TransportConnector)receiverBroker.getTransportConnectors().get(0)).getConnectUri()); - fac.setUseEmbeddedBroker(false); return fac; } catch (Exception e) { e.printStackTrace(); @@ -76,7 +75,6 @@ public class TwoBrokerTopicSendReceiveUsingTcpTest extends TwoBrokerTopicSendRec protected ActiveMQConnectionFactory createSenderConnectionFactory() throws JMSException { try { ActiveMQConnectionFactory fac = new ActiveMQConnectionFactory(((TransportConnector)senderBroker.getTransportConnectors().get(0)).getConnectUri()); - fac.setUseEmbeddedBroker(false); return fac; } catch (Exception e) { e.printStackTrace(); diff --git a/assembly/src/test/org/activemq/usecases/receiver-discovery.xml b/assembly/src/test/org/activemq/usecases/receiver-discovery.xml index 6f99c76bc5..952fe45489 100644 --- a/assembly/src/test/org/activemq/usecases/receiver-discovery.xml +++ b/assembly/src/test/org/activemq/usecases/receiver-discovery.xml @@ -8,7 +8,7 @@ - + diff --git a/assembly/src/test/org/activemq/usecases/sender-discovery.xml b/assembly/src/test/org/activemq/usecases/sender-discovery.xml index a33a55dd93..c94e061854 100644 --- a/assembly/src/test/org/activemq/usecases/sender-discovery.xml +++ b/assembly/src/test/org/activemq/usecases/sender-discovery.xml @@ -7,7 +7,7 @@ - +