Start of merge from trunk - some manual restructuring

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

42 files changed, 0 insertions, 0 deletions

diff --git a/java/broker/main/test/build-module.xml b/java/broker/test/build-module.xml
index 3128b77249..3128b77249 100644
--- a/java/broker/main/test/build-module.xml
+++ b/java/broker/test/build-module.xml
diff --git a/java/broker/main/test/lib/README b/java/broker/test/lib/README
index a75673935e..a75673935e 100644
--- a/java/broker/main/test/lib/README
+++ b/java/broker/test/lib/README
diff --git a/java/broker/main/test/lib/junit/junit-4.0.jar b/java/broker/test/lib/junit/junit-4.0.jar
index b20406924a..b20406924a 100644
--- a/java/broker/main/test/lib/junit/junit-4.0.jar
+++ b/java/broker/test/lib/junit/junit-4.0.jar
diff --git a/java/broker/main/test/lib/junit/junit.jar b/java/broker/test/lib/junit/junit.jar
index 674d71e89e..674d71e89e 100644
--- a/java/broker/main/test/lib/junit/junit.jar
+++ b/java/broker/test/lib/junit/junit.jar
diff --git a/java/broker/main/test/src/org/apache/qpid/server/UnitTests.java b/java/broker/test/src/org/apache/qpid/server/UnitTests.java
index 3372584c07..3372584c07 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/UnitTests.java
+++ b/java/broker/test/src/org/apache/qpid/server/UnitTests.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/ack/TxAckTest.java b/java/broker/test/src/org/apache/qpid/server/ack/TxAckTest.java
index 3f8898069b..3f8898069b 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/ack/TxAckTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/ack/TxAckTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/ack/UnitTests.java b/java/broker/test/src/org/apache/qpid/server/ack/UnitTests.java
index 3d7db01365..3d7db01365 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/ack/UnitTests.java
+++ b/java/broker/test/src/org/apache/qpid/server/ack/UnitTests.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/configuration/TestPropertyUtils.java b/java/broker/test/src/org/apache/qpid/server/configuration/TestPropertyUtils.java
index bd78d1c786..bd78d1c786 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/configuration/TestPropertyUtils.java
+++ b/java/broker/test/src/org/apache/qpid/server/configuration/TestPropertyUtils.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/configuration/UnitTests.java b/java/broker/test/src/org/apache/qpid/server/configuration/UnitTests.java
index 4c70d7c4da..4c70d7c4da 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/configuration/UnitTests.java
+++ b/java/broker/test/src/org/apache/qpid/server/configuration/UnitTests.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java b/java/broker/test/src/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java
index 1e9dd54d85..1e9dd54d85 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/exchange/HeadersBindingTest.java b/java/broker/test/src/org/apache/qpid/server/exchange/HeadersBindingTest.java
index 7e33b1d711..7e33b1d711 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/exchange/HeadersBindingTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/exchange/HeadersBindingTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java b/java/broker/test/src/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
index 74cb082db7..74cb082db7 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/java/broker/test/src/org/apache/qpid/server/exchange/HeadersExchangeTest.java
index 1c594d4374..1c594d4374 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/exchange/HeadersExchangeTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/exchange/HeadersExchangeTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/exchange/UnitTests.java b/java/broker/test/src/org/apache/qpid/server/exchange/UnitTests.java
index a3c6439b67..a3c6439b67 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/exchange/UnitTests.java
+++ b/java/broker/test/src/org/apache/qpid/server/exchange/UnitTests.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/protocol/MockIoSession.java b/java/broker/test/src/org/apache/qpid/server/protocol/MockIoSession.java
index f985050e9f..f985050e9f 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/protocol/MockIoSession.java
+++ b/java/broker/test/src/org/apache/qpid/server/protocol/MockIoSession.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/protocol/TestProtocolInitiation.java b/java/broker/test/src/org/apache/qpid/server/protocol/TestProtocolInitiation.java
index 34e1709a2d..34e1709a2d 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/protocol/TestProtocolInitiation.java
+++ b/java/broker/test/src/org/apache/qpid/server/protocol/TestProtocolInitiation.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/protocol/UnitTests.java b/java/broker/test/src/org/apache/qpid/server/protocol/UnitTests.java
index 09dc76d310..09dc76d310 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/protocol/UnitTests.java
+++ b/java/broker/test/src/org/apache/qpid/server/protocol/UnitTests.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/queue/AckTest.java b/java/broker/test/src/org/apache/qpid/server/queue/AckTest.java
index a76dac7263..a76dac7263 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/queue/AckTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/queue/AckTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/queue/ConcurrencyTest.java b/java/broker/test/src/org/apache/qpid/server/queue/ConcurrencyTest.java
index 1cf11933fa..1cf11933fa 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/queue/ConcurrencyTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/queue/ConcurrencyTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/queue/DeliveryManagerTest.java b/java/broker/test/src/org/apache/qpid/server/queue/DeliveryManagerTest.java
index ef287e079b..ef287e079b 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/queue/DeliveryManagerTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/queue/DeliveryManagerTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/queue/MessageTestHelper.java b/java/broker/test/src/org/apache/qpid/server/queue/MessageTestHelper.java
index 483cbedb58..483cbedb58 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/queue/MessageTestHelper.java
+++ b/java/broker/test/src/org/apache/qpid/server/queue/MessageTestHelper.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/queue/MockProtocolSession.java b/java/broker/test/src/org/apache/qpid/server/queue/MockProtocolSession.java
index f26d6d64b3..f26d6d64b3 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/queue/MockProtocolSession.java
+++ b/java/broker/test/src/org/apache/qpid/server/queue/MockProtocolSession.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java b/java/broker/test/src/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
index 8ae8ebae79..8ae8ebae79 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/queue/QueuePerfTest.java b/java/broker/test/src/org/apache/qpid/server/queue/QueuePerfTest.java
index 36e4e90f35..36e4e90f35 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/queue/QueuePerfTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/queue/QueuePerfTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/queue/SendPerfTest.java b/java/broker/test/src/org/apache/qpid/server/queue/SendPerfTest.java
index 15aceaf037..15aceaf037 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/queue/SendPerfTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/queue/SendPerfTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/queue/SubscriptionManagerTest.java b/java/broker/test/src/org/apache/qpid/server/queue/SubscriptionManagerTest.java
index 7743db5078..7743db5078 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/queue/SubscriptionManagerTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/queue/SubscriptionManagerTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/queue/SubscriptionSetTest.java b/java/broker/test/src/org/apache/qpid/server/queue/SubscriptionSetTest.java
index b6e8f8b44d..b6e8f8b44d 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/queue/SubscriptionSetTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/queue/SubscriptionSetTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/queue/TestSubscription.java b/java/broker/test/src/org/apache/qpid/server/queue/TestSubscription.java
index 093d7e60f4..093d7e60f4 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/queue/TestSubscription.java
+++ b/java/broker/test/src/org/apache/qpid/server/queue/TestSubscription.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/queue/UnitTests.java b/java/broker/test/src/org/apache/qpid/server/queue/UnitTests.java
index 3a86773a15..3a86773a15 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/queue/UnitTests.java
+++ b/java/broker/test/src/org/apache/qpid/server/queue/UnitTests.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/store/SkeletonMessageStore.java b/java/broker/test/src/org/apache/qpid/server/store/SkeletonMessageStore.java
index 981665b4e3..981665b4e3 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/store/SkeletonMessageStore.java
+++ b/java/broker/test/src/org/apache/qpid/server/store/SkeletonMessageStore.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/store/TestReferenceCounting.java b/java/broker/test/src/org/apache/qpid/server/store/TestReferenceCounting.java
index fea0c25852..fea0c25852 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/store/TestReferenceCounting.java
+++ b/java/broker/test/src/org/apache/qpid/server/store/TestReferenceCounting.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/store/TestableMemoryMessageStore.java b/java/broker/test/src/org/apache/qpid/server/store/TestableMemoryMessageStore.java
index c6ff9ce561..c6ff9ce561 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/store/TestableMemoryMessageStore.java
+++ b/java/broker/test/src/org/apache/qpid/server/store/TestableMemoryMessageStore.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/store/UnitTests.java b/java/broker/test/src/org/apache/qpid/server/store/UnitTests.java
index a917d736a2..a917d736a2 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/store/UnitTests.java
+++ b/java/broker/test/src/org/apache/qpid/server/store/UnitTests.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/txn/TxnBufferTest.java b/java/broker/test/src/org/apache/qpid/server/txn/TxnBufferTest.java
index 2b49752023..2b49752023 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/txn/TxnBufferTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/txn/TxnBufferTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/txn/UnitTests.java b/java/broker/test/src/org/apache/qpid/server/txn/UnitTests.java
index dd63b260fd..dd63b260fd 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/txn/UnitTests.java
+++ b/java/broker/test/src/org/apache/qpid/server/txn/UnitTests.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/util/AveragedRun.java b/java/broker/test/src/org/apache/qpid/server/util/AveragedRun.java
index 3e4a1edac4..3e4a1edac4 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/util/AveragedRun.java
+++ b/java/broker/test/src/org/apache/qpid/server/util/AveragedRun.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/util/ConcurrentTest.java b/java/broker/test/src/org/apache/qpid/server/util/ConcurrentTest.java
index 6c5185e254..6c5185e254 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/util/ConcurrentTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/util/ConcurrentTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/util/LoggingProxyTest.java b/java/broker/test/src/org/apache/qpid/server/util/LoggingProxyTest.java
index 15c9e1a59a..15c9e1a59a 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/util/LoggingProxyTest.java
+++ b/java/broker/test/src/org/apache/qpid/server/util/LoggingProxyTest.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/util/RunStats.java b/java/broker/test/src/org/apache/qpid/server/util/RunStats.java
index 248622836d..248622836d 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/util/RunStats.java
+++ b/java/broker/test/src/org/apache/qpid/server/util/RunStats.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/util/TestApplicationRegistry.java b/java/broker/test/src/org/apache/qpid/server/util/TestApplicationRegistry.java
index 69939b88e4..69939b88e4 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/util/TestApplicationRegistry.java
+++ b/java/broker/test/src/org/apache/qpid/server/util/TestApplicationRegistry.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/util/TimedRun.java b/java/broker/test/src/org/apache/qpid/server/util/TimedRun.java
index f779b7fbb6..f779b7fbb6 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/util/TimedRun.java
+++ b/java/broker/test/src/org/apache/qpid/server/util/TimedRun.java
diff --git a/java/broker/main/test/src/org/apache/qpid/server/util/UnitTests.java b/java/broker/test/src/org/apache/qpid/server/util/UnitTests.java
index d6cc471413..d6cc471413 100644
--- a/java/broker/main/test/src/org/apache/qpid/server/util/UnitTests.java
+++ b/java/broker/test/src/org/apache/qpid/server/util/UnitTests.java