activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r358057 - in /incubator/activemq/trunk/assembly: ./ src/test/org/activemq/benchmark/ src/test/org/activemq/config/ src/test/org/activemq/usecases/
Date Tue, 20 Dec 2005 18:06:33 GMT
Author: chirino
Date: Tue Dec 20 10:06:28 2005
New Revision: 358057

URL: http://svn.apache.org/viewcvs?rev=358057&view=rev
Log:
the useEmbeddedBroker property not needed anymore.

Modified:
    incubator/activemq/trunk/assembly/project.xml
    incubator/activemq/trunk/assembly/src/test/org/activemq/benchmark/BenchmarkSupport.java
    incubator/activemq/trunk/assembly/src/test/org/activemq/config/BrokerXmlConfigFromJNDITest.java
    incubator/activemq/trunk/assembly/src/test/org/activemq/config/BrokerXmlConfigTest.java
    incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/SubscribeClosePublishThenConsumeTest.java
    incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TransactionRollbackOrderTest.java
    incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TransactionTest.java
    incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java
    incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
    incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
    incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/receiver-discovery.xml
    incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/sender-discovery.xml

Modified: incubator/activemq/trunk/assembly/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/project.xml?rev=358057&r1=358056&r2=358057&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/project.xml (original)
+++ incubator/activemq/trunk/assembly/project.xml Tue Dec 20 10:06:28 2005
@@ -315,6 +315,7 @@
           <exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>
           <exclude>**/ChangeSessionDeliveryModeTest.*</exclude>
           <exclude>**/DeadLetterTest.*</exclude>
+          <exclude>**/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.*</exclude>
           
           <!-- HTTP not yet implemented -->
           <exclude>**/TwoBrokerTopicSendReceiveUsingHttpTest.*</exclude>

Modified: incubator/activemq/trunk/assembly/src/test/org/activemq/benchmark/BenchmarkSupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/org/activemq/benchmark/BenchmarkSupport.java?rev=358057&r1=358056&r2=358057&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/org/activemq/benchmark/BenchmarkSupport.java
(original)
+++ incubator/activemq/trunk/assembly/src/test/org/activemq/benchmark/BenchmarkSupport.java
Tue Dec 20 10:06:28 2005
@@ -42,7 +42,6 @@
     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 @@
         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 @@
 
     protected ActiveMQConnectionFactory createFactory() {
         ActiveMQConnectionFactory answer = new ActiveMQConnectionFactory(getUrl());
-        if (embeddedBroker) {
-            answer.setUseEmbeddedBroker(true);
-        }
         return answer;
     }
 

Modified: incubator/activemq/trunk/assembly/src/test/org/activemq/config/BrokerXmlConfigFromJNDITest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/org/activemq/config/BrokerXmlConfigFromJNDITest.java?rev=358057&r1=358056&r2=358057&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/org/activemq/config/BrokerXmlConfigFromJNDITest.java
(original)
+++ incubator/activemq/trunk/assembly/src/test/org/activemq/config/BrokerXmlConfigFromJNDITest.java
Tue Dec 20 10:06:28 2005
@@ -40,7 +40,6 @@
         // 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

Modified: incubator/activemq/trunk/assembly/src/test/org/activemq/config/BrokerXmlConfigTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/org/activemq/config/BrokerXmlConfigTest.java?rev=358057&r1=358056&r2=358057&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/org/activemq/config/BrokerXmlConfigTest.java
(original)
+++ incubator/activemq/trunk/assembly/src/test/org/activemq/config/BrokerXmlConfigTest.java
Tue Dec 20 10:06:28 2005
@@ -32,7 +32,6 @@
         // 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

Modified: incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/SubscribeClosePublishThenConsumeTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/SubscribeClosePublishThenConsumeTest.java?rev=358057&r1=358056&r2=358057&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/SubscribeClosePublishThenConsumeTest.java
(original)
+++ incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/SubscribeClosePublishThenConsumeTest.java
Tue Dec 20 10:06:28 2005
@@ -37,7 +37,6 @@
 
     public void testDurableTopic() throws Exception {
         ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://locahost");
-        connectionFactory.setUseEmbeddedBroker(true);
 
         String topicName = "TestTopic";
         String clientID = getName();

Modified: incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TransactionRollbackOrderTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TransactionRollbackOrderTest.java?rev=358057&r1=358056&r2=358057&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TransactionRollbackOrderTest.java
(original)
+++ incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TransactionRollbackOrderTest.java
Tue Dec 20 10:06:28 2005
@@ -64,7 +64,6 @@
 
         ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
 
-        factory.setUseEmbeddedBroker(true);
         connection = factory.createConnection();
         queue = new ActiveMQQueue(getClass().getName() + "." + getName());
 

Modified: incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TransactionTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TransactionTest.java?rev=358057&r1=358056&r2=358057&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TransactionTest.java
(original)
+++ incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TransactionTest.java
Tue Dec 20 10:06:28 2005
@@ -54,8 +54,6 @@
     public void testTransaction() throws Exception {
 
         ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost");
-
-        factory.setUseEmbeddedBroker(true);
         connection = factory.createConnection();
         queue = new ActiveMQQueue(getClass().getName() + "." + getName());
 

Modified: incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java?rev=358057&r1=358056&r2=358057&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java
(original)
+++ incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java
Tue Dec 20 10:06:28 2005
@@ -68,7 +68,6 @@
 
             BrokerService broker = brokerFactory.getBroker();
             ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(((TransportConnector)broker.getTransportConnectors().get(0)).getConnectUri());
-            factory.setUseEmbeddedBroker(false);
 
             return factory;
 

Modified: incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java?rev=358057&r1=358056&r2=358057&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
(original)
+++ incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
Tue Dec 20 10:06:28 2005
@@ -39,7 +39,6 @@
             receiveBroker.start();
 
             ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:62002");
-            factory.setUseEmbeddedBroker(false);
             return factory;
         } catch (Exception e) {
             e.printStackTrace();
@@ -56,7 +55,6 @@
             sendBroker.start();
 
             ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:62001");
-            factory.setUseEmbeddedBroker(false);
             return factory;
         } catch (Exception e) {
             e.printStackTrace();

Modified: incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java?rev=358057&r1=358056&r2=358057&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
(original)
+++ incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
Tue Dec 20 10:06:28 2005
@@ -65,7 +65,6 @@
     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 @@
     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();

Modified: incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/receiver-discovery.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/receiver-discovery.xml?rev=358057&r1=358056&r2=358057&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/receiver-discovery.xml
(original)
+++ incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/receiver-discovery.xml
Tue Dec 20 10:06:28 2005
@@ -8,7 +8,7 @@
     </transportConnectors>
 
     <networkConnectors>
-      <networkConnector uri="static:discovery:(multicast://default)"/>
+      <networkConnector uri="multicast://default"/>
     </networkConnectors>
 
     <persistenceAdapter>

Modified: incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/sender-discovery.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/sender-discovery.xml?rev=358057&r1=358056&r2=358057&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/sender-discovery.xml
(original)
+++ incubator/activemq/trunk/assembly/src/test/org/activemq/usecases/sender-discovery.xml
Tue Dec 20 10:06:28 2005
@@ -7,7 +7,7 @@
     </transportConnectors>
 
     <networkConnectors>
-      <networkConnector uri="static:discovery:(multicast://default)"/>
+      <networkConnector uri="multicast://default"/>
     </networkConnectors>
 
     <persistenceAdapter>



Mime
View raw message