Start of merge from trunk - some manual restructuring

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

182 files changed, 0 insertions, 0 deletions

diff --git a/java/broker/main/java/org/apache/qpid/server/AMQChannel.java b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index e3d9bc31ff..e3d9bc31ff 100644
--- a/java/broker/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
diff --git a/java/broker/main/java/org/apache/qpid/server/ConsumerTagNotUniqueException.java b/java/broker/src/main/java/org/apache/qpid/server/ConsumerTagNotUniqueException.java
index 6a7e54bc45..6a7e54bc45 100644
--- a/java/broker/main/java/org/apache/qpid/server/ConsumerTagNotUniqueException.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/ConsumerTagNotUniqueException.java
diff --git a/java/broker/main/java/org/apache/qpid/server/Main.java b/java/broker/src/main/java/org/apache/qpid/server/Main.java
index 13dc5fbca6..13dc5fbca6 100644
--- a/java/broker/main/java/org/apache/qpid/server/Main.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/Main.java
diff --git a/java/broker/main/java/org/apache/qpid/server/ManagedChannel.java b/java/broker/src/main/java/org/apache/qpid/server/ManagedChannel.java
index 815dfdcfbd..815dfdcfbd 100644
--- a/java/broker/main/java/org/apache/qpid/server/ManagedChannel.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/ManagedChannel.java
diff --git a/java/broker/main/java/org/apache/qpid/server/RequiredDeliveryException.java b/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java
index d2b017275a..d2b017275a 100644
--- a/java/broker/main/java/org/apache/qpid/server/RequiredDeliveryException.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java
diff --git a/java/broker/main/java/org/apache/qpid/server/ack/TxAck.java b/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
index 85072b6976..85072b6976 100644
--- a/java/broker/main/java/org/apache/qpid/server/ack/TxAck.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
diff --git a/java/broker/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java b/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
index f13ecef7ac..f13ecef7ac 100644
--- a/java/broker/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
diff --git a/java/broker/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java b/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
index 8fece7bcc1..8fece7bcc1 100644
--- a/java/broker/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
diff --git a/java/broker/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java b/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
index 8061687175..8061687175 100644
--- a/java/broker/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
diff --git a/java/broker/main/java/org/apache/qpid/server/configuration/Configurator.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/Configurator.java
index e02b958941..e02b958941 100644
--- a/java/broker/main/java/org/apache/qpid/server/configuration/Configurator.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/Configurator.java
diff --git a/java/broker/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
index a7ad50917c..a7ad50917c 100644
--- a/java/broker/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
diff --git a/java/broker/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index cf787b4739..cf787b4739 100644
--- a/java/broker/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
diff --git a/java/broker/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
index 990a868e72..990a868e72 100644
--- a/java/broker/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
diff --git a/java/broker/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
index 62b0415253..62b0415253 100644
--- a/java/broker/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
diff --git a/java/broker/main/java/org/apache/qpid/server/exchange/DestNameExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
index 38ceebe235..38ceebe235 100644
--- a/java/broker/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
diff --git a/java/broker/main/java/org/apache/qpid/server/exchange/DestWildExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
index 6f38013ffb..6f38013ffb 100644
--- a/java/broker/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
diff --git a/java/broker/main/java/org/apache/qpid/server/exchange/Exchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
index 02a0badb65..02a0badb65 100644
--- a/java/broker/main/java/org/apache/qpid/server/exchange/Exchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
diff --git a/java/broker/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
index 36fd159f31..36fd159f31 100644
--- a/java/broker/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
diff --git a/java/broker/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
index 4a6c735bee..4a6c735bee 100644
--- a/java/broker/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
diff --git a/java/broker/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
index 5b71cd7b0c..5b71cd7b0c 100644
--- a/java/broker/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
diff --git a/java/broker/main/java/org/apache/qpid/server/exchange/HeadersBinding.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
index d69e956b5f..d69e956b5f 100644
--- a/java/broker/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
diff --git a/java/broker/main/java/org/apache/qpid/server/exchange/HeadersExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
index 67a6ff6596..67a6ff6596 100644
--- a/java/broker/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
diff --git a/java/broker/main/java/org/apache/qpid/server/exchange/Index.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/Index.java
index 9e88b6a68c..9e88b6a68c 100644
--- a/java/broker/main/java/org/apache/qpid/server/exchange/Index.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/Index.java
diff --git a/java/broker/main/java/org/apache/qpid/server/exchange/ManagedExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
index bd02910d0a..bd02910d0a 100644
--- a/java/broker/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
diff --git a/java/broker/main/java/org/apache/qpid/server/exchange/MessageRouter.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
index 832a60c681..832a60c681 100644
--- a/java/broker/main/java/org/apache/qpid/server/exchange/MessageRouter.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
diff --git a/java/broker/main/java/org/apache/qpid/server/exchange/NoRouteException.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/NoRouteException.java
index 6d5511d9c8..6d5511d9c8 100644
--- a/java/broker/main/java/org/apache/qpid/server/exchange/NoRouteException.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/NoRouteException.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
index 5e236f7da9..5e236f7da9 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
index 52d6d9f0f1..52d6d9f0f1 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
index 40d49815e3..40d49815e3 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
index f2f660299d..f2f660299d 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/BasicQosHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
index 0d1c039207..0d1c039207 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
index 1dce283c9e..1dce283c9e 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
index 1b03f15d22..1b03f15d22 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java
index 7731e56d4d..7731e56d4d 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
index 1ad917b918..1ad917b918 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
index 634cd70469..634cd70469 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
index f78d6f7276..f78d6f7276 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java
index f918158edb..f918158edb 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
index 7bc28f9eb9..7bc28f9eb9 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
index 1c0da4f658..1c0da4f658 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
index 5715ce181b..5715ce181b 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
index 05ca10fec5..05ca10fec5 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
index 444a54a4f2..444a54a4f2 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
index 441e991872..441e991872 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java b/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java
index a689366a2f..a689366a2f 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/QueueBindHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
index 98eec37a4a..98eec37a4a 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
index d1eb387748..d1eb387748 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
index 82c1d93065..82c1d93065 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/TxCommitHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
index 14399b08f0..14399b08f0 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
index ff2d79fb95..ff2d79fb95 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/handler/TxSelectHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
index cf665950ca..cf665950ca 100644
--- a/java/broker/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/jms/JmsConsumer.java b/java/broker/src/main/java/org/apache/qpid/server/jms/JmsConsumer.java
index da82d2166e..da82d2166e 100644
--- a/java/broker/main/java/org/apache/qpid/server/jms/JmsConsumer.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/jms/JmsConsumer.java
diff --git a/java/broker/main/java/org/apache/qpid/server/management/AMQManagedObject.java b/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
index a5733ed4ef..a5733ed4ef 100644
--- a/java/broker/main/java/org/apache/qpid/server/management/AMQManagedObject.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
diff --git a/java/broker/main/java/org/apache/qpid/server/management/DefaultManagedObject.java b/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
index cd0d58acdb..cd0d58acdb 100644
--- a/java/broker/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
diff --git a/java/broker/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
index 0cd43cecac..0cd43cecac 100644
--- a/java/broker/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
diff --git a/java/broker/main/java/org/apache/qpid/server/management/MBeanAttribute.java b/java/broker/src/main/java/org/apache/qpid/server/management/MBeanAttribute.java
index 595c97dd76..595c97dd76 100644
--- a/java/broker/main/java/org/apache/qpid/server/management/MBeanAttribute.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/MBeanAttribute.java
diff --git a/java/broker/main/java/org/apache/qpid/server/management/MBeanConstructor.java b/java/broker/src/main/java/org/apache/qpid/server/management/MBeanConstructor.java
index 2ce275d50d..2ce275d50d 100644
--- a/java/broker/main/java/org/apache/qpid/server/management/MBeanConstructor.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/MBeanConstructor.java
diff --git a/java/broker/main/java/org/apache/qpid/server/management/MBeanDescription.java b/java/broker/src/main/java/org/apache/qpid/server/management/MBeanDescription.java
index ef6993036f..ef6993036f 100644
--- a/java/broker/main/java/org/apache/qpid/server/management/MBeanDescription.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/MBeanDescription.java
diff --git a/java/broker/main/java/org/apache/qpid/server/management/MBeanIntrospector.java b/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
index dcf05fa6fe..dcf05fa6fe 100644
--- a/java/broker/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
diff --git a/java/broker/main/java/org/apache/qpid/server/management/MBeanOperation.java b/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperation.java
index 30fdf81eee..30fdf81eee 100644
--- a/java/broker/main/java/org/apache/qpid/server/management/MBeanOperation.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperation.java
diff --git a/java/broker/main/java/org/apache/qpid/server/management/MBeanOperationParameter.java b/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperationParameter.java
index 919ac767c7..919ac767c7 100644
--- a/java/broker/main/java/org/apache/qpid/server/management/MBeanOperationParameter.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperationParameter.java
diff --git a/java/broker/main/java/org/apache/qpid/server/management/Managable.java b/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java
index e62e1c7f87..e62e1c7f87 100644
--- a/java/broker/main/java/org/apache/qpid/server/management/Managable.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java
diff --git a/java/broker/main/java/org/apache/qpid/server/management/ManagedBroker.java b/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
index a38931a0d8..a38931a0d8 100644
--- a/java/broker/main/java/org/apache/qpid/server/management/ManagedBroker.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
diff --git a/java/broker/main/java/org/apache/qpid/server/management/ManagedObject.java b/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java
index 4007337173..4007337173 100644
--- a/java/broker/main/java/org/apache/qpid/server/management/ManagedObject.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java
diff --git a/java/broker/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
index 7270ec83b4..7270ec83b4 100644
--- a/java/broker/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
diff --git a/java/broker/main/java/org/apache/qpid/server/management/ManagementConfiguration.java b/java/broker/src/main/java/org/apache/qpid/server/management/ManagementConfiguration.java
index ec80009d17..ec80009d17 100644
--- a/java/broker/main/java/org/apache/qpid/server/management/ManagementConfiguration.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/ManagementConfiguration.java
diff --git a/java/broker/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
index 3bf2c8d9ca..3bf2c8d9ca 100644
--- a/java/broker/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
diff --git a/java/broker/main/java/org/apache/qpid/server/protocol/AMQMethodEvent.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMethodEvent.java
index 0c8d049951..0c8d049951 100644
--- a/java/broker/main/java/org/apache/qpid/server/protocol/AMQMethodEvent.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMethodEvent.java
diff --git a/java/broker/main/java/org/apache/qpid/server/protocol/AMQMethodListener.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMethodListener.java
index e8d973cd91..e8d973cd91 100644
--- a/java/broker/main/java/org/apache/qpid/server/protocol/AMQMethodListener.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMethodListener.java
diff --git a/java/broker/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
index 9ede6157f4..9ede6157f4 100644
--- a/java/broker/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
diff --git a/java/broker/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
index 78fb76ae27..78fb76ae27 100644
--- a/java/broker/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
diff --git a/java/broker/main/java/org/apache/qpid/server/protocol/AMQPProtocolProvider.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPProtocolProvider.java
index 0088db08bb..0088db08bb 100644
--- a/java/broker/main/java/org/apache/qpid/server/protocol/AMQPProtocolProvider.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPProtocolProvider.java
diff --git a/java/broker/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
index 402ebc329d..402ebc329d 100644
--- a/java/broker/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
diff --git a/java/broker/main/java/org/apache/qpid/server/protocol/ExchangeInitialiser.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/ExchangeInitialiser.java
index 08c31ed3ff..08c31ed3ff 100644
--- a/java/broker/main/java/org/apache/qpid/server/protocol/ExchangeInitialiser.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/ExchangeInitialiser.java
diff --git a/java/broker/main/java/org/apache/qpid/server/protocol/HeartbeatConfig.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/HeartbeatConfig.java
index d7678185d4..d7678185d4 100644
--- a/java/broker/main/java/org/apache/qpid/server/protocol/HeartbeatConfig.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/HeartbeatConfig.java
diff --git a/java/broker/main/java/org/apache/qpid/server/protocol/ManagedConnection.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
index 2a800f327d..2a800f327d 100644
--- a/java/broker/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
diff --git a/java/broker/main/java/org/apache/qpid/server/protocol/ManagedSession.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedSession.java
index 2a1a0b62c2..2a1a0b62c2 100644
--- a/java/broker/main/java/org/apache/qpid/server/protocol/ManagedSession.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedSession.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/AMQMessage.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
index afab90dcc4..afab90dcc4 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/AMQMessage.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/AMQMessageHandle.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessageHandle.java
index 0fc9ec5dcd..0fc9ec5dcd 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/AMQMessageHandle.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessageHandle.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/AMQQueue.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
index d8bab6e3bc..d8bab6e3bc 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/AMQQueue.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/AsyncDeliveryConfig.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AsyncDeliveryConfig.java
index 60788c1ccb..60788c1ccb 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/AsyncDeliveryConfig.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AsyncDeliveryConfig.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
index a7dc98ec22..a7dc98ec22 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/DeliveryManager.java b/java/broker/src/main/java/org/apache/qpid/server/queue/DeliveryManager.java
index 55ecf799f6..55ecf799f6 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/DeliveryManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/DeliveryManager.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/ExchangeBindings.java b/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java
index 424330bd11..424330bd11 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/ExchangeBindings.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/FailedDequeueException.java b/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
index f27d935c25..f27d935c25 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/InMemoryMessageHandle.java b/java/broker/src/main/java/org/apache/qpid/server/queue/InMemoryMessageHandle.java
index e2e334c5f4..e2e334c5f4 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/InMemoryMessageHandle.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/InMemoryMessageHandle.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/ManagedQueue.java b/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
index 7528011bac..7528011bac 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/ManagedQueue.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/MessageCleanupException.java b/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
index 6f0fa285b1..6f0fa285b1 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/MessageHandleFactory.java b/java/broker/src/main/java/org/apache/qpid/server/queue/MessageHandleFactory.java
index 93aceb76ec..93aceb76ec 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/MessageHandleFactory.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/MessageHandleFactory.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/MessageMetaData.java b/java/broker/src/main/java/org/apache/qpid/server/queue/MessageMetaData.java
index deed18c188..deed18c188 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/MessageMetaData.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/MessageMetaData.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/NoConsumersException.java b/java/broker/src/main/java/org/apache/qpid/server/queue/NoConsumersException.java
index 09f01d6d97..09f01d6d97 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/NoConsumersException.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/NoConsumersException.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/QueueRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
index bc5599fb20..bc5599fb20 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/QueueRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/Subscription.java b/java/broker/src/main/java/org/apache/qpid/server/queue/Subscription.java
index a248efecb1..a248efecb1 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/Subscription.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/Subscription.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java b/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java
index 127b19b0e4..127b19b0e4 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java b/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
index 4422d1ffc2..4422d1ffc2 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/SubscriptionManager.java b/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionManager.java
index 185b0e4268..185b0e4268 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/SubscriptionManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionManager.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/SubscriptionSet.java b/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java
index fe55bd071b..fe55bd071b 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/SubscriptionSet.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java b/java/broker/src/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java
index bf82940ec8..bf82940ec8 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java
diff --git a/java/broker/main/java/org/apache/qpid/server/queue/WeightedSubscriptionManager.java b/java/broker/src/main/java/org/apache/qpid/server/queue/WeightedSubscriptionManager.java
index adf6aefdfb..adf6aefdfb 100644
--- a/java/broker/main/java/org/apache/qpid/server/queue/WeightedSubscriptionManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/WeightedSubscriptionManager.java
diff --git a/java/broker/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
index 50f3d711ab..50f3d711ab 100644
--- a/java/broker/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
diff --git a/java/broker/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
index db79ae8876..db79ae8876 100644
--- a/java/broker/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
diff --git a/java/broker/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
index 0102f78424..0102f78424 100644
--- a/java/broker/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/AuthenticationManager.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationManager.java
index 0adb7b98e2..0adb7b98e2 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/AuthenticationManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationManager.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/AuthenticationProviderInitialiser.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationProviderInitialiser.java
index 71e3c81ae4..71e3c81ae4 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/AuthenticationProviderInitialiser.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationProviderInitialiser.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
index d7dcf2c973..d7dcf2c973 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/CRAMMD5Initialiser.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/CRAMMD5Initialiser.java
index bfd2ac1b9f..bfd2ac1b9f 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/CRAMMD5Initialiser.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/CRAMMD5Initialiser.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/JCAProvider.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/JCAProvider.java
index 1477b33ebe..1477b33ebe 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/JCAProvider.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/JCAProvider.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/NullAuthenticationManager.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/NullAuthenticationManager.java
index 95a53951ad..95a53951ad 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/NullAuthenticationManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/NullAuthenticationManager.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/PasswordFilePrincipalDatabase.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/PasswordFilePrincipalDatabase.java
index fb11b89367..fb11b89367 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/PasswordFilePrincipalDatabase.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/PasswordFilePrincipalDatabase.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/PrincipalDatabase.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/PrincipalDatabase.java
index 8add5455ee..8add5455ee 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/PrincipalDatabase.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/PrincipalDatabase.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/SASLAuthenticationManager.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/SASLAuthenticationManager.java
index 7d0b60d95e..7d0b60d95e 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/SASLAuthenticationManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/SASLAuthenticationManager.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/UsernamePasswordInitialiser.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/UsernamePasswordInitialiser.java
index 02a953f47c..02a953f47c 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/UsernamePasswordInitialiser.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/UsernamePasswordInitialiser.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/UsernamePrincipal.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/UsernamePrincipal.java
index 1d425b8399..1d425b8399 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/UsernamePrincipal.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/UsernamePrincipal.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/amqplain/AmqPlainInitialiser.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/amqplain/AmqPlainInitialiser.java
index 94406237a5..94406237a5 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/amqplain/AmqPlainInitialiser.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/amqplain/AmqPlainInitialiser.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/amqplain/AmqPlainSaslServer.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/amqplain/AmqPlainSaslServer.java
index 0f7981abe1..0f7981abe1 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/amqplain/AmqPlainSaslServer.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/amqplain/AmqPlainSaslServer.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/amqplain/AmqPlainSaslServerFactory.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/amqplain/AmqPlainSaslServerFactory.java
index c4e904f923..c4e904f923 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/amqplain/AmqPlainSaslServerFactory.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/amqplain/AmqPlainSaslServerFactory.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/plain/PlainInitialiser.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/plain/PlainInitialiser.java
index 7b055a4f58..7b055a4f58 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/plain/PlainInitialiser.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/plain/PlainInitialiser.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/plain/PlainSaslServer.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/plain/PlainSaslServer.java
index 5a69ed02ba..5a69ed02ba 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/plain/PlainSaslServer.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/plain/PlainSaslServer.java
diff --git a/java/broker/main/java/org/apache/qpid/server/security/auth/plain/PlainSaslServerFactory.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/plain/PlainSaslServerFactory.java
index 754ecbde78..754ecbde78 100644
--- a/java/broker/main/java/org/apache/qpid/server/security/auth/plain/PlainSaslServerFactory.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/plain/PlainSaslServerFactory.java
diff --git a/java/broker/main/java/org/apache/qpid/server/state/AMQState.java b/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java
index 46d46eb4c0..46d46eb4c0 100644
--- a/java/broker/main/java/org/apache/qpid/server/state/AMQState.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java
diff --git a/java/broker/main/java/org/apache/qpid/server/state/AMQStateManager.java b/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
index 54c8bcd9d5..54c8bcd9d5 100644
--- a/java/broker/main/java/org/apache/qpid/server/state/AMQStateManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
diff --git a/java/broker/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java b/java/broker/src/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java
index c77cb4f833..c77cb4f833 100644
--- a/java/broker/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java
diff --git a/java/broker/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java b/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
index 9776151c28..9776151c28 100644
--- a/java/broker/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
diff --git a/java/broker/main/java/org/apache/qpid/server/state/StateListener.java b/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java
index d31e786ef1..d31e786ef1 100644
--- a/java/broker/main/java/org/apache/qpid/server/state/StateListener.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java
diff --git a/java/broker/main/java/org/apache/qpid/server/store/MemoryMessageStore.java b/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
index 0a243fa138..0a243fa138 100644
--- a/java/broker/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
diff --git a/java/broker/main/java/org/apache/qpid/server/store/MessageStore.java b/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
index c0e8d0465b..c0e8d0465b 100644
--- a/java/broker/main/java/org/apache/qpid/server/store/MessageStore.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
diff --git a/java/broker/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java b/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
index 6470d876bb..6470d876bb 100644
--- a/java/broker/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
diff --git a/java/broker/main/java/org/apache/qpid/server/transport/ThreadPoolFilter.java b/java/broker/src/main/java/org/apache/qpid/server/transport/ThreadPoolFilter.java
index e3d87f808c..e3d87f808c 100644
--- a/java/broker/main/java/org/apache/qpid/server/transport/ThreadPoolFilter.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/transport/ThreadPoolFilter.java
diff --git a/java/broker/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java b/java/broker/src/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java
index 7ff609b750..7ff609b750 100644
--- a/java/broker/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java
diff --git a/java/broker/main/java/org/apache/qpid/server/txn/DeliverMessageOperation.java b/java/broker/src/main/java/org/apache/qpid/server/txn/DeliverMessageOperation.java
index 059c13c687..059c13c687 100644
--- a/java/broker/main/java/org/apache/qpid/server/txn/DeliverMessageOperation.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/txn/DeliverMessageOperation.java
diff --git a/java/broker/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java b/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
index df6520e0a8..df6520e0a8 100644
--- a/java/broker/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
diff --git a/java/broker/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java b/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
index 9c8e7c7002..9c8e7c7002 100644
--- a/java/broker/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
diff --git a/java/broker/main/java/org/apache/qpid/server/txn/StoreMessageOperation.java b/java/broker/src/main/java/org/apache/qpid/server/txn/StoreMessageOperation.java
index 2a3b524060..2a3b524060 100644
--- a/java/broker/main/java/org/apache/qpid/server/txn/StoreMessageOperation.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/txn/StoreMessageOperation.java
diff --git a/java/broker/main/java/org/apache/qpid/server/txn/TransactionalContext.java b/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionalContext.java
index 1ec216cc8b..1ec216cc8b 100644
--- a/java/broker/main/java/org/apache/qpid/server/txn/TransactionalContext.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionalContext.java
diff --git a/java/broker/main/java/org/apache/qpid/server/txn/TxnBuffer.java b/java/broker/src/main/java/org/apache/qpid/server/txn/TxnBuffer.java
index 4e141495c2..4e141495c2 100644
--- a/java/broker/main/java/org/apache/qpid/server/txn/TxnBuffer.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/txn/TxnBuffer.java
diff --git a/java/broker/main/java/org/apache/qpid/server/txn/TxnOp.java b/java/broker/src/main/java/org/apache/qpid/server/txn/TxnOp.java
index 1a81786460..1a81786460 100644
--- a/java/broker/main/java/org/apache/qpid/server/txn/TxnOp.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/txn/TxnOp.java
diff --git a/java/broker/main/java/org/apache/qpid/server/util/CircularBuffer.java b/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
index d2c10cb4d1..d2c10cb4d1 100644
--- a/java/broker/main/java/org/apache/qpid/server/util/CircularBuffer.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
diff --git a/java/broker/main/java/org/apache/qpid/server/util/LoggingProxy.java b/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java
index 03c4896422..03c4896422 100644
--- a/java/broker/main/java/org/apache/qpid/server/util/LoggingProxy.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java
diff --git a/java/broker/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java
index 0fab1f6895..0fab1f6895 100644
--- a/java/broker/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java
diff --git a/java/broker/main/log4j.properties b/java/broker/src/main/log4j.properties
index 3ff6f0b581..3ff6f0b581 100644
--- a/java/broker/main/log4j.properties
+++ b/java/broker/src/main/log4j.properties
diff --git a/java/broker/main/test/build-module.xml b/java/broker/src/main/test/build-module.xml
index 3128b77249..3128b77249 100644
--- a/java/broker/main/test/build-module.xml
+++ b/java/broker/src/main/test/build-module.xml
diff --git a/java/broker/main/test/java/org/apache/qpid/server/UnitTests.java b/java/broker/src/main/test/java/org/apache/qpid/server/UnitTests.java
index 3372584c07..3372584c07 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/UnitTests.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/UnitTests.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/ack/TxAckTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/ack/TxAckTest.java
index 3f8898069b..3f8898069b 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/ack/TxAckTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/ack/TxAckTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/ack/UnitTests.java b/java/broker/src/main/test/java/org/apache/qpid/server/ack/UnitTests.java
index 3d7db01365..3d7db01365 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/ack/UnitTests.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/ack/UnitTests.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/configuration/TestPropertyUtils.java b/java/broker/src/main/test/java/org/apache/qpid/server/configuration/TestPropertyUtils.java
index bd78d1c786..bd78d1c786 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/configuration/TestPropertyUtils.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/configuration/TestPropertyUtils.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/configuration/UnitTests.java b/java/broker/src/main/test/java/org/apache/qpid/server/configuration/UnitTests.java
index 4c70d7c4da..4c70d7c4da 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/configuration/UnitTests.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/configuration/UnitTests.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java
index 1e9dd54d85..1e9dd54d85 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
index 7e33b1d711..7e33b1d711 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
index 74cb082db7..74cb082db7 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
index 1c594d4374..1c594d4374 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/exchange/UnitTests.java b/java/broker/src/main/test/java/org/apache/qpid/server/exchange/UnitTests.java
index a3c6439b67..a3c6439b67 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/exchange/UnitTests.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/exchange/UnitTests.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/protocol/MockIoSession.java b/java/broker/src/main/test/java/org/apache/qpid/server/protocol/MockIoSession.java
index f985050e9f..f985050e9f 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/protocol/MockIoSession.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/protocol/MockIoSession.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/protocol/TestProtocolInitiation.java b/java/broker/src/main/test/java/org/apache/qpid/server/protocol/TestProtocolInitiation.java
index 34e1709a2d..34e1709a2d 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/protocol/TestProtocolInitiation.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/protocol/TestProtocolInitiation.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/protocol/UnitTests.java b/java/broker/src/main/test/java/org/apache/qpid/server/protocol/UnitTests.java
index 09dc76d310..09dc76d310 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/protocol/UnitTests.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/protocol/UnitTests.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/queue/AckTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/queue/AckTest.java
index a76dac7263..a76dac7263 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/queue/AckTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/queue/AckTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
index 1cf11933fa..1cf11933fa 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
index ef287e079b..ef287e079b 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/queue/MessageTestHelper.java b/java/broker/src/main/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
index 483cbedb58..483cbedb58 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/queue/MockProtocolSession.java b/java/broker/src/main/test/java/org/apache/qpid/server/queue/MockProtocolSession.java
index f26d6d64b3..f26d6d64b3 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/queue/MockProtocolSession.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/queue/MockProtocolSession.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
index 8ae8ebae79..8ae8ebae79 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/queue/QueuePerfTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/queue/QueuePerfTest.java
index 36e4e90f35..36e4e90f35 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/queue/QueuePerfTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/queue/QueuePerfTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/queue/SendPerfTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/queue/SendPerfTest.java
index 15aceaf037..15aceaf037 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/queue/SendPerfTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/queue/SendPerfTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java
index 7743db5078..7743db5078 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java
index b6e8f8b44d..b6e8f8b44d 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/queue/TestSubscription.java b/java/broker/src/main/test/java/org/apache/qpid/server/queue/TestSubscription.java
index 093d7e60f4..093d7e60f4 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/queue/TestSubscription.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/queue/TestSubscription.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/queue/UnitTests.java b/java/broker/src/main/test/java/org/apache/qpid/server/queue/UnitTests.java
index 3a86773a15..3a86773a15 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/queue/UnitTests.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/queue/UnitTests.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java b/java/broker/src/main/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
index 981665b4e3..981665b4e3 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/store/TestReferenceCounting.java b/java/broker/src/main/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
index fea0c25852..fea0c25852 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java b/java/broker/src/main/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
index c6ff9ce561..c6ff9ce561 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/store/UnitTests.java b/java/broker/src/main/test/java/org/apache/qpid/server/store/UnitTests.java
index a917d736a2..a917d736a2 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/store/UnitTests.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/store/UnitTests.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/txn/TxnBufferTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/txn/TxnBufferTest.java
index 2b49752023..2b49752023 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/txn/TxnBufferTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/txn/TxnBufferTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/txn/UnitTests.java b/java/broker/src/main/test/java/org/apache/qpid/server/txn/UnitTests.java
index dd63b260fd..dd63b260fd 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/txn/UnitTests.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/txn/UnitTests.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/util/AveragedRun.java b/java/broker/src/main/test/java/org/apache/qpid/server/util/AveragedRun.java
index 3e4a1edac4..3e4a1edac4 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/util/AveragedRun.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/util/AveragedRun.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/util/ConcurrentTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/util/ConcurrentTest.java
index 6c5185e254..6c5185e254 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/util/ConcurrentTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/util/ConcurrentTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/util/LoggingProxyTest.java b/java/broker/src/main/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
index 15c9e1a59a..15c9e1a59a 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/util/RunStats.java b/java/broker/src/main/test/java/org/apache/qpid/server/util/RunStats.java
index 248622836d..248622836d 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/util/RunStats.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/util/RunStats.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java b/java/broker/src/main/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
index 69939b88e4..69939b88e4 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/util/TimedRun.java b/java/broker/src/main/test/java/org/apache/qpid/server/util/TimedRun.java
index f779b7fbb6..f779b7fbb6 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/util/TimedRun.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/util/TimedRun.java
diff --git a/java/broker/main/test/java/org/apache/qpid/server/util/UnitTests.java b/java/broker/src/main/test/java/org/apache/qpid/server/util/UnitTests.java
index d6cc471413..d6cc471413 100644
--- a/java/broker/main/test/java/org/apache/qpid/server/util/UnitTests.java
+++ b/java/broker/src/main/test/java/org/apache/qpid/server/util/UnitTests.java
diff --git a/java/broker/main/test/lib/README b/java/broker/src/main/test/lib/README
index a75673935e..a75673935e 100644
--- a/java/broker/main/test/lib/README
+++ b/java/broker/src/main/test/lib/README
diff --git a/java/broker/main/test/lib/junit/junit-4.0.jar b/java/broker/src/main/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/src/main/test/lib/junit/junit-4.0.jar
diff --git a/java/broker/main/test/lib/junit/junit.jar b/java/broker/src/main/test/lib/junit/junit.jar
index 674d71e89e..674d71e89e 100644
--- a/java/broker/main/test/lib/junit/junit.jar
+++ b/java/broker/src/main/test/lib/junit/junit.jar