You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/11/27 15:24:57 UTC
svn commit: r1414203 - in /activemq/trunk/activemq-core/src/test: java/org/apache/activemq/broker/ft/ resources/org/apache/activemq/broker/ft/

Author: chirino
Date: Tue Nov 27 14:24:55 2012
New Revision: 1414203

URL: http://svn.apache.org/viewvc?rev=1414203&view=rev
Log:
Changes for https://issues.apache.org/jira/browse/AMQ-4165 : Remove pure master/slave functionality

Added:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java
      - copied, changed from r1414010, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java
Removed:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/TopicMasterSlaveTest.java
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave2.xml
Modified:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestUsingSharedFileTest.java

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java?rev=1414203&r1=1414202&r2=1414203&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java Tue Nov 27 14:24:55 2012
@@ -33,7 +33,7 @@ import org.apache.activemq.store.jdbc.JD
 import org.apache.activemq.util.IOHelper;
 import org.apache.derby.jdbc.EmbeddedDataSource;
 
-public class JDBCQueueMasterSlaveTest extends QueueMasterSlaveTest {
+public class JDBCQueueMasterSlaveTest extends QueueMasterSlaveTestSupport {
     protected DataSource sharedDs;
     protected String MASTER_URL = "tcp://localhost:62001";
     protected String SLAVE_URL  = "tcp://localhost:62002";

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java?rev=1414203&r1=1414202&r2=1414203&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java Tue Nov 27 14:24:55 2012
@@ -17,7 +17,6 @@
 package org.apache.activemq.broker.ft;
 
 import java.io.File;
-import java.io.IOException;
 import java.net.URI;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
@@ -26,7 +25,7 @@ import org.apache.activemq.broker.Transp
 import org.apache.activemq.store.amq.AMQPersistenceAdapter;
 
 
-public class QueueMasterSlaveSingleUrlTest extends QueueMasterSlaveTest {
+public class QueueMasterSlaveSingleUrlTest extends QueueMasterSlaveTestSupport {
     private final String brokerUrl = "tcp://localhost:62001";
     private final String singleUriString = "failover://(" + brokerUrl +")?randomize=false";
 

Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java (from r1414010, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java&r1=1414010&r2=1414203&rev=1414203&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java Tue Nov 27 14:24:55 2012
@@ -39,8 +39,8 @@ import org.springframework.core.io.Class
 /**
  * Test failover for Queues
  */
-public class QueueMasterSlaveTest extends JmsTopicSendReceiveWithTwoConnectionsTest {
-    private static final transient Logger LOG = LoggerFactory.getLogger(QueueMasterSlaveTest.class);
+abstract public class QueueMasterSlaveTestSupport extends JmsTopicSendReceiveWithTwoConnectionsTest {
+    private static final transient Logger LOG = LoggerFactory.getLogger(QueueMasterSlaveTestSupport.class);
 
     protected BrokerService master;
     protected AtomicReference<BrokerService> slave = new AtomicReference<BrokerService>();

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestUsingSharedFileTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestUsingSharedFileTest.java?rev=1414203&r1=1414202&r2=1414203&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestUsingSharedFileTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestUsingSharedFileTest.java Tue Nov 27 14:24:55 2012
@@ -17,7 +17,7 @@
 package org.apache.activemq.broker.ft;
 
 public class QueueMasterSlaveTestUsingSharedFileTest extends
-        QueueMasterSlaveTest {
+        QueueMasterSlaveTestSupport {
     
     protected String getSlaveXml() {
         return "org/apache/activemq/broker/ft/sharedFileSlave.xml";