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

@@ -315,6 +315,7 @@
           <exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>
           <exclude>**/ChangeSessionDeliveryModeTest.*</exclude>
           <exclude>**/DeadLetterTest.*</exclude>
+          <exclude>**/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.*</exclude>
           
           <!-- HTTP not yet implemented -->
           <exclude>**/TwoBrokerTopicSendReceiveUsingHttpTest.*</exclude>

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;
     }
 

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

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

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();

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());
 

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());
 

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;
 

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();

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();

assembly/src/test/org/activemq/usecases/receiver-discovery.xml

@@ -8,7 +8,7 @@
     </transportConnectors>
 
     <networkConnectors>
-      <networkConnector uri="static:discovery:(multicast://default)"/>
+      <networkConnector uri="multicast://default"/>
     </networkConnectors>
 
     <persistenceAdapter>

assembly/src/test/org/activemq/usecases/sender-discovery.xml

@@ -7,7 +7,7 @@
     </transportConnectors>
 
     <networkConnectors>
-      <networkConnector uri="static:discovery:(multicast://default)"/>
+      <networkConnector uri="multicast://default"/>
     </networkConnectors>
 
     <persistenceAdapter>