http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
index 1d27f67..55cee08 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
@@ -136,11 +136,13 @@ public abstract class UdpTestSupport extends TestCase 
implements TransportListen
       return buffer.toString();
    }
 
+   @Override
    protected void setUp() throws Exception {
       server = createServer();
       if (server != null) {
          server.setAcceptListener(new TransportAcceptListener() {
 
+            @Override
             public void onAccept(Transport transport) {
                consumer = transport;
                consumer.setTransportListener(UdpTestSupport.this);
@@ -152,6 +154,7 @@ public abstract class UdpTestSupport extends TestCase 
implements TransportListen
                }
             }
 
+            @Override
             public void onAcceptError(Exception error) {
             }
          });
@@ -166,18 +169,22 @@ public abstract class UdpTestSupport extends TestCase 
implements TransportListen
 
       producer = createProducer();
       producer.setTransportListener(new TransportListener() {
+         @Override
          public void onCommand(Object command) {
             LOG.info("Producer received: " + command);
          }
 
+         @Override
          public void onException(IOException error) {
             LOG.info("Producer exception: " + error);
             error.printStackTrace();
          }
 
+         @Override
          public void transportInterupted() {
          }
 
+         @Override
          public void transportResumed() {
          }
       });
@@ -185,6 +192,7 @@ public abstract class UdpTestSupport extends TestCase 
implements TransportListen
       producer.start();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       if (producer != null) {
          try {
@@ -201,6 +209,7 @@ public abstract class UdpTestSupport extends TestCase 
implements TransportListen
       }
    }
 
+   @Override
    public void onCommand(Object o) {
       final Command command = (Command) o;
       if (command instanceof WireFormatInfo) {
@@ -244,15 +253,18 @@ public abstract class UdpTestSupport extends TestCase 
implements TransportListen
       }
    }
 
+   @Override
    public void onException(IOException error) {
       LOG.info("### Received error: " + error);
       error.printStackTrace();
    }
 
+   @Override
    public void transportInterupted() {
       LOG.info("### Transport interrupted");
    }
 
+   @Override
    public void transportResumed() {
       LOG.info("### Transport resumed");
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTransportTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTransportTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTransportTest.java
index 5904e21..d8d139d 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTransportTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTransportTest.java
@@ -36,6 +36,7 @@ public class UdpTransportTest extends UdpTestSupport {
    protected int consumerPort = 9123;
    protected String producerURI = "udp://localhost:" + consumerPort;
 
+   @Override
    protected Transport createProducer() throws Exception {
       LOG.info("Producer using URI: " + producerURI);
 
@@ -49,6 +50,7 @@ public class UdpTransportTest extends UdpTestSupport {
       return new CommandJoiner(transport, wireFormat);
    }
 
+   @Override
    protected Transport createConsumer() throws Exception {
       LOG.info("Consumer on port: " + consumerPort);
       OpenWireFormat wireFormat = createWireFormat();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTransportUsingServerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTransportUsingServerTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTransportUsingServerTest.java
index d3e58fa..348b986 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTransportUsingServerTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTransportUsingServerTest.java
@@ -51,16 +51,19 @@ public class UdpTransportUsingServerTest extends 
UdpTestSupport {
       assertTrue("Should not be an exception", !response.isException());
    }
 
+   @Override
    protected Transport createProducer() throws Exception {
       LOG.info("Producer using URI: " + producerURI);
       URI uri = new URI(producerURI);
       return TransportFactory.connect(uri);
    }
 
+   @Override
    protected TransportServer createServer() throws Exception {
       return TransportFactory.bind(new URI(serverURI));
    }
 
+   @Override
    protected Transport createConsumer() throws Exception {
       return null;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UpdTransportBindTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UpdTransportBindTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UpdTransportBindTest.java
index c15e32e..9643638 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UpdTransportBindTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UpdTransportBindTest.java
@@ -26,6 +26,7 @@ public class UpdTransportBindTest extends 
EmbeddedBrokerTestSupport {
 
    final String addr = "udp://localhost:61625";
 
+   @Override
    protected void setUp() throws Exception {
       bindAddress = addr + "?soTimeout=1000";
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportBrokerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportBrokerTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportBrokerTest.java
index b43038b..52e4b88 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportBrokerTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportBrokerTest.java
@@ -22,6 +22,7 @@ import 
org.apache.activemq.transport.TransportBrokerTestSupport;
 
 public class VMTransportBrokerTest extends TransportBrokerTestSupport {
 
+   @Override
    protected String getBindLocation() {
       return "vm://localhost";
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java
index 528059c..dbc7f29 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java
@@ -79,14 +79,17 @@ public class VMTransportEmbeddedBrokerTest extends 
BrokerTestSupport {
       assertNull(BrokerRegistry.getInstance().lookup("localhost"));
    }
 
+   @Override
    protected void setUp() throws Exception {
       // Don't call super since it manually starts up a broker.
    }
 
+   @Override
    protected void tearDown() throws Exception {
       // Don't call super since it manually tears down a broker.
    }
 
+   @Override
    protected StubConnection createConnection() throws Exception {
       try {
          Transport transport = TransportFactory.connect(new 
URI("vm://localhost?broker.persistent=false"));

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usage/CompositeMessageCursorUsageTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usage/CompositeMessageCursorUsageTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usage/CompositeMessageCursorUsageTest.java
index 79fbbdf..ff8d933 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usage/CompositeMessageCursorUsageTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usage/CompositeMessageCursorUsageTest.java
@@ -35,12 +35,14 @@ public class CompositeMessageCursorUsageTest extends 
TestCase {
 
    BrokerService broker;
 
+   @Override
    public void setUp() throws Exception {
       broker = new BrokerService();
       broker.setPersistent(false);
       broker.start();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       broker.stop();
    }
@@ -53,6 +55,7 @@ public class CompositeMessageCursorUsageTest extends TestCase 
{
       JmsTemplate jt = new JmsTemplate(cf);
 
       jt.send(compositeQueue, new MessageCreator() {
+         @Override
          public Message createMessage(Session session) throws JMSException {
             TextMessage tm = session.createTextMessage();
             tm.setText("test");
@@ -61,6 +64,7 @@ public class CompositeMessageCursorUsageTest extends TestCase 
{
       });
 
       jt.send("noCompositeA", new MessageCreator() {
+         @Override
          public Message createMessage(Session session) throws JMSException {
             TextMessage tm = session.createTextMessage();
             tm.setText("test");
@@ -69,6 +73,7 @@ public class CompositeMessageCursorUsageTest extends TestCase 
{
       });
 
       jt.send("noCompositeB", new MessageCreator() {
+         @Override
          public Message createMessage(Session session) throws JMSException {
             TextMessage tm = session.createTextMessage();
             tm.setText("test");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usage/StoreUsageTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usage/StoreUsageTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usage/StoreUsageTest.java
index a29e2a1..a133001 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usage/StoreUsageTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usage/StoreUsageTest.java
@@ -39,6 +39,7 @@ public class StoreUsageTest extends EmbeddedBrokerTestSupport 
{
       return broker;
    }
 
+   @Override
    protected boolean isPersistent() {
       return true;
    }
@@ -60,6 +61,7 @@ public class StoreUsageTest extends EmbeddedBrokerTestSupport 
{
       Thread.sleep(WAIT_TIME_MILLS);
 
       Wait.waitFor(new Wait.Condition() {
+         @Override
          public boolean isSatisified() throws Exception {
             return producer.getSentCount() == producer.getMessageCount();
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/AuthorizationFromAdminViewTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/AuthorizationFromAdminViewTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/AuthorizationFromAdminViewTest.java
index a9cd448..e972226 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/AuthorizationFromAdminViewTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/AuthorizationFromAdminViewTest.java
@@ -27,15 +27,18 @@ public class AuthorizationFromAdminViewTest extends 
org.apache.activemq.TestSupp
 
    private BrokerService broker;
 
+   @Override
    protected ActiveMQConnectionFactory createConnectionFactory() throws 
Exception {
       return new ActiveMQConnectionFactory("vm://" + getName());
    }
 
+   @Override
    protected void setUp() throws Exception {
       createBroker();
       super.setUp();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       super.tearDown();
       destroyBroker();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BacklogNetworkCrossTalkTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BacklogNetworkCrossTalkTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BacklogNetworkCrossTalkTest.java
index 6ae2acd..9bfb5ee 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BacklogNetworkCrossTalkTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BacklogNetworkCrossTalkTest.java
@@ -31,6 +31,7 @@ public class BacklogNetworkCrossTalkTest extends 
JmsMultipleBrokersTestSupport {
 
    private static final Logger LOG = 
LoggerFactory.getLogger(BacklogNetworkCrossTalkTest.class);
 
+   @Override
    protected BrokerService createBroker(String brokerName) throws Exception {
       BrokerService broker = new BrokerService();
       broker.setDeleteAllMessagesOnStartup(true);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ClientRebalanceTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ClientRebalanceTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ClientRebalanceTest.java
index 8fa255c..95242ca 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ClientRebalanceTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ClientRebalanceTest.java
@@ -33,6 +33,7 @@ public class ClientRebalanceTest extends 
JmsMultipleBrokersTestSupport {
    private static final Logger LOG = 
Logger.getLogger(ClientRebalanceTest.class);
    private static final String QUEUE_NAME = "Test.ClientRebalanceTest";
 
+   @Override
    protected void setUp() throws Exception {
       setAutoFail(true);
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java
index c73d7ad..922bf70 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java
@@ -32,6 +32,7 @@ public class CompositeConsumeTest extends 
JmsTopicSendReceiveWithTwoConnectionsT
 
    private static final Logger LOG = 
LoggerFactory.getLogger(CompositeConsumeTest.class);
 
+   @Override
    public void testSendReceive() throws Exception {
       messages.clear();
 
@@ -58,6 +59,7 @@ public class CompositeConsumeTest extends 
JmsTopicSendReceiveWithTwoConnectionsT
    /**
     * Returns the subscription subject
     */
+   @Override
    protected String getSubject() {
       return getPrefix() + "FOO.BAR," + getPrefix() + "FOO.X.Y," + getPrefix() 
+ "BAR.>";
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentDestinationCreationTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentDestinationCreationTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentDestinationCreationTest.java
index 9e44bb4..d1e8a42 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentDestinationCreationTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentDestinationCreationTest.java
@@ -52,6 +52,7 @@ public class ConcurrentDestinationCreationTest extends 
org.apache.activemq.TestS
       broker.stop();
    }
 
+   @Override
    protected ActiveMQConnectionFactory createConnectionFactory() throws 
Exception {
       return new 
ActiveMQConnectionFactory(broker.getTransportConnectors().get(0).getPublishableConnectString()
 + "?jms.watchTopicAdvisories=false&jms.closeTimeout=35000");
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
index ab319f5..bbd8e5d 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
@@ -184,6 +184,7 @@ public class ConcurrentProducerQueueConsumerTest extends 
TestSupport {
 
       final int toReceive = toSend * numIterations * consumerCount * 2;
       Wait.waitFor(new Wait.Condition() {
+         @Override
          public boolean isSatisified() throws Exception {
             LOG.info("count: " + allMessagesList.getMessageCount());
             return toReceive == allMessagesList.getMessageCount();
@@ -325,6 +326,7 @@ public class ConcurrentProducerQueueConsumerTest extends 
TestSupport {
       return brokerService;
    }
 
+   @Override
    protected ActiveMQConnectionFactory createConnectionFactory() throws 
Exception {
       ActiveMQConnectionFactory factory = new 
ActiveMQConnectionFactory(broker.getTransportConnectors().get(0).getPublishableConnectString());
       ActiveMQPrefetchPolicy prefetchPolicy = new ActiveMQPrefetchPolicy();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java
index 4bec5af..fbb24c7 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java
@@ -26,6 +26,7 @@ public class ConsumeQueuePrefetchTest extends 
ConsumeTopicPrefetchTest {
 
    private static final Logger LOG = 
LoggerFactory.getLogger(ConsumeQueuePrefetchTest.class);
 
+   @Override
    protected void setUp() throws Exception {
       topic = false;
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java
index a6af6b0..91103cd 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java
@@ -87,6 +87,7 @@ public class ConsumeTopicPrefetchTest extends 
ProducerConsumerTestSupport {
       validateConsumerPrefetch(this.getSubject(), 0);
    }
 
+   @Override
    protected Connection createConnection() throws Exception {
       ActiveMQConnection connection = (ActiveMQConnection) 
super.createConnection();
       connection.getPrefetchPolicy().setQueuePrefetch(prefetchSize);
@@ -127,6 +128,7 @@ public class ConsumeTopicPrefetchTest extends 
ProducerConsumerTestSupport {
          if (dest.getName().equals(destination)) {
             try {
                Wait.waitFor(new Condition() {
+                  @Override
                   public boolean isSatisified() throws Exception {
                      DestinationStatistics stats = 
target.getDestinationStatistics();
                      LOG.info("inflight for : " + target.getName() + ": " + 
stats.getInflight().getCount());

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
index 23e67c7..ff53ef8 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
@@ -67,6 +67,7 @@ public class CreateTemporaryQueueBeforeStartTest extends 
TestCase {
       final AtomicInteger count = new AtomicInteger(0);
       for (int i = 0; i < number; i++) {
          Thread thread = new Thread(new Runnable() {
+            @Override
             public void run() {
                try {
                   QueueConnection connection = createConnection();
@@ -114,6 +115,7 @@ public class CreateTemporaryQueueBeforeStartTest extends 
TestCase {
       return new ActiveMQConnectionFactory(connectionUri);
    }
 
+   @Override
    protected void setUp() throws Exception {
       broker.setUseJmx(false);
       broker.setPersistent(false);
@@ -124,6 +126,7 @@ public class CreateTemporaryQueueBeforeStartTest extends 
TestCase {
       super.setUp();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       if (connection != null) {
          connection.close();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTcpTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTcpTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTcpTest.java
index bccd367..c759dcf 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTcpTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTcpTest.java
@@ -53,6 +53,7 @@ public class DurableConsumerCloseAndReconnectTcpTest extends 
DurableConsumerClos
 
    private boolean reconnectInTransportListener;
 
+   @Override
    public void setUp() throws Exception {
       broker = new BrokerService();
       // let the client initiate the inactivity timeout
@@ -140,11 +141,13 @@ public class DurableConsumerCloseAndReconnectTcpTest 
extends DurableConsumerClos
 
    }
 
+   @Override
    public void tearDown() throws Exception {
       broker.stop();
       broker.waitUntilStopped();
    }
 
+   @Override
    protected ActiveMQConnectionFactory createConnectionFactory() throws 
Exception {
       return new 
ActiveMQConnectionFactory(URISupport.removeQuery(connector.getConnectUri()) + 
"?useKeepAlive=false&wireFormat.maxInactivityDuration=2000");
    }
@@ -168,6 +171,7 @@ public class DurableConsumerCloseAndReconnectTcpTest 
extends DurableConsumerClos
       assertNull("No exception: " + reconnectException, reconnectException);
    }
 
+   @Override
    public void onException(JMSException exception) {
       LOG.info("Exception listener exception:" + exception);
       if (reconnectInExceptionListener) {
@@ -182,9 +186,11 @@ public class DurableConsumerCloseAndReconnectTcpTest 
extends DurableConsumerClos
       }
    }
 
+   @Override
    public void onCommand(Object command) {
    }
 
+   @Override
    public void onException(IOException error) {
       LOG.info("Transport listener exception:" + error);
       if (reconnectInTransportListener) {
@@ -200,9 +206,11 @@ public class DurableConsumerCloseAndReconnectTcpTest 
extends DurableConsumerClos
       }
    }
 
+   @Override
    public void transportInterupted() {
    }
 
+   @Override
    public void transportResumed() {
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java
index 7ad8a2e..060ce20 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java
@@ -68,6 +68,7 @@ public class DurableConsumerCloseAndReconnectTest extends 
TestSupport {
       super.tearDown();
    }
 
+   @Override
    protected ActiveMQConnectionFactory createConnectionFactory() throws 
Exception {
       return new ActiveMQConnectionFactory(vmConnectorURI);
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java
index d04cad6..a8f85f3 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java
@@ -102,6 +102,7 @@ public class DurableSubDelayedUnsubscribeTest {
 
       // Wait for all clients to stop
       Wait.waitFor(new Wait.Condition() {
+         @Override
          public boolean isSatisified() throws Exception {
             return clientManager.getClientCount() == 0;
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubInBrokerNetworkTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubInBrokerNetworkTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubInBrokerNetworkTest.java
index 67e836a..5bc7390 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubInBrokerNetworkTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubInBrokerNetworkTest.java
@@ -46,6 +46,7 @@ public class DurableSubInBrokerNetworkTest extends 
NetworkTestSupport {
    private final String subName2 = "Subscriber2";
    private final String topicName = "TEST.FOO";
 
+   @Override
    protected void setUp() throws Exception {
       useJmx = true;
       super.setUp();
@@ -57,6 +58,7 @@ public class DurableSubInBrokerNetworkTest extends 
NetworkTestSupport {
       nc.start();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       if (remoteBroker.isStarted()) {
          remoteBroker.stop();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java
index f298767..cadd730 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java
@@ -625,6 +625,7 @@ public class DurableSubProcessTest extends 
org.apache.activemq.TestSupport {
       fail(message);
    }
 
+   @Override
    protected void setUp() throws Exception {
       topic = (ActiveMQTopic) createDestination();
       startBroker();
@@ -636,6 +637,7 @@ public class DurableSubProcessTest extends 
org.apache.activemq.TestSupport {
       super.setUp();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       super.tearDown();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java
index 8aac35a..bc291bc 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java
@@ -47,6 +47,7 @@ public class DurableSubsOfflineSelectorIndexUseTest extends 
org.apache.activemq.
    private ActiveMQTopic topic;
    private List<Throwable> exceptions = new ArrayList<Throwable>();
 
+   @Override
    protected ActiveMQConnectionFactory createConnectionFactory() throws 
Exception {
       ActiveMQConnectionFactory connectionFactory = new 
ActiveMQConnectionFactory("vm://" + getName(true));
       connectionFactory.setWatchTopicAdvisories(false);
@@ -69,6 +70,7 @@ public class DurableSubsOfflineSelectorIndexUseTest extends 
org.apache.activemq.
       return suite(DurableSubsOfflineSelectorIndexUseTest.class);
    }
 
+   @Override
    protected void setUp() throws Exception {
       exceptions.clear();
       topic = (ActiveMQTopic) createDestination();
@@ -76,6 +78,7 @@ public class DurableSubsOfflineSelectorIndexUseTest extends 
org.apache.activemq.
       super.setUp();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       super.tearDown();
       destroyBroker();
@@ -124,6 +127,7 @@ public class DurableSubsOfflineSelectorIndexUseTest extends 
org.apache.activemq.
       final MessageProducer producer = sendSession.createProducer(null);
 
       Thread sendThread = new Thread() {
+         @Override
          public void run() {
             try {
 
@@ -215,6 +219,7 @@ public class DurableSubsOfflineSelectorIndexUseTest extends 
org.apache.activemq.
       Listener() {
       }
 
+      @Override
       public void onMessage(Message message) {
          count++;
          if (id != null) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriberWithNetworkDisconnectTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriberWithNetworkDisconnectTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriberWithNetworkDisconnectTest.java
index 62ddc8c..39a8e74 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriberWithNetworkDisconnectTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriberWithNetworkDisconnectTest.java
@@ -91,6 +91,7 @@ public class DurableSubscriberWithNetworkDisconnectTest 
extends JmsMultipleBroke
       // Setup consumers
       MessageConsumer remoteConsumer = sesSpoke.createDurableSubscriber(topic, 
consumerName);
       remoteConsumer.setMessageListener(new MessageListener() {
+         @Override
          public void onMessage(Message msg) {
             try {
                TextMessage textMsg = (TextMessage) msg;
@@ -167,6 +168,7 @@ public class DurableSubscriberWithNetworkDisconnectTest 
extends JmsMultipleBroke
       sleep(600);
    }
 
+   @Override
    public void setUp() throws Exception {
       networkDownTimeStart = 0;
       inactiveDuration = 1000;
@@ -179,6 +181,7 @@ public class DurableSubscriberWithNetworkDisconnectTest 
extends JmsMultipleBroke
       createBroker(new URI("broker:(tcp://localhost:61616)/" + SPOKE + 
options));
    }
 
+   @Override
    public void tearDown() throws Exception {
       super.tearDown();
       if (socketProxy != null) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriberWithNetworkRestartTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriberWithNetworkRestartTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriberWithNetworkRestartTest.java
index eaf0535..5d86328 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriberWithNetworkRestartTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriberWithNetworkRestartTest.java
@@ -192,6 +192,7 @@ public class DurableSubscriberWithNetworkRestartTest 
extends JmsMultipleBrokersT
       sleep(600);
    }
 
+   @Override
    public void setUp() throws Exception {
       super.setAutoFail(false);
       super.setUp();
@@ -204,6 +205,7 @@ public class DurableSubscriberWithNetworkRestartTest 
extends JmsMultipleBrokersT
       createBroker(new URI("broker:(tcp://localhost:61616)/" + SPOKE + 
options));
    }
 
+   @Override
    protected void configureBroker(BrokerService broker) {
       broker.setKeepDurableSubsActive(false);
       broker.getManagementContext().setCreateConnector(false);
@@ -219,6 +221,7 @@ public class DurableSubscriberWithNetworkRestartTest 
extends JmsMultipleBrokersT
       broker.getSystemUsage().getMemoryUsage().setLimit(100 * 1024 * 1024);
    }
 
+   @Override
    public void tearDown() throws Exception {
       super.tearDown();
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionActivationTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionActivationTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionActivationTest.java
index 969211f..1c7e2ca 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionActivationTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionActivationTest.java
@@ -35,22 +35,26 @@ public class DurableSubscriptionActivationTest extends 
org.apache.activemq.TestS
    private Connection connection;
    private ActiveMQTopic topic;
 
+   @Override
    protected ActiveMQConnectionFactory createConnectionFactory() throws 
Exception {
       return new ActiveMQConnectionFactory("vm://" + getName());
    }
 
+   @Override
    protected Connection createConnection() throws Exception {
       Connection rc = super.createConnection();
       rc.setClientID(getName());
       return rc;
    }
 
+   @Override
    protected void setUp() throws Exception {
       topic = (ActiveMQTopic) createDestination();
       createBroker(true);
       super.setUp();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       super.tearDown();
       destroyBroker();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionReactivationTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionReactivationTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionReactivationTest.java
index bad3610..3270ff4 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionReactivationTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionReactivationTest.java
@@ -67,11 +67,13 @@ public class DurableSubscriptionReactivationTest extends 
EmbeddedBrokerTestSuppo
       assertNotNull("Message not received.", message);
    }
 
+   @Override
    protected void setUp() throws Exception {
       useTopic = true;
       super.setUp();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       super.tearDown();
    }
@@ -85,6 +87,7 @@ public class DurableSubscriptionReactivationTest extends 
EmbeddedBrokerTestSuppo
       return answer;
    }
 
+   @Override
    protected boolean isPersistent() {
       return true;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionRemoveOfflineTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionRemoveOfflineTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionRemoveOfflineTest.java
index e0c6aa2..c08c404 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionRemoveOfflineTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionRemoveOfflineTest.java
@@ -33,11 +33,13 @@ public class DurableSubscriptionRemoveOfflineTest extends 
EmbeddedBrokerTestSupp
 
    private static final Logger LOG = 
LoggerFactory.getLogger(DurableSubscriptionRemoveOfflineTest.class);
 
+   @Override
    protected void setUp() throws Exception {
       useTopic = true;
       super.setUp();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       super.tearDown();
    }
@@ -108,6 +110,7 @@ public class DurableSubscriptionRemoveOfflineTest extends 
EmbeddedBrokerTestSupp
       }, 20000));
    }
 
+   @Override
    protected boolean isPersistent() {
       return true;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableUnsubscribeTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableUnsubscribeTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableUnsubscribeTest.java
index 8a8839c..e9bbc0a 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableUnsubscribeTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableUnsubscribeTest.java
@@ -77,22 +77,26 @@ public class DurableUnsubscribeTest extends 
org.apache.activemq.TestSupport {
       assertEquals("Subscription exists.", 0, d.getConsumers().size());
    }
 
+   @Override
    protected ActiveMQConnectionFactory createConnectionFactory() throws 
Exception {
       return new ActiveMQConnectionFactory("vm://" + getName());
    }
 
+   @Override
    protected Connection createConnection() throws Exception {
       Connection rc = super.createConnection();
       rc.setClientID(getName());
       return rc;
    }
 
+   @Override
    protected void setUp() throws Exception {
       topic = (ActiveMQTopic) createDestination();
       createBroker();
       super.setUp();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       super.tearDown();
       destroyBroker();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java
index a7c91de..f542ecb 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java
@@ -114,6 +114,7 @@ public class ExceptionListenerTest implements 
ExceptionListener {
       }
    }
 
+   @Override
    public void onException(JMSException e) {
       LOG.info("onException:" + e, new Throwable("FromHere"));
       exceptionsViaListener.add(e);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JDBCDurableSubscriptionTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JDBCDurableSubscriptionTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JDBCDurableSubscriptionTest.java
index 5a5e4bf..ed65971 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JDBCDurableSubscriptionTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JDBCDurableSubscriptionTest.java
@@ -27,6 +27,7 @@ import org.apache.derby.jdbc.EmbeddedDataSource;
  */
 public class JDBCDurableSubscriptionTest extends 
DurableSubscriptionTestSupport {
 
+   @Override
    protected PersistenceAdapter createPersistenceAdapter() throws IOException {
       JDBCPersistenceAdapter jdbc = new JDBCPersistenceAdapter();
       EmbeddedDataSource dataSource = new EmbeddedDataSource();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JournalDurableSubscriptionTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JournalDurableSubscriptionTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JournalDurableSubscriptionTest.java
index b8358ed..f2b1e15 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JournalDurableSubscriptionTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JournalDurableSubscriptionTest.java
@@ -27,6 +27,7 @@ import 
org.apache.activemq.store.journal.JournalPersistenceAdapterFactory;
  */
 public class JournalDurableSubscriptionTest extends 
DurableSubscriptionTestSupport {
 
+   @Override
    protected PersistenceAdapter createPersistenceAdapter() throws IOException {
       File dataDir = new File("target/test-data/durableJournal");
       JournalPersistenceAdapterFactory factory = new 
JournalPersistenceAdapterFactory();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/KahaDBDurableSubscriptionTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/KahaDBDurableSubscriptionTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/KahaDBDurableSubscriptionTest.java
index cb22e71..23781c9 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/KahaDBDurableSubscriptionTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/KahaDBDurableSubscriptionTest.java
@@ -22,6 +22,7 @@ import org.apache.activemq.store.PersistenceAdapter;
 
 public class KahaDBDurableSubscriptionTest extends 
DurableSubscriptionTestSupport {
 
+   @Override
    protected PersistenceAdapter createPersistenceAdapter() throws IOException {
       return null; // use default
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/LevelDBDurableSubscriptionTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/LevelDBDurableSubscriptionTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/LevelDBDurableSubscriptionTest.java
index 3bd4503..3f58d6a 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/LevelDBDurableSubscriptionTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/LevelDBDurableSubscriptionTest.java
@@ -27,6 +27,7 @@ import org.apache.activemq.store.PersistenceAdapter;
  */
 public class LevelDBDurableSubscriptionTest extends 
DurableSubscriptionTestSupport {
 
+   @Override
    protected PersistenceAdapter createPersistenceAdapter() throws IOException {
       File dataDir = new File("target/test-data/durableLevelDB");
       LevelDBStore adaptor = new LevelDBStore();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java
index 75800e3..99fbb1e 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java
@@ -91,6 +91,7 @@ public class ManagedDurableSubscriptionTest extends 
org.apache.activemq.TestSupp
       broker = null;
    }
 
+   @Override
    protected ActiveMQConnectionFactory createConnectionFactory() throws 
Exception {
       return new ActiveMQConnectionFactory("vm://" + getName() + 
"?waitForStart=5000&create=false");
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupCloseTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupCloseTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupCloseTest.java
index 5be065d..5a67c46 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupCloseTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupCloseTest.java
@@ -57,6 +57,7 @@ public class MessageGroupCloseTest extends TestCase {
       connection.start();
       final String queueName = this.getClass().getSimpleName();
       final Thread producerThread = new Thread() {
+         @Override
          public void run() {
             try {
                Session session = connection.createSession(true, 
Session.SESSION_TRANSACTED);
@@ -91,6 +92,7 @@ public class MessageGroupCloseTest extends TestCase {
          }
       };
       final Thread consumerThread1 = new Thread() {
+         @Override
          public void run() {
             try {
                latchMessagesCreated.await();
@@ -122,6 +124,7 @@ public class MessageGroupCloseTest extends TestCase {
          }
       };
       final Thread consumerThread2 = new Thread() {
+         @Override
          public void run() {
             try {
                latchMessagesCreated.await();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupNewConsumerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupNewConsumerTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupNewConsumerTest.java
index cb88ea9..3642649 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupNewConsumerTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupNewConsumerTest.java
@@ -62,6 +62,7 @@ public class MessageGroupNewConsumerTest extends TestCase {
       connection.start();
       final String queueName = this.getClass().getSimpleName();
       final Thread producerThread = new Thread() {
+         @Override
          public void run() {
             try {
                Session session = connection.createSession(true, 
Session.SESSION_TRANSACTED);
@@ -94,6 +95,7 @@ public class MessageGroupNewConsumerTest extends TestCase {
          }
       };
       final Thread consumerThread1 = new Thread() {
+         @Override
          public void run() {
             try {
                Session session = connection.createSession(true, 
Session.SESSION_TRANSACTED);
@@ -126,6 +128,7 @@ public class MessageGroupNewConsumerTest extends TestCase {
          }
       };
       final Thread consumerThread2 = new Thread() {
+         @Override
          public void run() {
             try {
                latchGroupsAcquired.await();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageReroutingTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageReroutingTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageReroutingTest.java
index 86a3c11..3231ec1 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageReroutingTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageReroutingTest.java
@@ -36,6 +36,7 @@ public class MessageReroutingTest extends 
JmsMultipleBrokersTestSupport {
    public Destination dest;
    public static final int MESSAGE_COUNT = 50;
 
+   @Override
    protected void setUp() throws Exception {
       super.setAutoFail(true);
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java
index 77cea3a..5a7a427 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java
@@ -143,6 +143,7 @@ public class MultiBrokersMultiClientsTest extends 
JmsMultipleBrokersTestSupport
       assertNoUnhandeledExceptions();
    }
 
+   @Override
    public void setUp() throws Exception {
       super.setAutoFail(true);
       super.setUp();
@@ -158,6 +159,7 @@ public class MultiBrokersMultiClientsTest extends 
JmsMultipleBrokersTestSupport
       consumerMap = new HashMap<String, MessageConsumer>();
    }
 
+   @Override
    public void uncaughtException(Thread t, Throwable e) {
       synchronized (unhandeledExceptions) {
          unhandeledExceptions.put(t, e);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java
index 846e1b0..816589d 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java
@@ -75,6 +75,7 @@ public class MultiBrokersMultiClientsUsingTcpTest extends 
MultiBrokersMultiClien
       }
    }
 
+   @Override
    public void setUp() throws Exception {
       super.setUp();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MulticastDiscoveryOnFaultyNetworkTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MulticastDiscoveryOnFaultyNetworkTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MulticastDiscoveryOnFaultyNetworkTest.java
index 0ba292e..72c854a 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MulticastDiscoveryOnFaultyNetworkTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MulticastDiscoveryOnFaultyNetworkTest.java
@@ -79,6 +79,7 @@ public class MulticastDiscoveryOnFaultyNetworkTest extends 
JmsMultipleBrokersTes
       brokerItem.broker.start();
    }
 
+   @Override
    public void setUp() throws Exception {
       super.setAutoFail(true);
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkAsyncStartTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkAsyncStartTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkAsyncStartTest.java
index c348549..d551b01 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkAsyncStartTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkAsyncStartTest.java
@@ -83,6 +83,7 @@ public class NetworkAsyncStartTest extends 
JmsMultipleBrokersTestSupport {
 
       Executor e = Executors.newCachedThreadPool();
       e.execute(new Runnable() {
+         @Override
          public void run() {
             LOG.info("starting A");
             try {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkOfTwentyBrokersTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkOfTwentyBrokersTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkOfTwentyBrokersTest.java
index 5cbc11f..2213171 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkOfTwentyBrokersTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkOfTwentyBrokersTest.java
@@ -37,14 +37,17 @@ public class NetworkOfTwentyBrokersTest extends 
JmsMultipleBrokersTestSupport {
    private static final Logger LOG = 
LoggerFactory.getLogger(NetworkOfTwentyBrokersTest.class);
 
    // This will interconnect all brokers using multicast
+   @Override
    protected void bridgeAllBrokers() throws Exception {
       bridgeAllBrokers("TwentyBrokersTest", 1, false, false);
    }
 
+   @Override
    protected void bridgeAllBrokers(String groupName, int ttl, boolean 
suppressduplicateQueueSubs) throws Exception {
       bridgeAllBrokers(groupName, ttl, suppressduplicateQueueSubs, false);
    }
 
+   @Override
    protected void bridgeAllBrokers(String groupName,
                                    int ttl,
                                    boolean suppressduplicateQueueSubs,
@@ -80,6 +83,7 @@ public class NetworkOfTwentyBrokersTest extends 
JmsMultipleBrokersTestSupport {
       maxSetupTime = 8000;
    }
 
+   @Override
    protected BrokerService createBroker(String brokerName) throws Exception {
       BrokerService broker = new BrokerService();
       broker.setPersistent(false);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
index c3394fd..1b8617e 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
@@ -102,18 +102,21 @@ public class NoDuplicateOnTopicNetworkTest extends 
CombinationTestSupport {
 
    protected void waitForBridgeFormation() throws Exception {
       Wait.waitFor(new Wait.Condition() {
+         @Override
          public boolean isSatisified() throws Exception {
             return 
!broker3.getNetworkConnectors().get(0).activeBridges().isEmpty();
          }
       });
 
       Wait.waitFor(new Wait.Condition() {
+         @Override
          public boolean isSatisified() throws Exception {
             return 
!broker2.getNetworkConnectors().get(0).activeBridges().isEmpty();
          }
       });
 
       Wait.waitFor(new Wait.Condition() {
+         @Override
          public boolean isSatisified() throws Exception {
             return 
!broker1.getNetworkConnectors().get(0).activeBridges().isEmpty();
          }
@@ -167,6 +170,7 @@ public class NoDuplicateOnTopicNetworkTest extends 
CombinationTestSupport {
       final CountDownLatch consumerStarted = new CountDownLatch(1);
 
       Thread producerThread = new Thread(new Runnable() {
+         @Override
          public void run() {
             TopicWithDuplicateMessages producer = new 
TopicWithDuplicateMessages();
             producer.setBrokerURL(BROKER_1);
@@ -182,6 +186,7 @@ public class NoDuplicateOnTopicNetworkTest extends 
CombinationTestSupport {
 
       final TopicWithDuplicateMessages consumer = new 
TopicWithDuplicateMessages();
       Thread consumerThread = new Thread(new Runnable() {
+         @Override
          public void run() {
             consumer.setBrokerURL(BROKER_2);
             consumer.setTopicName(TOPIC_NAME);
@@ -319,6 +324,7 @@ public class NoDuplicateOnTopicNetworkTest extends 
CombinationTestSupport {
          }
          consumer.setMessageListener(new MessageListener() {
 
+            @Override
             public void onMessage(Message arg0) {
                TextMessage msg = (TextMessage) arg0;
                try {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java
index 8313c98..d47c48e 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java
@@ -54,6 +54,7 @@ public class ObjectMessageNotSerializableTest extends 
CombinationTestSupport {
       junit.textui.TestRunner.run(suite());
    }
 
+   @Override
    protected void setUp() throws Exception {
       exceptions.clear();
       broker = createBroker();
@@ -67,6 +68,7 @@ public class ObjectMessageNotSerializableTest extends 
CombinationTestSupport {
       final CountDownLatch consumerStarted = new CountDownLatch(1);
 
       Thread vmConsumerThread = new Thread("Consumer Thread") {
+         @Override
          public void run() {
             try {
                ActiveMQConnectionFactory factory = new 
ActiveMQConnectionFactory("vm://localhost");
@@ -95,6 +97,7 @@ public class ObjectMessageNotSerializableTest extends 
CombinationTestSupport {
       vmConsumerThread.start();
 
       Thread producingThread = new Thread("Producing Thread") {
+         @Override
          public void run() {
             try {
                ActiveMQConnectionFactory factory = new 
ActiveMQConnectionFactory("vm://localhost");
@@ -137,6 +140,7 @@ public class ObjectMessageNotSerializableTest extends 
CombinationTestSupport {
       final CountDownLatch consumerStarted = new CountDownLatch(3);
       final Vector<Throwable> exceptions = new Vector<Throwable>();
       Thread vmConsumerThread = new Thread("Consumer Thread") {
+         @Override
          public void run() {
             try {
                ActiveMQConnectionFactory factory = new 
ActiveMQConnectionFactory("vm://localhost");
@@ -165,6 +169,7 @@ public class ObjectMessageNotSerializableTest extends 
CombinationTestSupport {
       vmConsumerThread.start();
 
       Thread tcpConsumerThread = new Thread("Consumer Thread") {
+         @Override
          public void run() {
             try {
 
@@ -193,6 +198,7 @@ public class ObjectMessageNotSerializableTest extends 
CombinationTestSupport {
       tcpConsumerThread.start();
 
       Thread notherVmConsumerThread = new Thread("Consumer Thread") {
+         @Override
          public void run() {
             try {
                ActiveMQConnectionFactory factory = new 
ActiveMQConnectionFactory("vm://localhost");
@@ -221,6 +227,7 @@ public class ObjectMessageNotSerializableTest extends 
CombinationTestSupport {
       notherVmConsumerThread.start();
 
       Thread producingThread = new Thread("Producing Thread") {
+         @Override
          public void run() {
             try {
                ActiveMQConnectionFactory factory = new 
ActiveMQConnectionFactory("vm://localhost");
@@ -269,6 +276,7 @@ public class ObjectMessageNotSerializableTest extends 
CombinationTestSupport {
       return broker;
    }
 
+   @Override
    protected void tearDown() throws Exception {
       broker.stop();
       broker.waitUntilStopped();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ProducerConsumerTestSupport.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ProducerConsumerTestSupport.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ProducerConsumerTestSupport.java
index fdc54c0..2a52237 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ProducerConsumerTestSupport.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ProducerConsumerTestSupport.java
@@ -34,6 +34,7 @@ public class ProducerConsumerTestSupport extends TestSupport {
    protected MessageConsumer consumer;
    protected Destination destination;
 
+   @Override
    protected void setUp() throws Exception {
       super.setUp();
       connection = createConnection();
@@ -44,6 +45,7 @@ public class ProducerConsumerTestSupport extends TestSupport {
       connection.start();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       consumer.close();
       producer.close();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java
index 9481410..28a1f7b 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java
@@ -21,6 +21,7 @@ package org.apache.activemq.usecases;
  */
 public class PublishOnDurableTopicConsumedMessageTest extends 
PublishOnTopicConsumedMessageTest {
 
+   @Override
    protected void setUp() throws Exception {
       this.durable = true;
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java
index afa1c95..c014936 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java
@@ -63,6 +63,7 @@ public final class 
PublishOnQueueConsumedMessageInTransactionTest extends TestCa
    // The warning message is not thrown back to the client
    // private String url = "tcp://localhost:61616";
 
+   @Override
    protected void setUp() throws Exception {
       File dataFile = new File(dataFileRoot);
       recursiveDelete(dataFile);
@@ -116,6 +117,7 @@ public final class 
PublishOnQueueConsumedMessageInTransactionTest extends TestCa
       }
    }
 
+   @Override
    public synchronized void onMessage(Message m) {
       try {
          objectMessage = (ObjectMessage) m;
@@ -182,6 +184,7 @@ public final class 
PublishOnQueueConsumedMessageInTransactionTest extends TestCa
       file.delete();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       if (connection != null) {
          connection.close();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageTest.java
index 6712866..60a4d69 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageTest.java
@@ -21,6 +21,7 @@ package org.apache.activemq.usecases;
  */
 public class PublishOnQueueConsumedMessageTest extends 
PublishOnTopicConsumedMessageTest {
 
+   @Override
    protected void setUp() throws Exception {
       topic = false;
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
index f9b15b2..e028440 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
@@ -41,6 +41,7 @@ public class 
PublishOnQueueConsumedMessageUsingActivemqXMLTest extends PublishOn
     * @return ActiveMQConnectionFactory
     * @throws Exception
     */
+   @Override
    protected ActiveMQConnectionFactory createConnectionFactory() throws 
Exception {
       return new ActiveMQConnectionFactory("tcp://localhost:61616");
    }
@@ -50,6 +51,7 @@ public class 
PublishOnQueueConsumedMessageUsingActivemqXMLTest extends PublishOn
     *
     * @see junit.framework.TestCase#setUp()
     */
+   @Override
    protected void setUp() throws Exception {
       File journalFile = new File(JOURNAL_ROOT);
       recursiveDelete(journalFile);
@@ -64,6 +66,7 @@ public class 
PublishOnQueueConsumedMessageUsingActivemqXMLTest extends PublishOn
    * Stops the Broker
    * @see junit.framework.TestCase#tearDown()
    */
+   @Override
    protected void tearDown() throws Exception {
       LOG.info("Closing Broker");
       if (broker != null) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java
index 4773dfc..0364c52 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java
@@ -23,6 +23,7 @@ import javax.jms.DeliveryMode;
  */
 public class PublishOnTemporaryQueueConsumedMessageTest extends 
PublishOnTopicConsumedMessageTest {
 
+   @Override
    protected void setUp() throws Exception {
       topic = false;
       deliveryMode = DeliveryMode.NON_PERSISTENT;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java
index 6a891b1..d0ae379 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java
@@ -34,6 +34,7 @@ public class PublishOnTopicConsumedMessageTest extends 
JmsTopicSendReceiveWithTw
 
    private MessageProducer replyProducer;
 
+   @Override
    public synchronized void onMessage(Message message) {
 
       // lets resend the message somewhere else
@@ -50,6 +51,7 @@ public class PublishOnTopicConsumedMessageTest extends 
JmsTopicSendReceiveWithTw
       }
    }
 
+   @Override
    protected void setUp() throws Exception {
       super.setUp();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
index e1b3518..2182143 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
@@ -42,6 +42,7 @@ public class 
PublishOnTopicConsumerMessageUsingActivemqXMLTest extends PublishOn
     * @return ActiveMQConnectionFactory
     * @throws Exception
     */
+   @Override
    protected ActiveMQConnectionFactory createConnectionFactory() throws 
Exception {
       return new ActiveMQConnectionFactory("tcp://localhost:61616");
    }
@@ -51,6 +52,7 @@ public class 
PublishOnTopicConsumerMessageUsingActivemqXMLTest extends PublishOn
     *
     * @see junit.framework.TestCase#setUp()
     */
+   @Override
    protected void setUp() throws Exception {
       File journalFile = new File(JOURNAL_ROOT);
       recursiveDelete(journalFile);
@@ -65,6 +67,7 @@ public class 
PublishOnTopicConsumerMessageUsingActivemqXMLTest extends PublishOn
    * Stops the Broker
    * @see junit.framework.TestCase#tearDown()
    */
+   @Override
    protected void tearDown() throws Exception {
       LOG.info("Closing Broker");
       if (broker != null) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueConsumerCloseAndReconnectTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueConsumerCloseAndReconnectTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueConsumerCloseAndReconnectTest.java
index 3ba0bd2..63740c3 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueConsumerCloseAndReconnectTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueConsumerCloseAndReconnectTest.java
@@ -21,6 +21,7 @@ package org.apache.activemq.usecases;
  */
 public class QueueConsumerCloseAndReconnectTest extends 
DurableConsumerCloseAndReconnectTest {
 
+   @Override
    protected boolean isTopic() {
       return false;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java
index 6fcd8ff..1c8f7af 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java
@@ -53,6 +53,7 @@ public class QueueDuplicatesTest extends TestCase {
       super(name);
    }
 
+   @Override
    protected void setUp() throws Exception {
       String peerUrl = "peer://localhost:6099";
 
@@ -63,6 +64,7 @@ public class QueueDuplicatesTest extends TestCase {
       brokerConnection.start();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       if (brokerConnection != null) {
          brokerConnection.close();
@@ -123,6 +125,7 @@ public class QueueDuplicatesTest extends TestCase {
          setDaemon(false);
       }
 
+      @Override
       public void run() {
          try {
             Session session = createSession(brokerConnection);
@@ -148,6 +151,7 @@ public class QueueDuplicatesTest extends TestCase {
 
       private Map<String, Message> msgs = new HashMap<String, Message>();
 
+      @Override
       public void onMessage(Message message) {
          LOG.info(formatter.format(new Date()) + " SimpleConsumer Message 
Received: " + message);
          try {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.java
index 0293121..316f4f6 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.java
@@ -68,6 +68,7 @@ public class QueueMemoryFullMultiBrokersTest extends 
JmsMultipleBrokersTestSuppo
       assertEquals("inflight source:" + internalQueue, 0, 
internalQueue.getDestinationStatistics().getInflight().getCount());
    }
 
+   @Override
    public void setUp() throws Exception {
       super.setAutoFail(true);
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java
index b594515..66f747f 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java
@@ -21,6 +21,7 @@ package org.apache.activemq.usecases;
  */
 public class QueueRedeliverTest extends TopicRedeliverTest {
 
+   @Override
    protected void setUp() throws Exception {
       super.setUp();
       topic = false;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueRepeaterTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueRepeaterTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueRepeaterTest.java
index 190baa2..088c872 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueRepeaterTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueRepeaterTest.java
@@ -69,6 +69,7 @@ public final class QueueRepeaterTest extends TestCase {
       consumer = consumerSession.createConsumer(queue);
       consumer.setMessageListener(new MessageListener() {
 
+         @Override
          public void onMessage(Message m) {
             try {
                TextMessage tm = (TextMessage) m;
@@ -113,6 +114,7 @@ public final class QueueRepeaterTest extends TestCase {
       LOG.info("test completed, destination=" + receivedText);
    }
 
+   @Override
    protected void tearDown() throws Exception {
       if (connection != null) {
          connection.close();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
index 6c83cde..ff6c90e 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
@@ -56,6 +56,7 @@ public class ReliableReconnectTest extends 
org.apache.activemq.TestSupport {
    public ReliableReconnectTest() {
    }
 
+   @Override
    protected void setUp() throws Exception {
       this.setAutoFail(true);
       consumerClientId = idGen.generateId();
@@ -64,12 +65,14 @@ public class ReliableReconnectTest extends 
org.apache.activemq.TestSupport {
       destination = createDestination(getClass().getName());
    }
 
+   @Override
    protected void tearDown() throws Exception {
       if (broker != null) {
          broker.stop();
       }
    }
 
+   @Override
    public ActiveMQConnectionFactory getConnectionFactory() throws Exception {
       return new ActiveMQConnectionFactory();
    }
@@ -103,6 +106,7 @@ public class ReliableReconnectTest extends 
org.apache.activemq.TestSupport {
 
    protected void spawnConsumer() {
       Thread thread = new Thread(new Runnable() {
+         @Override
          public void run() {
             try {
                Connection consumerConnection = createConsumerConnection();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java
index b3c0d9a..b0da957 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java
@@ -40,12 +40,14 @@ public class 
StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest extends T
       void execute() throws Exception;
    }
 
+   @Override
    public void setUp() throws Exception {
    }
 
    public void testStartAndStopClientAndBrokerAndCheckNoThreadsAreLeft() 
throws Exception {
       runTest(new Task() {
 
+         @Override
          public void execute() throws Exception {
             BrokerService broker = new BrokerService();
             broker.setPersistent(false);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java
index 8fa590d..a7b020a 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java
@@ -294,6 +294,7 @@ public class ThreeBrokerQueueNetworkTest extends 
JmsMultipleBrokersTestSupport {
       MessageIdList msgsC = getConsumerMessages("BrokerC", clientC);
 
       waitFor(new Condition() {
+         @Override
          public boolean isSatisified() {
             return msgsA.getMessageCount() == MESSAGE_COUNT;
          }
@@ -522,6 +523,7 @@ public class ThreeBrokerQueueNetworkTest extends 
JmsMultipleBrokersTestSupport {
       BrokerItem brokerB = brokers.get("BrokerA");
       brokerB.broker.setPlugins(new BrokerPlugin[]{new BrokerPlugin() {
 
+         @Override
          public Broker installPlugin(Broker broker) throws Exception {
             return new BrokerFilter(broker) {
 
@@ -621,6 +623,7 @@ public class ThreeBrokerQueueNetworkTest extends 
JmsMultipleBrokersTestSupport {
    private void verifyConsumerCount(BrokerService broker, int count, final 
Destination dest) throws Exception {
       final RegionBroker regionBroker = (RegionBroker) 
broker.getRegionBroker();
       waitFor(new Condition() {
+         @Override
          public boolean isSatisified() throws Exception {
             return 
!regionBroker.getDestinations(ActiveMQDestination.transform(dest)).isEmpty();
          }
@@ -633,6 +636,7 @@ public class ThreeBrokerQueueNetworkTest extends 
JmsMultipleBrokersTestSupport {
    private void logConsumerCount(BrokerService broker, int count, final 
Destination dest) throws Exception {
       final RegionBroker regionBroker = (RegionBroker) 
broker.getRegionBroker();
       waitFor(new Condition() {
+         @Override
          public boolean isSatisified() throws Exception {
             return 
!regionBroker.getDestinations(ActiveMQDestination.transform(dest)).isEmpty();
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkLevelDBTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkLevelDBTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkLevelDBTest.java
index 0a2de63..0277c14 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkLevelDBTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkLevelDBTest.java
@@ -24,6 +24,7 @@ import org.apache.activemq.leveldb.LevelDBStore;
 
 public class ThreeBrokerVirtualTopicNetworkLevelDBTest extends 
ThreeBrokerVirtualTopicNetworkTest {
 
+   @Override
    protected void configurePersistenceAdapter(BrokerService broker) throws 
IOException {
       File dataFileDir = new File("target/test-data/leveldb/" + 
broker.getBrokerName());
       LevelDBStore adapter = new LevelDBStore();

Reply via email to