QPID-800 : junit toolkit sources added.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@629518 13f79535-47bb-0310-9956-ffa450edef68

37 files changed, 70 insertions, 103 deletions

diff --git a/java/systests/pom.xml b/java/systests/pom.xml
index d3ecfa91a2..f94cc4cae7 100644
--- a/java/systests/pom.xml
+++ b/java/systests/pom.xml
@@ -57,7 +57,7 @@
         </dependency>
 
         <dependency>
-            <groupId>uk.co.thebadgerset</groupId>
+            <groupId>org.apache.qpid</groupId>
             <artifactId>junit-toolkit</artifactId>
         </dependency>
 
@@ -102,7 +102,7 @@
 
             <!-- Runs the framework based tests against an in-vm broker. -->
             <plugin>
-                <groupId>uk.co.thebadgerset</groupId>
+                <groupId>org.apache.qpid</groupId>
                 <artifactId>junit-toolkit-maven-plugin</artifactId>
 
                 <configuration>
@@ -113,7 +113,7 @@
                         </property>
                     </systemproperties>
                     
-                    <testrunner>uk.co.thebadgerset.junit.extensions.TKTestRunner</testrunner>
+                    <testrunner>org.apache.qpid.junit.extensions.TKTestRunner</testrunner>
                     
                     <testrunneroptions>
                         <option>-X:decorators "org.apache.qpid.test.framework.qpid.InVMBrokerDecorator:org.apache.qpid.test.framework.qpid.AMQPFeatureDecorator"</option>
diff --git a/java/systests/src/main/java/org/apache/qpid/server/plugins/PluginTest.java b/java/systests/src/main/java/org/apache/qpid/server/plugins/PluginTest.java
index 1b082beee4..0221f7e275 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/plugins/PluginTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/plugins/PluginTest.java
@@ -1,9 +1,7 @@
 package org.apache.qpid.server.plugins;
 
-import java.util.Collection;
 import java.util.Map;
 
-import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.exchange.ExchangeType;
 
 import junit.framework.TestCase;
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java b/java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java
index a8f79ad59d..706d99ffe2 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java
@@ -20,7 +20,7 @@
  */

 package org.apache.qpid.test.framework;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 /**

  * An AMQPPublisher represents the status of the publishing side of a test circuit that exposes AMQP specific features.

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java b/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
index e2106eaca0..ceb9baf49c 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
@@ -26,11 +26,11 @@ import org.apache.log4j.NDC;
 import org.apache.qpid.test.framework.BrokerLifecycleAware;

 import org.apache.qpid.test.framework.sequencers.CircuitFactory;

 

-import uk.co.thebadgerset.junit.extensions.AsymptoticTestCase;

-import uk.co.thebadgerset.junit.extensions.SetupTaskAware;

-import uk.co.thebadgerset.junit.extensions.SetupTaskHandler;

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

-import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;

+import org.apache.qpid.junit.extensions.AsymptoticTestCase;

+import org.apache.qpid.junit.extensions.SetupTaskAware;

+import org.apache.qpid.junit.extensions.SetupTaskHandler;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.TestContextProperties;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java b/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java
index dac826fd5e..d1fcad9cc0 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java
@@ -26,7 +26,7 @@ import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.test.framework.localcircuit.LocalAMQPPublisherImpl;

 import org.apache.qpid.test.framework.localcircuit.LocalPublisherImpl;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 import javax.jms.*;

 

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java b/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
index f18ba521fa..38a924a4ee 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
@@ -28,7 +28,7 @@ import org.apache.qpid.test.framework.localcircuit.LocalReceiverImpl;
 import org.apache.qpid.test.framework.sequencers.CircuitFactory;

 import org.apache.qpid.util.ConversationFactory;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 import javax.jms.*;

 

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java b/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java
index 2c0f39d54c..574b4333e0 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java
@@ -20,7 +20,7 @@
  */

 package org.apache.qpid.test.framework;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 import javax.jms.Session;

 

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java b/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java
index c9bba54c51..63c7fd61c3 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java
@@ -22,7 +22,7 @@ package org.apache.qpid.test.framework;
 

 import org.apache.log4j.Logger;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 /**

  * NotApplicableAssertion is a messaging assertion that can be used when an assertion requested by a test-case is not

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java b/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java
index 418776b5cb..994371d4b3 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java
@@ -20,7 +20,7 @@
  */

 package org.apache.qpid.test.framework;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 /**

  * A Publisher represents the status of the publishing side of a test circuit. Its main purpose is to provide assertions

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java b/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java
index 4fd4ffeb48..8f9a246c70 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java
@@ -20,7 +20,7 @@
  */

 package org.apache.qpid.test.framework;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 /**

  * A Receiver is a {@link CircuitEnd} that represents the status of the receiving side of a test circuit. Its main

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java b/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java
index 6ad6185ece..3d4d9b36ec 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java
@@ -24,7 +24,7 @@ import org.apache.log4j.Logger;
 

 import static org.apache.qpid.test.framework.MessagingTestConfigProperties.*;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 import javax.jms.*;

 import javax.naming.Context;

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java
index 3a2655340e..1a08fe4b0f 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java
@@ -22,8 +22,8 @@ package org.apache.qpid.test.framework.clocksynch;
 

 import org.apache.log4j.Logger;

 

-import uk.co.thebadgerset.junit.extensions.ShutdownHookable;

-import uk.co.thebadgerset.junit.extensions.Throttle;

+import org.apache.qpid.junit.extensions.ShutdownHookable;

+import org.apache.qpid.junit.extensions.Throttle;

 

 /**

  * ClockSynchThread is a convenient utility for running a thread that periodically synchronizes the clock against

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java
index 0b3f6865d6..362236b1b8 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java
@@ -20,9 +20,7 @@
  */

 package org.apache.qpid.test.framework.clocksynch;

 

-import org.apache.log4j.Logger;

-

-import uk.co.thebadgerset.junit.extensions.ShutdownHookable;

+import org.apache.qpid.junit.extensions.ShutdownHookable;

 

 import java.io.IOException;

 import java.net.*;

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java
index 78f05767d3..4f37a655c6 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java
@@ -20,10 +20,8 @@
  */

 package org.apache.qpid.test.framework.clocksynch;

 

-import org.apache.log4j.Logger;

-

-import uk.co.thebadgerset.junit.extensions.util.CommandLineParser;

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.CommandLineParser;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 import java.io.IOException;

 import java.net.*;

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
index 628729cb51..a26b4b5c11 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
@@ -25,9 +25,9 @@ import org.apache.log4j.Logger;
 import org.apache.qpid.test.framework.*;

 import org.apache.qpid.util.ConversationFactory;

 

-import uk.co.thebadgerset.junit.extensions.TimingController;

-import uk.co.thebadgerset.junit.extensions.TimingControllerAware;

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.TimingController;

+import org.apache.qpid.junit.extensions.TimingControllerAware;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 import javax.jms.Destination;

 import javax.jms.JMSException;

@@ -232,7 +232,7 @@ public class DistributedCircuitImpl implements Circuit, TimingControllerAware
     }

 

     /**

-     * Used by tests cases that can supply a {@link uk.co.thebadgerset.junit.extensions.TimingController} to set the

+     * Used by tests cases that can supply a {@link org.apache.qpid.junit.extensions.TimingController} to set the

      * controller on an aware test.

      *

      * @param controller The timing controller.

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java
index 693fd854c7..712dc0ea24 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java
@@ -23,7 +23,7 @@ package org.apache.qpid.test.framework.distributedcircuit;
 import org.apache.qpid.test.framework.Assertion;

 import org.apache.qpid.test.framework.Publisher;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 /**

  * DistributedPublisherImpl represents the status of the publishing side of a test circuit. Its main purpose is to

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java
index 14782ee5e2..32307ce782 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java
@@ -23,7 +23,7 @@ package org.apache.qpid.test.framework.distributedcircuit;
 import org.apache.qpid.test.framework.Assertion;

 import org.apache.qpid.test.framework.Receiver;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 /**

  * DistributedReceiverImpl represents the status of the receiving side of a test circuit. Its main purpose is to

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java
index 845b0a39f6..8446bfa883 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java
@@ -25,8 +25,8 @@ import org.apache.log4j.Logger;
 import org.apache.qpid.test.framework.*;

 import org.apache.qpid.test.framework.distributedtesting.TestClientControlledTest;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

-import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.TestContextProperties;

 

 import javax.jms.*;

 

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
index 02fcb7fb55..2975bcc18a 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
@@ -1,32 +1,18 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

+/* Copyright Rupert Smith, 2005 to 2007, all rights reserved. */

 package org.apache.qpid.test.framework.distributedtesting;

 

+import java.net.InetAddress;

+import java.util.*;

+import java.util.concurrent.LinkedBlockingQueue;

+

+import javax.jms.*;

+

 import junit.framework.Test;

 import junit.framework.TestResult;

 import junit.framework.TestSuite;

 

 import org.apache.log4j.Logger;

 import org.apache.log4j.NDC;

-

 import org.apache.qpid.test.framework.FrameworkBaseCase;

 import org.apache.qpid.test.framework.MessagingTestConfigProperties;

 import org.apache.qpid.test.framework.TestClientDetails;

@@ -34,18 +20,12 @@ import org.apache.qpid.test.framework.TestUtils;
 import org.apache.qpid.test.framework.clocksynch.UDPClockReference;

 import org.apache.qpid.util.ConversationFactory;

 

-import uk.co.thebadgerset.junit.extensions.TKTestRunner;

-import uk.co.thebadgerset.junit.extensions.WrappedSuiteTestDecorator;

-import uk.co.thebadgerset.junit.extensions.util.CommandLineParser;

-import uk.co.thebadgerset.junit.extensions.util.MathUtils;

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

-import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;

-

-import javax.jms.*;

-

-import java.net.InetAddress;

-import java.util.*;

-import java.util.concurrent.LinkedBlockingQueue;

+import org.apache.qpid.junit.extensions.TKTestRunner;

+import org.apache.qpid.junit.extensions.WrappedSuiteTestDecorator;

+import org.apache.qpid.junit.extensions.util.CommandLineParser;

+import org.apache.qpid.junit.extensions.util.MathUtils;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.TestContextProperties;

 

 /**

  * <p/>Implements the coordinator client described in the interop testing specification

@@ -137,8 +117,7 @@ public class Coordinator extends TKTestRunner
         String reportDir, String runName, boolean verbose, String brokerUrl, String virtualHost, TestEngine engine,

         boolean terminate, boolean csv, boolean xml, List<TestDecoratorFactory> decoratorFactories)

     {

-        super(repetitions, duration, threads, delay, params, testCaseName, reportDir, runName, csv, xml, verbose,

-            decoratorFactories);

+        super(repetitions, duration, threads, delay, params, testCaseName, reportDir, runName, csv, xml, decoratorFactories);

 

         log.debug("public Coordinator(Integer repetitions = " + repetitions + " , Long duration = " + duration

             + ", int[] threads = " + Arrays.toString(threads) + ", int delay = " + delay + ", int[] params = "

@@ -480,7 +459,7 @@ public class Coordinator extends TKTestRunner
         {

             log.debug("targetTest is a TestSuite");

 

-            TestSuite suite = (TestSuite) test;

+            TestSuite suite = (TestSuite)test;

 

             int numTests = suite.countTestCases();

             log.debug("There are " + numTests + " in the suite.");

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
index c2f34b44fc..958df63d45 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
@@ -29,7 +29,7 @@ import org.apache.qpid.test.framework.TestClientDetails;
 import org.apache.qpid.test.framework.sequencers.CircuitFactory;

 import org.apache.qpid.util.ConversationFactory;

 

-import uk.co.thebadgerset.junit.extensions.WrappedSuiteTestDecorator;

+import org.apache.qpid.junit.extensions.WrappedSuiteTestDecorator;

 

 import javax.jms.Connection;

 import javax.jms.Destination;

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
index 995aa5e71d..c68ca5f7ef 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
@@ -32,14 +32,13 @@ import org.apache.qpid.test.framework.sequencers.CircuitFactory;
 import org.apache.qpid.test.framework.sequencers.FanOutCircuitFactory;

 import org.apache.qpid.util.ConversationFactory;

 

-import uk.co.thebadgerset.junit.extensions.WrappedSuiteTestDecorator;

+import org.apache.qpid.junit.extensions.WrappedSuiteTestDecorator;

 

 import javax.jms.Connection;

 import javax.jms.JMSException;

 import javax.jms.Message;

 import javax.jms.MessageListener;

 

-import java.util.Collection;

 import java.util.Iterator;

 import java.util.Set;

 

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
index 00285ab37e..e9636e35da 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
@@ -31,7 +31,7 @@ import org.apache.qpid.test.framework.sequencers.CircuitFactory;
 import org.apache.qpid.test.framework.sequencers.InteropCircuitFactory;

 import org.apache.qpid.util.ConversationFactory;

 

-import uk.co.thebadgerset.junit.extensions.WrappedSuiteTestDecorator;

+import org.apache.qpid.junit.extensions.WrappedSuiteTestDecorator;

 

 import javax.jms.Connection;

 

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
index b011e52ca7..1c138fe575 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
@@ -30,9 +30,9 @@ import org.apache.qpid.test.framework.clocksynch.UDPClockSynchronizer;
 import org.apache.qpid.util.ReflectionUtils;

 import org.apache.qpid.util.ReflectionUtilsException;

 

-import uk.co.thebadgerset.junit.extensions.SleepThrottle;

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

-import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;

+import org.apache.qpid.junit.extensions.SleepThrottle;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.TestContextProperties;

 

 import javax.jms.*;

 

@@ -154,8 +154,8 @@ public class TestClient implements MessageListener
         // Any options and trailing name=value pairs are also injected into the test context properties object,

         // to override any defaults that may have been set up.

         ParsedProperties options =

-            new ParsedProperties(uk.co.thebadgerset.junit.extensions.util.CommandLineParser.processCommandLine(args,

-                    new uk.co.thebadgerset.junit.extensions.util.CommandLineParser(

+            new ParsedProperties(org.apache.qpid.junit.extensions.util.CommandLineParser.processCommandLine(args,

+                    new org.apache.qpid.junit.extensions.util.CommandLineParser(

                         new String[][]

                         {

                             { "b", "The broker URL.", "broker", "false" },

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java b/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
index 014dd21292..bed6f0dfd6 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
@@ -26,8 +26,8 @@ import junit.framework.TestCase;
 

 import org.apache.log4j.Logger;

 

-import uk.co.thebadgerset.junit.extensions.ShutdownHookable;

-import uk.co.thebadgerset.junit.extensions.listeners.TKTestListener;

+import org.apache.qpid.junit.extensions.ShutdownHookable;

+import org.apache.qpid.junit.extensions.listeners.TKTestListener;

 

 import java.io.IOException;

 import java.io.PrintWriter;

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java
index 44a807ed6d..14ae108da8 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java
@@ -24,7 +24,7 @@ import org.apache.qpid.client.AMQNoConsumersException;
 import org.apache.qpid.client.AMQNoRouteException;

 import org.apache.qpid.test.framework.*;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 import javax.jms.MessageConsumer;

 import javax.jms.MessageProducer;

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
index 9c6220d97f..3cf5276b4d 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
@@ -24,7 +24,7 @@ import org.apache.log4j.Logger;
 

 import org.apache.qpid.test.framework.*;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 import javax.jms.*;

 

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java
index bd15839e41..77d6754f9c 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java
@@ -22,7 +22,7 @@ package org.apache.qpid.test.framework.localcircuit;
 

 import org.apache.qpid.test.framework.*;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 import javax.jms.MessageConsumer;

 import javax.jms.MessageProducer;

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java
index 9a86c00a1b..f349a521a1 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java
@@ -22,7 +22,7 @@ package org.apache.qpid.test.framework.localcircuit;
 

 import org.apache.qpid.test.framework.*;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 import javax.jms.MessageConsumer;

 import javax.jms.MessageProducer;

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java
index 3a44531ad2..4545e3c164 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java
@@ -26,7 +26,7 @@ import junit.framework.TestResult;
 import org.apache.qpid.test.framework.FrameworkBaseCase;

 import org.apache.qpid.test.framework.LocalAMQPCircuitFactory;

 

-import uk.co.thebadgerset.junit.extensions.WrappedSuiteTestDecorator;

+import org.apache.qpid.junit.extensions.WrappedSuiteTestDecorator;

 

 /**

  * AMQPFeatureDecorator applies decorations to {@link FrameworkBaseCase} tests, so that they may use Qpid/AMQP specific

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java
index 2e41e5c0c6..3a048ac042 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java
@@ -26,7 +26,7 @@ import junit.framework.TestResult;
 import org.apache.qpid.test.framework.BrokerLifecycleAware;

 import org.apache.qpid.test.framework.CauseFailureUserPrompt;

 

-import uk.co.thebadgerset.junit.extensions.WrappedSuiteTestDecorator;

+import org.apache.qpid.junit.extensions.WrappedSuiteTestDecorator;

 

 /**

  * CauseFailureDecorator applies decorations to {@link BrokerLifecycleAware} tests, so that they may use different failure

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
index a7ea9f9c7f..bcf052ea06 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
@@ -29,8 +29,8 @@ import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.test.framework.BrokerLifecycleAware;

 import org.apache.qpid.test.framework.FrameworkBaseCase;

 

-import uk.co.thebadgerset.junit.extensions.SetupTaskAware;

-import uk.co.thebadgerset.junit.extensions.WrappedSuiteTestDecorator;

+import org.apache.qpid.junit.extensions.SetupTaskAware;

+import org.apache.qpid.junit.extensions.WrappedSuiteTestDecorator;

 

 /**

  * InVMBrokerDecorator is a test decorator, that is activated when running tests against an in-vm broker only. Its

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
index ade96427ac..8e9591580f 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
@@ -25,13 +25,9 @@ import org.apache.qpid.test.framework.Circuit;
 import org.apache.qpid.test.framework.TestClientDetails;

 import org.apache.qpid.util.ConversationFactory;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

-

-import javax.jms.JMSException;

-import javax.jms.Message;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 import java.util.List;

-import java.util.Map;

 import java.util.Properties;

 

 /**

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
index ff4ee741ad..a82bb7c382 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
@@ -29,7 +29,7 @@ import org.apache.qpid.test.framework.TestUtils;
 import org.apache.qpid.test.framework.distributedcircuit.DistributedCircuitImpl;

 import org.apache.qpid.util.ConversationFactory;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 import javax.jms.Destination;

 import javax.jms.JMSException;

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
index 4c56a68d8f..77889e8651 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
@@ -29,7 +29,7 @@ import org.apache.qpid.test.framework.TestUtils;
 import org.apache.qpid.test.framework.distributedcircuit.DistributedCircuitImpl;

 import org.apache.qpid.util.ConversationFactory;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 import javax.jms.Destination;

 import javax.jms.JMSException;

diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java b/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java
index c7bbd70e99..845c3ed9c8 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java
@@ -27,8 +27,7 @@ import org.apache.qpid.test.framework.MessagingTestConfigProperties;
 import static org.apache.qpid.test.framework.MessagingTestConfigProperties.*;

 import org.apache.qpid.test.framework.sequencers.CircuitFactory;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

-import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;

+import org.apache.qpid.junit.extensions.util.TestContextProperties;

 

 /**

  * ImmediateMessageTest tests for the desired behaviour of immediate messages. Immediate messages are a non-JMS

diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java b/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java
index 7391bf23d2..066b4e24ba 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java
@@ -27,8 +27,8 @@ import org.apache.qpid.test.framework.MessagingTestConfigProperties;
 import static org.apache.qpid.test.framework.MessagingTestConfigProperties.*;

 import org.apache.qpid.test.framework.sequencers.CircuitFactory;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

-import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.TestContextProperties;

 

 /**

  * MandatoryMessageTest tests for the desired behaviour of mandatory messages. Mandatory messages are a non-JMS

diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java b/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java
index 163a6a67f6..f39d22bc67 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java
@@ -26,8 +26,8 @@ import org.apache.qpid.test.framework.MessagingTestConfigProperties;
 import static org.apache.qpid.test.framework.MessagingTestConfigProperties.*;

 import org.apache.qpid.test.framework.sequencers.CircuitFactory;

 

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

-import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.TestContextProperties;

 

 /**

  * RollbackTest tests the rollback ability of transactional messaging.