Refactored packaging of test framework.

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

22 files changed, 58 insertions, 132 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java
index 6dd0a08198..4a0a27bb06 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java
@@ -20,7 +20,7 @@
  */

 package org.apache.qpid.server.exchange;

 

-import org.apache.qpid.interop.coordinator.sequencers.TestCaseSequencer;

+import org.apache.qpid.test.framework.sequencers.TestCaseSequencer;

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

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

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

diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java
index 987a458121..94a33806d0 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java
@@ -20,7 +20,7 @@
  */

 package org.apache.qpid.server.exchange;

 

-import org.apache.qpid.interop.coordinator.sequencers.TestCaseSequencer;

+import org.apache.qpid.test.framework.sequencers.TestCaseSequencer;

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

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

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

diff --git a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/DropInTest.java b/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java
index f7e38fb1ad..12cf0d79d5 100644
--- a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/DropInTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java
@@ -18,7 +18,7 @@
  * under the License.

  *

  */

-package org.apache.qpid.interop.coordinator;

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

 

 import javax.jms.JMSException;

 import javax.jms.Message;

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 0c24836b27..d6cb0cad13 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
@@ -25,16 +25,13 @@ import junit.framework.TestCase;
 import org.apache.log4j.NDC;

 

 import org.apache.qpid.client.transport.TransportConnection;

-import org.apache.qpid.interop.coordinator.sequencers.TestCaseSequencer;

+import org.apache.qpid.test.framework.sequencers.TestCaseSequencer;

 import org.apache.qpid.server.registry.ApplicationRegistry;

+import org.apache.qpid.test.framework.localcircuit.CircuitImpl;

 

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

 

-import javax.jms.JMSException;

-import javax.jms.Message;

-

 import java.util.ArrayList;

-import java.util.LinkedList;

 import java.util.List;

 import java.util.Properties;

 

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/MultiProducerConsumerPairImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/MultiProducerConsumerPairImpl.java
deleted file mode 100644
index 88617555d3..0000000000
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/MultiProducerConsumerPairImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*

- *

- * 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.

- *

- */

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

-

-import javax.jms.*;

-

-/**

- * Multiple producers and consumers made to look like a single producer and consumer. All methods repeated accross

- * all producers and consumers.

- */

-public class MultiProducerConsumerPairImpl implements CircuitEnd

-{

-    /**

-     * Gets the message producer at this circuit end point.

-     *

-     * @return The message producer at with this circuit end point.

-     */

-    public MessageProducer getProducer()

-    {

-        throw new RuntimeException("Not implemented.");

-    }

-

-    /**

-     * Gets the message consumer at this circuit end point.

-     *

-     * @return The message consumer at this circuit end point.

-     */

-    public MessageConsumer getConsumer()

-    {

-        throw new RuntimeException("Not implemented.");

-    }

-

-    /**

-     * Send the specified message over the producer at this end point.

-     *

-     * @param message The message to send.

-     * @throws javax.jms.JMSException Any JMS exception occuring during the send is allowed to fall through.

-     */

-    public void send(Message message) throws JMSException

-    {

-        throw new RuntimeException("Not implemented.");

-    }

-

-    /**

-     * Gets the JMS Session associated with this circuit end point.

-     *

-     * @return The JMS Session associated with this circuit end point.

-     */

-    public Session getSession()

-    {

-        throw new RuntimeException("Not implemented.");

-    }

-

-    /**

-     * Closes the message producers and consumers and the sessions, associated with this circuit end point.

-     *

-     * @throws javax.jms.JMSException Any JMSExceptions occurring during the close are allowed to fall through.

-     */

-    public void close() throws JMSException

-    {

-        throw new RuntimeException("Not implemented.");

-    }

-}

diff --git a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/TestClientDetails.java b/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java
index 742375b7bd..1e5807cba8 100644
--- a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/TestClientDetails.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java
@@ -18,7 +18,7 @@
  * under the License.

  *

  */

-package org.apache.qpid.interop.coordinator;

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

 

 /**

  * TestClientDetails is used to encapsulate information about an interop test client. It pairs together the unique

diff --git a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/distributedcircuit/DistributedCircuitImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
index 405898f1e6..aadd378aed 100644
--- a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/distributedcircuit/DistributedCircuitImpl.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
@@ -18,7 +18,7 @@
  * under the License.

  *

  */

-package org.apache.qpid.interop.coordinator.distributedcircuit;

+package org.apache.qpid.test.framework.distributedcircuit;

 

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

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

diff --git a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/Coordinator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
index 28d8ce79a0..7d28aee432 100644
--- a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/Coordinator.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
@@ -18,7 +18,7 @@
  * under the License.

  *

  */

-package org.apache.qpid.interop.coordinator;

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

 

 import junit.framework.Test;

 import junit.framework.TestResult;

@@ -28,6 +28,8 @@ import org.apache.log4j.Logger;
 

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

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

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

+import org.apache.qpid.test.framework.listeners.XMLTestListener;

 import org.apache.qpid.util.ConversationFactory;

 import org.apache.qpid.util.PrettyPrintingUtils;

 

diff --git a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/DistributedTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestCase.java
index 96b0d0c33f..c47650ba1c 100644
--- a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/DistributedTestCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestCase.java
@@ -18,21 +18,21 @@
  * under the License.

  *

  */

-package org.apache.qpid.interop.coordinator;

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

 

 import org.apache.log4j.Logger;

 

-import org.apache.qpid.interop.coordinator.sequencers.DistributedTestSequencer;

+import org.apache.qpid.test.framework.sequencers.DistributedTestSequencer;

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

 

 /**

- * DistributedTestCase provides a base class implementation of the {@link org.apache.qpid.interop.coordinator.sequencers.DistributedTestSequencer}, taking care of its

+ * DistributedTestCase provides a base class implementation of the {@link org.apache.qpid.test.framework.sequencers.DistributedTestSequencer}, taking care of its

  * more mundane aspects, such as recording the test pariticipants.

  *

  * <p/><table id="crc"><caption>CRC Card</caption>

  * <tr><th> Responsibilities <th> Collaborations

  * <tr><td> Accept notification of test case participants.

- *     <td> {@link org.apache.qpid.interop.coordinator.DistributedTestDecorator}

+ *     <td> {@link DistributedTestDecorator}

  * <tr><td> Accept JMS Connection to carry out the coordination over.

  * </table>

  */

diff --git a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/DistributedTestDecorator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
index e33a5c7228..bcc409dff9 100644
--- a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/DistributedTestDecorator.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
@@ -18,13 +18,14 @@
  * under the License.

  *

  */

-package org.apache.qpid.interop.coordinator;

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

 

 import junit.framework.TestResult;

 

 import org.apache.log4j.Logger;

 

-import org.apache.qpid.interop.coordinator.sequencers.DistributedTestSequencer;

+import org.apache.qpid.test.framework.sequencers.DistributedTestSequencer;

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

 import org.apache.qpid.util.ConversationFactory;

 

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

@@ -42,8 +43,8 @@ import java.util.*;
  * returns the set of test clients that are available to particiapte in the test.

  *

  * <p/>When used to wrap a {@link org.apache.qpid.test.framework.FrameworkBaseCase} test, it replaces the default

- * {@link org.apache.qpid.interop.coordinator.sequencers.TestCaseSequencer} implementations with a suitable

- * {@link org.apache.qpid.interop.coordinator.sequencers.DistributedTestSequencer}. Concrete implementations

+ * {@link org.apache.qpid.test.framework.sequencers.TestCaseSequencer} implementations with a suitable

+ * {@link org.apache.qpid.test.framework.sequencers.DistributedTestSequencer}. Concrete implementations

  * can use this to configure the sending and receiving roles on the test.

  *

  * <p><table id="crc"><caption>CRC Card</caption>

diff --git a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/FanOutTestDecorator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
index acace5bd7d..83d6602e57 100644
--- a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/FanOutTestDecorator.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
@@ -18,17 +18,18 @@
  * under the License.

  *

  */

-package org.apache.qpid.interop.coordinator;

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

 

 import junit.framework.Test;

 import junit.framework.TestResult;

 

 import org.apache.log4j.Logger;

 

-import org.apache.qpid.interop.coordinator.sequencers.DistributedTestSequencer;

-import org.apache.qpid.interop.coordinator.sequencers.FanOutTestSequencer;

-import org.apache.qpid.interop.coordinator.sequencers.InteropTestSequencer;

+import org.apache.qpid.test.framework.sequencers.DistributedTestSequencer;

+import org.apache.qpid.test.framework.sequencers.FanOutTestSequencer;

+import org.apache.qpid.test.framework.DropInTest;

 import org.apache.qpid.util.ConversationFactory;

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

 

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

 

diff --git a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/InteropTestDecorator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
index 7dcc391650..7743d2bba3 100644
--- a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/InteropTestDecorator.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
@@ -18,15 +18,16 @@
  * under the License.

  *

  */

-package org.apache.qpid.interop.coordinator;

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

 

 import junit.framework.Test;

 import junit.framework.TestResult;

 

 import org.apache.log4j.Logger;

 

-import org.apache.qpid.interop.coordinator.sequencers.DistributedTestSequencer;

-import org.apache.qpid.interop.coordinator.sequencers.InteropTestSequencer;

+import org.apache.qpid.test.framework.sequencers.DistributedTestSequencer;

+import org.apache.qpid.test.framework.sequencers.InteropTestSequencer;

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

 import org.apache.qpid.util.ConversationFactory;

 

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

diff --git a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/OptOutTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java
index f3673583e7..83ec12ad56 100644
--- a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/OptOutTestCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java
@@ -18,11 +18,9 @@
  * under the License.

  *

  */

-package org.apache.qpid.interop.coordinator;

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

 

-import junit.framework.Assert;

-

-import org.apache.qpid.interop.coordinator.sequencers.DistributedTestSequencer;

+import org.apache.qpid.test.framework.sequencers.DistributedTestSequencer;

 

 /**

  * An OptOutTestCase is a test case that automatically fails. It is used when a list of test clients has been generated

@@ -51,7 +49,7 @@ public class OptOutTestCase extends DistributedTestCase
     {

         DistributedTestSequencer sequencer = getDistributedTestSequencer();

 

-        Assert.fail("One of " + sequencer.getSender() + " and " + getDistributedTestSequencer().getReceivers()

+        fail("One of " + sequencer.getSender() + " and " + getDistributedTestSequencer().getReceivers()

             + " opted out of the test.");

     }

 

diff --git a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/XMLTestListener.java b/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
index 74c86b1d83..ee274a1e01 100644
--- a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/XMLTestListener.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
@@ -18,7 +18,7 @@
  * under the License.

  *

  */

-package org.apache.qpid.interop.coordinator;

+package org.apache.qpid.test.framework.listeners;

 

 import junit.framework.AssertionFailedError;

 import junit.framework.Test;

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/CircuitImpl.java
index 0bcf2e5036..3c678eef7d 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitImpl.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/CircuitImpl.java
@@ -18,10 +18,10 @@
  * under the License.

  *

  */

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

+package org.apache.qpid.test.framework.localcircuit;

 

 import org.apache.qpid.client.AMQSession;

-import org.apache.qpid.test.framework.MessageMonitor;

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

 

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

 

@@ -42,10 +42,10 @@ import java.util.concurrent.atomic.AtomicLong;
  * <tr><td> Start the circuit running.

  * <tr><td> Close the circuit down.

  * <tr><td> Take a reading of the circuits state.

- * <tr><td> Apply assertions against the circuits state. <td> {@link Assertion}

+ * <tr><td> Apply assertions against the circuits state. <td> {@link org.apache.qpid.test.framework.Assertion}

  * <tr><td> Send test messages over the circuit.

  * <tr><td> Perform the default test procedure on the circuit.

- * <tr><td> Provide access to connection and session exception monitors <td> {@link ExceptionMonitor}

+ * <tr><td> Provide access to connection and session exception monitors <td> {@link org.apache.qpid.test.framework.ExceptionMonitor}

  * </table>

  *

  * @todo Add ability to create routes with no consumers active on them. Immediate/Mandatory tests are closing consumers

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/PublisherImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/PublisherImpl.java
index 48bb9187fb..5b63607867 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/PublisherImpl.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/PublisherImpl.java
@@ -18,17 +18,19 @@
  * under the License.

  *

  */

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

+package org.apache.qpid.test.framework.localcircuit;

 

 import org.apache.qpid.client.AMQNoConsumersException;

 import org.apache.qpid.client.AMQNoRouteException;

+import org.apache.qpid.test.framework.localcircuit.CircuitImpl;

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

 

 import javax.jms.MessageConsumer;

 import javax.jms.MessageProducer;

 import javax.jms.Session;

 

 /**

- * Provides an implementation of the {@link Publisher} interface that wraps a single message producer and consumer on

+ * Provides an implementation of the {@link org.apache.qpid.test.framework.Publisher} interface that wraps a single message producer and consumer on

  * a single session.

  *

  * <p/><table id="crc"><caption>CRC Card</caption>

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/ReceiverImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/ReceiverImpl.java
index ce783ed9e0..6dd7056806 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/ReceiverImpl.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/ReceiverImpl.java
@@ -18,14 +18,19 @@
  * under the License.

  *

  */

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

+package org.apache.qpid.test.framework.localcircuit;

+

+import org.apache.qpid.test.framework.localcircuit.CircuitImpl;

+import org.apache.qpid.test.framework.CircuitEndBase;

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

+import org.apache.qpid.test.framework.Assertion;

 

 import javax.jms.MessageConsumer;

 import javax.jms.MessageProducer;

 import javax.jms.Session;

 

 /**

- * Provides an implementation of the {@link Receiver} interface that wraps a single message producer and consumer on

+ * Provides an implementation of the {@link org.apache.qpid.test.framework.Receiver} interface that wraps a single message producer and consumer on

  * a single session.

  *

  * <p/><table id="crc"><caption>CRC Card</caption>

diff --git a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/sequencers/BaseDistributedTestSequencer.java b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseDistributedTestSequencer.java
index ad073014d0..a0e3d3b4a6 100644
--- a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/sequencers/BaseDistributedTestSequencer.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseDistributedTestSequencer.java
@@ -18,12 +18,12 @@
  * under the License.

  *

  */

-package org.apache.qpid.interop.coordinator.sequencers;

+package org.apache.qpid.test.framework.sequencers;

 

 import org.apache.log4j.Logger;

 

-import org.apache.qpid.interop.coordinator.DistributedTestCase;

-import org.apache.qpid.interop.coordinator.TestClientDetails;

+import org.apache.qpid.test.framework.distributedtesting.DistributedTestCase;

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

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

 import org.apache.qpid.util.ConversationFactory;

 

diff --git a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/sequencers/DistributedTestSequencer.java b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/DistributedTestSequencer.java
index 9b58107796..73e61ec921 100644
--- a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/sequencers/DistributedTestSequencer.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/DistributedTestSequencer.java
@@ -18,16 +18,16 @@
  * under the License.

  *

  */

-package org.apache.qpid.interop.coordinator.sequencers;

+package org.apache.qpid.test.framework.sequencers;

 

-import org.apache.qpid.interop.coordinator.TestClientDetails;

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

 import org.apache.qpid.util.ConversationFactory;

 

 import java.util.List;

 

 /**

  * A DistributedTestSequencer is a test sequencer that coordinates activity amongst many

- * {@link org.apache.qpid.interop.testclient.TestClient}s.

+ * {@link org.apache.qpid.test.framework.distributedtesting.TestClient}s.

  *

  * <p><table id="crc"><caption>CRC Card</caption>

  * <tr><th> Responsibilities <th> Collaborations

diff --git a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/sequencers/FanOutTestSequencer.java b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutTestSequencer.java
index 5a41481e21..a116b23065 100644
--- a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/sequencers/FanOutTestSequencer.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutTestSequencer.java
@@ -18,11 +18,11 @@
  * under the License.

  *

  */

-package org.apache.qpid.interop.coordinator.sequencers;

+package org.apache.qpid.test.framework.sequencers;

 

 import org.apache.log4j.Logger;

 

-import org.apache.qpid.interop.coordinator.TestClientDetails;

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

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

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

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

diff --git a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/sequencers/InteropTestSequencer.java b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropTestSequencer.java
index 0230bf4d77..f2253d416b 100644
--- a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/sequencers/InteropTestSequencer.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropTestSequencer.java
@@ -18,11 +18,11 @@
  * under the License.

  *

  */

-package org.apache.qpid.interop.coordinator.sequencers;

+package org.apache.qpid.test.framework.sequencers;

 

 import org.apache.log4j.Logger;

 

-import org.apache.qpid.interop.coordinator.TestClientDetails;

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

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

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

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

diff --git a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/sequencers/TestCaseSequencer.java b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/TestCaseSequencer.java
index 94105f30a8..4f09642467 100644
--- a/java/systests/src/main/java/org/apache/qpid/interop/coordinator/sequencers/TestCaseSequencer.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/TestCaseSequencer.java
@@ -18,7 +18,7 @@
  * under the License.

  *

  */

-package org.apache.qpid.interop.coordinator.sequencers;

+package org.apache.qpid.test.framework.sequencers;

 

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

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