Modified: incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java?rev=629518&r1=629517&r2=629518&view=diff ============================================================================== --- incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java (original) +++ incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java Wed Feb 20 08:04:25 2008 @@ -26,7 +26,7 @@ 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 [EMAIL PROTECTED] BrokerLifecycleAware} tests, so that they may use different failure
Modified: incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java?rev=629518&r1=629517&r2=629518&view=diff ============================================================================== --- incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java (original) +++ incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java Wed Feb 20 08:04:25 2008 @@ -29,8 +29,8 @@ 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 Modified: incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java?rev=629518&r1=629517&r2=629518&view=diff ============================================================================== --- incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java (original) +++ incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java Wed Feb 20 08:04:25 2008 @@ -25,13 +25,9 @@ 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; /** Modified: incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java?rev=629518&r1=629517&r2=629518&view=diff ============================================================================== --- incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java (original) +++ incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java Wed Feb 20 08:04:25 2008 @@ -29,7 +29,7 @@ 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; Modified: incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java?rev=629518&r1=629517&r2=629518&view=diff ============================================================================== --- incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java (original) +++ incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java Wed Feb 20 08:04:25 2008 @@ -29,7 +29,7 @@ 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; Modified: incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java?rev=629518&r1=629517&r2=629518&view=diff ============================================================================== --- incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java (original) +++ incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java Wed Feb 20 08:04:25 2008 @@ -27,8 +27,7 @@ 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 Modified: incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java?rev=629518&r1=629517&r2=629518&view=diff ============================================================================== --- incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java (original) +++ incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java Wed Feb 20 08:04:25 2008 @@ -27,8 +27,8 @@ 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 Modified: incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java?rev=629518&r1=629517&r2=629518&view=diff ============================================================================== --- incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java (original) +++ incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java Wed Feb 20 08:04:25 2008 @@ -26,8 +26,8 @@ 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.
