Start of merge from trunk - some manual restructuring

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

223 files changed, 0 insertions, 0 deletions

diff --git a/java/client/src/org/apache/qpid/client/AMQAuthenticationException.java b/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
index 93b5cb5b8e..93b5cb5b8e 100644
--- a/java/client/src/org/apache/qpid/client/AMQAuthenticationException.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
diff --git a/java/client/src/org/apache/qpid/client/AMQBrokerDetails.java b/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
index 43e1672564..43e1672564 100644
--- a/java/client/src/org/apache/qpid/client/AMQBrokerDetails.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
diff --git a/java/client/src/org/apache/qpid/client/AMQConnection.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
index 1f72484993..1f72484993 100644
--- a/java/client/src/org/apache/qpid/client/AMQConnection.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
diff --git a/java/client/src/org/apache/qpid/client/AMQConnectionFactory.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
index 05a484e366..05a484e366 100644
--- a/java/client/src/org/apache/qpid/client/AMQConnectionFactory.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
diff --git a/java/client/src/org/apache/qpid/client/AMQConnectionURL.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
index b87388b9c8..b87388b9c8 100644
--- a/java/client/src/org/apache/qpid/client/AMQConnectionURL.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
diff --git a/java/client/src/org/apache/qpid/client/AMQDestination.java b/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
index 5deb974c5b..5deb974c5b 100644
--- a/java/client/src/org/apache/qpid/client/AMQDestination.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
diff --git a/java/client/src/org/apache/qpid/client/AMQHeadersExchange.java b/java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
index 257a9374e8..257a9374e8 100644
--- a/java/client/src/org/apache/qpid/client/AMQHeadersExchange.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
diff --git a/java/client/src/org/apache/qpid/client/AMQNoConsumersException.java b/java/client/src/main/java/org/apache/qpid/client/AMQNoConsumersException.java
index 19d4da0b8c..19d4da0b8c 100644
--- a/java/client/src/org/apache/qpid/client/AMQNoConsumersException.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQNoConsumersException.java
diff --git a/java/client/src/org/apache/qpid/client/AMQNoRouteException.java b/java/client/src/main/java/org/apache/qpid/client/AMQNoRouteException.java
index ad885bcbb3..ad885bcbb3 100644
--- a/java/client/src/org/apache/qpid/client/AMQNoRouteException.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQNoRouteException.java
diff --git a/java/client/src/org/apache/qpid/client/AMQQueue.java b/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
index 0a8e1bdd7c..0a8e1bdd7c 100644
--- a/java/client/src/org/apache/qpid/client/AMQQueue.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
diff --git a/java/client/src/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 8b2c2ec04d..8b2c2ec04d 100644
--- a/java/client/src/org/apache/qpid/client/AMQSession.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
diff --git a/java/client/src/org/apache/qpid/client/AMQTemporaryQueue.java b/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java
index 8c029f4919..8c029f4919 100644
--- a/java/client/src/org/apache/qpid/client/AMQTemporaryQueue.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java
diff --git a/java/client/src/org/apache/qpid/client/AMQTemporaryTopic.java b/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
index 5e96f919e4..5e96f919e4 100644
--- a/java/client/src/org/apache/qpid/client/AMQTemporaryTopic.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
diff --git a/java/client/src/org/apache/qpid/client/AMQTopic.java b/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
index aa6d8f95cf..aa6d8f95cf 100644
--- a/java/client/src/org/apache/qpid/client/AMQTopic.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
diff --git a/java/client/src/org/apache/qpid/client/BasicMessageConsumer.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
index a6f89fd221..a6f89fd221 100644
--- a/java/client/src/org/apache/qpid/client/BasicMessageConsumer.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
diff --git a/java/client/src/org/apache/qpid/client/BasicMessageProducer.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
index 694a4a7863..694a4a7863 100644
--- a/java/client/src/org/apache/qpid/client/BasicMessageProducer.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
diff --git a/java/client/src/org/apache/qpid/client/Closeable.java b/java/client/src/main/java/org/apache/qpid/client/Closeable.java
index b4aec84ab6..b4aec84ab6 100644
--- a/java/client/src/org/apache/qpid/client/Closeable.java
+++ b/java/client/src/main/java/org/apache/qpid/client/Closeable.java
diff --git a/java/client/src/org/apache/qpid/client/ConnectionTuneParameters.java b/java/client/src/main/java/org/apache/qpid/client/ConnectionTuneParameters.java
index a3471e9140..a3471e9140 100644
--- a/java/client/src/org/apache/qpid/client/ConnectionTuneParameters.java
+++ b/java/client/src/main/java/org/apache/qpid/client/ConnectionTuneParameters.java
diff --git a/java/client/src/org/apache/qpid/client/JmsNotImplementedException.java b/java/client/src/main/java/org/apache/qpid/client/JmsNotImplementedException.java
index 684940a271..684940a271 100644
--- a/java/client/src/org/apache/qpid/client/JmsNotImplementedException.java
+++ b/java/client/src/main/java/org/apache/qpid/client/JmsNotImplementedException.java
diff --git a/java/client/src/org/apache/qpid/client/TopicSubscriberAdaptor.java b/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
index caa7e5139b..caa7e5139b 100644
--- a/java/client/src/org/apache/qpid/client/TopicSubscriberAdaptor.java
+++ b/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
diff --git a/java/client/src/org/apache/qpid/client/failover/FailoverException.java b/java/client/src/main/java/org/apache/qpid/client/failover/FailoverException.java
index c17c56bdf7..c17c56bdf7 100644
--- a/java/client/src/org/apache/qpid/client/failover/FailoverException.java
+++ b/java/client/src/main/java/org/apache/qpid/client/failover/FailoverException.java
diff --git a/java/client/src/org/apache/qpid/client/failover/FailoverHandler.java b/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
index 0c68c75122..0c68c75122 100644
--- a/java/client/src/org/apache/qpid/client/failover/FailoverHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
diff --git a/java/client/src/org/apache/qpid/client/failover/FailoverState.java b/java/client/src/main/java/org/apache/qpid/client/failover/FailoverState.java
index 20886f391c..20886f391c 100644
--- a/java/client/src/org/apache/qpid/client/failover/FailoverState.java
+++ b/java/client/src/main/java/org/apache/qpid/client/failover/FailoverState.java
diff --git a/java/client/src/org/apache/qpid/client/failover/FailoverSupport.java b/java/client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java
index e2d797dfac..e2d797dfac 100644
--- a/java/client/src/org/apache/qpid/client/failover/FailoverSupport.java
+++ b/java/client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java
diff --git a/java/client/src/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java b/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
index ab1e84ee17..ab1e84ee17 100644
--- a/java/client/src/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
diff --git a/java/client/src/org/apache/qpid/client/handler/BasicReturnMethodHandler.java b/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
index ae9d7bcb4a..ae9d7bcb4a 100644
--- a/java/client/src/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
diff --git a/java/client/src/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java b/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
index 959f1eb4df..959f1eb4df 100644
--- a/java/client/src/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
diff --git a/java/client/src/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java b/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
index b857b5e91b..b857b5e91b 100644
--- a/java/client/src/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
diff --git a/java/client/src/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java b/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
index f26917b2e3..f26917b2e3 100644
--- a/java/client/src/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
diff --git a/java/client/src/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java b/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
index 6ec5b1cb49..6ec5b1cb49 100644
--- a/java/client/src/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
diff --git a/java/client/src/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java b/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
index 73986ed81a..73986ed81a 100644
--- a/java/client/src/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
diff --git a/java/client/src/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java b/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
index d326191d84..d326191d84 100644
--- a/java/client/src/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
diff --git a/java/client/src/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java b/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
index 106ffc908e..106ffc908e 100644
--- a/java/client/src/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
diff --git a/java/client/src/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java b/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
index f0d17e9b55..f0d17e9b55 100644
--- a/java/client/src/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
diff --git a/java/client/src/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java b/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
index 6e32bb692e..6e32bb692e 100644
--- a/java/client/src/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
diff --git a/java/client/src/org/apache/qpid/client/message/AMQMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/AMQMessage.java
index d281a15607..d281a15607 100644
--- a/java/client/src/org/apache/qpid/client/message/AMQMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/AMQMessage.java
diff --git a/java/client/src/org/apache/qpid/client/message/AbstractJMSMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
index 4453aa3d59..4453aa3d59 100644
--- a/java/client/src/org/apache/qpid/client/message/AbstractJMSMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
diff --git a/java/client/src/org/apache/qpid/client/message/AbstractJMSMessageFactory.java b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
index 57603f8a7e..57603f8a7e 100644
--- a/java/client/src/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
diff --git a/java/client/src/org/apache/qpid/client/message/JMSBytesMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
index ba13997e79..ba13997e79 100644
--- a/java/client/src/org/apache/qpid/client/message/JMSBytesMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
diff --git a/java/client/src/org/apache/qpid/client/message/JMSBytesMessageFactory.java b/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java
index 0e3aa45047..0e3aa45047 100644
--- a/java/client/src/org/apache/qpid/client/message/JMSBytesMessageFactory.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java
diff --git a/java/client/src/org/apache/qpid/client/message/JMSObjectMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
index f0ac87c2d7..f0ac87c2d7 100644
--- a/java/client/src/org/apache/qpid/client/message/JMSObjectMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
diff --git a/java/client/src/org/apache/qpid/client/message/JMSObjectMessageFactory.java b/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java
index cb5f29ec74..cb5f29ec74 100644
--- a/java/client/src/org/apache/qpid/client/message/JMSObjectMessageFactory.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java
diff --git a/java/client/src/org/apache/qpid/client/message/JMSTextMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
index b860d55e94..b860d55e94 100644
--- a/java/client/src/org/apache/qpid/client/message/JMSTextMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
diff --git a/java/client/src/org/apache/qpid/client/message/JMSTextMessageFactory.java b/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java
index 747965d26e..747965d26e 100644
--- a/java/client/src/org/apache/qpid/client/message/JMSTextMessageFactory.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java
diff --git a/java/client/src/org/apache/qpid/client/message/MessageFactory.java b/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
index a9c7dd1b48..a9c7dd1b48 100644
--- a/java/client/src/org/apache/qpid/client/message/MessageFactory.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
diff --git a/java/client/src/org/apache/qpid/client/message/MessageFactoryRegistry.java b/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
index 5808f9aa35..5808f9aa35 100644
--- a/java/client/src/org/apache/qpid/client/message/MessageFactoryRegistry.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
diff --git a/java/client/src/org/apache/qpid/client/message/UnexpectedBodyReceivedException.java b/java/client/src/main/java/org/apache/qpid/client/message/UnexpectedBodyReceivedException.java
index f2cb7defd2..f2cb7defd2 100644
--- a/java/client/src/org/apache/qpid/client/message/UnexpectedBodyReceivedException.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/UnexpectedBodyReceivedException.java
diff --git a/java/client/src/org/apache/qpid/client/message/UnprocessedMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java
index 7d4ee097d3..7d4ee097d3 100644
--- a/java/client/src/org/apache/qpid/client/message/UnprocessedMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java
diff --git a/java/client/src/org/apache/qpid/client/protocol/AMQMethodEvent.java b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQMethodEvent.java
index b14a7cb8b0..b14a7cb8b0 100644
--- a/java/client/src/org/apache/qpid/client/protocol/AMQMethodEvent.java
+++ b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQMethodEvent.java
diff --git a/java/client/src/org/apache/qpid/client/protocol/AMQMethodListener.java b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQMethodListener.java
index fd20151e95..fd20151e95 100644
--- a/java/client/src/org/apache/qpid/client/protocol/AMQMethodListener.java
+++ b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQMethodListener.java
diff --git a/java/client/src/org/apache/qpid/client/protocol/AMQProtocolHandler.java b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
index ebd5abda92..ebd5abda92 100644
--- a/java/client/src/org/apache/qpid/client/protocol/AMQProtocolHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
diff --git a/java/client/src/org/apache/qpid/client/protocol/AMQProtocolSession.java b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
index acb60f63ae..acb60f63ae 100644
--- a/java/client/src/org/apache/qpid/client/protocol/AMQProtocolSession.java
+++ b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
diff --git a/java/client/src/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java b/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
index a7e3ebdd14..a7e3ebdd14 100644
--- a/java/client/src/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
+++ b/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
diff --git a/java/client/src/org/apache/qpid/client/protocol/HeartbeatConfig.java b/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatConfig.java
index d6240b919a..d6240b919a 100644
--- a/java/client/src/org/apache/qpid/client/protocol/HeartbeatConfig.java
+++ b/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatConfig.java
diff --git a/java/client/src/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java b/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java
index 07a9213402..07a9213402 100644
--- a/java/client/src/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java
+++ b/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java
diff --git a/java/client/src/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java b/java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java
index 88cbd32764..88cbd32764 100644
--- a/java/client/src/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java
+++ b/java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java
diff --git a/java/client/src/org/apache/qpid/client/security/AMQCallbackHandler.java b/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
index 43e1e6ab70..43e1e6ab70 100644
--- a/java/client/src/org/apache/qpid/client/security/AMQCallbackHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
diff --git a/java/client/src/org/apache/qpid/client/security/CallbackHandlerRegistry.java b/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java
index 8bfa0c32c4..8bfa0c32c4 100644
--- a/java/client/src/org/apache/qpid/client/security/CallbackHandlerRegistry.java
+++ b/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java
diff --git a/java/client/src/org/apache/qpid/client/security/CallbackHandlerRegistry.properties b/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
index 357f9a1199..357f9a1199 100644
--- a/java/client/src/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
+++ b/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
diff --git a/java/client/src/org/apache/qpid/client/security/DynamicSaslRegistrar.java b/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java
index 3d81ad505a..3d81ad505a 100644
--- a/java/client/src/org/apache/qpid/client/security/DynamicSaslRegistrar.java
+++ b/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java
diff --git a/java/client/src/org/apache/qpid/client/security/DynamicSaslRegistrar.properties b/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
index b853d86d65..b853d86d65 100644
--- a/java/client/src/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
+++ b/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
diff --git a/java/client/src/org/apache/qpid/client/security/JCAProvider.java b/java/client/src/main/java/org/apache/qpid/client/security/JCAProvider.java
index 4a14063793..4a14063793 100644
--- a/java/client/src/org/apache/qpid/client/security/JCAProvider.java
+++ b/java/client/src/main/java/org/apache/qpid/client/security/JCAProvider.java
diff --git a/java/client/src/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java b/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
index 201cc04726..201cc04726 100644
--- a/java/client/src/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
diff --git a/java/client/src/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java b/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java
index d564e82ec3..d564e82ec3 100644
--- a/java/client/src/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java
+++ b/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java
diff --git a/java/client/src/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java b/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java
index b4cc34dd03..b4cc34dd03 100644
--- a/java/client/src/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java
+++ b/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java
diff --git a/java/client/src/org/apache/qpid/client/state/AMQState.java b/java/client/src/main/java/org/apache/qpid/client/state/AMQState.java
index 02a391ee71..02a391ee71 100644
--- a/java/client/src/org/apache/qpid/client/state/AMQState.java
+++ b/java/client/src/main/java/org/apache/qpid/client/state/AMQState.java
diff --git a/java/client/src/org/apache/qpid/client/state/AMQStateChangedEvent.java b/java/client/src/main/java/org/apache/qpid/client/state/AMQStateChangedEvent.java
index 91955e37fd..91955e37fd 100644
--- a/java/client/src/org/apache/qpid/client/state/AMQStateChangedEvent.java
+++ b/java/client/src/main/java/org/apache/qpid/client/state/AMQStateChangedEvent.java
diff --git a/java/client/src/org/apache/qpid/client/state/AMQStateListener.java b/java/client/src/main/java/org/apache/qpid/client/state/AMQStateListener.java
index 7f9698dc92..7f9698dc92 100644
--- a/java/client/src/org/apache/qpid/client/state/AMQStateListener.java
+++ b/java/client/src/main/java/org/apache/qpid/client/state/AMQStateListener.java
diff --git a/java/client/src/org/apache/qpid/client/state/AMQStateManager.java b/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
index cdabcf1df4..cdabcf1df4 100644
--- a/java/client/src/org/apache/qpid/client/state/AMQStateManager.java
+++ b/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
diff --git a/java/client/src/org/apache/qpid/client/state/IllegalStateTransitionException.java b/java/client/src/main/java/org/apache/qpid/client/state/IllegalStateTransitionException.java
index 58bb38352b..58bb38352b 100644
--- a/java/client/src/org/apache/qpid/client/state/IllegalStateTransitionException.java
+++ b/java/client/src/main/java/org/apache/qpid/client/state/IllegalStateTransitionException.java
diff --git a/java/client/src/org/apache/qpid/client/state/StateAwareMethodListener.java b/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
index 6fed4f2df6..6fed4f2df6 100644
--- a/java/client/src/org/apache/qpid/client/state/StateAwareMethodListener.java
+++ b/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
diff --git a/java/client/src/org/apache/qpid/client/state/StateListener.java b/java/client/src/main/java/org/apache/qpid/client/state/StateListener.java
index 0a5bee5106..0a5bee5106 100644
--- a/java/client/src/org/apache/qpid/client/state/StateListener.java
+++ b/java/client/src/main/java/org/apache/qpid/client/state/StateListener.java
diff --git a/java/client/src/org/apache/qpid/client/state/StateWaiter.java b/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java
index 53ce452b78..53ce452b78 100644
--- a/java/client/src/org/apache/qpid/client/state/StateWaiter.java
+++ b/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java
diff --git a/java/client/src/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java b/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
index b2d7d777d8..b2d7d777d8 100644
--- a/java/client/src/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
+++ b/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
diff --git a/java/client/src/org/apache/qpid/client/transport/AMQNoTransportForProtocolException.java b/java/client/src/main/java/org/apache/qpid/client/transport/AMQNoTransportForProtocolException.java
index 6faed9bb5f..6faed9bb5f 100644
--- a/java/client/src/org/apache/qpid/client/transport/AMQNoTransportForProtocolException.java
+++ b/java/client/src/main/java/org/apache/qpid/client/transport/AMQNoTransportForProtocolException.java
diff --git a/java/client/src/org/apache/qpid/client/transport/AMQTransportConnectionException.java b/java/client/src/main/java/org/apache/qpid/client/transport/AMQTransportConnectionException.java
index a40cea7807..a40cea7807 100644
--- a/java/client/src/org/apache/qpid/client/transport/AMQTransportConnectionException.java
+++ b/java/client/src/main/java/org/apache/qpid/client/transport/AMQTransportConnectionException.java
diff --git a/java/client/src/org/apache/qpid/client/transport/ITransportConnection.java b/java/client/src/main/java/org/apache/qpid/client/transport/ITransportConnection.java
index 49af2d1bdb..49af2d1bdb 100644
--- a/java/client/src/org/apache/qpid/client/transport/ITransportConnection.java
+++ b/java/client/src/main/java/org/apache/qpid/client/transport/ITransportConnection.java
diff --git a/java/client/src/org/apache/qpid/client/transport/SocketTransportConnection.java b/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java
index 0ec5ba2473..0ec5ba2473 100644
--- a/java/client/src/org/apache/qpid/client/transport/SocketTransportConnection.java
+++ b/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java
diff --git a/java/client/src/org/apache/qpid/client/transport/TransportConnection.java b/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
index ddcaa067af..ddcaa067af 100644
--- a/java/client/src/org/apache/qpid/client/transport/TransportConnection.java
+++ b/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
diff --git a/java/client/src/org/apache/qpid/client/transport/VmPipeTransportConnection.java b/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java
index d7cfd93bd6..d7cfd93bd6 100644
--- a/java/client/src/org/apache/qpid/client/transport/VmPipeTransportConnection.java
+++ b/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java
diff --git a/java/client/src/org/apache/qpid/client/util/FlowControllingBlockingQueue.java b/java/client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java
index e9ca7cb30c..e9ca7cb30c 100644
--- a/java/client/src/org/apache/qpid/client/util/FlowControllingBlockingQueue.java
+++ b/java/client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java
diff --git a/java/client/src/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java b/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
index d13cffd290..d13cffd290 100644
--- a/java/client/src/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
+++ b/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
diff --git a/java/client/src/org/apache/qpid/jms/BrokerDetails.java b/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
index 25efd261f9..25efd261f9 100644
--- a/java/client/src/org/apache/qpid/jms/BrokerDetails.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
diff --git a/java/client/src/org/apache/qpid/jms/ChannelLimitReachedException.java b/java/client/src/main/java/org/apache/qpid/jms/ChannelLimitReachedException.java
index d18831f5ff..d18831f5ff 100644
--- a/java/client/src/org/apache/qpid/jms/ChannelLimitReachedException.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/ChannelLimitReachedException.java
diff --git a/java/client/src/org/apache/qpid/jms/Connection.java b/java/client/src/main/java/org/apache/qpid/jms/Connection.java
index b0375c8493..b0375c8493 100644
--- a/java/client/src/org/apache/qpid/jms/Connection.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/Connection.java
diff --git a/java/client/src/org/apache/qpid/jms/ConnectionListener.java b/java/client/src/main/java/org/apache/qpid/jms/ConnectionListener.java
index 2ffcf0c8fc..2ffcf0c8fc 100644
--- a/java/client/src/org/apache/qpid/jms/ConnectionListener.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/ConnectionListener.java
diff --git a/java/client/src/org/apache/qpid/jms/ConnectionURL.java b/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
index 555bbd2f46..555bbd2f46 100644
--- a/java/client/src/org/apache/qpid/jms/ConnectionURL.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
diff --git a/java/client/src/org/apache/qpid/jms/FailoverPolicy.java b/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
index 8c0e982478..8c0e982478 100644
--- a/java/client/src/org/apache/qpid/jms/FailoverPolicy.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
diff --git a/java/client/src/org/apache/qpid/jms/MessageConsumer.java b/java/client/src/main/java/org/apache/qpid/jms/MessageConsumer.java
index 2116ebe918..2116ebe918 100644
--- a/java/client/src/org/apache/qpid/jms/MessageConsumer.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/MessageConsumer.java
diff --git a/java/client/src/org/apache/qpid/jms/MessageProducer.java b/java/client/src/main/java/org/apache/qpid/jms/MessageProducer.java
index 12aad6a61e..12aad6a61e 100644
--- a/java/client/src/org/apache/qpid/jms/MessageProducer.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/MessageProducer.java
diff --git a/java/client/src/org/apache/qpid/jms/Session.java b/java/client/src/main/java/org/apache/qpid/jms/Session.java
index 1440ace2b6..1440ace2b6 100644
--- a/java/client/src/org/apache/qpid/jms/Session.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/Session.java
diff --git a/java/client/src/org/apache/qpid/jms/failover/FailoverMethod.java b/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverMethod.java
index 2e14348ad0..2e14348ad0 100644
--- a/java/client/src/org/apache/qpid/jms/failover/FailoverMethod.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverMethod.java
diff --git a/java/client/src/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java b/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
index 2909d667fb..2909d667fb 100644
--- a/java/client/src/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
diff --git a/java/client/src/org/apache/qpid/jms/failover/FailoverSingleServer.java b/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
index 76dc6a2dd5..76dc6a2dd5 100644
--- a/java/client/src/org/apache/qpid/jms/failover/FailoverSingleServer.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
diff --git a/java/client/src/org/apache/qpid/jndi/Example.properties b/java/client/src/main/java/org/apache/qpid/jndi/Example.properties
index ae2859f8e1..ae2859f8e1 100644
--- a/java/client/src/org/apache/qpid/jndi/Example.properties
+++ b/java/client/src/main/java/org/apache/qpid/jndi/Example.properties
diff --git a/java/client/src/org/apache/qpid/jndi/NameParserImpl.java b/java/client/src/main/java/org/apache/qpid/jndi/NameParserImpl.java
index a3174aec7a..a3174aec7a 100644
--- a/java/client/src/org/apache/qpid/jndi/NameParserImpl.java
+++ b/java/client/src/main/java/org/apache/qpid/jndi/NameParserImpl.java
diff --git a/java/client/src/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java b/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
index 7691a607ba..7691a607ba 100644
--- a/java/client/src/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
+++ b/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
diff --git a/java/client/src/org/apache/qpid/jndi/ReadOnlyContext.java b/java/client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java
index b721aefc87..b721aefc87 100644
--- a/java/client/src/org/apache/qpid/jndi/ReadOnlyContext.java
+++ b/java/client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java
diff --git a/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java b/java/client/test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
index 038be976ad..038be976ad 100644
--- a/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
+++ b/java/client/test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
diff --git a/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java b/java/client/test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
index b90fc8b3cd..b90fc8b3cd 100644
--- a/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
+++ b/java/client/test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
diff --git a/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java b/java/client/test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
index 2de58a2b17..2de58a2b17 100644
--- a/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
+++ b/java/client/test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
diff --git a/java/client/test/src/org/apache/qpid/IBMPerfTest/README.txt b/java/client/test/java/org/apache/qpid/IBMPerfTest/README.txt
index 95ee9f9c77..95ee9f9c77 100644
--- a/java/client/test/src/org/apache/qpid/IBMPerfTest/README.txt
+++ b/java/client/test/java/org/apache/qpid/IBMPerfTest/README.txt
diff --git a/java/client/test/src/org/apache/qpid/ack/DisconnectAndRedeliverTest.java b/java/client/test/java/org/apache/qpid/ack/DisconnectAndRedeliverTest.java
index 9e248cdfb8..9e248cdfb8 100644
--- a/java/client/test/src/org/apache/qpid/ack/DisconnectAndRedeliverTest.java
+++ b/java/client/test/java/org/apache/qpid/ack/DisconnectAndRedeliverTest.java
diff --git a/java/client/test/src/org/apache/qpid/ack/RecoverTest.java b/java/client/test/java/org/apache/qpid/ack/RecoverTest.java
index 0feecb5a79..0feecb5a79 100644
--- a/java/client/test/src/org/apache/qpid/ack/RecoverTest.java
+++ b/java/client/test/java/org/apache/qpid/ack/RecoverTest.java
diff --git a/java/client/test/src/org/apache/qpid/ack/UnitTests.java b/java/client/test/java/org/apache/qpid/ack/UnitTests.java
index 5caaff69cf..5caaff69cf 100644
--- a/java/client/test/src/org/apache/qpid/ack/UnitTests.java
+++ b/java/client/test/java/org/apache/qpid/ack/UnitTests.java
diff --git a/java/client/test/src/org/apache/qpid/basic/BytesMessageTest.java b/java/client/test/java/org/apache/qpid/basic/BytesMessageTest.java
index e8a9debe1d..e8a9debe1d 100644
--- a/java/client/test/src/org/apache/qpid/basic/BytesMessageTest.java
+++ b/java/client/test/java/org/apache/qpid/basic/BytesMessageTest.java
diff --git a/java/client/test/src/org/apache/qpid/basic/FieldTableKeyEnumeratorTest.java b/java/client/test/java/org/apache/qpid/basic/FieldTableKeyEnumeratorTest.java
index 08ff65ea29..08ff65ea29 100644
--- a/java/client/test/src/org/apache/qpid/basic/FieldTableKeyEnumeratorTest.java
+++ b/java/client/test/java/org/apache/qpid/basic/FieldTableKeyEnumeratorTest.java
diff --git a/java/client/test/src/org/apache/qpid/basic/FieldTableMessageTest.java b/java/client/test/java/org/apache/qpid/basic/FieldTableMessageTest.java
index 82e43773a4..82e43773a4 100644
--- a/java/client/test/src/org/apache/qpid/basic/FieldTableMessageTest.java
+++ b/java/client/test/java/org/apache/qpid/basic/FieldTableMessageTest.java
diff --git a/java/client/test/src/org/apache/qpid/basic/MultipleConnectionTest.java b/java/client/test/java/org/apache/qpid/basic/MultipleConnectionTest.java
index 8bf6fc1991..8bf6fc1991 100644
--- a/java/client/test/src/org/apache/qpid/basic/MultipleConnectionTest.java
+++ b/java/client/test/java/org/apache/qpid/basic/MultipleConnectionTest.java
diff --git a/java/client/test/src/org/apache/qpid/basic/ObjectMessageTest.java b/java/client/test/java/org/apache/qpid/basic/ObjectMessageTest.java
index a78cd6f72b..a78cd6f72b 100644
--- a/java/client/test/src/org/apache/qpid/basic/ObjectMessageTest.java
+++ b/java/client/test/java/org/apache/qpid/basic/ObjectMessageTest.java
diff --git a/java/client/test/src/org/apache/qpid/basic/ReceiveTest.java b/java/client/test/java/org/apache/qpid/basic/ReceiveTest.java
index d72d748935..d72d748935 100644
--- a/java/client/test/src/org/apache/qpid/basic/ReceiveTest.java
+++ b/java/client/test/java/org/apache/qpid/basic/ReceiveTest.java
diff --git a/java/client/test/src/org/apache/qpid/basic/SessionStartTest.java b/java/client/test/java/org/apache/qpid/basic/SessionStartTest.java
index f201f23681..f201f23681 100644
--- a/java/client/test/src/org/apache/qpid/basic/SessionStartTest.java
+++ b/java/client/test/java/org/apache/qpid/basic/SessionStartTest.java
diff --git a/java/client/test/src/org/apache/qpid/basic/TextMessageTest.java b/java/client/test/java/org/apache/qpid/basic/TextMessageTest.java
index 2b76f64659..2b76f64659 100644
--- a/java/client/test/src/org/apache/qpid/basic/TextMessageTest.java
+++ b/java/client/test/java/org/apache/qpid/basic/TextMessageTest.java
diff --git a/java/client/test/src/org/apache/qpid/basic/UnitTests.java b/java/client/test/java/org/apache/qpid/basic/UnitTests.java
index b87254f73a..b87254f73a 100644
--- a/java/client/test/src/org/apache/qpid/basic/UnitTests.java
+++ b/java/client/test/java/org/apache/qpid/basic/UnitTests.java
diff --git a/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java b/java/client/test/java/org/apache/qpid/client/AllClientUnitTests.java
index 0ecd715284..0ecd715284 100644
--- a/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java
+++ b/java/client/test/java/org/apache/qpid/client/AllClientUnitTests.java
diff --git a/java/client/test/src/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java b/java/client/test/java/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java
index e12d6c0fc5..e12d6c0fc5 100644
--- a/java/client/test/src/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java
+++ b/java/client/test/java/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java
diff --git a/java/client/test/src/org/apache/qpid/client/channelclose/UnitTests.java b/java/client/test/java/org/apache/qpid/client/channelclose/UnitTests.java
index ed98bc0c30..ed98bc0c30 100644
--- a/java/client/test/src/org/apache/qpid/client/channelclose/UnitTests.java
+++ b/java/client/test/java/org/apache/qpid/client/channelclose/UnitTests.java
diff --git a/java/client/test/src/org/apache/qpid/client/message/ObjectMessageTest.java b/java/client/test/java/org/apache/qpid/client/message/ObjectMessageTest.java
index a5e1a0d558..a5e1a0d558 100644
--- a/java/client/test/src/org/apache/qpid/client/message/ObjectMessageTest.java
+++ b/java/client/test/java/org/apache/qpid/client/message/ObjectMessageTest.java
diff --git a/java/client/test/src/org/apache/qpid/client/message/TestBytesMessage.java b/java/client/test/java/org/apache/qpid/client/message/TestBytesMessage.java
index 03bb65081f..03bb65081f 100644
--- a/java/client/test/src/org/apache/qpid/client/message/TestBytesMessage.java
+++ b/java/client/test/java/org/apache/qpid/client/message/TestBytesMessage.java
diff --git a/java/client/test/src/org/apache/qpid/client/message/TestTextMessage.java b/java/client/test/java/org/apache/qpid/client/message/TestTextMessage.java
index 766f47d841..766f47d841 100644
--- a/java/client/test/src/org/apache/qpid/client/message/TestTextMessage.java
+++ b/java/client/test/java/org/apache/qpid/client/message/TestTextMessage.java
diff --git a/java/client/test/src/org/apache/qpid/client/message/UnitTests.java b/java/client/test/java/org/apache/qpid/client/message/UnitTests.java
index 889c437df3..889c437df3 100644
--- a/java/client/test/src/org/apache/qpid/client/message/UnitTests.java
+++ b/java/client/test/java/org/apache/qpid/client/message/UnitTests.java
diff --git a/java/client/test/src/org/apache/qpid/cluster/Client.java b/java/client/test/java/org/apache/qpid/cluster/Client.java
index 1d12f157b9..1d12f157b9 100644
--- a/java/client/test/src/org/apache/qpid/cluster/Client.java
+++ b/java/client/test/java/org/apache/qpid/cluster/Client.java
diff --git a/java/client/test/src/org/apache/qpid/codec/BasicDeliverTest.java b/java/client/test/java/org/apache/qpid/codec/BasicDeliverTest.java
index 4dd67c48d9..4dd67c48d9 100644
--- a/java/client/test/src/org/apache/qpid/codec/BasicDeliverTest.java
+++ b/java/client/test/java/org/apache/qpid/codec/BasicDeliverTest.java
diff --git a/java/client/test/src/org/apache/qpid/codec/Client.java b/java/client/test/java/org/apache/qpid/codec/Client.java
index 3118aa8539..3118aa8539 100644
--- a/java/client/test/src/org/apache/qpid/codec/Client.java
+++ b/java/client/test/java/org/apache/qpid/codec/Client.java
diff --git a/java/client/test/src/org/apache/qpid/codec/Server.java b/java/client/test/java/org/apache/qpid/codec/Server.java
index 772424e002..772424e002 100644
--- a/java/client/test/src/org/apache/qpid/codec/Server.java
+++ b/java/client/test/java/org/apache/qpid/codec/Server.java
diff --git a/java/client/test/src/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java b/java/client/test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
index 7c208e4cc4..7c208e4cc4 100644
--- a/java/client/test/src/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
+++ b/java/client/test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
diff --git a/java/client/test/src/org/apache/qpid/config/AbstractConfig.java b/java/client/test/java/org/apache/qpid/config/AbstractConfig.java
index 9b1bf88497..9b1bf88497 100644
--- a/java/client/test/src/org/apache/qpid/config/AbstractConfig.java
+++ b/java/client/test/java/org/apache/qpid/config/AbstractConfig.java
diff --git a/java/client/test/src/org/apache/qpid/config/ConnectionFactoryInitialiser.java b/java/client/test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
index a5599c8e58..a5599c8e58 100644
--- a/java/client/test/src/org/apache/qpid/config/ConnectionFactoryInitialiser.java
+++ b/java/client/test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
diff --git a/java/client/test/src/org/apache/qpid/config/Connector.java b/java/client/test/java/org/apache/qpid/config/Connector.java
index a3b93aad22..a3b93aad22 100644
--- a/java/client/test/src/org/apache/qpid/config/Connector.java
+++ b/java/client/test/java/org/apache/qpid/config/Connector.java
diff --git a/java/client/test/src/org/apache/qpid/config/ConnectorConfig.java b/java/client/test/java/org/apache/qpid/config/ConnectorConfig.java
index 8921d579a6..8921d579a6 100644
--- a/java/client/test/src/org/apache/qpid/config/ConnectorConfig.java
+++ b/java/client/test/java/org/apache/qpid/config/ConnectorConfig.java
diff --git a/java/client/test/src/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java b/java/client/test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
index 60e358056f..60e358056f 100644
--- a/java/client/test/src/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
+++ b/java/client/test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
diff --git a/java/client/test/src/org/apache/qpid/connection/ConnectionTest.java b/java/client/test/java/org/apache/qpid/connection/ConnectionTest.java
index e86d238dc4..e86d238dc4 100644
--- a/java/client/test/src/org/apache/qpid/connection/ConnectionTest.java
+++ b/java/client/test/java/org/apache/qpid/connection/ConnectionTest.java
diff --git a/java/client/test/src/org/apache/qpid/connection/TestManyConnections.java b/java/client/test/java/org/apache/qpid/connection/TestManyConnections.java
index 4456037c2e..4456037c2e 100644
--- a/java/client/test/src/org/apache/qpid/connection/TestManyConnections.java
+++ b/java/client/test/java/org/apache/qpid/connection/TestManyConnections.java
diff --git a/java/client/test/src/org/apache/qpid/connectionurl/ConnectionURLTest.java b/java/client/test/java/org/apache/qpid/connectionurl/ConnectionURLTest.java
index cc8442af90..cc8442af90 100644
--- a/java/client/test/src/org/apache/qpid/connectionurl/ConnectionURLTest.java
+++ b/java/client/test/java/org/apache/qpid/connectionurl/ConnectionURLTest.java
diff --git a/java/client/test/src/org/apache/qpid/connectionurl/UnitTests.java b/java/client/test/java/org/apache/qpid/connectionurl/UnitTests.java
index f4f269330e..f4f269330e 100644
--- a/java/client/test/src/org/apache/qpid/connectionurl/UnitTests.java
+++ b/java/client/test/java/org/apache/qpid/connectionurl/UnitTests.java
diff --git a/java/client/test/src/org/apache/qpid/cts/bin/jmscts.sh b/java/client/test/java/org/apache/qpid/cts/bin/jmscts.sh
index 5786e0d689..5786e0d689 100755
--- a/java/client/test/src/org/apache/qpid/cts/bin/jmscts.sh
+++ b/java/client/test/java/org/apache/qpid/cts/bin/jmscts.sh
diff --git a/java/client/test/src/org/apache/qpid/cts/bin/setenv.sh b/java/client/test/java/org/apache/qpid/cts/bin/setenv.sh
index 17cbfb8d11..17cbfb8d11 100755
--- a/java/client/test/src/org/apache/qpid/cts/bin/setenv.sh
+++ b/java/client/test/java/org/apache/qpid/cts/bin/setenv.sh
diff --git a/java/client/test/src/org/apache/qpid/cts/config/jmscts.policy b/java/client/test/java/org/apache/qpid/cts/config/jmscts.policy
index 6acd889dc4..6acd889dc4 100644
--- a/java/client/test/src/org/apache/qpid/cts/config/jmscts.policy
+++ b/java/client/test/java/org/apache/qpid/cts/config/jmscts.policy
diff --git a/java/client/test/src/org/apache/qpid/cts/config/jmscts.properties b/java/client/test/java/org/apache/qpid/cts/config/jmscts.properties
index eccb1fd411..eccb1fd411 100644
--- a/java/client/test/src/org/apache/qpid/cts/config/jmscts.properties
+++ b/java/client/test/java/org/apache/qpid/cts/config/jmscts.properties
diff --git a/java/client/test/src/org/apache/qpid/cts/config/providers.xml b/java/client/test/java/org/apache/qpid/cts/config/providers.xml
index eea1f334cc..eea1f334cc 100644
--- a/java/client/test/src/org/apache/qpid/cts/config/providers.xml
+++ b/java/client/test/java/org/apache/qpid/cts/config/providers.xml
diff --git a/java/client/test/src/org/apache/qpid/cts/readme.txt b/java/client/test/java/org/apache/qpid/cts/readme.txt
index 117e7d4954..117e7d4954 100644
--- a/java/client/test/src/org/apache/qpid/cts/readme.txt
+++ b/java/client/test/java/org/apache/qpid/cts/readme.txt
diff --git a/java/client/test/src/org/apache/qpid/cts/src/compile.sh b/java/client/test/java/org/apache/qpid/cts/src/compile.sh
index c5877e7927..c5877e7927 100755
--- a/java/client/test/src/org/apache/qpid/cts/src/compile.sh
+++ b/java/client/test/java/org/apache/qpid/cts/src/compile.sh
diff --git a/java/client/test/src/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPAdministrator.java b/java/client/test/java/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPAdministrator.java
index 21a6816af7..21a6816af7 100644
--- a/java/client/test/src/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPAdministrator.java
+++ b/java/client/test/java/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPAdministrator.java
diff --git a/java/client/test/src/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPProvider.java b/java/client/test/java/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPProvider.java
index 21610d39b2..21610d39b2 100644
--- a/java/client/test/src/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPProvider.java
+++ b/java/client/test/java/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPProvider.java
diff --git a/java/client/test/src/org/apache/qpid/destinationurl/DestinationURLTest.java b/java/client/test/java/org/apache/qpid/destinationurl/DestinationURLTest.java
index 8369fa9e75..8369fa9e75 100644
--- a/java/client/test/src/org/apache/qpid/destinationurl/DestinationURLTest.java
+++ b/java/client/test/java/org/apache/qpid/destinationurl/DestinationURLTest.java
diff --git a/java/client/test/src/org/apache/qpid/destinationurl/UnitTests.java b/java/client/test/java/org/apache/qpid/destinationurl/UnitTests.java
index 12760aef94..12760aef94 100644
--- a/java/client/test/src/org/apache/qpid/destinationurl/UnitTests.java
+++ b/java/client/test/java/org/apache/qpid/destinationurl/UnitTests.java
diff --git a/java/client/test/src/org/apache/qpid/example/log4j.xml b/java/client/test/java/org/apache/qpid/example/log4j.xml
index e537b1796d..e537b1796d 100644
--- a/java/client/test/src/org/apache/qpid/example/log4j.xml
+++ b/java/client/test/java/org/apache/qpid/example/log4j.xml
diff --git a/java/client/test/src/org/apache/qpid/example/publisher/FileMessageDispatcher.java b/java/client/test/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
index 4dd58cf4a1..4dd58cf4a1 100644
--- a/java/client/test/src/org/apache/qpid/example/publisher/FileMessageDispatcher.java
+++ b/java/client/test/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
diff --git a/java/client/test/src/org/apache/qpid/example/publisher/MessageFactory.java b/java/client/test/java/org/apache/qpid/example/publisher/MessageFactory.java
index ff40eddb03..ff40eddb03 100644
--- a/java/client/test/src/org/apache/qpid/example/publisher/MessageFactory.java
+++ b/java/client/test/java/org/apache/qpid/example/publisher/MessageFactory.java
diff --git a/java/client/test/src/org/apache/qpid/example/publisher/MessageFactoryException.java b/java/client/test/java/org/apache/qpid/example/publisher/MessageFactoryException.java
index d0fb821700..d0fb821700 100644
--- a/java/client/test/src/org/apache/qpid/example/publisher/MessageFactoryException.java
+++ b/java/client/test/java/org/apache/qpid/example/publisher/MessageFactoryException.java
diff --git a/java/client/test/src/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java b/java/client/test/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
index 9d56403cda..9d56403cda 100644
--- a/java/client/test/src/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
+++ b/java/client/test/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
diff --git a/java/client/test/src/org/apache/qpid/example/publisher/MonitorPublisher.java b/java/client/test/java/org/apache/qpid/example/publisher/MonitorPublisher.java
index 4c1d884f5d..4c1d884f5d 100644
--- a/java/client/test/src/org/apache/qpid/example/publisher/MonitorPublisher.java
+++ b/java/client/test/java/org/apache/qpid/example/publisher/MonitorPublisher.java
diff --git a/java/client/test/src/org/apache/qpid/example/publisher/Publisher.java b/java/client/test/java/org/apache/qpid/example/publisher/Publisher.java
index a2d9e5bdf6..a2d9e5bdf6 100644
--- a/java/client/test/src/org/apache/qpid/example/publisher/Publisher.java
+++ b/java/client/test/java/org/apache/qpid/example/publisher/Publisher.java
diff --git a/java/client/test/src/org/apache/qpid/example/publisher/UndeliveredMessageException.java b/java/client/test/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
index 921e5f4855..921e5f4855 100644
--- a/java/client/test/src/org/apache/qpid/example/publisher/UndeliveredMessageException.java
+++ b/java/client/test/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
diff --git a/java/client/test/src/org/apache/qpid/example/shared/ConnectionException.java b/java/client/test/java/org/apache/qpid/example/shared/ConnectionException.java
index 0ce08fd59d..0ce08fd59d 100644
--- a/java/client/test/src/org/apache/qpid/example/shared/ConnectionException.java
+++ b/java/client/test/java/org/apache/qpid/example/shared/ConnectionException.java
diff --git a/java/client/test/src/org/apache/qpid/example/shared/FileUtils.java b/java/client/test/java/org/apache/qpid/example/shared/FileUtils.java
index 6f33727194..6f33727194 100644
--- a/java/client/test/src/org/apache/qpid/example/shared/FileUtils.java
+++ b/java/client/test/java/org/apache/qpid/example/shared/FileUtils.java
diff --git a/java/client/test/src/org/apache/qpid/example/shared/Statics.java b/java/client/test/java/org/apache/qpid/example/shared/Statics.java
index e945c743be..e945c743be 100644
--- a/java/client/test/src/org/apache/qpid/example/shared/Statics.java
+++ b/java/client/test/java/org/apache/qpid/example/shared/Statics.java
diff --git a/java/client/test/src/org/apache/qpid/example/subscriber/MonitoredSubscriber.java b/java/client/test/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
index 37a8dbeca8..37a8dbeca8 100644
--- a/java/client/test/src/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
+++ b/java/client/test/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
diff --git a/java/client/test/src/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java b/java/client/test/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
index 719e7441cc..719e7441cc 100644
--- a/java/client/test/src/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
+++ b/java/client/test/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
diff --git a/java/client/test/src/org/apache/qpid/example/subscriber/Subscriber.java b/java/client/test/java/org/apache/qpid/example/subscriber/Subscriber.java
index 710192f291..710192f291 100644
--- a/java/client/test/src/org/apache/qpid/example/subscriber/Subscriber.java
+++ b/java/client/test/java/org/apache/qpid/example/subscriber/Subscriber.java
diff --git a/java/client/test/src/org/apache/qpid/example/subscriber/SubscriptionWrapper.java b/java/client/test/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
index bc0363be2a..bc0363be2a 100644
--- a/java/client/test/src/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
+++ b/java/client/test/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
diff --git a/java/client/test/src/org/apache/qpid/example/test/TestAMSPubSub.java b/java/client/test/java/org/apache/qpid/example/test/TestAMSPubSub.java
index 1364c7b849..1364c7b849 100644
--- a/java/client/test/src/org/apache/qpid/example/test/TestAMSPubSub.java
+++ b/java/client/test/java/org/apache/qpid/example/test/TestAMSPubSub.java
diff --git a/java/client/test/src/org/apache/qpid/example/test/TestMultSubscribers.java b/java/client/test/java/org/apache/qpid/example/test/TestMultSubscribers.java
index a1af923e12..a1af923e12 100644
--- a/java/client/test/src/org/apache/qpid/example/test/TestMultSubscribers.java
+++ b/java/client/test/java/org/apache/qpid/example/test/TestMultSubscribers.java
diff --git a/java/client/test/src/org/apache/qpid/example/test/TestPublisher.java b/java/client/test/java/org/apache/qpid/example/test/TestPublisher.java
index aa6a54cb0e..aa6a54cb0e 100644
--- a/java/client/test/src/org/apache/qpid/example/test/TestPublisher.java
+++ b/java/client/test/java/org/apache/qpid/example/test/TestPublisher.java
diff --git a/java/client/test/src/org/apache/qpid/example/test/TestSubscriber.java b/java/client/test/java/org/apache/qpid/example/test/TestSubscriber.java
index 01c02fe5e4..01c02fe5e4 100644
--- a/java/client/test/src/org/apache/qpid/example/test/TestSubscriber.java
+++ b/java/client/test/java/org/apache/qpid/example/test/TestSubscriber.java
diff --git a/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java b/java/client/test/java/org/apache/qpid/failover/FailoverBrokerTester.java
index f20b0e1409..f20b0e1409 100644
--- a/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java
+++ b/java/client/test/java/org/apache/qpid/failover/FailoverBrokerTester.java
diff --git a/java/client/test/src/org/apache/qpid/failover/FailoverMultiMethodTest.java b/java/client/test/java/org/apache/qpid/failover/FailoverMultiMethodTest.java
index b9f4c1c0dc..b9f4c1c0dc 100644
--- a/java/client/test/src/org/apache/qpid/failover/FailoverMultiMethodTest.java
+++ b/java/client/test/java/org/apache/qpid/failover/FailoverMultiMethodTest.java
diff --git a/java/client/test/src/org/apache/qpid/failover/FailoverRoundRobinTest.java b/java/client/test/java/org/apache/qpid/failover/FailoverRoundRobinTest.java
index 23119f2394..23119f2394 100644
--- a/java/client/test/src/org/apache/qpid/failover/FailoverRoundRobinTest.java
+++ b/java/client/test/java/org/apache/qpid/failover/FailoverRoundRobinTest.java
diff --git a/java/client/test/src/org/apache/qpid/failover/FailoverSingleServerTest.java b/java/client/test/java/org/apache/qpid/failover/FailoverSingleServerTest.java
index 7f3b058438..7f3b058438 100644
--- a/java/client/test/src/org/apache/qpid/failover/FailoverSingleServerTest.java
+++ b/java/client/test/java/org/apache/qpid/failover/FailoverSingleServerTest.java
diff --git a/java/client/test/src/org/apache/qpid/failover/FailoverTest.java b/java/client/test/java/org/apache/qpid/failover/FailoverTest.java
index 4905bf5614..4905bf5614 100644
--- a/java/client/test/src/org/apache/qpid/failover/FailoverTest.java
+++ b/java/client/test/java/org/apache/qpid/failover/FailoverTest.java
diff --git a/java/client/test/src/org/apache/qpid/failover/FailoverTxTest.java b/java/client/test/java/org/apache/qpid/failover/FailoverTxTest.java
index 10ec682bf5..10ec682bf5 100644
--- a/java/client/test/src/org/apache/qpid/failover/FailoverTxTest.java
+++ b/java/client/test/java/org/apache/qpid/failover/FailoverTxTest.java
diff --git a/java/client/test/src/org/apache/qpid/flow/ChannelFlowTest.java b/java/client/test/java/org/apache/qpid/flow/ChannelFlowTest.java
index fad1849fed..fad1849fed 100644
--- a/java/client/test/src/org/apache/qpid/flow/ChannelFlowTest.java
+++ b/java/client/test/java/org/apache/qpid/flow/ChannelFlowTest.java
diff --git a/java/client/test/src/org/apache/qpid/forwardall/Client.java b/java/client/test/java/org/apache/qpid/forwardall/Client.java
index 4ad8587ae0..4ad8587ae0 100644
--- a/java/client/test/src/org/apache/qpid/forwardall/Client.java
+++ b/java/client/test/java/org/apache/qpid/forwardall/Client.java
diff --git a/java/client/test/src/org/apache/qpid/forwardall/Combined.java b/java/client/test/java/org/apache/qpid/forwardall/Combined.java
index ea5216dd2d..ea5216dd2d 100644
--- a/java/client/test/src/org/apache/qpid/forwardall/Combined.java
+++ b/java/client/test/java/org/apache/qpid/forwardall/Combined.java
diff --git a/java/client/test/src/org/apache/qpid/forwardall/Service.java b/java/client/test/java/org/apache/qpid/forwardall/Service.java
index bc3cc4c1f4..bc3cc4c1f4 100644
--- a/java/client/test/src/org/apache/qpid/forwardall/Service.java
+++ b/java/client/test/java/org/apache/qpid/forwardall/Service.java
diff --git a/java/client/test/src/org/apache/qpid/forwardall/ServiceCreator.java b/java/client/test/java/org/apache/qpid/forwardall/ServiceCreator.java
index 6d43f85cf2..6d43f85cf2 100644
--- a/java/client/test/src/org/apache/qpid/forwardall/ServiceCreator.java
+++ b/java/client/test/java/org/apache/qpid/forwardall/ServiceCreator.java
diff --git a/java/client/test/src/org/apache/qpid/forwardall/SpecialQueue.java b/java/client/test/java/org/apache/qpid/forwardall/SpecialQueue.java
index efa633033f..efa633033f 100644
--- a/java/client/test/src/org/apache/qpid/forwardall/SpecialQueue.java
+++ b/java/client/test/java/org/apache/qpid/forwardall/SpecialQueue.java
diff --git a/java/client/test/src/org/apache/qpid/forwardall/UnitTests.java b/java/client/test/java/org/apache/qpid/forwardall/UnitTests.java
index c62acce11d..c62acce11d 100644
--- a/java/client/test/src/org/apache/qpid/forwardall/UnitTests.java
+++ b/java/client/test/java/org/apache/qpid/forwardall/UnitTests.java
diff --git a/java/client/test/src/org/apache/qpid/fragmentation/TestLargePublisher.java b/java/client/test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
index 161f225d08..161f225d08 100644
--- a/java/client/test/src/org/apache/qpid/fragmentation/TestLargePublisher.java
+++ b/java/client/test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
diff --git a/java/client/test/src/org/apache/qpid/fragmentation/TestLargeSubscriber.java b/java/client/test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
index 5268884b93..5268884b93 100644
--- a/java/client/test/src/org/apache/qpid/fragmentation/TestLargeSubscriber.java
+++ b/java/client/test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
diff --git a/java/client/test/src/org/apache/qpid/framing/FieldTableTest.java b/java/client/test/java/org/apache/qpid/framing/FieldTableTest.java
index c76596ac5c..c76596ac5c 100644
--- a/java/client/test/src/org/apache/qpid/framing/FieldTableTest.java
+++ b/java/client/test/java/org/apache/qpid/framing/FieldTableTest.java
diff --git a/java/client/test/src/org/apache/qpid/framing/content.txt b/java/client/test/java/org/apache/qpid/framing/content.txt
index fd3fb28590..fd3fb28590 100644
--- a/java/client/test/src/org/apache/qpid/framing/content.txt
+++ b/java/client/test/java/org/apache/qpid/framing/content.txt
diff --git a/java/client/test/src/org/apache/qpid/headers/Listener.java b/java/client/test/java/org/apache/qpid/headers/Listener.java
index 480596b022..480596b022 100644
--- a/java/client/test/src/org/apache/qpid/headers/Listener.java
+++ b/java/client/test/java/org/apache/qpid/headers/Listener.java
diff --git a/java/client/test/src/org/apache/qpid/headers/MessageFactory.java b/java/client/test/java/org/apache/qpid/headers/MessageFactory.java
index fc976766e4..fc976766e4 100644
--- a/java/client/test/src/org/apache/qpid/headers/MessageFactory.java
+++ b/java/client/test/java/org/apache/qpid/headers/MessageFactory.java
diff --git a/java/client/test/src/org/apache/qpid/headers/Publisher.java b/java/client/test/java/org/apache/qpid/headers/Publisher.java
index 16113037d1..16113037d1 100644
--- a/java/client/test/src/org/apache/qpid/headers/Publisher.java
+++ b/java/client/test/java/org/apache/qpid/headers/Publisher.java
diff --git a/java/client/test/src/org/apache/qpid/jndi/referenceable/Bind.java b/java/client/test/java/org/apache/qpid/jndi/referenceable/Bind.java
index 3715ef7cc4..3715ef7cc4 100644
--- a/java/client/test/src/org/apache/qpid/jndi/referenceable/Bind.java
+++ b/java/client/test/java/org/apache/qpid/jndi/referenceable/Bind.java
diff --git a/java/client/test/src/org/apache/qpid/jndi/referenceable/Lookup.java b/java/client/test/java/org/apache/qpid/jndi/referenceable/Lookup.java
index 05098269c1..05098269c1 100644
--- a/java/client/test/src/org/apache/qpid/jndi/referenceable/Lookup.java
+++ b/java/client/test/java/org/apache/qpid/jndi/referenceable/Lookup.java
diff --git a/java/client/test/src/org/apache/qpid/jndi/referenceable/Unbind.java b/java/client/test/java/org/apache/qpid/jndi/referenceable/Unbind.java
index 1e9f57c07f..1e9f57c07f 100644
--- a/java/client/test/src/org/apache/qpid/jndi/referenceable/Unbind.java
+++ b/java/client/test/java/org/apache/qpid/jndi/referenceable/Unbind.java
diff --git a/java/client/test/src/org/apache/qpid/jndi/referenceabletest/Bind.java b/java/client/test/java/org/apache/qpid/jndi/referenceabletest/Bind.java
index 221237a37c..221237a37c 100644
--- a/java/client/test/src/org/apache/qpid/jndi/referenceabletest/Bind.java
+++ b/java/client/test/java/org/apache/qpid/jndi/referenceabletest/Bind.java
diff --git a/java/client/test/src/org/apache/qpid/jndi/referenceabletest/JNDIReferenceableTest.java b/java/client/test/java/org/apache/qpid/jndi/referenceabletest/JNDIReferenceableTest.java
index 7c7d32991f..7c7d32991f 100644
--- a/java/client/test/src/org/apache/qpid/jndi/referenceabletest/JNDIReferenceableTest.java
+++ b/java/client/test/java/org/apache/qpid/jndi/referenceabletest/JNDIReferenceableTest.java
diff --git a/java/client/test/src/org/apache/qpid/jndi/referenceabletest/Lookup.java b/java/client/test/java/org/apache/qpid/jndi/referenceabletest/Lookup.java
index 481500b8f0..481500b8f0 100644
--- a/java/client/test/src/org/apache/qpid/jndi/referenceabletest/Lookup.java
+++ b/java/client/test/java/org/apache/qpid/jndi/referenceabletest/Lookup.java
diff --git a/java/client/test/src/org/apache/qpid/jndi/referenceabletest/Unbind.java b/java/client/test/java/org/apache/qpid/jndi/referenceabletest/Unbind.java
index 767f7c5737..767f7c5737 100644
--- a/java/client/test/src/org/apache/qpid/jndi/referenceabletest/Unbind.java
+++ b/java/client/test/java/org/apache/qpid/jndi/referenceabletest/Unbind.java
diff --git a/java/client/test/src/org/apache/qpid/jndi/referenceabletest/UnitTests.java b/java/client/test/java/org/apache/qpid/jndi/referenceabletest/UnitTests.java
index f7b3889d22..f7b3889d22 100644
--- a/java/client/test/src/org/apache/qpid/jndi/referenceabletest/UnitTests.java
+++ b/java/client/test/java/org/apache/qpid/jndi/referenceabletest/UnitTests.java
diff --git a/java/client/test/src/org/apache/qpid/latency/LatencyTest.java b/java/client/test/java/org/apache/qpid/latency/LatencyTest.java
index 981bfdc3a6..981bfdc3a6 100644
--- a/java/client/test/src/org/apache/qpid/latency/LatencyTest.java
+++ b/java/client/test/java/org/apache/qpid/latency/LatencyTest.java
diff --git a/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java b/java/client/test/java/org/apache/qpid/mina/AcceptorTest.java
index f0a80f2ead..f0a80f2ead 100644
--- a/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java
+++ b/java/client/test/java/org/apache/qpid/mina/AcceptorTest.java
diff --git a/java/client/test/src/org/apache/qpid/mina/BlockingAcceptorTest.java b/java/client/test/java/org/apache/qpid/mina/BlockingAcceptorTest.java
index 547ffc9dcb..547ffc9dcb 100644
--- a/java/client/test/src/org/apache/qpid/mina/BlockingAcceptorTest.java
+++ b/java/client/test/java/org/apache/qpid/mina/BlockingAcceptorTest.java
diff --git a/java/client/test/src/org/apache/qpid/mina/WriterTest.java b/java/client/test/java/org/apache/qpid/mina/WriterTest.java
index ae0b7ea522..ae0b7ea522 100644
--- a/java/client/test/src/org/apache/qpid/mina/WriterTest.java
+++ b/java/client/test/java/org/apache/qpid/mina/WriterTest.java
diff --git a/java/client/test/src/org/apache/qpid/multiconsumer/AMQTest.java b/java/client/test/java/org/apache/qpid/multiconsumer/AMQTest.java
index 66bb2e5e01..66bb2e5e01 100644
--- a/java/client/test/src/org/apache/qpid/multiconsumer/AMQTest.java
+++ b/java/client/test/java/org/apache/qpid/multiconsumer/AMQTest.java
diff --git a/java/client/test/src/org/apache/qpid/ping/TestPingClient.java b/java/client/test/java/org/apache/qpid/ping/TestPingClient.java
index 77c5bb648c..77c5bb648c 100644
--- a/java/client/test/src/org/apache/qpid/ping/TestPingClient.java
+++ b/java/client/test/java/org/apache/qpid/ping/TestPingClient.java
diff --git a/java/client/test/src/org/apache/qpid/ping/TestPingProducer.java b/java/client/test/java/org/apache/qpid/ping/TestPingProducer.java
index 999f593131..999f593131 100644
--- a/java/client/test/src/org/apache/qpid/ping/TestPingProducer.java
+++ b/java/client/test/java/org/apache/qpid/ping/TestPingProducer.java
diff --git a/java/client/test/src/org/apache/qpid/ping/TestPingPublisher.java b/java/client/test/java/org/apache/qpid/ping/TestPingPublisher.java
index b297cf8610..b297cf8610 100644
--- a/java/client/test/src/org/apache/qpid/ping/TestPingPublisher.java
+++ b/java/client/test/java/org/apache/qpid/ping/TestPingPublisher.java
diff --git a/java/client/test/src/org/apache/qpid/ping/TestPingSubscriber.java b/java/client/test/java/org/apache/qpid/ping/TestPingSubscriber.java
index 8e6a4a125e..8e6a4a125e 100644
--- a/java/client/test/src/org/apache/qpid/ping/TestPingSubscriber.java
+++ b/java/client/test/java/org/apache/qpid/ping/TestPingSubscriber.java
diff --git a/java/client/test/src/org/apache/qpid/pubsub1/TestPublisher.java b/java/client/test/java/org/apache/qpid/pubsub1/TestPublisher.java
index c3e4fb9e0d..c3e4fb9e0d 100644
--- a/java/client/test/src/org/apache/qpid/pubsub1/TestPublisher.java
+++ b/java/client/test/java/org/apache/qpid/pubsub1/TestPublisher.java
diff --git a/java/client/test/src/org/apache/qpid/pubsub1/TestSubscriber.java b/java/client/test/java/org/apache/qpid/pubsub1/TestSubscriber.java
index 968cd23880..968cd23880 100644
--- a/java/client/test/src/org/apache/qpid/pubsub1/TestSubscriber.java
+++ b/java/client/test/java/org/apache/qpid/pubsub1/TestSubscriber.java
diff --git a/java/client/test/src/org/apache/qpid/requestreply1/ServiceProvidingClient.java b/java/client/test/java/org/apache/qpid/requestreply1/ServiceProvidingClient.java
index 276eec3e11..276eec3e11 100644
--- a/java/client/test/src/org/apache/qpid/requestreply1/ServiceProvidingClient.java
+++ b/java/client/test/java/org/apache/qpid/requestreply1/ServiceProvidingClient.java
diff --git a/java/client/test/src/org/apache/qpid/requestreply1/ServiceRequestingClient.java b/java/client/test/java/org/apache/qpid/requestreply1/ServiceRequestingClient.java
index 29eaf02701..29eaf02701 100644
--- a/java/client/test/src/org/apache/qpid/requestreply1/ServiceRequestingClient.java
+++ b/java/client/test/java/org/apache/qpid/requestreply1/ServiceRequestingClient.java
diff --git a/java/client/test/src/org/apache/qpid/requestreply1/VmRequestReply.java b/java/client/test/java/org/apache/qpid/requestreply1/VmRequestReply.java
index a9357ae2ae..a9357ae2ae 100644
--- a/java/client/test/src/org/apache/qpid/requestreply1/VmRequestReply.java
+++ b/java/client/test/java/org/apache/qpid/requestreply1/VmRequestReply.java
diff --git a/java/client/test/src/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java b/java/client/test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java
index 27a92d334a..27a92d334a 100644
--- a/java/client/test/src/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java
+++ b/java/client/test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java
diff --git a/java/client/test/src/org/apache/qpid/testutil/Config.java b/java/client/test/java/org/apache/qpid/testutil/Config.java
index b5ec9c8c0c..b5ec9c8c0c 100644
--- a/java/client/test/src/org/apache/qpid/testutil/Config.java
+++ b/java/client/test/java/org/apache/qpid/testutil/Config.java
diff --git a/java/client/test/src/org/apache/qpid/topic/Config.java b/java/client/test/java/org/apache/qpid/topic/Config.java
index e77b1098c2..e77b1098c2 100644
--- a/java/client/test/src/org/apache/qpid/topic/Config.java
+++ b/java/client/test/java/org/apache/qpid/topic/Config.java
diff --git a/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java b/java/client/test/java/org/apache/qpid/topic/DurableSubscriptionTest.java
index 7acf2a262f..7acf2a262f 100644
--- a/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java
+++ b/java/client/test/java/org/apache/qpid/topic/DurableSubscriptionTest.java
diff --git a/java/client/test/src/org/apache/qpid/topic/Listener.java b/java/client/test/java/org/apache/qpid/topic/Listener.java
index cb4ef6c0d2..cb4ef6c0d2 100644
--- a/java/client/test/src/org/apache/qpid/topic/Listener.java
+++ b/java/client/test/java/org/apache/qpid/topic/Listener.java
diff --git a/java/client/test/src/org/apache/qpid/topic/MessageFactory.java b/java/client/test/java/org/apache/qpid/topic/MessageFactory.java
index fff85d1290..fff85d1290 100644
--- a/java/client/test/src/org/apache/qpid/topic/MessageFactory.java
+++ b/java/client/test/java/org/apache/qpid/topic/MessageFactory.java
diff --git a/java/client/test/src/org/apache/qpid/topic/Publisher.java b/java/client/test/java/org/apache/qpid/topic/Publisher.java
index 3b8c7ce810..3b8c7ce810 100644
--- a/java/client/test/src/org/apache/qpid/topic/Publisher.java
+++ b/java/client/test/java/org/apache/qpid/topic/Publisher.java
diff --git a/java/client/test/src/org/apache/qpid/transacted/Config.java b/java/client/test/java/org/apache/qpid/transacted/Config.java
index 3312d20b0a..3312d20b0a 100644
--- a/java/client/test/src/org/apache/qpid/transacted/Config.java
+++ b/java/client/test/java/org/apache/qpid/transacted/Config.java
diff --git a/java/client/test/src/org/apache/qpid/transacted/Ping.java b/java/client/test/java/org/apache/qpid/transacted/Ping.java
index 9d6287549c..9d6287549c 100644
--- a/java/client/test/src/org/apache/qpid/transacted/Ping.java
+++ b/java/client/test/java/org/apache/qpid/transacted/Ping.java
diff --git a/java/client/test/src/org/apache/qpid/transacted/Pong.java b/java/client/test/java/org/apache/qpid/transacted/Pong.java
index d9e5618a3b..d9e5618a3b 100644
--- a/java/client/test/src/org/apache/qpid/transacted/Pong.java
+++ b/java/client/test/java/org/apache/qpid/transacted/Pong.java
diff --git a/java/client/test/src/org/apache/qpid/transacted/Relay.java b/java/client/test/java/org/apache/qpid/transacted/Relay.java
index 96a7a71ac0..96a7a71ac0 100644
--- a/java/client/test/src/org/apache/qpid/transacted/Relay.java
+++ b/java/client/test/java/org/apache/qpid/transacted/Relay.java
diff --git a/java/client/test/src/org/apache/qpid/transacted/Start.java b/java/client/test/java/org/apache/qpid/transacted/Start.java
index 85a633fc4f..85a633fc4f 100644
--- a/java/client/test/src/org/apache/qpid/transacted/Start.java
+++ b/java/client/test/java/org/apache/qpid/transacted/Start.java
diff --git a/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java b/java/client/test/java/org/apache/qpid/transacted/TransactedTest.java
index 200c89bebe..200c89bebe 100644
--- a/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java
+++ b/java/client/test/java/org/apache/qpid/transacted/TransactedTest.java
diff --git a/java/client/test/src/org/apache/qpid/transacted/UnitTests.java b/java/client/test/java/org/apache/qpid/transacted/UnitTests.java
index 8d43287d6f..8d43287d6f 100644
--- a/java/client/test/src/org/apache/qpid/transacted/UnitTests.java
+++ b/java/client/test/java/org/apache/qpid/transacted/UnitTests.java
diff --git a/java/client/test/src/org/apache/qpid/weblogic/ServiceProvider.java b/java/client/test/java/org/apache/qpid/weblogic/ServiceProvider.java
index 8c6f6ab62e..8c6f6ab62e 100644
--- a/java/client/test/src/org/apache/qpid/weblogic/ServiceProvider.java
+++ b/java/client/test/java/org/apache/qpid/weblogic/ServiceProvider.java
diff --git a/java/client/test/src/org/apache/qpid/weblogic/ServiceRequestingClient.java b/java/client/test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
index b2d24cd1c1..b2d24cd1c1 100644
--- a/java/client/test/src/org/apache/qpid/weblogic/ServiceRequestingClient.java
+++ b/java/client/test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java