1733 files changed, 0 insertions, 0 deletions

diff --git a/Final/KEYS b/Final2/KEYS
index fabfa79997..fabfa79997 100644
--- a/Final/KEYS
+++ b/Final2/KEYS
diff --git a/Final/bin/set_svn_properties.sh b/Final2/bin/set_svn_properties.sh
index cc29490eea..cc29490eea 100755
--- a/Final/bin/set_svn_properties.sh
+++ b/Final2/bin/set_svn_properties.sh
diff --git a/Final/cpp/DESIGN b/Final2/cpp/DESIGN
index 7e9ba6755c..7e9ba6755c 100644
--- a/Final/cpp/DESIGN
+++ b/Final2/cpp/DESIGN
diff --git a/Final/cpp/LICENSE b/Final2/cpp/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/Final/cpp/LICENSE
+++ b/Final2/cpp/LICENSE
diff --git a/Final/cpp/Makefile.am b/Final2/cpp/Makefile.am
index ffeec27f97..ffeec27f97 100644
--- a/Final/cpp/Makefile.am
+++ b/Final2/cpp/Makefile.am
diff --git a/Final/cpp/NOTICE b/Final2/cpp/NOTICE
index cae69a873a..cae69a873a 100644
--- a/Final/cpp/NOTICE
+++ b/Final2/cpp/NOTICE
diff --git a/Final/cpp/README b/Final2/cpp/README
index 2f3f2d81d3..2f3f2d81d3 100644
--- a/Final/cpp/README
+++ b/Final2/cpp/README
diff --git a/Final/cpp/RELEASE_NOTES b/Final2/cpp/RELEASE_NOTES
index 819539b1ec..819539b1ec 100644
--- a/Final/cpp/RELEASE_NOTES
+++ b/Final2/cpp/RELEASE_NOTES
diff --git a/Final/cpp/bootstrap b/Final2/cpp/bootstrap
index f5dc3b19c3..f5dc3b19c3 100755
--- a/Final/cpp/bootstrap
+++ b/Final2/cpp/bootstrap
diff --git a/Final/cpp/build-aux/compile b/Final2/cpp/build-aux/compile
index 1b1d232169..1b1d232169 100755
--- a/Final/cpp/build-aux/compile
+++ b/Final2/cpp/build-aux/compile
diff --git a/Final/cpp/build-aux/config.guess b/Final2/cpp/build-aux/config.guess
index c93201a4d2..c93201a4d2 100755
--- a/Final/cpp/build-aux/config.guess
+++ b/Final2/cpp/build-aux/config.guess
diff --git a/Final/cpp/build-aux/config.rpath b/Final2/cpp/build-aux/config.rpath
index c492a93b66..c492a93b66 100755
--- a/Final/cpp/build-aux/config.rpath
+++ b/Final2/cpp/build-aux/config.rpath
diff --git a/Final/cpp/build-aux/config.sub b/Final2/cpp/build-aux/config.sub
index 7ccee73057..7ccee73057 100755
--- a/Final/cpp/build-aux/config.sub
+++ b/Final2/cpp/build-aux/config.sub
diff --git a/Final/cpp/build-aux/depcomp b/Final2/cpp/build-aux/depcomp
index ca5ea4e1ef..ca5ea4e1ef 100755
--- a/Final/cpp/build-aux/depcomp
+++ b/Final2/cpp/build-aux/depcomp
diff --git a/Final/cpp/build-aux/install-sh b/Final2/cpp/build-aux/install-sh
index 4fbbae7b7f..4fbbae7b7f 100755
--- a/Final/cpp/build-aux/install-sh
+++ b/Final2/cpp/build-aux/install-sh
diff --git a/Final/cpp/build-aux/ltmain.sh b/Final2/cpp/build-aux/ltmain.sh
index c715b59412..c715b59412 100755
--- a/Final/cpp/build-aux/ltmain.sh
+++ b/Final2/cpp/build-aux/ltmain.sh
diff --git a/Final/cpp/build-aux/mdate-sh b/Final2/cpp/build-aux/mdate-sh
index cd916c0a34..cd916c0a34 100755
--- a/Final/cpp/build-aux/mdate-sh
+++ b/Final2/cpp/build-aux/mdate-sh
diff --git a/Final/cpp/build-aux/missing b/Final2/cpp/build-aux/missing
index 1c8ff7049d..1c8ff7049d 100755
--- a/Final/cpp/build-aux/missing
+++ b/Final2/cpp/build-aux/missing
diff --git a/Final/cpp/configure.ac b/Final2/cpp/configure.ac
index 2e7ea22607..2e7ea22607 100644
--- a/Final/cpp/configure.ac
+++ b/Final2/cpp/configure.ac
diff --git a/Final/cpp/docs/api/Makefile.am b/Final2/cpp/docs/api/Makefile.am
index 4c910c971c..4c910c971c 100644
--- a/Final/cpp/docs/api/Makefile.am
+++ b/Final2/cpp/docs/api/Makefile.am
diff --git a/Final/cpp/docs/api/user.doxygen b/Final2/cpp/docs/api/user.doxygen
index 0d92dc283b..0d92dc283b 100644
--- a/Final/cpp/docs/api/user.doxygen
+++ b/Final2/cpp/docs/api/user.doxygen
diff --git a/Final/cpp/docs/man/Makefile.am b/Final2/cpp/docs/man/Makefile.am
index ad4e76c8fe..ad4e76c8fe 100644
--- a/Final/cpp/docs/man/Makefile.am
+++ b/Final2/cpp/docs/man/Makefile.am
diff --git a/Final/cpp/docs/man/qpidd.x b/Final2/cpp/docs/man/qpidd.x
index 91d3c3a969..91d3c3a969 100644
--- a/Final/cpp/docs/man/qpidd.x
+++ b/Final2/cpp/docs/man/qpidd.x
diff --git a/Final/cpp/etc/qpidd b/Final2/cpp/etc/qpidd
index 11cc03e0af..11cc03e0af 100755
--- a/Final/cpp/etc/qpidd
+++ b/Final2/cpp/etc/qpidd
diff --git a/Final/cpp/gen/Makefile.am b/Final2/cpp/gen/Makefile.am
index 3398f01330..3398f01330 100644
--- a/Final/cpp/gen/Makefile.am
+++ b/Final2/cpp/gen/Makefile.am
diff --git a/Final/cpp/gen/make-gen-src-mk.sh b/Final2/cpp/gen/make-gen-src-mk.sh
index fdaa848001..fdaa848001 100755
--- a/Final/cpp/gen/make-gen-src-mk.sh
+++ b/Final2/cpp/gen/make-gen-src-mk.sh
diff --git a/Final/cpp/lib/Makefile.am b/Final2/cpp/lib/Makefile.am
index 9a3e117623..9a3e117623 100644
--- a/Final/cpp/lib/Makefile.am
+++ b/Final2/cpp/lib/Makefile.am
diff --git a/Final/cpp/lib/broker/AccumulatedAck.cpp b/Final2/cpp/lib/broker/AccumulatedAck.cpp
index a9826ba5ea..a9826ba5ea 100644
--- a/Final/cpp/lib/broker/AccumulatedAck.cpp
+++ b/Final2/cpp/lib/broker/AccumulatedAck.cpp
diff --git a/Final/cpp/lib/broker/AccumulatedAck.h b/Final2/cpp/lib/broker/AccumulatedAck.h
index c472f7f3ea..c472f7f3ea 100644
--- a/Final/cpp/lib/broker/AccumulatedAck.h
+++ b/Final2/cpp/lib/broker/AccumulatedAck.h
diff --git a/Final/cpp/lib/broker/AutoDelete.cpp b/Final2/cpp/lib/broker/AutoDelete.cpp
index ae48d10505..ae48d10505 100644
--- a/Final/cpp/lib/broker/AutoDelete.cpp
+++ b/Final2/cpp/lib/broker/AutoDelete.cpp
diff --git a/Final/cpp/lib/broker/AutoDelete.h b/Final2/cpp/lib/broker/AutoDelete.h
index 19a5938df1..19a5938df1 100644
--- a/Final/cpp/lib/broker/AutoDelete.h
+++ b/Final2/cpp/lib/broker/AutoDelete.h
diff --git a/Final/cpp/lib/broker/Binding.h b/Final2/cpp/lib/broker/Binding.h
index 16ca223208..16ca223208 100644
--- a/Final/cpp/lib/broker/Binding.h
+++ b/Final2/cpp/lib/broker/Binding.h
diff --git a/Final/cpp/lib/broker/Broker.cpp b/Final2/cpp/lib/broker/Broker.cpp
index 806127bf43..806127bf43 100644
--- a/Final/cpp/lib/broker/Broker.cpp
+++ b/Final2/cpp/lib/broker/Broker.cpp
diff --git a/Final/cpp/lib/broker/Broker.h b/Final2/cpp/lib/broker/Broker.h
index 8b54bd592b..8b54bd592b 100644
--- a/Final/cpp/lib/broker/Broker.h
+++ b/Final2/cpp/lib/broker/Broker.h
diff --git a/Final/cpp/lib/broker/BrokerChannel.cpp b/Final2/cpp/lib/broker/BrokerChannel.cpp
index d8fbdc467c..d8fbdc467c 100644
--- a/Final/cpp/lib/broker/BrokerChannel.cpp
+++ b/Final2/cpp/lib/broker/BrokerChannel.cpp
diff --git a/Final/cpp/lib/broker/BrokerChannel.h b/Final2/cpp/lib/broker/BrokerChannel.h
index be40a25013..be40a25013 100644
--- a/Final/cpp/lib/broker/BrokerChannel.h
+++ b/Final2/cpp/lib/broker/BrokerChannel.h
diff --git a/Final/cpp/lib/broker/BrokerExchange.h b/Final2/cpp/lib/broker/BrokerExchange.h
index f5e4d9cb28..f5e4d9cb28 100644
--- a/Final/cpp/lib/broker/BrokerExchange.h
+++ b/Final2/cpp/lib/broker/BrokerExchange.h
diff --git a/Final/cpp/lib/broker/BrokerMessage.cpp b/Final2/cpp/lib/broker/BrokerMessage.cpp
index 6ba2131a74..6ba2131a74 100644
--- a/Final/cpp/lib/broker/BrokerMessage.cpp
+++ b/Final2/cpp/lib/broker/BrokerMessage.cpp
diff --git a/Final/cpp/lib/broker/BrokerMessage.h b/Final2/cpp/lib/broker/BrokerMessage.h
index 1f68e1004a..1f68e1004a 100644
--- a/Final/cpp/lib/broker/BrokerMessage.h
+++ b/Final2/cpp/lib/broker/BrokerMessage.h
diff --git a/Final/cpp/lib/broker/BrokerQueue.cpp b/Final2/cpp/lib/broker/BrokerQueue.cpp
index 0e48d3b13d..0e48d3b13d 100644
--- a/Final/cpp/lib/broker/BrokerQueue.cpp
+++ b/Final2/cpp/lib/broker/BrokerQueue.cpp
diff --git a/Final/cpp/lib/broker/BrokerQueue.h b/Final2/cpp/lib/broker/BrokerQueue.h
index 41611bebe9..41611bebe9 100644
--- a/Final/cpp/lib/broker/BrokerQueue.h
+++ b/Final2/cpp/lib/broker/BrokerQueue.h
diff --git a/Final/cpp/lib/broker/ConnectionToken.h b/Final2/cpp/lib/broker/ConnectionToken.h
index 7e7f813d0e..7e7f813d0e 100644
--- a/Final/cpp/lib/broker/ConnectionToken.h
+++ b/Final2/cpp/lib/broker/ConnectionToken.h
diff --git a/Final/cpp/lib/broker/Consumer.h b/Final2/cpp/lib/broker/Consumer.h
index 26deef4a26..26deef4a26 100644
--- a/Final/cpp/lib/broker/Consumer.h
+++ b/Final2/cpp/lib/broker/Consumer.h
diff --git a/Final/cpp/lib/broker/Content.h b/Final2/cpp/lib/broker/Content.h
index 8aacf02959..8aacf02959 100644
--- a/Final/cpp/lib/broker/Content.h
+++ b/Final2/cpp/lib/broker/Content.h
diff --git a/Final/cpp/lib/broker/Daemon.cpp b/Final2/cpp/lib/broker/Daemon.cpp
index 3a0e687bf2..3a0e687bf2 100644
--- a/Final/cpp/lib/broker/Daemon.cpp
+++ b/Final2/cpp/lib/broker/Daemon.cpp
diff --git a/Final/cpp/lib/broker/Daemon.h b/Final2/cpp/lib/broker/Daemon.h
index a9755bc8e7..a9755bc8e7 100644
--- a/Final/cpp/lib/broker/Daemon.h
+++ b/Final2/cpp/lib/broker/Daemon.h
diff --git a/Final/cpp/lib/broker/DeletingTxOp.cpp b/Final2/cpp/lib/broker/DeletingTxOp.cpp
index 25fe9c98db..25fe9c98db 100644
--- a/Final/cpp/lib/broker/DeletingTxOp.cpp
+++ b/Final2/cpp/lib/broker/DeletingTxOp.cpp
diff --git a/Final/cpp/lib/broker/DeletingTxOp.h b/Final2/cpp/lib/broker/DeletingTxOp.h
index 3e026cd4ca..3e026cd4ca 100644
--- a/Final/cpp/lib/broker/DeletingTxOp.h
+++ b/Final2/cpp/lib/broker/DeletingTxOp.h
diff --git a/Final/cpp/lib/broker/Deliverable.h b/Final2/cpp/lib/broker/Deliverable.h
index e33443555d..e33443555d 100644
--- a/Final/cpp/lib/broker/Deliverable.h
+++ b/Final2/cpp/lib/broker/Deliverable.h
diff --git a/Final/cpp/lib/broker/DeliverableMessage.cpp b/Final2/cpp/lib/broker/DeliverableMessage.cpp
index b9c89da690..b9c89da690 100644
--- a/Final/cpp/lib/broker/DeliverableMessage.cpp
+++ b/Final2/cpp/lib/broker/DeliverableMessage.cpp
diff --git a/Final/cpp/lib/broker/DeliverableMessage.h b/Final2/cpp/lib/broker/DeliverableMessage.h
index 962f0da640..962f0da640 100644
--- a/Final/cpp/lib/broker/DeliverableMessage.h
+++ b/Final2/cpp/lib/broker/DeliverableMessage.h
diff --git a/Final/cpp/lib/broker/DeliveryRecord.cpp b/Final2/cpp/lib/broker/DeliveryRecord.cpp
index 19b01cc312..19b01cc312 100644
--- a/Final/cpp/lib/broker/DeliveryRecord.cpp
+++ b/Final2/cpp/lib/broker/DeliveryRecord.cpp
diff --git a/Final/cpp/lib/broker/DeliveryRecord.h b/Final2/cpp/lib/broker/DeliveryRecord.h
index 01a4024b28..01a4024b28 100644
--- a/Final/cpp/lib/broker/DeliveryRecord.h
+++ b/Final2/cpp/lib/broker/DeliveryRecord.h
diff --git a/Final/cpp/lib/broker/DirectExchange.cpp b/Final2/cpp/lib/broker/DirectExchange.cpp
index c898ae8d7e..c898ae8d7e 100644
--- a/Final/cpp/lib/broker/DirectExchange.cpp
+++ b/Final2/cpp/lib/broker/DirectExchange.cpp
diff --git a/Final/cpp/lib/broker/DirectExchange.h b/Final2/cpp/lib/broker/DirectExchange.h
index a7ef5aca9e..a7ef5aca9e 100644
--- a/Final/cpp/lib/broker/DirectExchange.h
+++ b/Final2/cpp/lib/broker/DirectExchange.h
diff --git a/Final/cpp/lib/broker/ExchangeBinding.cpp b/Final2/cpp/lib/broker/ExchangeBinding.cpp
index bf2102414d..bf2102414d 100644
--- a/Final/cpp/lib/broker/ExchangeBinding.cpp
+++ b/Final2/cpp/lib/broker/ExchangeBinding.cpp
diff --git a/Final/cpp/lib/broker/ExchangeBinding.h b/Final2/cpp/lib/broker/ExchangeBinding.h
index 2afaa89552..2afaa89552 100644
--- a/Final/cpp/lib/broker/ExchangeBinding.h
+++ b/Final2/cpp/lib/broker/ExchangeBinding.h
diff --git a/Final/cpp/lib/broker/ExchangeRegistry.cpp b/Final2/cpp/lib/broker/ExchangeRegistry.cpp
index 7bf96c4544..7bf96c4544 100644
--- a/Final/cpp/lib/broker/ExchangeRegistry.cpp
+++ b/Final2/cpp/lib/broker/ExchangeRegistry.cpp
diff --git a/Final/cpp/lib/broker/ExchangeRegistry.h b/Final2/cpp/lib/broker/ExchangeRegistry.h
index 8dcd0d3623..8dcd0d3623 100644
--- a/Final/cpp/lib/broker/ExchangeRegistry.h
+++ b/Final2/cpp/lib/broker/ExchangeRegistry.h
diff --git a/Final/cpp/lib/broker/FanOutExchange.cpp b/Final2/cpp/lib/broker/FanOutExchange.cpp
index 48afcc20d5..48afcc20d5 100644
--- a/Final/cpp/lib/broker/FanOutExchange.cpp
+++ b/Final2/cpp/lib/broker/FanOutExchange.cpp
diff --git a/Final/cpp/lib/broker/FanOutExchange.h b/Final2/cpp/lib/broker/FanOutExchange.h
index 6dc70e69bb..6dc70e69bb 100644
--- a/Final/cpp/lib/broker/FanOutExchange.h
+++ b/Final2/cpp/lib/broker/FanOutExchange.h
diff --git a/Final/cpp/lib/broker/HeadersExchange.cpp b/Final2/cpp/lib/broker/HeadersExchange.cpp
index acd344725a..acd344725a 100644
--- a/Final/cpp/lib/broker/HeadersExchange.cpp
+++ b/Final2/cpp/lib/broker/HeadersExchange.cpp
diff --git a/Final/cpp/lib/broker/HeadersExchange.h b/Final2/cpp/lib/broker/HeadersExchange.h
index 5e8da5ad85..5e8da5ad85 100644
--- a/Final/cpp/lib/broker/HeadersExchange.h
+++ b/Final2/cpp/lib/broker/HeadersExchange.h
diff --git a/Final/cpp/lib/broker/InMemoryContent.cpp b/Final2/cpp/lib/broker/InMemoryContent.cpp
index 07af8633e5..07af8633e5 100644
--- a/Final/cpp/lib/broker/InMemoryContent.cpp
+++ b/Final2/cpp/lib/broker/InMemoryContent.cpp
diff --git a/Final/cpp/lib/broker/InMemoryContent.h b/Final2/cpp/lib/broker/InMemoryContent.h
index 1db1acd7e1..1db1acd7e1 100644
--- a/Final/cpp/lib/broker/InMemoryContent.h
+++ b/Final2/cpp/lib/broker/InMemoryContent.h
diff --git a/Final/cpp/lib/broker/LazyLoadedContent.cpp b/Final2/cpp/lib/broker/LazyLoadedContent.cpp
index ec1ca3e195..ec1ca3e195 100644
--- a/Final/cpp/lib/broker/LazyLoadedContent.cpp
+++ b/Final2/cpp/lib/broker/LazyLoadedContent.cpp
diff --git a/Final/cpp/lib/broker/LazyLoadedContent.h b/Final2/cpp/lib/broker/LazyLoadedContent.h
index 80f8cce4eb..80f8cce4eb 100644
--- a/Final/cpp/lib/broker/LazyLoadedContent.h
+++ b/Final2/cpp/lib/broker/LazyLoadedContent.h
diff --git a/Final/cpp/lib/broker/Makefile.am b/Final2/cpp/lib/broker/Makefile.am
index 1a3fc79dea..1a3fc79dea 100644
--- a/Final/cpp/lib/broker/Makefile.am
+++ b/Final2/cpp/lib/broker/Makefile.am
diff --git a/Final/cpp/lib/broker/MessageBuilder.cpp b/Final2/cpp/lib/broker/MessageBuilder.cpp
index 41bf812d2d..41bf812d2d 100644
--- a/Final/cpp/lib/broker/MessageBuilder.cpp
+++ b/Final2/cpp/lib/broker/MessageBuilder.cpp
diff --git a/Final/cpp/lib/broker/MessageBuilder.h b/Final2/cpp/lib/broker/MessageBuilder.h
index 4e51f223f0..4e51f223f0 100644
--- a/Final/cpp/lib/broker/MessageBuilder.h
+++ b/Final2/cpp/lib/broker/MessageBuilder.h
diff --git a/Final/cpp/lib/broker/MessageStore.h b/Final2/cpp/lib/broker/MessageStore.h
index 938f807a67..938f807a67 100644
--- a/Final/cpp/lib/broker/MessageStore.h
+++ b/Final2/cpp/lib/broker/MessageStore.h
diff --git a/Final/cpp/lib/broker/MessageStoreModule.cpp b/Final2/cpp/lib/broker/MessageStoreModule.cpp
index ccc5501379..ccc5501379 100644
--- a/Final/cpp/lib/broker/MessageStoreModule.cpp
+++ b/Final2/cpp/lib/broker/MessageStoreModule.cpp
diff --git a/Final/cpp/lib/broker/MessageStoreModule.h b/Final2/cpp/lib/broker/MessageStoreModule.h
index c49e06efa1..c49e06efa1 100644
--- a/Final/cpp/lib/broker/MessageStoreModule.h
+++ b/Final2/cpp/lib/broker/MessageStoreModule.h
diff --git a/Final/cpp/lib/broker/NameGenerator.cpp b/Final2/cpp/lib/broker/NameGenerator.cpp
index 3f281859fa..3f281859fa 100644
--- a/Final/cpp/lib/broker/NameGenerator.cpp
+++ b/Final2/cpp/lib/broker/NameGenerator.cpp
diff --git a/Final/cpp/lib/broker/NameGenerator.h b/Final2/cpp/lib/broker/NameGenerator.h
index b2dbbdfb69..b2dbbdfb69 100644
--- a/Final/cpp/lib/broker/NameGenerator.h
+++ b/Final2/cpp/lib/broker/NameGenerator.h
diff --git a/Final/cpp/lib/broker/NullMessageStore.cpp b/Final2/cpp/lib/broker/NullMessageStore.cpp
index dd58539925..dd58539925 100644
--- a/Final/cpp/lib/broker/NullMessageStore.cpp
+++ b/Final2/cpp/lib/broker/NullMessageStore.cpp
diff --git a/Final/cpp/lib/broker/NullMessageStore.h b/Final2/cpp/lib/broker/NullMessageStore.h
index ef2bea8fd6..ef2bea8fd6 100644
--- a/Final/cpp/lib/broker/NullMessageStore.h
+++ b/Final2/cpp/lib/broker/NullMessageStore.h
diff --git a/Final/cpp/lib/broker/Prefetch.h b/Final2/cpp/lib/broker/Prefetch.h
index a1adccaee7..a1adccaee7 100644
--- a/Final/cpp/lib/broker/Prefetch.h
+++ b/Final2/cpp/lib/broker/Prefetch.h
diff --git a/Final/cpp/lib/broker/QueuePolicy.cpp b/Final2/cpp/lib/broker/QueuePolicy.cpp
index e13fd62fc6..e13fd62fc6 100644
--- a/Final/cpp/lib/broker/QueuePolicy.cpp
+++ b/Final2/cpp/lib/broker/QueuePolicy.cpp
diff --git a/Final/cpp/lib/broker/QueuePolicy.h b/Final2/cpp/lib/broker/QueuePolicy.h
index 597cfe7ce8..597cfe7ce8 100644
--- a/Final/cpp/lib/broker/QueuePolicy.h
+++ b/Final2/cpp/lib/broker/QueuePolicy.h
diff --git a/Final/cpp/lib/broker/QueueRegistry.cpp b/Final2/cpp/lib/broker/QueueRegistry.cpp
index c69d553b06..c69d553b06 100644
--- a/Final/cpp/lib/broker/QueueRegistry.cpp
+++ b/Final2/cpp/lib/broker/QueueRegistry.cpp
diff --git a/Final/cpp/lib/broker/QueueRegistry.h b/Final2/cpp/lib/broker/QueueRegistry.h
index 7232024675..7232024675 100644
--- a/Final/cpp/lib/broker/QueueRegistry.h
+++ b/Final2/cpp/lib/broker/QueueRegistry.h
diff --git a/Final/cpp/lib/broker/RecoveryManager.cpp b/Final2/cpp/lib/broker/RecoveryManager.cpp
index 6ea4c00c65..6ea4c00c65 100644
--- a/Final/cpp/lib/broker/RecoveryManager.cpp
+++ b/Final2/cpp/lib/broker/RecoveryManager.cpp
diff --git a/Final/cpp/lib/broker/RecoveryManager.h b/Final2/cpp/lib/broker/RecoveryManager.h
index d4e4cff3fd..d4e4cff3fd 100644
--- a/Final/cpp/lib/broker/RecoveryManager.h
+++ b/Final2/cpp/lib/broker/RecoveryManager.h
diff --git a/Final/cpp/lib/broker/SessionHandlerFactoryImpl.cpp b/Final2/cpp/lib/broker/SessionHandlerFactoryImpl.cpp
index 1b5441e3cf..1b5441e3cf 100644
--- a/Final/cpp/lib/broker/SessionHandlerFactoryImpl.cpp
+++ b/Final2/cpp/lib/broker/SessionHandlerFactoryImpl.cpp
diff --git a/Final/cpp/lib/broker/SessionHandlerFactoryImpl.h b/Final2/cpp/lib/broker/SessionHandlerFactoryImpl.h
index a69b67b08d..a69b67b08d 100644
--- a/Final/cpp/lib/broker/SessionHandlerFactoryImpl.h
+++ b/Final2/cpp/lib/broker/SessionHandlerFactoryImpl.h
diff --git a/Final/cpp/lib/broker/SessionHandlerImpl.cpp b/Final2/cpp/lib/broker/SessionHandlerImpl.cpp
index b23432e29d..b23432e29d 100644
--- a/Final/cpp/lib/broker/SessionHandlerImpl.cpp
+++ b/Final2/cpp/lib/broker/SessionHandlerImpl.cpp
diff --git a/Final/cpp/lib/broker/SessionHandlerImpl.h b/Final2/cpp/lib/broker/SessionHandlerImpl.h
index 7e631b4505..7e631b4505 100644
--- a/Final/cpp/lib/broker/SessionHandlerImpl.h
+++ b/Final2/cpp/lib/broker/SessionHandlerImpl.h
diff --git a/Final/cpp/lib/broker/TopicExchange.cpp b/Final2/cpp/lib/broker/TopicExchange.cpp
index 3ebb3c8c56..3ebb3c8c56 100644
--- a/Final/cpp/lib/broker/TopicExchange.cpp
+++ b/Final2/cpp/lib/broker/TopicExchange.cpp
diff --git a/Final/cpp/lib/broker/TopicExchange.h b/Final2/cpp/lib/broker/TopicExchange.h
index fa0c86863a..fa0c86863a 100644
--- a/Final/cpp/lib/broker/TopicExchange.h
+++ b/Final2/cpp/lib/broker/TopicExchange.h
diff --git a/Final/cpp/lib/broker/TransactionalStore.h b/Final2/cpp/lib/broker/TransactionalStore.h
index 17bca3878a..17bca3878a 100644
--- a/Final/cpp/lib/broker/TransactionalStore.h
+++ b/Final2/cpp/lib/broker/TransactionalStore.h
diff --git a/Final/cpp/lib/broker/TxAck.cpp b/Final2/cpp/lib/broker/TxAck.cpp
index b5211158f3..b5211158f3 100644
--- a/Final/cpp/lib/broker/TxAck.cpp
+++ b/Final2/cpp/lib/broker/TxAck.cpp
diff --git a/Final/cpp/lib/broker/TxAck.h b/Final2/cpp/lib/broker/TxAck.h
index 88c321c445..88c321c445 100644
--- a/Final/cpp/lib/broker/TxAck.h
+++ b/Final2/cpp/lib/broker/TxAck.h
diff --git a/Final/cpp/lib/broker/TxBuffer.cpp b/Final2/cpp/lib/broker/TxBuffer.cpp
index acd3283bb7..acd3283bb7 100644
--- a/Final/cpp/lib/broker/TxBuffer.cpp
+++ b/Final2/cpp/lib/broker/TxBuffer.cpp
diff --git a/Final/cpp/lib/broker/TxBuffer.h b/Final2/cpp/lib/broker/TxBuffer.h
index 2d9a2a3679..2d9a2a3679 100644
--- a/Final/cpp/lib/broker/TxBuffer.h
+++ b/Final2/cpp/lib/broker/TxBuffer.h
diff --git a/Final/cpp/lib/broker/TxOp.h b/Final2/cpp/lib/broker/TxOp.h
index abba84a8e8..abba84a8e8 100644
--- a/Final/cpp/lib/broker/TxOp.h
+++ b/Final2/cpp/lib/broker/TxOp.h
diff --git a/Final/cpp/lib/broker/TxPublish.cpp b/Final2/cpp/lib/broker/TxPublish.cpp
index 49dd8abd89..49dd8abd89 100644
--- a/Final/cpp/lib/broker/TxPublish.cpp
+++ b/Final2/cpp/lib/broker/TxPublish.cpp
diff --git a/Final/cpp/lib/broker/TxPublish.h b/Final2/cpp/lib/broker/TxPublish.h
index 75f201257e..75f201257e 100644
--- a/Final/cpp/lib/broker/TxPublish.h
+++ b/Final2/cpp/lib/broker/TxPublish.h
diff --git a/Final/cpp/lib/client/ClientChannel.cpp b/Final2/cpp/lib/client/ClientChannel.cpp
index a97d79dcf9..a97d79dcf9 100644
--- a/Final/cpp/lib/client/ClientChannel.cpp
+++ b/Final2/cpp/lib/client/ClientChannel.cpp
diff --git a/Final/cpp/lib/client/ClientChannel.h b/Final2/cpp/lib/client/ClientChannel.h
index 066f837430..066f837430 100644
--- a/Final/cpp/lib/client/ClientChannel.h
+++ b/Final2/cpp/lib/client/ClientChannel.h
diff --git a/Final/cpp/lib/client/ClientExchange.cpp b/Final2/cpp/lib/client/ClientExchange.cpp
index 5e5f3f14c6..5e5f3f14c6 100644
--- a/Final/cpp/lib/client/ClientExchange.cpp
+++ b/Final2/cpp/lib/client/ClientExchange.cpp
diff --git a/Final/cpp/lib/client/ClientExchange.h b/Final2/cpp/lib/client/ClientExchange.h
index a8ac21fa9b..a8ac21fa9b 100644
--- a/Final/cpp/lib/client/ClientExchange.h
+++ b/Final2/cpp/lib/client/ClientExchange.h
diff --git a/Final/cpp/lib/client/ClientMessage.cpp b/Final2/cpp/lib/client/ClientMessage.cpp
index e8a2a6019e..e8a2a6019e 100644
--- a/Final/cpp/lib/client/ClientMessage.cpp
+++ b/Final2/cpp/lib/client/ClientMessage.cpp
diff --git a/Final/cpp/lib/client/ClientMessage.h b/Final2/cpp/lib/client/ClientMessage.h
index b46eb0bc72..b46eb0bc72 100644
--- a/Final/cpp/lib/client/ClientMessage.h
+++ b/Final2/cpp/lib/client/ClientMessage.h
diff --git a/Final/cpp/lib/client/ClientQueue.cpp b/Final2/cpp/lib/client/ClientQueue.cpp
index 773be504d8..773be504d8 100644
--- a/Final/cpp/lib/client/ClientQueue.cpp
+++ b/Final2/cpp/lib/client/ClientQueue.cpp
diff --git a/Final/cpp/lib/client/ClientQueue.h b/Final2/cpp/lib/client/ClientQueue.h
index 4a63097c55..4a63097c55 100644
--- a/Final/cpp/lib/client/ClientQueue.h
+++ b/Final2/cpp/lib/client/ClientQueue.h
diff --git a/Final/cpp/lib/client/Connection.cpp b/Final2/cpp/lib/client/Connection.cpp
index c00b58a4a9..c00b58a4a9 100644
--- a/Final/cpp/lib/client/Connection.cpp
+++ b/Final2/cpp/lib/client/Connection.cpp
diff --git a/Final/cpp/lib/client/Connection.h b/Final2/cpp/lib/client/Connection.h
index 2222250188..2222250188 100644
--- a/Final/cpp/lib/client/Connection.h
+++ b/Final2/cpp/lib/client/Connection.h
diff --git a/Final/cpp/lib/client/Connector.cpp b/Final2/cpp/lib/client/Connector.cpp
index a99360b840..a99360b840 100644
--- a/Final/cpp/lib/client/Connector.cpp
+++ b/Final2/cpp/lib/client/Connector.cpp
diff --git a/Final/cpp/lib/client/Connector.h b/Final2/cpp/lib/client/Connector.h
index 44112369dc..44112369dc 100644
--- a/Final/cpp/lib/client/Connector.h
+++ b/Final2/cpp/lib/client/Connector.h
diff --git a/Final/cpp/lib/client/IncomingMessage.cpp b/Final2/cpp/lib/client/IncomingMessage.cpp
index 2ff143ba94..2ff143ba94 100644
--- a/Final/cpp/lib/client/IncomingMessage.cpp
+++ b/Final2/cpp/lib/client/IncomingMessage.cpp
diff --git a/Final/cpp/lib/client/IncomingMessage.h b/Final2/cpp/lib/client/IncomingMessage.h
index 464e05d877..464e05d877 100644
--- a/Final/cpp/lib/client/IncomingMessage.h
+++ b/Final2/cpp/lib/client/IncomingMessage.h
diff --git a/Final/cpp/lib/client/Makefile.am b/Final2/cpp/lib/client/Makefile.am
index 9935da654a..9935da654a 100644
--- a/Final/cpp/lib/client/Makefile.am
+++ b/Final2/cpp/lib/client/Makefile.am
diff --git a/Final/cpp/lib/client/MessageListener.cpp b/Final2/cpp/lib/client/MessageListener.cpp
index 70d44e7040..70d44e7040 100644
--- a/Final/cpp/lib/client/MessageListener.cpp
+++ b/Final2/cpp/lib/client/MessageListener.cpp
diff --git a/Final/cpp/lib/client/MessageListener.h b/Final2/cpp/lib/client/MessageListener.h
index cfb917b4f8..cfb917b4f8 100644
--- a/Final/cpp/lib/client/MessageListener.h
+++ b/Final2/cpp/lib/client/MessageListener.h
diff --git a/Final/cpp/lib/client/MethodBodyInstances.h b/Final2/cpp/lib/client/MethodBodyInstances.h
index 3ab0c9af8f..3ab0c9af8f 100644
--- a/Final/cpp/lib/client/MethodBodyInstances.h
+++ b/Final2/cpp/lib/client/MethodBodyInstances.h
diff --git a/Final/cpp/lib/client/ResponseHandler.cpp b/Final2/cpp/lib/client/ResponseHandler.cpp
index ac8b4a9ced..ac8b4a9ced 100644
--- a/Final/cpp/lib/client/ResponseHandler.cpp
+++ b/Final2/cpp/lib/client/ResponseHandler.cpp
diff --git a/Final/cpp/lib/client/ResponseHandler.h b/Final2/cpp/lib/client/ResponseHandler.h
index c3d499d046..c3d499d046 100644
--- a/Final/cpp/lib/client/ResponseHandler.h
+++ b/Final2/cpp/lib/client/ResponseHandler.h
diff --git a/Final/cpp/lib/client/ReturnedMessageHandler.cpp b/Final2/cpp/lib/client/ReturnedMessageHandler.cpp
index ee9f7462ef..ee9f7462ef 100644
--- a/Final/cpp/lib/client/ReturnedMessageHandler.cpp
+++ b/Final2/cpp/lib/client/ReturnedMessageHandler.cpp
diff --git a/Final/cpp/lib/client/ReturnedMessageHandler.h b/Final2/cpp/lib/client/ReturnedMessageHandler.h
index 137f0b2e17..137f0b2e17 100644
--- a/Final/cpp/lib/client/ReturnedMessageHandler.h
+++ b/Final2/cpp/lib/client/ReturnedMessageHandler.h
diff --git a/Final/cpp/lib/common/CommonOptions.cpp b/Final2/cpp/lib/common/CommonOptions.cpp
index 2b6657b4e0..2b6657b4e0 100644
--- a/Final/cpp/lib/common/CommonOptions.cpp
+++ b/Final2/cpp/lib/common/CommonOptions.cpp
diff --git a/Final/cpp/lib/common/CommonOptions.h b/Final2/cpp/lib/common/CommonOptions.h
index 086b9742fb..086b9742fb 100644
--- a/Final/cpp/lib/common/CommonOptions.h
+++ b/Final2/cpp/lib/common/CommonOptions.h
diff --git a/Final/cpp/lib/common/Exception.cpp b/Final2/cpp/lib/common/Exception.cpp
index 64d88af1b4..64d88af1b4 100644
--- a/Final/cpp/lib/common/Exception.cpp
+++ b/Final2/cpp/lib/common/Exception.cpp
diff --git a/Final/cpp/lib/common/Exception.h b/Final2/cpp/lib/common/Exception.h
index 4e26ad42e3..4e26ad42e3 100644
--- a/Final/cpp/lib/common/Exception.h
+++ b/Final2/cpp/lib/common/Exception.h
diff --git a/Final/cpp/lib/common/ExceptionHolder.cpp b/Final2/cpp/lib/common/ExceptionHolder.cpp
index 34079d2f25..34079d2f25 100644
--- a/Final/cpp/lib/common/ExceptionHolder.cpp
+++ b/Final2/cpp/lib/common/ExceptionHolder.cpp
diff --git a/Final/cpp/lib/common/ExceptionHolder.h b/Final2/cpp/lib/common/ExceptionHolder.h
index e4679e7828..e4679e7828 100644
--- a/Final/cpp/lib/common/ExceptionHolder.h
+++ b/Final2/cpp/lib/common/ExceptionHolder.h
diff --git a/Final/cpp/lib/common/Makefile.am b/Final2/cpp/lib/common/Makefile.am
index b2e2de2cf1..b2e2de2cf1 100644
--- a/Final/cpp/lib/common/Makefile.am
+++ b/Final2/cpp/lib/common/Makefile.am
diff --git a/Final/cpp/lib/common/QpidError.cpp b/Final2/cpp/lib/common/QpidError.cpp
index 7f4f9e2f34..7f4f9e2f34 100644
--- a/Final/cpp/lib/common/QpidError.cpp
+++ b/Final2/cpp/lib/common/QpidError.cpp
diff --git a/Final/cpp/lib/common/QpidError.h b/Final2/cpp/lib/common/QpidError.h
index 30d9d27076..30d9d27076 100644
--- a/Final/cpp/lib/common/QpidError.h
+++ b/Final2/cpp/lib/common/QpidError.h
diff --git a/Final/cpp/lib/common/SharedObject.h b/Final2/cpp/lib/common/SharedObject.h
index 852a036ab9..852a036ab9 100644
--- a/Final/cpp/lib/common/SharedObject.h
+++ b/Final2/cpp/lib/common/SharedObject.h
diff --git a/Final/cpp/lib/common/doxygen_mainpage.h b/Final2/cpp/lib/common/doxygen_mainpage.h
index 752fcbf862..752fcbf862 100644
--- a/Final/cpp/lib/common/doxygen_mainpage.h
+++ b/Final2/cpp/lib/common/doxygen_mainpage.h
diff --git a/Final/cpp/lib/common/framing/AMQBody.cpp b/Final2/cpp/lib/common/framing/AMQBody.cpp
index b095312a16..b095312a16 100644
--- a/Final/cpp/lib/common/framing/AMQBody.cpp
+++ b/Final2/cpp/lib/common/framing/AMQBody.cpp
diff --git a/Final/cpp/lib/common/framing/AMQBody.h b/Final2/cpp/lib/common/framing/AMQBody.h
index 5547d3c506..5547d3c506 100644
--- a/Final/cpp/lib/common/framing/AMQBody.h
+++ b/Final2/cpp/lib/common/framing/AMQBody.h
diff --git a/Final/cpp/lib/common/framing/AMQContentBody.cpp b/Final2/cpp/lib/common/framing/AMQContentBody.cpp
index 4f51dca243..4f51dca243 100644
--- a/Final/cpp/lib/common/framing/AMQContentBody.cpp
+++ b/Final2/cpp/lib/common/framing/AMQContentBody.cpp
diff --git a/Final/cpp/lib/common/framing/AMQContentBody.h b/Final2/cpp/lib/common/framing/AMQContentBody.h
index 172228671a..172228671a 100644
--- a/Final/cpp/lib/common/framing/AMQContentBody.h
+++ b/Final2/cpp/lib/common/framing/AMQContentBody.h
diff --git a/Final/cpp/lib/common/framing/AMQDataBlock.h b/Final2/cpp/lib/common/framing/AMQDataBlock.h
index ac91c52164..ac91c52164 100644
--- a/Final/cpp/lib/common/framing/AMQDataBlock.h
+++ b/Final2/cpp/lib/common/framing/AMQDataBlock.h
diff --git a/Final/cpp/lib/common/framing/AMQFrame.cpp b/Final2/cpp/lib/common/framing/AMQFrame.cpp
index 6fa5b9ae51..6fa5b9ae51 100644
--- a/Final/cpp/lib/common/framing/AMQFrame.cpp
+++ b/Final2/cpp/lib/common/framing/AMQFrame.cpp
diff --git a/Final/cpp/lib/common/framing/AMQFrame.h b/Final2/cpp/lib/common/framing/AMQFrame.h
index d3c769087a..d3c769087a 100644
--- a/Final/cpp/lib/common/framing/AMQFrame.h
+++ b/Final2/cpp/lib/common/framing/AMQFrame.h
diff --git a/Final/cpp/lib/common/framing/AMQHeaderBody.cpp b/Final2/cpp/lib/common/framing/AMQHeaderBody.cpp
index 3653073f29..3653073f29 100644
--- a/Final/cpp/lib/common/framing/AMQHeaderBody.cpp
+++ b/Final2/cpp/lib/common/framing/AMQHeaderBody.cpp
diff --git a/Final/cpp/lib/common/framing/AMQHeaderBody.h b/Final2/cpp/lib/common/framing/AMQHeaderBody.h
index 31cf7d575e..31cf7d575e 100644
--- a/Final/cpp/lib/common/framing/AMQHeaderBody.h
+++ b/Final2/cpp/lib/common/framing/AMQHeaderBody.h
diff --git a/Final/cpp/lib/common/framing/AMQHeartbeatBody.cpp b/Final2/cpp/lib/common/framing/AMQHeartbeatBody.cpp
index 63f83a3d29..63f83a3d29 100644
--- a/Final/cpp/lib/common/framing/AMQHeartbeatBody.cpp
+++ b/Final2/cpp/lib/common/framing/AMQHeartbeatBody.cpp
diff --git a/Final/cpp/lib/common/framing/AMQHeartbeatBody.h b/Final2/cpp/lib/common/framing/AMQHeartbeatBody.h
index a2315119e4..a2315119e4 100644
--- a/Final/cpp/lib/common/framing/AMQHeartbeatBody.h
+++ b/Final2/cpp/lib/common/framing/AMQHeartbeatBody.h
diff --git a/Final/cpp/lib/common/framing/AMQMethodBody.cpp b/Final2/cpp/lib/common/framing/AMQMethodBody.cpp
index 525310f3d4..525310f3d4 100644
--- a/Final/cpp/lib/common/framing/AMQMethodBody.cpp
+++ b/Final2/cpp/lib/common/framing/AMQMethodBody.cpp
diff --git a/Final/cpp/lib/common/framing/AMQMethodBody.h b/Final2/cpp/lib/common/framing/AMQMethodBody.h
index da25c7c545..da25c7c545 100644
--- a/Final/cpp/lib/common/framing/AMQMethodBody.h
+++ b/Final2/cpp/lib/common/framing/AMQMethodBody.h
diff --git a/Final/cpp/lib/common/framing/BasicHeaderProperties.cpp b/Final2/cpp/lib/common/framing/BasicHeaderProperties.cpp
index f673215536..f673215536 100644
--- a/Final/cpp/lib/common/framing/BasicHeaderProperties.cpp
+++ b/Final2/cpp/lib/common/framing/BasicHeaderProperties.cpp
diff --git a/Final/cpp/lib/common/framing/BasicHeaderProperties.h b/Final2/cpp/lib/common/framing/BasicHeaderProperties.h
index bcd81b4776..bcd81b4776 100644
--- a/Final/cpp/lib/common/framing/BasicHeaderProperties.h
+++ b/Final2/cpp/lib/common/framing/BasicHeaderProperties.h
diff --git a/Final/cpp/lib/common/framing/BodyHandler.cpp b/Final2/cpp/lib/common/framing/BodyHandler.cpp
index 8ccfb222df..8ccfb222df 100644
--- a/Final/cpp/lib/common/framing/BodyHandler.cpp
+++ b/Final2/cpp/lib/common/framing/BodyHandler.cpp
diff --git a/Final/cpp/lib/common/framing/BodyHandler.h b/Final2/cpp/lib/common/framing/BodyHandler.h
index 3923258d1c..3923258d1c 100644
--- a/Final/cpp/lib/common/framing/BodyHandler.h
+++ b/Final2/cpp/lib/common/framing/BodyHandler.h
diff --git a/Final/cpp/lib/common/framing/Buffer.cpp b/Final2/cpp/lib/common/framing/Buffer.cpp
index 43815c2f1d..43815c2f1d 100644
--- a/Final/cpp/lib/common/framing/Buffer.cpp
+++ b/Final2/cpp/lib/common/framing/Buffer.cpp
diff --git a/Final/cpp/lib/common/framing/Buffer.h b/Final2/cpp/lib/common/framing/Buffer.h
index b07c2a2ced..b07c2a2ced 100644
--- a/Final/cpp/lib/common/framing/Buffer.h
+++ b/Final2/cpp/lib/common/framing/Buffer.h
diff --git a/Final/cpp/lib/common/framing/FieldTable.cpp b/Final2/cpp/lib/common/framing/FieldTable.cpp
index cf16e87272..cf16e87272 100644
--- a/Final/cpp/lib/common/framing/FieldTable.cpp
+++ b/Final2/cpp/lib/common/framing/FieldTable.cpp
diff --git a/Final/cpp/lib/common/framing/FieldTable.h b/Final2/cpp/lib/common/framing/FieldTable.h
index 6fa10ab108..6fa10ab108 100644
--- a/Final/cpp/lib/common/framing/FieldTable.h
+++ b/Final2/cpp/lib/common/framing/FieldTable.h
diff --git a/Final/cpp/lib/common/framing/FramingContent.cpp b/Final2/cpp/lib/common/framing/FramingContent.cpp
index e5f50b5075..e5f50b5075 100644
--- a/Final/cpp/lib/common/framing/FramingContent.cpp
+++ b/Final2/cpp/lib/common/framing/FramingContent.cpp
diff --git a/Final/cpp/lib/common/framing/FramingContent.h b/Final2/cpp/lib/common/framing/FramingContent.h
index 1ab3ba468b..1ab3ba468b 100644
--- a/Final/cpp/lib/common/framing/FramingContent.h
+++ b/Final2/cpp/lib/common/framing/FramingContent.h
diff --git a/Final/cpp/lib/common/framing/HeaderProperties.h b/Final2/cpp/lib/common/framing/HeaderProperties.h
index 7a8c65549d..7a8c65549d 100644
--- a/Final/cpp/lib/common/framing/HeaderProperties.h
+++ b/Final2/cpp/lib/common/framing/HeaderProperties.h
diff --git a/Final/cpp/lib/common/framing/InitiationHandler.cpp b/Final2/cpp/lib/common/framing/InitiationHandler.cpp
index dd92c9859b..dd92c9859b 100644
--- a/Final/cpp/lib/common/framing/InitiationHandler.cpp
+++ b/Final2/cpp/lib/common/framing/InitiationHandler.cpp
diff --git a/Final/cpp/lib/common/framing/InitiationHandler.h b/Final2/cpp/lib/common/framing/InitiationHandler.h
index d94fc58d2c..d94fc58d2c 100644
--- a/Final/cpp/lib/common/framing/InitiationHandler.h
+++ b/Final2/cpp/lib/common/framing/InitiationHandler.h
diff --git a/Final/cpp/lib/common/framing/InputHandler.h b/Final2/cpp/lib/common/framing/InputHandler.h
index 4e2d4bcc9b..4e2d4bcc9b 100644
--- a/Final/cpp/lib/common/framing/InputHandler.h
+++ b/Final2/cpp/lib/common/framing/InputHandler.h
diff --git a/Final/cpp/lib/common/framing/OutputHandler.h b/Final2/cpp/lib/common/framing/OutputHandler.h
index 2e01e34df2..2e01e34df2 100644
--- a/Final/cpp/lib/common/framing/OutputHandler.h
+++ b/Final2/cpp/lib/common/framing/OutputHandler.h
diff --git a/Final/cpp/lib/common/framing/ProtocolInitiation.cpp b/Final2/cpp/lib/common/framing/ProtocolInitiation.cpp
index 471f736a7d..471f736a7d 100644
--- a/Final/cpp/lib/common/framing/ProtocolInitiation.cpp
+++ b/Final2/cpp/lib/common/framing/ProtocolInitiation.cpp
diff --git a/Final/cpp/lib/common/framing/ProtocolInitiation.h b/Final2/cpp/lib/common/framing/ProtocolInitiation.h
index 003c3bba81..003c3bba81 100644
--- a/Final/cpp/lib/common/framing/ProtocolInitiation.h
+++ b/Final2/cpp/lib/common/framing/ProtocolInitiation.h
diff --git a/Final/cpp/lib/common/framing/ProtocolVersion.cpp b/Final2/cpp/lib/common/framing/ProtocolVersion.cpp
index 69ff89ec32..69ff89ec32 100644
--- a/Final/cpp/lib/common/framing/ProtocolVersion.cpp
+++ b/Final2/cpp/lib/common/framing/ProtocolVersion.cpp
diff --git a/Final/cpp/lib/common/framing/ProtocolVersion.h b/Final2/cpp/lib/common/framing/ProtocolVersion.h
index 331cf53555..331cf53555 100644
--- a/Final/cpp/lib/common/framing/ProtocolVersion.h
+++ b/Final2/cpp/lib/common/framing/ProtocolVersion.h
diff --git a/Final/cpp/lib/common/framing/ProtocolVersionException.cpp b/Final2/cpp/lib/common/framing/ProtocolVersionException.cpp
index 8249a88f4b..8249a88f4b 100644
--- a/Final/cpp/lib/common/framing/ProtocolVersionException.cpp
+++ b/Final2/cpp/lib/common/framing/ProtocolVersionException.cpp
diff --git a/Final/cpp/lib/common/framing/ProtocolVersionException.h b/Final2/cpp/lib/common/framing/ProtocolVersionException.h
index 4494d87064..4494d87064 100644
--- a/Final/cpp/lib/common/framing/ProtocolVersionException.h
+++ b/Final2/cpp/lib/common/framing/ProtocolVersionException.h
diff --git a/Final/cpp/lib/common/framing/Value.cpp b/Final2/cpp/lib/common/framing/Value.cpp
index 9b1f3bbc94..9b1f3bbc94 100644
--- a/Final/cpp/lib/common/framing/Value.cpp
+++ b/Final2/cpp/lib/common/framing/Value.cpp
diff --git a/Final/cpp/lib/common/framing/Value.h b/Final2/cpp/lib/common/framing/Value.h
index e7ae865a70..e7ae865a70 100644
--- a/Final/cpp/lib/common/framing/Value.h
+++ b/Final2/cpp/lib/common/framing/Value.h
diff --git a/Final/cpp/lib/common/framing/amqp_framing.h b/Final2/cpp/lib/common/framing/amqp_framing.h
index 62f87352f8..62f87352f8 100644
--- a/Final/cpp/lib/common/framing/amqp_framing.h
+++ b/Final2/cpp/lib/common/framing/amqp_framing.h
diff --git a/Final/cpp/lib/common/framing/amqp_types.h b/Final2/cpp/lib/common/framing/amqp_types.h
index 3d8e9632c0..3d8e9632c0 100644
--- a/Final/cpp/lib/common/framing/amqp_types.h
+++ b/Final2/cpp/lib/common/framing/amqp_types.h
diff --git a/Final/cpp/lib/common/sys/Acceptor.h b/Final2/cpp/lib/common/sys/Acceptor.h
index e6bc27a593..e6bc27a593 100644
--- a/Final/cpp/lib/common/sys/Acceptor.h
+++ b/Final2/cpp/lib/common/sys/Acceptor.h
diff --git a/Final/cpp/lib/common/sys/AtomicCount.h b/Final2/cpp/lib/common/sys/AtomicCount.h
index b3d099192f..b3d099192f 100644
--- a/Final/cpp/lib/common/sys/AtomicCount.h
+++ b/Final2/cpp/lib/common/sys/AtomicCount.h
diff --git a/Final/cpp/lib/common/sys/Module.h b/Final2/cpp/lib/common/sys/Module.h
index 64ed309afb..64ed309afb 100644
--- a/Final/cpp/lib/common/sys/Module.h
+++ b/Final2/cpp/lib/common/sys/Module.h
diff --git a/Final/cpp/lib/common/sys/Monitor.h b/Final2/cpp/lib/common/sys/Monitor.h
index c615a97aa3..c615a97aa3 100644
--- a/Final/cpp/lib/common/sys/Monitor.h
+++ b/Final2/cpp/lib/common/sys/Monitor.h
diff --git a/Final/cpp/lib/common/sys/Mutex.h b/Final2/cpp/lib/common/sys/Mutex.h
index ae1d6369af..ae1d6369af 100644
--- a/Final/cpp/lib/common/sys/Mutex.h
+++ b/Final2/cpp/lib/common/sys/Mutex.h
diff --git a/Final/cpp/lib/common/sys/Runnable.cpp b/Final2/cpp/lib/common/sys/Runnable.cpp
index c3174b9bc8..c3174b9bc8 100644
--- a/Final/cpp/lib/common/sys/Runnable.cpp
+++ b/Final2/cpp/lib/common/sys/Runnable.cpp
diff --git a/Final/cpp/lib/common/sys/Runnable.h b/Final2/cpp/lib/common/sys/Runnable.h
index fb3927c612..fb3927c612 100644
--- a/Final/cpp/lib/common/sys/Runnable.h
+++ b/Final2/cpp/lib/common/sys/Runnable.h
diff --git a/Final/cpp/lib/common/sys/SessionContext.h b/Final2/cpp/lib/common/sys/SessionContext.h
index 671e00774f..671e00774f 100644
--- a/Final/cpp/lib/common/sys/SessionContext.h
+++ b/Final2/cpp/lib/common/sys/SessionContext.h
diff --git a/Final/cpp/lib/common/sys/SessionHandler.h b/Final2/cpp/lib/common/sys/SessionHandler.h
index 76f79d421d..76f79d421d 100644
--- a/Final/cpp/lib/common/sys/SessionHandler.h
+++ b/Final2/cpp/lib/common/sys/SessionHandler.h
diff --git a/Final/cpp/lib/common/sys/SessionHandlerFactory.h b/Final2/cpp/lib/common/sys/SessionHandlerFactory.h
index 2a01aebcb0..2a01aebcb0 100644
--- a/Final/cpp/lib/common/sys/SessionHandlerFactory.h
+++ b/Final2/cpp/lib/common/sys/SessionHandlerFactory.h
diff --git a/Final/cpp/lib/common/sys/ShutdownHandler.h b/Final2/cpp/lib/common/sys/ShutdownHandler.h
index 88baecb5b6..88baecb5b6 100644
--- a/Final/cpp/lib/common/sys/ShutdownHandler.h
+++ b/Final2/cpp/lib/common/sys/ShutdownHandler.h
diff --git a/Final/cpp/lib/common/sys/Socket.h b/Final2/cpp/lib/common/sys/Socket.h
index b5f74847c2..b5f74847c2 100644
--- a/Final/cpp/lib/common/sys/Socket.h
+++ b/Final2/cpp/lib/common/sys/Socket.h
diff --git a/Final/cpp/lib/common/sys/Thread.h b/Final2/cpp/lib/common/sys/Thread.h
index c14c7cc6ad..c14c7cc6ad 100644
--- a/Final/cpp/lib/common/sys/Thread.h
+++ b/Final2/cpp/lib/common/sys/Thread.h
diff --git a/Final/cpp/lib/common/sys/Time.cpp b/Final2/cpp/lib/common/sys/Time.cpp
index ad6185b966..ad6185b966 100644
--- a/Final/cpp/lib/common/sys/Time.cpp
+++ b/Final2/cpp/lib/common/sys/Time.cpp
diff --git a/Final/cpp/lib/common/sys/Time.h b/Final2/cpp/lib/common/sys/Time.h
index 3dd46741d8..3dd46741d8 100644
--- a/Final/cpp/lib/common/sys/Time.h
+++ b/Final2/cpp/lib/common/sys/Time.h
diff --git a/Final/cpp/lib/common/sys/TimeoutHandler.h b/Final2/cpp/lib/common/sys/TimeoutHandler.h
index 0c10709bbf..0c10709bbf 100644
--- a/Final/cpp/lib/common/sys/TimeoutHandler.h
+++ b/Final2/cpp/lib/common/sys/TimeoutHandler.h
diff --git a/Final/cpp/lib/common/sys/apr/APRAcceptor.cpp b/Final2/cpp/lib/common/sys/apr/APRAcceptor.cpp
index a427542fc3..a427542fc3 100644
--- a/Final/cpp/lib/common/sys/apr/APRAcceptor.cpp
+++ b/Final2/cpp/lib/common/sys/apr/APRAcceptor.cpp
diff --git a/Final/cpp/lib/common/sys/apr/APRBase.cpp b/Final2/cpp/lib/common/sys/apr/APRBase.cpp
index 861071499f..861071499f 100644
--- a/Final/cpp/lib/common/sys/apr/APRBase.cpp
+++ b/Final2/cpp/lib/common/sys/apr/APRBase.cpp
diff --git a/Final/cpp/lib/common/sys/apr/APRBase.h b/Final2/cpp/lib/common/sys/apr/APRBase.h
index 6a866a554a..6a866a554a 100644
--- a/Final/cpp/lib/common/sys/apr/APRBase.h
+++ b/Final2/cpp/lib/common/sys/apr/APRBase.h
diff --git a/Final/cpp/lib/common/sys/apr/APRPool.cpp b/Final2/cpp/lib/common/sys/apr/APRPool.cpp
index 91481faf09..91481faf09 100644
--- a/Final/cpp/lib/common/sys/apr/APRPool.cpp
+++ b/Final2/cpp/lib/common/sys/apr/APRPool.cpp
diff --git a/Final/cpp/lib/common/sys/apr/APRPool.h b/Final2/cpp/lib/common/sys/apr/APRPool.h
index c22338599e..c22338599e 100644
--- a/Final/cpp/lib/common/sys/apr/APRPool.h
+++ b/Final2/cpp/lib/common/sys/apr/APRPool.h
diff --git a/Final/cpp/lib/common/sys/apr/APRSocket.cpp b/Final2/cpp/lib/common/sys/apr/APRSocket.cpp
index f68d51d8e4..f68d51d8e4 100644
--- a/Final/cpp/lib/common/sys/apr/APRSocket.cpp
+++ b/Final2/cpp/lib/common/sys/apr/APRSocket.cpp
diff --git a/Final/cpp/lib/common/sys/apr/APRSocket.h b/Final2/cpp/lib/common/sys/apr/APRSocket.h
index 53f1055c6a..53f1055c6a 100644
--- a/Final/cpp/lib/common/sys/apr/APRSocket.h
+++ b/Final2/cpp/lib/common/sys/apr/APRSocket.h
diff --git a/Final/cpp/lib/common/sys/apr/LFProcessor.cpp b/Final2/cpp/lib/common/sys/apr/LFProcessor.cpp
index 22b601e688..22b601e688 100644
--- a/Final/cpp/lib/common/sys/apr/LFProcessor.cpp
+++ b/Final2/cpp/lib/common/sys/apr/LFProcessor.cpp
diff --git a/Final/cpp/lib/common/sys/apr/LFProcessor.h b/Final2/cpp/lib/common/sys/apr/LFProcessor.h
index 0f4850ee08..0f4850ee08 100644
--- a/Final/cpp/lib/common/sys/apr/LFProcessor.h
+++ b/Final2/cpp/lib/common/sys/apr/LFProcessor.h
diff --git a/Final/cpp/lib/common/sys/apr/LFSessionContext.cpp b/Final2/cpp/lib/common/sys/apr/LFSessionContext.cpp
index 8a7ce18136..8a7ce18136 100644
--- a/Final/cpp/lib/common/sys/apr/LFSessionContext.cpp
+++ b/Final2/cpp/lib/common/sys/apr/LFSessionContext.cpp
diff --git a/Final/cpp/lib/common/sys/apr/LFSessionContext.h b/Final2/cpp/lib/common/sys/apr/LFSessionContext.h
index eeb8279d9a..eeb8279d9a 100644
--- a/Final/cpp/lib/common/sys/apr/LFSessionContext.h
+++ b/Final2/cpp/lib/common/sys/apr/LFSessionContext.h
diff --git a/Final/cpp/lib/common/sys/apr/Socket.cpp b/Final2/cpp/lib/common/sys/apr/Socket.cpp
index c2abf50c5f..c2abf50c5f 100644
--- a/Final/cpp/lib/common/sys/apr/Socket.cpp
+++ b/Final2/cpp/lib/common/sys/apr/Socket.cpp
diff --git a/Final/cpp/lib/common/sys/apr/Thread.cpp b/Final2/cpp/lib/common/sys/apr/Thread.cpp
index 997ff03ab3..997ff03ab3 100644
--- a/Final/cpp/lib/common/sys/apr/Thread.cpp
+++ b/Final2/cpp/lib/common/sys/apr/Thread.cpp
diff --git a/Final/cpp/lib/common/sys/posix/EventChannel.cpp b/Final2/cpp/lib/common/sys/posix/EventChannel.cpp
index 8b91fc1ba6..8b91fc1ba6 100644
--- a/Final/cpp/lib/common/sys/posix/EventChannel.cpp
+++ b/Final2/cpp/lib/common/sys/posix/EventChannel.cpp
diff --git a/Final/cpp/lib/common/sys/posix/EventChannel.h b/Final2/cpp/lib/common/sys/posix/EventChannel.h
index 56c1d1549d..56c1d1549d 100644
--- a/Final/cpp/lib/common/sys/posix/EventChannel.h
+++ b/Final2/cpp/lib/common/sys/posix/EventChannel.h
diff --git a/Final/cpp/lib/common/sys/posix/EventChannelAcceptor.cpp b/Final2/cpp/lib/common/sys/posix/EventChannelAcceptor.cpp
index 7cd6f60902..7cd6f60902 100644
--- a/Final/cpp/lib/common/sys/posix/EventChannelAcceptor.cpp
+++ b/Final2/cpp/lib/common/sys/posix/EventChannelAcceptor.cpp
diff --git a/Final/cpp/lib/common/sys/posix/EventChannelConnection.cpp b/Final2/cpp/lib/common/sys/posix/EventChannelConnection.cpp
index 85014b7bd4..85014b7bd4 100644
--- a/Final/cpp/lib/common/sys/posix/EventChannelConnection.cpp
+++ b/Final2/cpp/lib/common/sys/posix/EventChannelConnection.cpp
diff --git a/Final/cpp/lib/common/sys/posix/EventChannelConnection.h b/Final2/cpp/lib/common/sys/posix/EventChannelConnection.h
index da190b0213..da190b0213 100644
--- a/Final/cpp/lib/common/sys/posix/EventChannelConnection.h
+++ b/Final2/cpp/lib/common/sys/posix/EventChannelConnection.h
diff --git a/Final/cpp/lib/common/sys/posix/EventChannelThreads.cpp b/Final2/cpp/lib/common/sys/posix/EventChannelThreads.cpp
index fe8a290729..fe8a290729 100644
--- a/Final/cpp/lib/common/sys/posix/EventChannelThreads.cpp
+++ b/Final2/cpp/lib/common/sys/posix/EventChannelThreads.cpp
diff --git a/Final/cpp/lib/common/sys/posix/EventChannelThreads.h b/Final2/cpp/lib/common/sys/posix/EventChannelThreads.h
index e28190e0ed..e28190e0ed 100644
--- a/Final/cpp/lib/common/sys/posix/EventChannelThreads.h
+++ b/Final2/cpp/lib/common/sys/posix/EventChannelThreads.h
diff --git a/Final/cpp/lib/common/sys/posix/PosixAcceptor.cpp b/Final2/cpp/lib/common/sys/posix/PosixAcceptor.cpp
index 842aa76f36..842aa76f36 100644
--- a/Final/cpp/lib/common/sys/posix/PosixAcceptor.cpp
+++ b/Final2/cpp/lib/common/sys/posix/PosixAcceptor.cpp
diff --git a/Final/cpp/lib/common/sys/posix/Socket.cpp b/Final2/cpp/lib/common/sys/posix/Socket.cpp
index e27ced9161..e27ced9161 100644
--- a/Final/cpp/lib/common/sys/posix/Socket.cpp
+++ b/Final2/cpp/lib/common/sys/posix/Socket.cpp
diff --git a/Final/cpp/lib/common/sys/posix/Thread.cpp b/Final2/cpp/lib/common/sys/posix/Thread.cpp
index 7291022dc6..7291022dc6 100644
--- a/Final/cpp/lib/common/sys/posix/Thread.cpp
+++ b/Final2/cpp/lib/common/sys/posix/Thread.cpp
diff --git a/Final/cpp/lib/common/sys/posix/check.cpp b/Final2/cpp/lib/common/sys/posix/check.cpp
index 408679caa8..408679caa8 100644
--- a/Final/cpp/lib/common/sys/posix/check.cpp
+++ b/Final2/cpp/lib/common/sys/posix/check.cpp
diff --git a/Final/cpp/lib/common/sys/posix/check.h b/Final2/cpp/lib/common/sys/posix/check.h
index 5afbe8f5a8..5afbe8f5a8 100644
--- a/Final/cpp/lib/common/sys/posix/check.h
+++ b/Final2/cpp/lib/common/sys/posix/check.h
diff --git a/Final/cpp/m4/clock_time.m4 b/Final2/cpp/m4/clock_time.m4
index 227a5978e5..227a5978e5 100644
--- a/Final/cpp/m4/clock_time.m4
+++ b/Final2/cpp/m4/clock_time.m4
diff --git a/Final/cpp/m4/compiler-flags.m4 b/Final2/cpp/m4/compiler-flags.m4
index 01cb728f02..01cb728f02 100644
--- a/Final/cpp/m4/compiler-flags.m4
+++ b/Final2/cpp/m4/compiler-flags.m4
diff --git a/Final/cpp/m4/cppunit.m4 b/Final2/cpp/m4/cppunit.m4
index f009086f9d..f009086f9d 100644
--- a/Final/cpp/m4/cppunit.m4
+++ b/Final2/cpp/m4/cppunit.m4
diff --git a/Final/cpp/m4/extensions.m4 b/Final2/cpp/m4/extensions.m4
index 143a9e5403..143a9e5403 100644
--- a/Final/cpp/m4/extensions.m4
+++ b/Final2/cpp/m4/extensions.m4
diff --git a/Final/cpp/make-dist b/Final2/cpp/make-dist
index 595b89f969..595b89f969 100755
--- a/Final/cpp/make-dist
+++ b/Final2/cpp/make-dist
diff --git a/Final/cpp/qpid-autotools-install b/Final2/cpp/qpid-autotools-install
index 19f20ff5e8..19f20ff5e8 100755
--- a/Final/cpp/qpid-autotools-install
+++ b/Final2/cpp/qpid-autotools-install
diff --git a/Final/cpp/qpidc.spec.in b/Final2/cpp/qpidc.spec.in
index b7f06b159f..b7f06b159f 100644
--- a/Final/cpp/qpidc.spec.in
+++ b/Final2/cpp/qpidc.spec.in
diff --git a/Final/cpp/rpm/Makefile.am b/Final2/cpp/rpm/Makefile.am
index 159a5cd4c2..159a5cd4c2 100644
--- a/Final/cpp/rpm/Makefile.am
+++ b/Final2/cpp/rpm/Makefile.am
diff --git a/Final/cpp/src/Makefile.am b/Final2/cpp/src/Makefile.am
index 6ca6632c77..6ca6632c77 100644
--- a/Final/cpp/src/Makefile.am
+++ b/Final2/cpp/src/Makefile.am
diff --git a/Final/cpp/src/qpidd.cpp b/Final2/cpp/src/qpidd.cpp
index 2672da87d5..2672da87d5 100644
--- a/Final/cpp/src/qpidd.cpp
+++ b/Final2/cpp/src/qpidd.cpp
diff --git a/Final/cpp/tests/.vg-supp b/Final2/cpp/tests/.vg-supp
index bb73c53744..bb73c53744 100644
--- a/Final/cpp/tests/.vg-supp
+++ b/Final2/cpp/tests/.vg-supp
diff --git a/Final/cpp/tests/APRBaseTest.cpp b/Final2/cpp/tests/APRBaseTest.cpp
index 7d95c3bf52..7d95c3bf52 100644
--- a/Final/cpp/tests/APRBaseTest.cpp
+++ b/Final2/cpp/tests/APRBaseTest.cpp
diff --git a/Final/cpp/tests/AcceptorTest.cpp b/Final2/cpp/tests/AcceptorTest.cpp
index 394dfea463..394dfea463 100644
--- a/Final/cpp/tests/AcceptorTest.cpp
+++ b/Final2/cpp/tests/AcceptorTest.cpp
diff --git a/Final/cpp/tests/AccumulatedAckTest.cpp b/Final2/cpp/tests/AccumulatedAckTest.cpp
index a2ee3df752..a2ee3df752 100644
--- a/Final/cpp/tests/AccumulatedAckTest.cpp
+++ b/Final2/cpp/tests/AccumulatedAckTest.cpp
diff --git a/Final/cpp/tests/BasicP2PTest.cpp b/Final2/cpp/tests/BasicP2PTest.cpp
index b202f88ca6..b202f88ca6 100644
--- a/Final/cpp/tests/BasicP2PTest.cpp
+++ b/Final2/cpp/tests/BasicP2PTest.cpp
diff --git a/Final/cpp/tests/BasicP2PTest.h b/Final2/cpp/tests/BasicP2PTest.h
index 3936f556a9..3936f556a9 100644
--- a/Final/cpp/tests/BasicP2PTest.h
+++ b/Final2/cpp/tests/BasicP2PTest.h
diff --git a/Final/cpp/tests/BasicPubSubTest.cpp b/Final2/cpp/tests/BasicPubSubTest.cpp
index 623194d331..623194d331 100644
--- a/Final/cpp/tests/BasicPubSubTest.cpp
+++ b/Final2/cpp/tests/BasicPubSubTest.cpp
diff --git a/Final/cpp/tests/BasicPubSubTest.h b/Final2/cpp/tests/BasicPubSubTest.h
index e757bd8020..e757bd8020 100644
--- a/Final/cpp/tests/BasicPubSubTest.h
+++ b/Final2/cpp/tests/BasicPubSubTest.h
diff --git a/Final/cpp/tests/BodyHandlerTest.cpp b/Final2/cpp/tests/BodyHandlerTest.cpp
index bf60dd21e3..bf60dd21e3 100644
--- a/Final/cpp/tests/BodyHandlerTest.cpp
+++ b/Final2/cpp/tests/BodyHandlerTest.cpp
diff --git a/Final/cpp/tests/ChannelTest.cpp b/Final2/cpp/tests/ChannelTest.cpp
index cc0a90bad9..cc0a90bad9 100644
--- a/Final/cpp/tests/ChannelTest.cpp
+++ b/Final2/cpp/tests/ChannelTest.cpp
diff --git a/Final/cpp/tests/EventChannelConnectionTest.cpp b/Final2/cpp/tests/EventChannelConnectionTest.cpp
index a6b309d771..a6b309d771 100644
--- a/Final/cpp/tests/EventChannelConnectionTest.cpp
+++ b/Final2/cpp/tests/EventChannelConnectionTest.cpp
diff --git a/Final/cpp/tests/EventChannelTest.cpp b/Final2/cpp/tests/EventChannelTest.cpp
index 8e5c724a15..8e5c724a15 100644
--- a/Final/cpp/tests/EventChannelTest.cpp
+++ b/Final2/cpp/tests/EventChannelTest.cpp
diff --git a/Final/cpp/tests/EventChannelThreadsTest.cpp b/Final2/cpp/tests/EventChannelThreadsTest.cpp
index 285ed29518..285ed29518 100644
--- a/Final/cpp/tests/EventChannelThreadsTest.cpp
+++ b/Final2/cpp/tests/EventChannelThreadsTest.cpp
diff --git a/Final/cpp/tests/ExceptionTest.cpp b/Final2/cpp/tests/ExceptionTest.cpp
index 6cea863168..6cea863168 100644
--- a/Final/cpp/tests/ExceptionTest.cpp
+++ b/Final2/cpp/tests/ExceptionTest.cpp
diff --git a/Final/cpp/tests/ExchangeTest.cpp b/Final2/cpp/tests/ExchangeTest.cpp
index 8fef4ccaac..8fef4ccaac 100644
--- a/Final/cpp/tests/ExchangeTest.cpp
+++ b/Final2/cpp/tests/ExchangeTest.cpp
diff --git a/Final/cpp/tests/FieldTableTest.cpp b/Final2/cpp/tests/FieldTableTest.cpp
index 8d9285bf4b..8d9285bf4b 100644
--- a/Final/cpp/tests/FieldTableTest.cpp
+++ b/Final2/cpp/tests/FieldTableTest.cpp
diff --git a/Final/cpp/tests/FramingTest.cpp b/Final2/cpp/tests/FramingTest.cpp
index e4d289d3d5..e4d289d3d5 100644
--- a/Final/cpp/tests/FramingTest.cpp
+++ b/Final2/cpp/tests/FramingTest.cpp
diff --git a/Final/cpp/tests/HeaderTest.cpp b/Final2/cpp/tests/HeaderTest.cpp
index 01927c7190..01927c7190 100644
--- a/Final/cpp/tests/HeaderTest.cpp
+++ b/Final2/cpp/tests/HeaderTest.cpp
diff --git a/Final/cpp/tests/HeadersExchangeTest.cpp b/Final2/cpp/tests/HeadersExchangeTest.cpp
index 6cd51c55a9..6cd51c55a9 100644
--- a/Final/cpp/tests/HeadersExchangeTest.cpp
+++ b/Final2/cpp/tests/HeadersExchangeTest.cpp
diff --git a/Final/cpp/tests/InMemoryContentTest.cpp b/Final2/cpp/tests/InMemoryContentTest.cpp
index bd638dae66..bd638dae66 100644
--- a/Final/cpp/tests/InMemoryContentTest.cpp
+++ b/Final2/cpp/tests/InMemoryContentTest.cpp
diff --git a/Final/cpp/tests/LazyLoadedContentTest.cpp b/Final2/cpp/tests/LazyLoadedContentTest.cpp
index 2075a6dd3a..2075a6dd3a 100644
--- a/Final/cpp/tests/LazyLoadedContentTest.cpp
+++ b/Final2/cpp/tests/LazyLoadedContentTest.cpp
diff --git a/Final/cpp/tests/Makefile.am b/Final2/cpp/tests/Makefile.am
index 256e68058d..256e68058d 100644
--- a/Final/cpp/tests/Makefile.am
+++ b/Final2/cpp/tests/Makefile.am
diff --git a/Final/cpp/tests/MessageBuilderTest.cpp b/Final2/cpp/tests/MessageBuilderTest.cpp
index 88e8318832..88e8318832 100644
--- a/Final/cpp/tests/MessageBuilderTest.cpp
+++ b/Final2/cpp/tests/MessageBuilderTest.cpp
diff --git a/Final/cpp/tests/MessageTest.cpp b/Final2/cpp/tests/MessageTest.cpp
index bcf3ad8064..bcf3ad8064 100644
--- a/Final/cpp/tests/MessageTest.cpp
+++ b/Final2/cpp/tests/MessageTest.cpp
diff --git a/Final/cpp/tests/MockSessionHandler.h b/Final2/cpp/tests/MockSessionHandler.h
index 165436adf1..165436adf1 100644
--- a/Final/cpp/tests/MockSessionHandler.h
+++ b/Final2/cpp/tests/MockSessionHandler.h
diff --git a/Final/cpp/tests/P2PMessageSizeTest.cpp b/Final2/cpp/tests/P2PMessageSizeTest.cpp
index 20ddb6e2aa..20ddb6e2aa 100644
--- a/Final/cpp/tests/P2PMessageSizeTest.cpp
+++ b/Final2/cpp/tests/P2PMessageSizeTest.cpp
diff --git a/Final/cpp/tests/P2PMessageSizeTest.h b/Final2/cpp/tests/P2PMessageSizeTest.h
index c434e74f4d..c434e74f4d 100644
--- a/Final/cpp/tests/P2PMessageSizeTest.h
+++ b/Final2/cpp/tests/P2PMessageSizeTest.h
diff --git a/Final/cpp/tests/PubSubMessageSizeTest.cpp b/Final2/cpp/tests/PubSubMessageSizeTest.cpp
index e75334d989..e75334d989 100644
--- a/Final/cpp/tests/PubSubMessageSizeTest.cpp
+++ b/Final2/cpp/tests/PubSubMessageSizeTest.cpp
diff --git a/Final/cpp/tests/PubSubMessageSizeTest.h b/Final2/cpp/tests/PubSubMessageSizeTest.h
index c17f81fc1e..c17f81fc1e 100644
--- a/Final/cpp/tests/PubSubMessageSizeTest.h
+++ b/Final2/cpp/tests/PubSubMessageSizeTest.h
diff --git a/Final/cpp/tests/QueuePolicyTest.cpp b/Final2/cpp/tests/QueuePolicyTest.cpp
index 0ae0d2f7bc..0ae0d2f7bc 100644
--- a/Final/cpp/tests/QueuePolicyTest.cpp
+++ b/Final2/cpp/tests/QueuePolicyTest.cpp
diff --git a/Final/cpp/tests/QueueRegistryTest.cpp b/Final2/cpp/tests/QueueRegistryTest.cpp
index 3926d56292..3926d56292 100644
--- a/Final/cpp/tests/QueueRegistryTest.cpp
+++ b/Final2/cpp/tests/QueueRegistryTest.cpp
diff --git a/Final/cpp/tests/QueueTest.cpp b/Final2/cpp/tests/QueueTest.cpp
index 9d655781c1..9d655781c1 100644
--- a/Final/cpp/tests/QueueTest.cpp
+++ b/Final2/cpp/tests/QueueTest.cpp
diff --git a/Final/cpp/tests/SimpleTestCaseBase.cpp b/Final2/cpp/tests/SimpleTestCaseBase.cpp
index 3603df3af3..3603df3af3 100644
--- a/Final/cpp/tests/SimpleTestCaseBase.cpp
+++ b/Final2/cpp/tests/SimpleTestCaseBase.cpp
diff --git a/Final/cpp/tests/SimpleTestCaseBase.h b/Final2/cpp/tests/SimpleTestCaseBase.h
index 66f87ae42a..66f87ae42a 100644
--- a/Final/cpp/tests/SimpleTestCaseBase.h
+++ b/Final2/cpp/tests/SimpleTestCaseBase.h
diff --git a/Final/cpp/tests/TestCase.h b/Final2/cpp/tests/TestCase.h
index ec151a6d84..ec151a6d84 100644
--- a/Final/cpp/tests/TestCase.h
+++ b/Final2/cpp/tests/TestCase.h
diff --git a/Final/cpp/tests/TestOptions.h b/Final2/cpp/tests/TestOptions.h
index 7031efc266..7031efc266 100644
--- a/Final/cpp/tests/TestOptions.h
+++ b/Final2/cpp/tests/TestOptions.h
diff --git a/Final/cpp/tests/TestUtils.cpp b/Final2/cpp/tests/TestUtils.cpp
index 0b517a4339..0b517a4339 100644
--- a/Final/cpp/tests/TestUtils.cpp
+++ b/Final2/cpp/tests/TestUtils.cpp
diff --git a/Final/cpp/tests/TestUtils.h b/Final2/cpp/tests/TestUtils.h
index 1178a4e06f..1178a4e06f 100644
--- a/Final/cpp/tests/TestUtils.h
+++ b/Final2/cpp/tests/TestUtils.h
diff --git a/Final/cpp/tests/TopicExchangeTest.cpp b/Final2/cpp/tests/TopicExchangeTest.cpp
index 4ba9cdd6e5..4ba9cdd6e5 100644
--- a/Final/cpp/tests/TopicExchangeTest.cpp
+++ b/Final2/cpp/tests/TopicExchangeTest.cpp
diff --git a/Final/cpp/tests/TxAckTest.cpp b/Final2/cpp/tests/TxAckTest.cpp
index 7d5b8a838a..7d5b8a838a 100644
--- a/Final/cpp/tests/TxAckTest.cpp
+++ b/Final2/cpp/tests/TxAckTest.cpp
diff --git a/Final/cpp/tests/TxBufferTest.cpp b/Final2/cpp/tests/TxBufferTest.cpp
index 0573ad15b0..0573ad15b0 100644
--- a/Final/cpp/tests/TxBufferTest.cpp
+++ b/Final2/cpp/tests/TxBufferTest.cpp
diff --git a/Final/cpp/tests/TxPublishTest.cpp b/Final2/cpp/tests/TxPublishTest.cpp
index 3542e08f45..3542e08f45 100644
--- a/Final/cpp/tests/TxPublishTest.cpp
+++ b/Final2/cpp/tests/TxPublishTest.cpp
diff --git a/Final/cpp/tests/ValueTest.cpp b/Final2/cpp/tests/ValueTest.cpp
index a3f9ec2541..a3f9ec2541 100644
--- a/Final/cpp/tests/ValueTest.cpp
+++ b/Final2/cpp/tests/ValueTest.cpp
diff --git a/Final/cpp/tests/client_test.cpp b/Final2/cpp/tests/client_test.cpp
index a5cc64d1e4..a5cc64d1e4 100644
--- a/Final/cpp/tests/client_test.cpp
+++ b/Final2/cpp/tests/client_test.cpp
diff --git a/Final/cpp/tests/daemon_test b/Final2/cpp/tests/daemon_test
index 05e9ed88a0..05e9ed88a0 100755
--- a/Final/cpp/tests/daemon_test
+++ b/Final2/cpp/tests/daemon_test
diff --git a/Final/cpp/tests/echo_service.cpp b/Final2/cpp/tests/echo_service.cpp
index 666c8cfa46..666c8cfa46 100644
--- a/Final/cpp/tests/echo_service.cpp
+++ b/Final2/cpp/tests/echo_service.cpp
diff --git a/Final/cpp/tests/env b/Final2/cpp/tests/env
index 2d88077ae5..2d88077ae5 100755
--- a/Final/cpp/tests/env
+++ b/Final2/cpp/tests/env
diff --git a/Final/cpp/tests/examples.Makefile b/Final2/cpp/tests/examples.Makefile
index 4a0fd808a1..4a0fd808a1 100644
--- a/Final/cpp/tests/examples.Makefile
+++ b/Final2/cpp/tests/examples.Makefile
diff --git a/Final/cpp/tests/examples.README b/Final2/cpp/tests/examples.README
index 65f908c249..65f908c249 100644
--- a/Final/cpp/tests/examples.README
+++ b/Final2/cpp/tests/examples.README
diff --git a/Final/cpp/tests/interop_runner.cpp b/Final2/cpp/tests/interop_runner.cpp
index 7cb9f1ead5..7cb9f1ead5 100644
--- a/Final/cpp/tests/interop_runner.cpp
+++ b/Final2/cpp/tests/interop_runner.cpp
diff --git a/Final/cpp/tests/qpid_test_plugin.h b/Final2/cpp/tests/qpid_test_plugin.h
index b2f4a8ffed..b2f4a8ffed 100644
--- a/Final/cpp/tests/qpid_test_plugin.h
+++ b/Final2/cpp/tests/qpid_test_plugin.h
diff --git a/Final/cpp/tests/run-python-tests b/Final2/cpp/tests/run-python-tests
index 5148f644eb..5148f644eb 100755
--- a/Final/cpp/tests/run-python-tests
+++ b/Final2/cpp/tests/run-python-tests
diff --git a/Final/cpp/tests/run-system-tests b/Final2/cpp/tests/run-system-tests
index 2f2728da32..2f2728da32 100755
--- a/Final/cpp/tests/run-system-tests
+++ b/Final2/cpp/tests/run-system-tests
diff --git a/Final/cpp/tests/run-unit-tests b/Final2/cpp/tests/run-unit-tests
index 27e88a5d9d..27e88a5d9d 100755
--- a/Final/cpp/tests/run-unit-tests
+++ b/Final2/cpp/tests/run-unit-tests
diff --git a/Final/cpp/tests/setup b/Final2/cpp/tests/setup
index f46435864b..f46435864b 100644
--- a/Final/cpp/tests/setup
+++ b/Final2/cpp/tests/setup
diff --git a/Final/cpp/tests/topic_listener.cpp b/Final2/cpp/tests/topic_listener.cpp
index 7a32373492..7a32373492 100644
--- a/Final/cpp/tests/topic_listener.cpp
+++ b/Final2/cpp/tests/topic_listener.cpp
diff --git a/Final/cpp/tests/topic_publisher.cpp b/Final2/cpp/tests/topic_publisher.cpp
index 31e5fc3fc2..31e5fc3fc2 100644
--- a/Final/cpp/tests/topic_publisher.cpp
+++ b/Final2/cpp/tests/topic_publisher.cpp
diff --git a/Final/cpp/tests/topicall b/Final2/cpp/tests/topicall
index 5f80955309..5f80955309 100755
--- a/Final/cpp/tests/topicall
+++ b/Final2/cpp/tests/topicall
diff --git a/Final/cpp/tests/topictest b/Final2/cpp/tests/topictest
index 28af55951e..28af55951e 100755
--- a/Final/cpp/tests/topictest
+++ b/Final2/cpp/tests/topictest
diff --git a/Final/cpp/versions b/Final2/cpp/versions
index 2aa52bf877..2aa52bf877 100755
--- a/Final/cpp/versions
+++ b/Final2/cpp/versions
diff --git a/Final/dotnet/LICENSE.txt b/Final2/dotnet/LICENSE.txt
index 6b0b1270ff..6b0b1270ff 100644
--- a/Final/dotnet/LICENSE.txt
+++ b/Final2/dotnet/LICENSE.txt
diff --git a/Final/dotnet/NOTICE.txt b/Final2/dotnet/NOTICE.txt
index 910974b01c..910974b01c 100644
--- a/Final/dotnet/NOTICE.txt
+++ b/Final2/dotnet/NOTICE.txt
diff --git a/Final/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs b/Final2/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
index 1191d49954..1191d49954 100644
--- a/Final/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
+++ b/Final2/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
diff --git a/Final/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj b/Final2/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
index c3459aff29..c3459aff29 100644
--- a/Final/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
+++ b/Final2/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
diff --git a/Final/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs b/Final2/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs
index 9af8801627..9af8801627 100644
--- a/Final/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs
+++ b/Final2/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs
diff --git a/Final/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs b/Final2/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs
index 071aa23830..071aa23830 100644
--- a/Final/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs
+++ b/Final2/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs
diff --git a/Final/dotnet/Qpid.Buffer.Tests/default.build b/Final2/dotnet/Qpid.Buffer.Tests/default.build
index 688633fc11..688633fc11 100644
--- a/Final/dotnet/Qpid.Buffer.Tests/default.build
+++ b/Final2/dotnet/Qpid.Buffer.Tests/default.build
diff --git a/Final/dotnet/Qpid.Buffer/BufferOverflowException.cs b/Final2/dotnet/Qpid.Buffer/BufferOverflowException.cs
index 5a2fff74a7..5a2fff74a7 100644
--- a/Final/dotnet/Qpid.Buffer/BufferOverflowException.cs
+++ b/Final2/dotnet/Qpid.Buffer/BufferOverflowException.cs
diff --git a/Final/dotnet/Qpid.Buffer/BufferUnderflowException.cs b/Final2/dotnet/Qpid.Buffer/BufferUnderflowException.cs
index 13939b77a8..13939b77a8 100644
--- a/Final/dotnet/Qpid.Buffer/BufferUnderflowException.cs
+++ b/Final2/dotnet/Qpid.Buffer/BufferUnderflowException.cs
diff --git a/Final/dotnet/Qpid.Buffer/ByteBuffer.cs b/Final2/dotnet/Qpid.Buffer/ByteBuffer.cs
index 67f0edd440..67f0edd440 100644
--- a/Final/dotnet/Qpid.Buffer/ByteBuffer.cs
+++ b/Final2/dotnet/Qpid.Buffer/ByteBuffer.cs
diff --git a/Final/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs b/Final2/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs
index 4c2856c333..4c2856c333 100644
--- a/Final/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs
+++ b/Final2/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs
diff --git a/Final/dotnet/Qpid.Buffer/IByteBufferAllocator.cs b/Final2/dotnet/Qpid.Buffer/IByteBufferAllocator.cs
index 0f457df065..0f457df065 100644
--- a/Final/dotnet/Qpid.Buffer/IByteBufferAllocator.cs
+++ b/Final2/dotnet/Qpid.Buffer/IByteBufferAllocator.cs
diff --git a/Final/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs b/Final2/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
index 4dd92ccdc2..4dd92ccdc2 100644
--- a/Final/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
+++ b/Final2/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
diff --git a/Final/dotnet/Qpid.Buffer/Qpid.Buffer.csproj b/Final2/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
index 9320438f6f..9320438f6f 100644
--- a/Final/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
+++ b/Final2/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
diff --git a/Final/dotnet/Qpid.Buffer/SimpleByteBuffer.cs b/Final2/dotnet/Qpid.Buffer/SimpleByteBuffer.cs
index d3b7245cb1..d3b7245cb1 100644
--- a/Final/dotnet/Qpid.Buffer/SimpleByteBuffer.cs
+++ b/Final2/dotnet/Qpid.Buffer/SimpleByteBuffer.cs
diff --git a/Final/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs b/Final2/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
index e772e59ae3..e772e59ae3 100644
--- a/Final/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
+++ b/Final2/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
diff --git a/Final/dotnet/Qpid.Buffer/SlicedByteBuffer.cs b/Final2/dotnet/Qpid.Buffer/SlicedByteBuffer.cs
index c27b7949b6..c27b7949b6 100644
--- a/Final/dotnet/Qpid.Buffer/SlicedByteBuffer.cs
+++ b/Final2/dotnet/Qpid.Buffer/SlicedByteBuffer.cs
diff --git a/Final/dotnet/Qpid.Buffer/default.build b/Final2/dotnet/Qpid.Buffer/default.build
index c2d36d15e6..c2d36d15e6 100644
--- a/Final/dotnet/Qpid.Buffer/default.build
+++ b/Final2/dotnet/Qpid.Buffer/default.build
diff --git a/Final/dotnet/Qpid.Client.Tests/App.config b/Final2/dotnet/Qpid.Client.Tests/App.config
index fd7c412a57..fd7c412a57 100644
--- a/Final/dotnet/Qpid.Client.Tests/App.config
+++ b/Final2/dotnet/Qpid.Client.Tests/App.config
diff --git a/Final/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs b/Final2/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs
index 8e8d8ced3b..8e8d8ced3b 100644
--- a/Final/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs b/Final2/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs
index c27aa9a503..c27aa9a503 100644
--- a/Final/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs b/Final2/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs
index a9a39f87f8..a9a39f87f8 100644
--- a/Final/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs b/Final2/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs
index 9f91958028..9f91958028 100644
--- a/Final/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs b/Final2/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs
index f3ce695de8..f3ce695de8 100644
--- a/Final/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs b/Final2/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs
index 1211196541..1211196541 100644
--- a/Final/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs b/Final2/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs
index dc3b436a41..dc3b436a41 100644
--- a/Final/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs b/Final2/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
index b3648391c1..b3648391c1 100644
--- a/Final/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj b/Final2/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
index 16f73ea621..16f73ea621 100644
--- a/Final/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
+++ b/Final2/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
diff --git a/Final/dotnet/Qpid.Client.Tests/Qpid.Common.DLL.config b/Final2/dotnet/Qpid.Client.Tests/Qpid.Common.DLL.config
index e1300549d7..e1300549d7 100644
--- a/Final/dotnet/Qpid.Client.Tests/Qpid.Common.DLL.config
+++ b/Final2/dotnet/Qpid.Client.Tests/Qpid.Common.DLL.config
diff --git a/Final/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs b/Final2/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs
index 1345511cbf..1345511cbf 100644
--- a/Final/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs b/Final2/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs
index f299812989..f299812989 100644
--- a/Final/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs b/Final2/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
index 165da62828..165da62828 100644
--- a/Final/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs b/Final2/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
index e1c61f9059..e1c61f9059 100644
--- a/Final/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/default.build b/Final2/dotnet/Qpid.Client.Tests/default.build
index d1b1496a8b..d1b1496a8b 100644
--- a/Final/dotnet/Qpid.Client.Tests/default.build
+++ b/Final2/dotnet/Qpid.Client.Tests/default.build
diff --git a/Final/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs b/Final2/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
index 15e2eb6757..15e2eb6757 100644
--- a/Final/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs b/Final2/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs
index a667265ba4..a667265ba4 100644
--- a/Final/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs b/Final2/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs
index 7ff686e1cb..7ff686e1cb 100644
--- a/Final/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs b/Final2/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs
index 657c512a67..657c512a67 100644
--- a/Final/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs b/Final2/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs
index 937730576d..937730576d 100644
--- a/Final/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/interop/TestClient.cs b/Final2/dotnet/Qpid.Client.Tests/interop/TestClient.cs
index 3edd28a892..3edd28a892 100644
--- a/Final/dotnet/Qpid.Client.Tests/interop/TestClient.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/interop/TestClient.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/interop/TopicListener.cs b/Final2/dotnet/Qpid.Client.Tests/interop/TopicListener.cs
index 13141d52b8..13141d52b8 100644
--- a/Final/dotnet/Qpid.Client.Tests/interop/TopicListener.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/interop/TopicListener.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs b/Final2/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs
index ef5d39f0bc..ef5d39f0bc 100644
--- a/Final/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/lib/nunit/nunit-licence.txt b/Final2/dotnet/Qpid.Client.Tests/lib/nunit/nunit-licence.txt
index b2316295d3..b2316295d3 100644
--- a/Final/dotnet/Qpid.Client.Tests/lib/nunit/nunit-licence.txt
+++ b/Final2/dotnet/Qpid.Client.Tests/lib/nunit/nunit-licence.txt
diff --git a/Final/dotnet/Qpid.Client.Tests/lib/nunit/nunit.framework.dll b/Final2/dotnet/Qpid.Client.Tests/lib/nunit/nunit.framework.dll
index 53666e74c9..53666e74c9 100644
--- a/Final/dotnet/Qpid.Client.Tests/lib/nunit/nunit.framework.dll
+++ b/Final2/dotnet/Qpid.Client.Tests/lib/nunit/nunit.framework.dll
diff --git a/Final/dotnet/Qpid.Client.Tests/log4net.config b/Final2/dotnet/Qpid.Client.Tests/log4net.config
index 8753c9c431..8753c9c431 100644
--- a/Final/dotnet/Qpid.Client.Tests/log4net.config
+++ b/Final2/dotnet/Qpid.Client.Tests/log4net.config
diff --git a/Final/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs b/Final2/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs
index cbc93ae2fe..cbc93ae2fe 100644
--- a/Final/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs b/Final2/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs
index f35fb2dac9..f35fb2dac9 100644
--- a/Final/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs b/Final2/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs
index bcf57e586e..bcf57e586e 100644
--- a/Final/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs
diff --git a/Final/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs b/Final2/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
index 3c9f8dd4e2..3c9f8dd4e2 100644
--- a/Final/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
+++ b/Final2/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
diff --git a/Final/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs b/Final2/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs
index badaa48111..badaa48111 100644
--- a/Final/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs
+++ b/Final2/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs
diff --git a/Final/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs b/Final2/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs
index 17f911fb6d..17f911fb6d 100644
--- a/Final/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs
+++ b/Final2/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs
diff --git a/Final/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs b/Final2/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs
index 19da2fceb9..19da2fceb9 100644
--- a/Final/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs
+++ b/Final2/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs
diff --git a/Final/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs b/Final2/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
index 00f366b5a9..00f366b5a9 100644
--- a/Final/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
+++ b/Final2/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
diff --git a/Final/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj b/Final2/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj
index a12b6695e2..a12b6695e2 100644
--- a/Final/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj
+++ b/Final2/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj
diff --git a/Final/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp b/Final2/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp
index 8f95000a4a..8f95000a4a 100644
--- a/Final/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp
+++ b/Final2/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp
diff --git a/Final/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs b/Final2/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs
index 6382eaaf39..6382eaaf39 100644
--- a/Final/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs
+++ b/Final2/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs
diff --git a/Final/dotnet/Qpid.Client/Client/AMQConnection.cs b/Final2/dotnet/Qpid.Client/Client/AMQConnection.cs
index d74cf6b5e4..d74cf6b5e4 100644
--- a/Final/dotnet/Qpid.Client/Client/AMQConnection.cs
+++ b/Final2/dotnet/Qpid.Client/Client/AMQConnection.cs
diff --git a/Final/dotnet/Qpid.Client/Client/AMQConnectionException.cs b/Final2/dotnet/Qpid.Client/Client/AMQConnectionException.cs
index c8a48814bb..c8a48814bb 100644
--- a/Final/dotnet/Qpid.Client/Client/AMQConnectionException.cs
+++ b/Final2/dotnet/Qpid.Client/Client/AMQConnectionException.cs
diff --git a/Final/dotnet/Qpid.Client/Client/AMQDestination.cs b/Final2/dotnet/Qpid.Client/Client/AMQDestination.cs
index 07ce3c2354..07ce3c2354 100644
--- a/Final/dotnet/Qpid.Client/Client/AMQDestination.cs
+++ b/Final2/dotnet/Qpid.Client/Client/AMQDestination.cs
diff --git a/Final/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs b/Final2/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs
index 0d93176734..0d93176734 100644
--- a/Final/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs
+++ b/Final2/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs
diff --git a/Final/dotnet/Qpid.Client/Client/AMQNoRouteException.cs b/Final2/dotnet/Qpid.Client/Client/AMQNoRouteException.cs
index bde3cdd989..bde3cdd989 100644
--- a/Final/dotnet/Qpid.Client/Client/AMQNoRouteException.cs
+++ b/Final2/dotnet/Qpid.Client/Client/AMQNoRouteException.cs
diff --git a/Final/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs b/Final2/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
index 591c5b941f..591c5b941f 100644
--- a/Final/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
+++ b/Final2/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
diff --git a/Final/dotnet/Qpid.Client/Client/AmqChannel.cs b/Final2/dotnet/Qpid.Client/Client/AmqChannel.cs
index 84f08729dd..84f08729dd 100644
--- a/Final/dotnet/Qpid.Client/Client/AmqChannel.cs
+++ b/Final2/dotnet/Qpid.Client/Client/AmqChannel.cs
diff --git a/Final/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs b/Final2/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
index fd4ff79505..fd4ff79505 100644
--- a/Final/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
+++ b/Final2/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
diff --git a/Final/dotnet/Qpid.Client/Client/BasicMessageProducer.cs b/Final2/dotnet/Qpid.Client/Client/BasicMessageProducer.cs
index ca6d2abee5..ca6d2abee5 100644
--- a/Final/dotnet/Qpid.Client/Client/BasicMessageProducer.cs
+++ b/Final2/dotnet/Qpid.Client/Client/BasicMessageProducer.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Closeable.cs b/Final2/dotnet/Qpid.Client/Client/Closeable.cs
index d70f75ee6b..d70f75ee6b 100644
--- a/Final/dotnet/Qpid.Client/Client/Closeable.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Closeable.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs b/Final2/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs
index ae9225a53a..ae9225a53a 100644
--- a/Final/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs b/Final2/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs
index b21486bfa8..b21486bfa8 100644
--- a/Final/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs
+++ b/Final2/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Failover/FailoverException.cs b/Final2/dotnet/Qpid.Client/Client/Failover/FailoverException.cs
index 7013746414..7013746414 100644
--- a/Final/dotnet/Qpid.Client/Client/Failover/FailoverException.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Failover/FailoverException.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs b/Final2/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs
index 83c69b7d25..83c69b7d25 100644
--- a/Final/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Failover/FailoverState.cs b/Final2/dotnet/Qpid.Client/Client/Failover/FailoverState.cs
index 3058cdcd69..3058cdcd69 100644
--- a/Final/dotnet/Qpid.Client/Client/Failover/FailoverState.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Failover/FailoverState.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs b/Final2/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs
index afa5301f39..afa5301f39 100644
--- a/Final/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs b/Final2/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs
index def1e78e8c..def1e78e8c 100644
--- a/Final/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs b/Final2/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs
index f413dfc9c6..f413dfc9c6 100644
--- a/Final/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs b/Final2/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs
index 9ed09a0d01..9ed09a0d01 100644
--- a/Final/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs b/Final2/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs
index 66cff3bc65..66cff3bc65 100644
--- a/Final/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs b/Final2/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs
index 038da15731..038da15731 100644
--- a/Final/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs b/Final2/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs
index a12e4ead60..a12e4ead60 100644
--- a/Final/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs b/Final2/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs
index 08cc580b17..08cc580b17 100644
--- a/Final/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs b/Final2/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs
index 9333d4d0a6..9333d4d0a6 100644
--- a/Final/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs b/Final2/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
index 1710c19080..1710c19080 100644
--- a/Final/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs b/Final2/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs
index 15a1d908b7..15a1d908b7 100644
--- a/Final/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs b/Final2/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs
index 7290d758f8..7290d758f8 100644
--- a/Final/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs b/Final2/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs
index 8bde707b00..8bde707b00 100644
--- a/Final/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Message/AMQMessage.cs b/Final2/dotnet/Qpid.Client/Client/Message/AMQMessage.cs
index e58de2ab96..e58de2ab96 100644
--- a/Final/dotnet/Qpid.Client/Client/Message/AMQMessage.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Message/AMQMessage.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs b/Final2/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs
index f352d62c11..f352d62c11 100644
--- a/Final/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs b/Final2/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
index 34b47137e5..34b47137e5 100644
--- a/Final/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs b/Final2/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs
index bed379290f..bed379290f 100644
--- a/Final/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs b/Final2/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs
index fdb5e14aa6..fdb5e14aa6 100644
--- a/Final/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs b/Final2/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
index fb3efb1b0f..fb3efb1b0f 100644
--- a/Final/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs b/Final2/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs
index 3cc96cbddc..3cc96cbddc 100644
--- a/Final/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs b/Final2/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs
index d27c1df853..d27c1df853 100644
--- a/Final/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs b/Final2/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
index 24aef92aa5..24aef92aa5 100644
--- a/Final/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs b/Final2/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs
index 79871e85ca..79871e85ca 100644
--- a/Final/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs b/Final2/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs
index 4317ef3474..4317ef3474 100644
--- a/Final/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs b/Final2/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs
index d329712334..d329712334 100644
--- a/Final/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs b/Final2/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs
index a7ce808862..a7ce808862 100644
--- a/Final/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs b/Final2/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs
index c51538b70e..c51538b70e 100644
--- a/Final/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs b/Final2/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs
index e0fa22e7a3..e0fa22e7a3 100644
--- a/Final/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs b/Final2/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs
index 6841b46f54..6841b46f54 100644
--- a/Final/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs b/Final2/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs
index e3298200c4..e3298200c4 100644
--- a/Final/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs b/Final2/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs
index 3b53f015f8..3b53f015f8 100644
--- a/Final/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs b/Final2/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs
index 9cc9f8cee5..9cc9f8cee5 100644
--- a/Final/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs b/Final2/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs
index b5450d00f7..b5450d00f7 100644
--- a/Final/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs b/Final2/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs
index 8cdc1dbba9..8cdc1dbba9 100644
--- a/Final/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs b/Final2/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs
index 11918f1ea2..11918f1ea2 100644
--- a/Final/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs
diff --git a/Final/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs b/Final2/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
index ede8966f37..ede8966f37 100644
--- a/Final/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
+++ b/Final2/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs b/Final2/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs
index 85be927ff4..85be927ff4 100644
--- a/Final/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs b/Final2/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs
index 2560c1d96b..2560c1d96b 100644
--- a/Final/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs b/Final2/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs
index 489d4d1665..489d4d1665 100644
--- a/Final/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/SslOptions.cs b/Final2/dotnet/Qpid.Client/Client/SslOptions.cs
index d637101000..d637101000 100644
--- a/Final/dotnet/Qpid.Client/Client/SslOptions.cs
+++ b/Final2/dotnet/Qpid.Client/Client/SslOptions.cs
diff --git a/Final/dotnet/Qpid.Client/Client/State/AMQState.cs b/Final2/dotnet/Qpid.Client/Client/State/AMQState.cs
index 67f8427fb2..67f8427fb2 100644
--- a/Final/dotnet/Qpid.Client/Client/State/AMQState.cs
+++ b/Final2/dotnet/Qpid.Client/Client/State/AMQState.cs
diff --git a/Final/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs b/Final2/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs
index a464bbb6f5..a464bbb6f5 100644
--- a/Final/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs
+++ b/Final2/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs
diff --git a/Final/dotnet/Qpid.Client/Client/State/AMQStateManager.cs b/Final2/dotnet/Qpid.Client/Client/State/AMQStateManager.cs
index 881e01e697..881e01e697 100644
--- a/Final/dotnet/Qpid.Client/Client/State/AMQStateManager.cs
+++ b/Final2/dotnet/Qpid.Client/Client/State/AMQStateManager.cs
diff --git a/Final/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs b/Final2/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs
index 31e4b5046d..31e4b5046d 100644
--- a/Final/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs
+++ b/Final2/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs
diff --git a/Final/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs b/Final2/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs
index 0874f39665..0874f39665 100644
--- a/Final/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs
+++ b/Final2/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs
diff --git a/Final/dotnet/Qpid.Client/Client/State/IStateListener.cs b/Final2/dotnet/Qpid.Client/Client/State/IStateListener.cs
index edd7382f93..edd7382f93 100644
--- a/Final/dotnet/Qpid.Client/Client/State/IStateListener.cs
+++ b/Final2/dotnet/Qpid.Client/Client/State/IStateListener.cs
diff --git a/Final/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs b/Final2/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs
index 81de622617..81de622617 100644
--- a/Final/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs
+++ b/Final2/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs
diff --git a/Final/dotnet/Qpid.Client/Client/State/StateWaiter.cs b/Final2/dotnet/Qpid.Client/Client/State/StateWaiter.cs
index e739d0cb44..e739d0cb44 100644
--- a/Final/dotnet/Qpid.Client/Client/State/StateWaiter.cs
+++ b/Final2/dotnet/Qpid.Client/Client/State/StateWaiter.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs b/Final2/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs
index dd0bb404cb..dd0bb404cb 100644
--- a/Final/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs b/Final2/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs
index dc72846bbe..dc72846bbe 100644
--- a/Final/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs b/Final2/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs
index 35806f2a6e..35806f2a6e 100644
--- a/Final/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs b/Final2/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs
index 0b59ee8799..0b59ee8799 100644
--- a/Final/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs b/Final2/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs
index 592dff3a19..592dff3a19 100644
--- a/Final/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs b/Final2/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs
index 7195b3ab04..7195b3ab04 100644
--- a/Final/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Transport/ITransport.cs b/Final2/dotnet/Qpid.Client/Client/Transport/ITransport.cs
index 693a9a9534..693a9a9534 100644
--- a/Final/dotnet/Qpid.Client/Client/Transport/ITransport.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Transport/ITransport.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Transport/IoHandler.cs b/Final2/dotnet/Qpid.Client/Client/Transport/IoHandler.cs
index 9ac513069e..9ac513069e 100644
--- a/Final/dotnet/Qpid.Client/Client/Transport/IoHandler.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Transport/IoHandler.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs b/Final2/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs
index 357aab0f45..357aab0f45 100644
--- a/Final/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs b/Final2/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs
index a1aa889ba0..a1aa889ba0 100644
--- a/Final/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs b/Final2/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
index 8a16f9a675..8a16f9a675 100644
--- a/Final/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs b/Final2/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs
index 077f69541f..077f69541f 100644
--- a/Final/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs b/Final2/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs
index 3d5d2898cf..3d5d2898cf 100644
--- a/Final/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs b/Final2/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs
index 83f7287e9b..83f7287e9b 100644
--- a/Final/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs b/Final2/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs
index 708edde48c..708edde48c 100644
--- a/Final/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs
diff --git a/Final/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs b/Final2/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs
index 87bb2a2859..87bb2a2859 100644
--- a/Final/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs
+++ b/Final2/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs
diff --git a/Final/dotnet/Qpid.Client/Properties/AssemblyInfo.cs b/Final2/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
index 8722a02db9..8722a02db9 100644
--- a/Final/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
+++ b/Final2/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
diff --git a/Final/dotnet/Qpid.Client/Qpid.Client.csproj b/Final2/dotnet/Qpid.Client/Qpid.Client.csproj
index 9294d76764..9294d76764 100644
--- a/Final/dotnet/Qpid.Client/Qpid.Client.csproj
+++ b/Final2/dotnet/Qpid.Client/Qpid.Client.csproj
diff --git a/Final/dotnet/Qpid.Client/default.build b/Final2/dotnet/Qpid.Client/default.build
index 14e457203e..14e457203e 100644
--- a/Final/dotnet/Qpid.Client/default.build
+++ b/Final2/dotnet/Qpid.Client/default.build
diff --git a/Final/dotnet/Qpid.Client/qms/BrokerInfo.cs b/Final2/dotnet/Qpid.Client/qms/BrokerInfo.cs
index 93c00af6e0..93c00af6e0 100644
--- a/Final/dotnet/Qpid.Client/qms/BrokerInfo.cs
+++ b/Final2/dotnet/Qpid.Client/qms/BrokerInfo.cs
diff --git a/Final/dotnet/Qpid.Client/qms/ConnectionInfo.cs b/Final2/dotnet/Qpid.Client/qms/ConnectionInfo.cs
index 4d3f7698b5..4d3f7698b5 100644
--- a/Final/dotnet/Qpid.Client/qms/ConnectionInfo.cs
+++ b/Final2/dotnet/Qpid.Client/qms/ConnectionInfo.cs
diff --git a/Final/dotnet/Qpid.Client/qms/FailoverPolicy.cs b/Final2/dotnet/Qpid.Client/qms/FailoverPolicy.cs
index 179a695bf9..179a695bf9 100644
--- a/Final/dotnet/Qpid.Client/qms/FailoverPolicy.cs
+++ b/Final2/dotnet/Qpid.Client/qms/FailoverPolicy.cs
diff --git a/Final/dotnet/Qpid.Client/qms/UrlSyntaxException.cs b/Final2/dotnet/Qpid.Client/qms/UrlSyntaxException.cs
index ab3de325d4..ab3de325d4 100644
--- a/Final/dotnet/Qpid.Client/qms/UrlSyntaxException.cs
+++ b/Final2/dotnet/Qpid.Client/qms/UrlSyntaxException.cs
diff --git a/Final/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs b/Final2/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs
index f32b275e84..f32b275e84 100644
--- a/Final/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs
+++ b/Final2/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs
diff --git a/Final/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs b/Final2/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
index 8103940fb4..8103940fb4 100644
--- a/Final/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
+++ b/Final2/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
diff --git a/Final/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs b/Final2/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
index 5e502b897e..5e502b897e 100644
--- a/Final/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
+++ b/Final2/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
diff --git a/Final/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs b/Final2/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs
index 6cfd75c851..6cfd75c851 100644
--- a/Final/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs
+++ b/Final2/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs
diff --git a/Final/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs b/Final2/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs
index 78276202d6..78276202d6 100644
--- a/Final/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs
+++ b/Final2/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs
diff --git a/Final/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs b/Final2/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs
index 5892673440..5892673440 100644
--- a/Final/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs
+++ b/Final2/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs
diff --git a/Final/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs b/Final2/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs
index 9e333d670f..9e333d670f 100644
--- a/Final/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs
+++ b/Final2/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs
diff --git a/Final/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs b/Final2/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs
index 75ae23592b..75ae23592b 100644
--- a/Final/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs
+++ b/Final2/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs
diff --git a/Final/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs b/Final2/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs
index 3001d1a963..3001d1a963 100644
--- a/Final/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs
+++ b/Final2/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs
diff --git a/Final/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs b/Final2/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs
index ab01864bc0..ab01864bc0 100644
--- a/Final/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs
+++ b/Final2/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs
diff --git a/Final/dotnet/Qpid.Codec/IProtocolCodecFactory.cs b/Final2/dotnet/Qpid.Codec/IProtocolCodecFactory.cs
index a26b91b16c..a26b91b16c 100644
--- a/Final/dotnet/Qpid.Codec/IProtocolCodecFactory.cs
+++ b/Final2/dotnet/Qpid.Codec/IProtocolCodecFactory.cs
diff --git a/Final/dotnet/Qpid.Codec/IProtocolDecoder.cs b/Final2/dotnet/Qpid.Codec/IProtocolDecoder.cs
index 3cccb0f7da..3cccb0f7da 100644
--- a/Final/dotnet/Qpid.Codec/IProtocolDecoder.cs
+++ b/Final2/dotnet/Qpid.Codec/IProtocolDecoder.cs
diff --git a/Final/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs b/Final2/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs
index 77a1aea9db..77a1aea9db 100644
--- a/Final/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs
+++ b/Final2/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs
diff --git a/Final/dotnet/Qpid.Codec/IProtocolEncoder.cs b/Final2/dotnet/Qpid.Codec/IProtocolEncoder.cs
index a16f2ad9d6..a16f2ad9d6 100644
--- a/Final/dotnet/Qpid.Codec/IProtocolEncoder.cs
+++ b/Final2/dotnet/Qpid.Codec/IProtocolEncoder.cs
diff --git a/Final/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs b/Final2/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs
index 70f9be38dc..70f9be38dc 100644
--- a/Final/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs
+++ b/Final2/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs
diff --git a/Final/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs b/Final2/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
index aa1d6a662e..aa1d6a662e 100644
--- a/Final/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
+++ b/Final2/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
diff --git a/Final/dotnet/Qpid.Codec/ProtocolCodecException.cs b/Final2/dotnet/Qpid.Codec/ProtocolCodecException.cs
index 49678d2c11..49678d2c11 100644
--- a/Final/dotnet/Qpid.Codec/ProtocolCodecException.cs
+++ b/Final2/dotnet/Qpid.Codec/ProtocolCodecException.cs
diff --git a/Final/dotnet/Qpid.Codec/ProtocolDecoderException.cs b/Final2/dotnet/Qpid.Codec/ProtocolDecoderException.cs
index 8e7e6da145..8e7e6da145 100644
--- a/Final/dotnet/Qpid.Codec/ProtocolDecoderException.cs
+++ b/Final2/dotnet/Qpid.Codec/ProtocolDecoderException.cs
diff --git a/Final/dotnet/Qpid.Codec/ProtocolEncoderException.cs b/Final2/dotnet/Qpid.Codec/ProtocolEncoderException.cs
index ac565a308b..ac565a308b 100644
--- a/Final/dotnet/Qpid.Codec/ProtocolEncoderException.cs
+++ b/Final2/dotnet/Qpid.Codec/ProtocolEncoderException.cs
diff --git a/Final/dotnet/Qpid.Codec/Qpid.Codec.csproj b/Final2/dotnet/Qpid.Codec/Qpid.Codec.csproj
index ebe4681397..ebe4681397 100644
--- a/Final/dotnet/Qpid.Codec/Qpid.Codec.csproj
+++ b/Final2/dotnet/Qpid.Codec/Qpid.Codec.csproj
diff --git a/Final/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs b/Final2/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs
index 0a4ff10ff0..0a4ff10ff0 100644
--- a/Final/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs
+++ b/Final2/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs
diff --git a/Final/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs b/Final2/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs
index 2e4224ef98..2e4224ef98 100644
--- a/Final/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs
+++ b/Final2/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs
diff --git a/Final/dotnet/Qpid.Codec/default.build b/Final2/dotnet/Qpid.Codec/default.build
index db9e8d1166..db9e8d1166 100644
--- a/Final/dotnet/Qpid.Codec/default.build
+++ b/Final2/dotnet/Qpid.Codec/default.build
diff --git a/Final/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs b/Final2/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
index 32dcae60ae..32dcae60ae 100644
--- a/Final/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
+++ b/Final2/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
diff --git a/Final/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj b/Final2/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
index b51faf92c7..b51faf92c7 100644
--- a/Final/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
+++ b/Final2/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
diff --git a/Final/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs b/Final2/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs
index 03ed999999..03ed999999 100644
--- a/Final/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs
+++ b/Final2/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs
diff --git a/Final/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs b/Final2/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs
index dbbc98a2e6..dbbc98a2e6 100644
--- a/Final/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs
+++ b/Final2/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs
diff --git a/Final/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs b/Final2/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs
index ab4cb4409c..ab4cb4409c 100644
--- a/Final/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs
+++ b/Final2/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs
diff --git a/Final/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs b/Final2/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs
index 720d7697d3..720d7697d3 100644
--- a/Final/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs
+++ b/Final2/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs
diff --git a/Final/dotnet/Qpid.Common.Tests/default.build b/Final2/dotnet/Qpid.Common.Tests/default.build
index 00658bdbe2..00658bdbe2 100644
--- a/Final/dotnet/Qpid.Common.Tests/default.build
+++ b/Final2/dotnet/Qpid.Common.Tests/default.build
diff --git a/Final/dotnet/Qpid.Common/AMQChannelClosedException.cs b/Final2/dotnet/Qpid.Common/AMQChannelClosedException.cs
index 98c6966cd1..98c6966cd1 100644
--- a/Final/dotnet/Qpid.Common/AMQChannelClosedException.cs
+++ b/Final2/dotnet/Qpid.Common/AMQChannelClosedException.cs
diff --git a/Final/dotnet/Qpid.Common/AMQConnectionClosedException.cs b/Final2/dotnet/Qpid.Common/AMQConnectionClosedException.cs
index 136131144b..136131144b 100644
--- a/Final/dotnet/Qpid.Common/AMQConnectionClosedException.cs
+++ b/Final2/dotnet/Qpid.Common/AMQConnectionClosedException.cs
diff --git a/Final/dotnet/Qpid.Common/AMQDisconnectedException.cs b/Final2/dotnet/Qpid.Common/AMQDisconnectedException.cs
index b5c4d544cd..b5c4d544cd 100644
--- a/Final/dotnet/Qpid.Common/AMQDisconnectedException.cs
+++ b/Final2/dotnet/Qpid.Common/AMQDisconnectedException.cs
diff --git a/Final/dotnet/Qpid.Common/AMQException.cs b/Final2/dotnet/Qpid.Common/AMQException.cs
index f9f7158a26..f9f7158a26 100644
--- a/Final/dotnet/Qpid.Common/AMQException.cs
+++ b/Final2/dotnet/Qpid.Common/AMQException.cs
diff --git a/Final/dotnet/Qpid.Common/AMQInvalidArgumentException.cs b/Final2/dotnet/Qpid.Common/AMQInvalidArgumentException.cs
index 0fb4ddae99..0fb4ddae99 100644
--- a/Final/dotnet/Qpid.Common/AMQInvalidArgumentException.cs
+++ b/Final2/dotnet/Qpid.Common/AMQInvalidArgumentException.cs
diff --git a/Final/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs b/Final2/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
index 3f8dead94d..3f8dead94d 100644
--- a/Final/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
+++ b/Final2/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
diff --git a/Final/dotnet/Qpid.Common/AMQUndeliveredException.cs b/Final2/dotnet/Qpid.Common/AMQUndeliveredException.cs
index 70ad86c8a3..70ad86c8a3 100644
--- a/Final/dotnet/Qpid.Common/AMQUndeliveredException.cs
+++ b/Final2/dotnet/Qpid.Common/AMQUndeliveredException.cs
diff --git a/Final/dotnet/Qpid.Common/AssemblySettings.cs b/Final2/dotnet/Qpid.Common/AssemblySettings.cs
index 888de692e8..888de692e8 100644
--- a/Final/dotnet/Qpid.Common/AssemblySettings.cs
+++ b/Final2/dotnet/Qpid.Common/AssemblySettings.cs
diff --git a/Final/dotnet/Qpid.Common/Collections/BlockingQueue.cs b/Final2/dotnet/Qpid.Common/Collections/BlockingQueue.cs
index dcfacf8474..dcfacf8474 100644
--- a/Final/dotnet/Qpid.Common/Collections/BlockingQueue.cs
+++ b/Final2/dotnet/Qpid.Common/Collections/BlockingQueue.cs
diff --git a/Final/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs b/Final2/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs
index ea4526faaf..ea4526faaf 100644
--- a/Final/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs
+++ b/Final2/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs
diff --git a/Final/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs b/Final2/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs
index be92576951..be92576951 100644
--- a/Final/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs
+++ b/Final2/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs
diff --git a/Final/dotnet/Qpid.Common/Collections/LinkedHashtable.cs b/Final2/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
index 10ab5c674d..10ab5c674d 100644
--- a/Final/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
+++ b/Final2/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
diff --git a/Final/dotnet/Qpid.Common/Collections/SynchronousQueue.cs b/Final2/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
index 3c12df6067..3c12df6067 100644
--- a/Final/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
+++ b/Final2/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs b/Final2/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
index 7867650e50..7867650e50 100644
--- a/Final/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs b/Final2/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs
index e2645c630e..e2645c630e 100644
--- a/Final/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/AMQFrame.cs b/Final2/dotnet/Qpid.Common/Framing/AMQFrame.cs
index 912be72d30..912be72d30 100644
--- a/Final/dotnet/Qpid.Common/Framing/AMQFrame.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/AMQFrame.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs b/Final2/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs
index cda8c84ecf..cda8c84ecf 100644
--- a/Final/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/AMQMethodBody.cs b/Final2/dotnet/Qpid.Common/Framing/AMQMethodBody.cs
index a3c4337147..a3c4337147 100644
--- a/Final/dotnet/Qpid.Common/Framing/AMQMethodBody.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/AMQMethodBody.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs b/Final2/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs
index c1fd3f887a..c1fd3f887a 100644
--- a/Final/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs b/Final2/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs
index 379e5d00ba..379e5d00ba 100644
--- a/Final/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/AMQType.cs b/Final2/dotnet/Qpid.Common/Framing/AMQType.cs
index 618ab31d32..618ab31d32 100644
--- a/Final/dotnet/Qpid.Common/Framing/AMQType.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/AMQType.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/AMQTypeMap.cs b/Final2/dotnet/Qpid.Common/Framing/AMQTypeMap.cs
index ed38c203a9..ed38c203a9 100644
--- a/Final/dotnet/Qpid.Common/Framing/AMQTypeMap.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/AMQTypeMap.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/AMQTypedValue.cs b/Final2/dotnet/Qpid.Common/Framing/AMQTypedValue.cs
index 8d21a60831..8d21a60831 100644
--- a/Final/dotnet/Qpid.Common/Framing/AMQTypedValue.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/AMQTypedValue.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs b/Final2/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs
index 47db7b0887..47db7b0887 100644
--- a/Final/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs b/Final2/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs
index d2b7f606b2..d2b7f606b2 100644
--- a/Final/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/ContentBody.cs b/Final2/dotnet/Qpid.Common/Framing/ContentBody.cs
index 7a2142985d..7a2142985d 100644
--- a/Final/dotnet/Qpid.Common/Framing/ContentBody.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/ContentBody.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs b/Final2/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs
index 400b2aec08..400b2aec08 100644
--- a/Final/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs b/Final2/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs
index 82889c23c8..82889c23c8 100644
--- a/Final/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs b/Final2/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs
index c95a10871d..c95a10871d 100644
--- a/Final/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs b/Final2/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs
index bac5d10fd4..bac5d10fd4 100644
--- a/Final/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/EncodingUtils.cs b/Final2/dotnet/Qpid.Common/Framing/EncodingUtils.cs
index 4d424656f9..4d424656f9 100644
--- a/Final/dotnet/Qpid.Common/Framing/EncodingUtils.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/EncodingUtils.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/FieldTable.cs b/Final2/dotnet/Qpid.Common/Framing/FieldTable.cs
index 6567bf58ab..6567bf58ab 100644
--- a/Final/dotnet/Qpid.Common/Framing/FieldTable.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/FieldTable.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/HeartbeatBody.cs b/Final2/dotnet/Qpid.Common/Framing/HeartbeatBody.cs
index a8906f5ba8..a8906f5ba8 100644
--- a/Final/dotnet/Qpid.Common/Framing/HeartbeatBody.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/HeartbeatBody.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs b/Final2/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs
index 90e5c7768e..90e5c7768e 100644
--- a/Final/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/IBody.cs b/Final2/dotnet/Qpid.Common/Framing/IBody.cs
index 97b4459e5c..97b4459e5c 100644
--- a/Final/dotnet/Qpid.Common/Framing/IBody.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/IBody.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/IBodyFactory.cs b/Final2/dotnet/Qpid.Common/Framing/IBodyFactory.cs
index dd7960ddbe..dd7960ddbe 100644
--- a/Final/dotnet/Qpid.Common/Framing/IBodyFactory.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/IBodyFactory.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs b/Final2/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs
index 676d0910d4..676d0910d4 100644
--- a/Final/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/IDataBlock.cs b/Final2/dotnet/Qpid.Common/Framing/IDataBlock.cs
index c61ed90d10..c61ed90d10 100644
--- a/Final/dotnet/Qpid.Common/Framing/IDataBlock.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/IDataBlock.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs b/Final2/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs
index da8bf9fef9..da8bf9fef9 100644
--- a/Final/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs
diff --git a/Final/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs b/Final2/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
index a9f5697144..a9f5697144 100644
--- a/Final/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
+++ b/Final2/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
diff --git a/Final/dotnet/Qpid.Common/Properties/AssemblyInfo.cs b/Final2/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
index e876015bc3..e876015bc3 100644
--- a/Final/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
+++ b/Final2/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
diff --git a/Final/dotnet/Qpid.Common/Protocol/AMQConstant.cs b/Final2/dotnet/Qpid.Common/Protocol/AMQConstant.cs
index fcf94c29f4..fcf94c29f4 100644
--- a/Final/dotnet/Qpid.Common/Protocol/AMQConstant.cs
+++ b/Final2/dotnet/Qpid.Common/Protocol/AMQConstant.cs
diff --git a/Final/dotnet/Qpid.Common/Qpid.Common.csproj b/Final2/dotnet/Qpid.Common/Qpid.Common.csproj
index d15c1887b7..d15c1887b7 100644
--- a/Final/dotnet/Qpid.Common/Qpid.Common.csproj
+++ b/Final2/dotnet/Qpid.Common/Qpid.Common.csproj
diff --git a/Final/dotnet/Qpid.Common/amqp.xml b/Final2/dotnet/Qpid.Common/amqp.xml
index 8ad0f17a2c..8ad0f17a2c 100644
--- a/Final/dotnet/Qpid.Common/amqp.xml
+++ b/Final2/dotnet/Qpid.Common/amqp.xml
diff --git a/Final/dotnet/Qpid.Common/build.xml b/Final2/dotnet/Qpid.Common/build.xml
index b6a8fb63b9..b6a8fb63b9 100644
--- a/Final/dotnet/Qpid.Common/build.xml
+++ b/Final2/dotnet/Qpid.Common/build.xml
diff --git a/Final/dotnet/Qpid.Common/default.build b/Final2/dotnet/Qpid.Common/default.build
index 36055b9ca9..36055b9ca9 100644
--- a/Final/dotnet/Qpid.Common/default.build
+++ b/Final2/dotnet/Qpid.Common/default.build
diff --git a/Final/dotnet/Qpid.Common/lib/log4net/log4net-licence.txt b/Final2/dotnet/Qpid.Common/lib/log4net/log4net-licence.txt
index 261eeb9e9f..261eeb9e9f 100644
--- a/Final/dotnet/Qpid.Common/lib/log4net/log4net-licence.txt
+++ b/Final2/dotnet/Qpid.Common/lib/log4net/log4net-licence.txt
diff --git a/Final/dotnet/Qpid.Common/lib/log4net/log4net.dll b/Final2/dotnet/Qpid.Common/lib/log4net/log4net.dll
index 995816f27b..995816f27b 100644
--- a/Final/dotnet/Qpid.Common/lib/log4net/log4net.dll
+++ b/Final2/dotnet/Qpid.Common/lib/log4net/log4net.dll
diff --git a/Final/dotnet/Qpid.Common/lib/log4net/log4net.xml b/Final2/dotnet/Qpid.Common/lib/log4net/log4net.xml
index b8fd000170..b8fd000170 100644
--- a/Final/dotnet/Qpid.Common/lib/log4net/log4net.xml
+++ b/Final2/dotnet/Qpid.Common/lib/log4net/log4net.xml
diff --git a/Final/dotnet/Qpid.Common/lib/saxon/saxon-licence.txt b/Final2/dotnet/Qpid.Common/lib/saxon/saxon-licence.txt
index 1bf2b1279d..1bf2b1279d 100644
--- a/Final/dotnet/Qpid.Common/lib/saxon/saxon-licence.txt
+++ b/Final2/dotnet/Qpid.Common/lib/saxon/saxon-licence.txt
diff --git a/Final/dotnet/Qpid.Common/lib/saxon/saxon8.jar b/Final2/dotnet/Qpid.Common/lib/saxon/saxon8.jar
index 197ce75c5b..197ce75c5b 100644
--- a/Final/dotnet/Qpid.Common/lib/saxon/saxon8.jar
+++ b/Final2/dotnet/Qpid.Common/lib/saxon/saxon8.jar
diff --git a/Final/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll b/Final2/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll
index c3b95d71ba..c3b95d71ba 100644
--- a/Final/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll
+++ b/Final2/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll
diff --git a/Final/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt b/Final2/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt
index e837183135..e837183135 100644
--- a/Final/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt
+++ b/Final2/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt
diff --git a/Final/dotnet/Qpid.Common/resources/registry.template b/Final2/dotnet/Qpid.Common/resources/registry.template
index 1c0a695f10..1c0a695f10 100644
--- a/Final/dotnet/Qpid.Common/resources/registry.template
+++ b/Final2/dotnet/Qpid.Common/resources/registry.template
diff --git a/Final/dotnet/Qpid.Common/stylesheets/csharp.xsl b/Final2/dotnet/Qpid.Common/stylesheets/csharp.xsl
index 674c971559..674c971559 100644
--- a/Final/dotnet/Qpid.Common/stylesheets/csharp.xsl
+++ b/Final2/dotnet/Qpid.Common/stylesheets/csharp.xsl
diff --git a/Final/dotnet/Qpid.Common/stylesheets/framing.xsl b/Final2/dotnet/Qpid.Common/stylesheets/framing.xsl
index e015d4c40b..e015d4c40b 100644
--- a/Final/dotnet/Qpid.Common/stylesheets/framing.xsl
+++ b/Final2/dotnet/Qpid.Common/stylesheets/framing.xsl
diff --git a/Final/dotnet/Qpid.Common/stylesheets/java.xsl b/Final2/dotnet/Qpid.Common/stylesheets/java.xsl
index f9904c9e94..f9904c9e94 100644
--- a/Final/dotnet/Qpid.Common/stylesheets/java.xsl
+++ b/Final2/dotnet/Qpid.Common/stylesheets/java.xsl
diff --git a/Final/dotnet/Qpid.Common/stylesheets/prepare1.xsl b/Final2/dotnet/Qpid.Common/stylesheets/prepare1.xsl
index 9661fb47f6..9661fb47f6 100644
--- a/Final/dotnet/Qpid.Common/stylesheets/prepare1.xsl
+++ b/Final2/dotnet/Qpid.Common/stylesheets/prepare1.xsl
diff --git a/Final/dotnet/Qpid.Common/stylesheets/prepare2.xsl b/Final2/dotnet/Qpid.Common/stylesheets/prepare2.xsl
index d98365d1f3..d98365d1f3 100644
--- a/Final/dotnet/Qpid.Common/stylesheets/prepare2.xsl
+++ b/Final2/dotnet/Qpid.Common/stylesheets/prepare2.xsl
diff --git a/Final/dotnet/Qpid.Common/stylesheets/prepare3.xsl b/Final2/dotnet/Qpid.Common/stylesheets/prepare3.xsl
index 92a2648cd6..92a2648cd6 100644
--- a/Final/dotnet/Qpid.Common/stylesheets/prepare3.xsl
+++ b/Final2/dotnet/Qpid.Common/stylesheets/prepare3.xsl
diff --git a/Final/dotnet/Qpid.Common/stylesheets/readme.txt b/Final2/dotnet/Qpid.Common/stylesheets/readme.txt
index c2f98050a6..c2f98050a6 100644
--- a/Final/dotnet/Qpid.Common/stylesheets/readme.txt
+++ b/Final2/dotnet/Qpid.Common/stylesheets/readme.txt
diff --git a/Final/dotnet/Qpid.Common/stylesheets/registry.xsl b/Final2/dotnet/Qpid.Common/stylesheets/registry.xsl
index ae2a25a792..ae2a25a792 100644
--- a/Final/dotnet/Qpid.Common/stylesheets/registry.xsl
+++ b/Final2/dotnet/Qpid.Common/stylesheets/registry.xsl
diff --git a/Final/dotnet/Qpid.Common/stylesheets/utils.xsl b/Final2/dotnet/Qpid.Common/stylesheets/utils.xsl
index 422b757b5c..422b757b5c 100644
--- a/Final/dotnet/Qpid.Common/stylesheets/utils.xsl
+++ b/Final2/dotnet/Qpid.Common/stylesheets/utils.xsl
diff --git a/Final/dotnet/Qpid.Messaging/AcknowledgeMode.cs b/Final2/dotnet/Qpid.Messaging/AcknowledgeMode.cs
index 4896b64f68..4896b64f68 100644
--- a/Final/dotnet/Qpid.Messaging/AcknowledgeMode.cs
+++ b/Final2/dotnet/Qpid.Messaging/AcknowledgeMode.cs
diff --git a/Final/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs b/Final2/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
index 8b43422f5c..8b43422f5c 100644
--- a/Final/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
+++ b/Final2/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
diff --git a/Final/dotnet/Qpid.Messaging/DeliveryMode.cs b/Final2/dotnet/Qpid.Messaging/DeliveryMode.cs
index 3c4713ee2a..3c4713ee2a 100644
--- a/Final/dotnet/Qpid.Messaging/DeliveryMode.cs
+++ b/Final2/dotnet/Qpid.Messaging/DeliveryMode.cs
diff --git a/Final/dotnet/Qpid.Messaging/ExchangeClassConstants.cs b/Final2/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
index 984e8b0f17..984e8b0f17 100644
--- a/Final/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
+++ b/Final2/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
diff --git a/Final/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs b/Final2/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
index 2689fb5e46..2689fb5e46 100644
--- a/Final/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
+++ b/Final2/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
diff --git a/Final/dotnet/Qpid.Messaging/IBytesMessage.cs b/Final2/dotnet/Qpid.Messaging/IBytesMessage.cs
index 5be942423d..5be942423d 100644
--- a/Final/dotnet/Qpid.Messaging/IBytesMessage.cs
+++ b/Final2/dotnet/Qpid.Messaging/IBytesMessage.cs
diff --git a/Final/dotnet/Qpid.Messaging/IChannel.cs b/Final2/dotnet/Qpid.Messaging/IChannel.cs
index 4da41a773d..4da41a773d 100644
--- a/Final/dotnet/Qpid.Messaging/IChannel.cs
+++ b/Final2/dotnet/Qpid.Messaging/IChannel.cs
diff --git a/Final/dotnet/Qpid.Messaging/IConnection.cs b/Final2/dotnet/Qpid.Messaging/IConnection.cs
index 420228fa8e..420228fa8e 100644
--- a/Final/dotnet/Qpid.Messaging/IConnection.cs
+++ b/Final2/dotnet/Qpid.Messaging/IConnection.cs
diff --git a/Final/dotnet/Qpid.Messaging/IConnectionFactory.cs b/Final2/dotnet/Qpid.Messaging/IConnectionFactory.cs
index f141d509be..f141d509be 100644
--- a/Final/dotnet/Qpid.Messaging/IConnectionFactory.cs
+++ b/Final2/dotnet/Qpid.Messaging/IConnectionFactory.cs
diff --git a/Final/dotnet/Qpid.Messaging/IConnectionListener.cs b/Final2/dotnet/Qpid.Messaging/IConnectionListener.cs
index 02d9eb38da..02d9eb38da 100644
--- a/Final/dotnet/Qpid.Messaging/IConnectionListener.cs
+++ b/Final2/dotnet/Qpid.Messaging/IConnectionListener.cs
diff --git a/Final/dotnet/Qpid.Messaging/IFieldTable.cs b/Final2/dotnet/Qpid.Messaging/IFieldTable.cs
index 730ce399d4..730ce399d4 100644
--- a/Final/dotnet/Qpid.Messaging/IFieldTable.cs
+++ b/Final2/dotnet/Qpid.Messaging/IFieldTable.cs
diff --git a/Final/dotnet/Qpid.Messaging/IHeaders.cs b/Final2/dotnet/Qpid.Messaging/IHeaders.cs
index 7fdf26ebda..7fdf26ebda 100644
--- a/Final/dotnet/Qpid.Messaging/IHeaders.cs
+++ b/Final2/dotnet/Qpid.Messaging/IHeaders.cs
diff --git a/Final/dotnet/Qpid.Messaging/IMessage.cs b/Final2/dotnet/Qpid.Messaging/IMessage.cs
index 20ae5ee130..20ae5ee130 100644
--- a/Final/dotnet/Qpid.Messaging/IMessage.cs
+++ b/Final2/dotnet/Qpid.Messaging/IMessage.cs
diff --git a/Final/dotnet/Qpid.Messaging/IMessageConsumer.cs b/Final2/dotnet/Qpid.Messaging/IMessageConsumer.cs
index 82d697bf61..82d697bf61 100644
--- a/Final/dotnet/Qpid.Messaging/IMessageConsumer.cs
+++ b/Final2/dotnet/Qpid.Messaging/IMessageConsumer.cs
diff --git a/Final/dotnet/Qpid.Messaging/IMessagePublisher.cs b/Final2/dotnet/Qpid.Messaging/IMessagePublisher.cs
index fab0df0c2b..fab0df0c2b 100644
--- a/Final/dotnet/Qpid.Messaging/IMessagePublisher.cs
+++ b/Final2/dotnet/Qpid.Messaging/IMessagePublisher.cs
diff --git a/Final/dotnet/Qpid.Messaging/ITextMessage.cs b/Final2/dotnet/Qpid.Messaging/ITextMessage.cs
index 902beb70f8..902beb70f8 100644
--- a/Final/dotnet/Qpid.Messaging/ITextMessage.cs
+++ b/Final2/dotnet/Qpid.Messaging/ITextMessage.cs
diff --git a/Final/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs b/Final2/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
index 2d6f76d639..2d6f76d639 100644
--- a/Final/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
+++ b/Final2/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
diff --git a/Final/dotnet/Qpid.Messaging/MessageNotReadableException.cs b/Final2/dotnet/Qpid.Messaging/MessageNotReadableException.cs
index 2afcffd531..2afcffd531 100644
--- a/Final/dotnet/Qpid.Messaging/MessageNotReadableException.cs
+++ b/Final2/dotnet/Qpid.Messaging/MessageNotReadableException.cs
diff --git a/Final/dotnet/Qpid.Messaging/MessageNotWritableException.cs b/Final2/dotnet/Qpid.Messaging/MessageNotWritableException.cs
index 9b00f01948..9b00f01948 100644
--- a/Final/dotnet/Qpid.Messaging/MessageNotWritableException.cs
+++ b/Final2/dotnet/Qpid.Messaging/MessageNotWritableException.cs
diff --git a/Final/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs b/Final2/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
index 79c7575d0a..79c7575d0a 100644
--- a/Final/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
+++ b/Final2/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
diff --git a/Final/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs b/Final2/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
index 8683ad08b2..8683ad08b2 100644
--- a/Final/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
+++ b/Final2/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
diff --git a/Final/dotnet/Qpid.Messaging/Qpid.Messaging.csproj b/Final2/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
index 90354bece6..90354bece6 100644
--- a/Final/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
+++ b/Final2/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
diff --git a/Final/dotnet/Qpid.Messaging/QpidException.cs b/Final2/dotnet/Qpid.Messaging/QpidException.cs
index 3e39f2293d..3e39f2293d 100644
--- a/Final/dotnet/Qpid.Messaging/QpidException.cs
+++ b/Final2/dotnet/Qpid.Messaging/QpidException.cs
diff --git a/Final/dotnet/Qpid.Messaging/ResourceAllocationException.cs b/Final2/dotnet/Qpid.Messaging/ResourceAllocationException.cs
index 954dcdd94c..954dcdd94c 100644
--- a/Final/dotnet/Qpid.Messaging/ResourceAllocationException.cs
+++ b/Final2/dotnet/Qpid.Messaging/ResourceAllocationException.cs
diff --git a/Final/dotnet/Qpid.Messaging/default.build b/Final2/dotnet/Qpid.Messaging/default.build
index 789258bfad..789258bfad 100644
--- a/Final/dotnet/Qpid.Messaging/default.build
+++ b/Final2/dotnet/Qpid.Messaging/default.build
diff --git a/Final/dotnet/Qpid.NET.FxCop b/Final2/dotnet/Qpid.NET.FxCop
index cfc5445e40..cfc5445e40 100644
--- a/Final/dotnet/Qpid.NET.FxCop
+++ b/Final2/dotnet/Qpid.NET.FxCop
diff --git a/Final/dotnet/Qpid.NET.sln b/Final2/dotnet/Qpid.NET.sln
index 8b174db90f..8b174db90f 100644
--- a/Final/dotnet/Qpid.NET.sln
+++ b/Final2/dotnet/Qpid.NET.sln
diff --git a/Final/dotnet/Qpid.Sasl.Tests/App.config b/Final2/dotnet/Qpid.Sasl.Tests/App.config
index 539f341e7c..539f341e7c 100644
--- a/Final/dotnet/Qpid.Sasl.Tests/App.config
+++ b/Final2/dotnet/Qpid.Sasl.Tests/App.config
diff --git a/Final/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs b/Final2/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs
index 09260736f0..09260736f0 100644
--- a/Final/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs
+++ b/Final2/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs
diff --git a/Final/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs b/Final2/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs
index e8b0ae5468..e8b0ae5468 100644
--- a/Final/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs
+++ b/Final2/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs
diff --git a/Final/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs b/Final2/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
index eb7e7ebbd5..eb7e7ebbd5 100644
--- a/Final/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
+++ b/Final2/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
diff --git a/Final/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs b/Final2/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
index 1864a6c957..1864a6c957 100644
--- a/Final/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
+++ b/Final2/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
diff --git a/Final/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs b/Final2/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs
index 4c82f7b126..4c82f7b126 100644
--- a/Final/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs
+++ b/Final2/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs
diff --git a/Final/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs b/Final2/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
index 657b15e3ea..657b15e3ea 100644
--- a/Final/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
+++ b/Final2/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
diff --git a/Final/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj b/Final2/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
index 8c807e2385..8c807e2385 100644
--- a/Final/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
+++ b/Final2/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
diff --git a/Final/dotnet/Qpid.Sasl.Tests/SaslTests.cs b/Final2/dotnet/Qpid.Sasl.Tests/SaslTests.cs
index 5b27949b98..5b27949b98 100644
--- a/Final/dotnet/Qpid.Sasl.Tests/SaslTests.cs
+++ b/Final2/dotnet/Qpid.Sasl.Tests/SaslTests.cs
diff --git a/Final/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs b/Final2/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs
index 73c68ea2b3..73c68ea2b3 100644
--- a/Final/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs
+++ b/Final2/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs
diff --git a/Final/dotnet/Qpid.Sasl.Tests/default.build b/Final2/dotnet/Qpid.Sasl.Tests/default.build
index eb0514d417..eb0514d417 100644
--- a/Final/dotnet/Qpid.Sasl.Tests/default.build
+++ b/Final2/dotnet/Qpid.Sasl.Tests/default.build
diff --git a/Final/dotnet/Qpid.Sasl/Callbacks.cs b/Final2/dotnet/Qpid.Sasl/Callbacks.cs
index 90e36beeb8..90e36beeb8 100644
--- a/Final/dotnet/Qpid.Sasl/Callbacks.cs
+++ b/Final2/dotnet/Qpid.Sasl/Callbacks.cs
diff --git a/Final/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs b/Final2/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs
index 3446261724..3446261724 100644
--- a/Final/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs
+++ b/Final2/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs
diff --git a/Final/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs b/Final2/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs
index 21f6b92414..21f6b92414 100644
--- a/Final/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs
+++ b/Final2/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs
diff --git a/Final/dotnet/Qpid.Sasl/DefaultClientFactory.cs b/Final2/dotnet/Qpid.Sasl/DefaultClientFactory.cs
index d552aa80c0..d552aa80c0 100644
--- a/Final/dotnet/Qpid.Sasl/DefaultClientFactory.cs
+++ b/Final2/dotnet/Qpid.Sasl/DefaultClientFactory.cs
diff --git a/Final/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs b/Final2/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs
index 0dfc482333..0dfc482333 100644
--- a/Final/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs
+++ b/Final2/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs
diff --git a/Final/dotnet/Qpid.Sasl/ISaslClient.cs b/Final2/dotnet/Qpid.Sasl/ISaslClient.cs
index 526cc1f43a..526cc1f43a 100644
--- a/Final/dotnet/Qpid.Sasl/ISaslClient.cs
+++ b/Final2/dotnet/Qpid.Sasl/ISaslClient.cs
diff --git a/Final/dotnet/Qpid.Sasl/ISaslClientFactory.cs b/Final2/dotnet/Qpid.Sasl/ISaslClientFactory.cs
index fc81057ec4..fc81057ec4 100644
--- a/Final/dotnet/Qpid.Sasl/ISaslClientFactory.cs
+++ b/Final2/dotnet/Qpid.Sasl/ISaslClientFactory.cs
diff --git a/Final/dotnet/Qpid.Sasl/MD5HMAC.cs b/Final2/dotnet/Qpid.Sasl/MD5HMAC.cs
index 134332284a..134332284a 100644
--- a/Final/dotnet/Qpid.Sasl/MD5HMAC.cs
+++ b/Final2/dotnet/Qpid.Sasl/MD5HMAC.cs
diff --git a/Final/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs b/Final2/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs
index 5e8c56ff51..5e8c56ff51 100644
--- a/Final/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs
+++ b/Final2/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs
diff --git a/Final/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs b/Final2/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs
index 672cc64c6a..672cc64c6a 100644
--- a/Final/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs
+++ b/Final2/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs
diff --git a/Final/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs b/Final2/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs
index 59d3a88991..59d3a88991 100644
--- a/Final/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs
+++ b/Final2/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs
diff --git a/Final/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs b/Final2/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs
index 5b513bda87..5b513bda87 100644
--- a/Final/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs
+++ b/Final2/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs
diff --git a/Final/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs b/Final2/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs
index 3addeb2e83..3addeb2e83 100644
--- a/Final/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs
+++ b/Final2/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs
diff --git a/Final/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs b/Final2/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
index f38725e53f..f38725e53f 100644
--- a/Final/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
+++ b/Final2/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
diff --git a/Final/dotnet/Qpid.Sasl/Qpid.Sasl.csproj b/Final2/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
index 891d710379..891d710379 100644
--- a/Final/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
+++ b/Final2/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
diff --git a/Final/dotnet/Qpid.Sasl/Sasl.cs b/Final2/dotnet/Qpid.Sasl/Sasl.cs
index 5a744a30d9..5a744a30d9 100644
--- a/Final/dotnet/Qpid.Sasl/Sasl.cs
+++ b/Final2/dotnet/Qpid.Sasl/Sasl.cs
diff --git a/Final/dotnet/Qpid.Sasl/SaslClient.cs b/Final2/dotnet/Qpid.Sasl/SaslClient.cs
index 1390b1b352..1390b1b352 100644
--- a/Final/dotnet/Qpid.Sasl/SaslClient.cs
+++ b/Final2/dotnet/Qpid.Sasl/SaslClient.cs
diff --git a/Final/dotnet/Qpid.Sasl/SaslException.cs b/Final2/dotnet/Qpid.Sasl/SaslException.cs
index 8f6e00a7ba..8f6e00a7ba 100644
--- a/Final/dotnet/Qpid.Sasl/SaslException.cs
+++ b/Final2/dotnet/Qpid.Sasl/SaslException.cs
diff --git a/Final/dotnet/Qpid.Sasl/SaslProperties.cs b/Final2/dotnet/Qpid.Sasl/SaslProperties.cs
index 0658acda21..0658acda21 100644
--- a/Final/dotnet/Qpid.Sasl/SaslProperties.cs
+++ b/Final2/dotnet/Qpid.Sasl/SaslProperties.cs
diff --git a/Final/dotnet/Qpid.Sasl/default.build b/Final2/dotnet/Qpid.Sasl/default.build
index 5b44d6b9c4..5b44d6b9c4 100644
--- a/Final/dotnet/Qpid.Sasl/default.build
+++ b/Final2/dotnet/Qpid.Sasl/default.build
diff --git a/Final/dotnet/README.txt b/Final2/dotnet/README.txt
index 1c0be05c11..1c0be05c11 100644
--- a/Final/dotnet/README.txt
+++ b/Final2/dotnet/README.txt
diff --git a/Final/dotnet/RELEASE_NOTES.txt b/Final2/dotnet/RELEASE_NOTES.txt
index 97e8a6f3b8..97e8a6f3b8 100644
--- a/Final/dotnet/RELEASE_NOTES.txt
+++ b/Final2/dotnet/RELEASE_NOTES.txt
diff --git a/Final/dotnet/TODO.txt b/Final2/dotnet/TODO.txt
index d79fb8f5f7..d79fb8f5f7 100644
--- a/Final/dotnet/TODO.txt
+++ b/Final2/dotnet/TODO.txt
diff --git a/Final/dotnet/TestClient/Program.cs b/Final2/dotnet/TestClient/Program.cs
index 4c39638eb3..4c39638eb3 100644
--- a/Final/dotnet/TestClient/Program.cs
+++ b/Final2/dotnet/TestClient/Program.cs
diff --git a/Final/dotnet/TestClient/Properties/AssemblyInfo.cs b/Final2/dotnet/TestClient/Properties/AssemblyInfo.cs
index becfda4a69..becfda4a69 100644
--- a/Final/dotnet/TestClient/Properties/AssemblyInfo.cs
+++ b/Final2/dotnet/TestClient/Properties/AssemblyInfo.cs
diff --git a/Final/dotnet/TestClient/TestClient.csproj b/Final2/dotnet/TestClient/TestClient.csproj
index b00994b265..b00994b265 100644
--- a/Final/dotnet/TestClient/TestClient.csproj
+++ b/Final2/dotnet/TestClient/TestClient.csproj
diff --git a/Final/dotnet/TestClient/default.build b/Final2/dotnet/TestClient/default.build
index dee644c71e..dee644c71e 100644
--- a/Final/dotnet/TestClient/default.build
+++ b/Final2/dotnet/TestClient/default.build
diff --git a/Final/dotnet/TopicListener/Program.cs b/Final2/dotnet/TopicListener/Program.cs
index 0134dca1ba..0134dca1ba 100644
--- a/Final/dotnet/TopicListener/Program.cs
+++ b/Final2/dotnet/TopicListener/Program.cs
diff --git a/Final/dotnet/TopicListener/Properties/AssemblyInfo.cs b/Final2/dotnet/TopicListener/Properties/AssemblyInfo.cs
index 8672df7059..8672df7059 100644
--- a/Final/dotnet/TopicListener/Properties/AssemblyInfo.cs
+++ b/Final2/dotnet/TopicListener/Properties/AssemblyInfo.cs
diff --git a/Final/dotnet/TopicListener/TopicListener.csproj b/Final2/dotnet/TopicListener/TopicListener.csproj
index 5522ada191..5522ada191 100644
--- a/Final/dotnet/TopicListener/TopicListener.csproj
+++ b/Final2/dotnet/TopicListener/TopicListener.csproj
diff --git a/Final/dotnet/TopicListener/default.build b/Final2/dotnet/TopicListener/default.build
index afde4d6937..afde4d6937 100644
--- a/Final/dotnet/TopicListener/default.build
+++ b/Final2/dotnet/TopicListener/default.build
diff --git a/Final/dotnet/TopicPublisher/Program.cs b/Final2/dotnet/TopicPublisher/Program.cs
index a68df14bb3..a68df14bb3 100644
--- a/Final/dotnet/TopicPublisher/Program.cs
+++ b/Final2/dotnet/TopicPublisher/Program.cs
diff --git a/Final/dotnet/TopicPublisher/Properties/AssemblyInfo.cs b/Final2/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
index 85442960ed..85442960ed 100644
--- a/Final/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
+++ b/Final2/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
diff --git a/Final/dotnet/TopicPublisher/TopicPublisher.csproj b/Final2/dotnet/TopicPublisher/TopicPublisher.csproj
index 2e03ce858e..2e03ce858e 100644
--- a/Final/dotnet/TopicPublisher/TopicPublisher.csproj
+++ b/Final2/dotnet/TopicPublisher/TopicPublisher.csproj
diff --git a/Final/dotnet/TopicPublisher/default.build b/Final2/dotnet/TopicPublisher/default.build
index 8991aae751..8991aae751 100644
--- a/Final/dotnet/TopicPublisher/default.build
+++ b/Final2/dotnet/TopicPublisher/default.build
diff --git a/Final/dotnet/build-dotnet11 b/Final2/dotnet/build-dotnet11
index 918010bf1f..918010bf1f 100644
--- a/Final/dotnet/build-dotnet11
+++ b/Final2/dotnet/build-dotnet11
diff --git a/Final/dotnet/build-dotnet11.bat b/Final2/dotnet/build-dotnet11.bat
index 4b58f13b2a..4b58f13b2a 100644
--- a/Final/dotnet/build-dotnet11.bat
+++ b/Final2/dotnet/build-dotnet11.bat
diff --git a/Final/dotnet/build-dotnet20 b/Final2/dotnet/build-dotnet20
index 713a7aa55a..713a7aa55a 100644
--- a/Final/dotnet/build-dotnet20
+++ b/Final2/dotnet/build-dotnet20
diff --git a/Final/dotnet/build-framing b/Final2/dotnet/build-framing
index 315a1a1cb2..315a1a1cb2 100644
--- a/Final/dotnet/build-framing
+++ b/Final2/dotnet/build-framing
diff --git a/Final/dotnet/build-framing.bat b/Final2/dotnet/build-framing.bat
index bc5aa23ab7..bc5aa23ab7 100644
--- a/Final/dotnet/build-framing.bat
+++ b/Final2/dotnet/build-framing.bat
diff --git a/Final/dotnet/build-mono b/Final2/dotnet/build-mono
index 6f5cad5744..6f5cad5744 100755
--- a/Final/dotnet/build-mono
+++ b/Final2/dotnet/build-mono
diff --git a/Final/dotnet/default.build b/Final2/dotnet/default.build
index c103804d62..c103804d62 100644
--- a/Final/dotnet/default.build
+++ b/Final2/dotnet/default.build
diff --git a/Final/dotnet/release b/Final2/dotnet/release
index 11291e87d6..11291e87d6 100755
--- a/Final/dotnet/release
+++ b/Final2/dotnet/release
diff --git a/Final/etc/svn-auto-props b/Final2/etc/svn-auto-props
index 35f1d10998..35f1d10998 100644
--- a/Final/etc/svn-auto-props
+++ b/Final2/etc/svn-auto-props
diff --git a/Final/gentools/README b/Final2/gentools/README
index c4abecc199..c4abecc199 100644
--- a/Final/gentools/README
+++ b/Final2/gentools/README
diff --git a/Final/gentools/build b/Final2/gentools/build
index ad9827b113..ad9827b113 100755
--- a/Final/gentools/build
+++ b/Final2/gentools/build
diff --git a/Final/gentools/build.xml b/Final2/gentools/build.xml
index d35790f714..d35790f714 100644
--- a/Final/gentools/build.xml
+++ b/Final2/gentools/build.xml
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpClass.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpClass.java
index 2e8bdaf971..2e8bdaf971 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpClass.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpClass.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
index 01d4df283b..01d4df283b 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpConstant.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
index 6ccd2dbf99..6ccd2dbf99 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
index 7b38f5cf3c..7b38f5cf3c 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpDomain.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
index 4796f31fb3..4796f31fb3 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
index 7e2974a444..7e2974a444 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
index f91d98bfe7..f91d98bfe7 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpField.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpField.java
index e1177e0154..e1177e0154 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpField.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpField.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
index c91ec3d623..c91ec3d623 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
index 048221bda8..048221bda8 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpMethod.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
index ce963465de..ce963465de 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
index 59eedd2a2b..59eedd2a2b 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpModel.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpModel.java
index 721247a4b2..721247a4b2 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpModel.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpModel.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
index 34d3b7ca5f..34d3b7ca5f 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
index 3706c9391d..3706c9391d 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
index 10978d0e4a..10978d0e4a 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpParseException.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
index 4d9f495390..4d9f495390 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
index b1e6f3d712..b1e6f3d712 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
index 1053543fdd..1053543fdd 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpVersion.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
index 579d8e28b2..579d8e28b2 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java b/Final2/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
index 4406893cbb..4406893cbb 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/CppGenerator.java b/Final2/gentools/src/org/apache/qpid/gentools/CppGenerator.java
index 06454ddeb9..06454ddeb9 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/CppGenerator.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/CppGenerator.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java b/Final2/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
index bd49315241..bd49315241 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/Generator.java b/Final2/gentools/src/org/apache/qpid/gentools/Generator.java
index e7ccd64fbe..e7ccd64fbe 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/Generator.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/Generator.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/JavaGenerator.java b/Final2/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
index 84d06cf204..84d06cf204 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/LanguageConverter.java b/Final2/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
index cb0a14e3bc..cb0a14e3bc 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/Main.java b/Final2/gentools/src/org/apache/qpid/gentools/Main.java
index e8c8a80a26..e8c8a80a26 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/Main.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/Main.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/NodeAware.java b/Final2/gentools/src/org/apache/qpid/gentools/NodeAware.java
index df4e0ecb02..df4e0ecb02 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/NodeAware.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/NodeAware.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/Printable.java b/Final2/gentools/src/org/apache/qpid/gentools/Printable.java
index a73878c506..a73878c506 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/Printable.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/Printable.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java b/Final2/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
index cdaf381f0a..cdaf381f0a 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/Utils.java b/Final2/gentools/src/org/apache/qpid/gentools/Utils.java
index ade00cd8c7..ade00cd8c7 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/Utils.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/Utils.java
diff --git a/Final/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java b/Final2/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
index 1f6b9f1a6d..1f6b9f1a6d 100644
--- a/Final/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
+++ b/Final2/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
diff --git a/Final/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/Final2/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
index a9fb0e0f69..a9fb0e0f69 100644
--- a/Final/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
+++ b/Final2/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
diff --git a/Final/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl b/Final2/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
index 8cca6e5cec..8cca6e5cec 100644
--- a/Final/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
+++ b/Final2/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
diff --git a/Final/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl b/Final2/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
index 0653ed7186..0653ed7186 100644
--- a/Final/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
+++ b/Final2/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
diff --git a/Final/gentools/templ.cpp/AMQP_Constants.h.tmpl b/Final2/gentools/templ.cpp/AMQP_Constants.h.tmpl
index 4631bc8de6..4631bc8de6 100644
--- a/Final/gentools/templ.cpp/AMQP_Constants.h.tmpl
+++ b/Final2/gentools/templ.cpp/AMQP_Constants.h.tmpl
diff --git a/Final/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl b/Final2/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
index 9753b454ba..9753b454ba 100644
--- a/Final/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
+++ b/Final2/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
diff --git a/Final/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl b/Final2/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
index dc2a890c88..dc2a890c88 100644
--- a/Final/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
+++ b/Final2/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
diff --git a/Final/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl b/Final2/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
index c197871d4b..c197871d4b 100644
--- a/Final/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
+++ b/Final2/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
diff --git a/Final/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl b/Final2/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
index e87723667b..e87723667b 100644
--- a/Final/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
+++ b/Final2/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
diff --git a/Final/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl b/Final2/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
index cce369f98b..cce369f98b 100644
--- a/Final/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
+++ b/Final2/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
diff --git a/Final/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl b/Final2/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
index fab29f2c60..fab29f2c60 100644
--- a/Final/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
+++ b/Final2/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
diff --git a/Final/gentools/templ.cpp/MethodBodyClass.h.tmpl b/Final2/gentools/templ.cpp/MethodBodyClass.h.tmpl
index 5819a9cf9c..5819a9cf9c 100644
--- a/Final/gentools/templ.cpp/MethodBodyClass.h.tmpl
+++ b/Final2/gentools/templ.cpp/MethodBodyClass.h.tmpl
diff --git a/Final/gentools/templ.java/AmqpConstantsClass.tmpl b/Final2/gentools/templ.java/AmqpConstantsClass.tmpl
index 8d459f2977..8d459f2977 100644
--- a/Final/gentools/templ.java/AmqpConstantsClass.tmpl
+++ b/Final2/gentools/templ.java/AmqpConstantsClass.tmpl
diff --git a/Final/gentools/templ.java/MethodBodyClass.tmpl b/Final2/gentools/templ.java/MethodBodyClass.tmpl
index eb730fd891..eb730fd891 100644
--- a/Final/gentools/templ.java/MethodBodyClass.tmpl
+++ b/Final2/gentools/templ.java/MethodBodyClass.tmpl
diff --git a/Final/gentools/templ.java/MethodRegistryClass.tmpl b/Final2/gentools/templ.java/MethodRegistryClass.tmpl
index 01e440e209..01e440e209 100644
--- a/Final/gentools/templ.java/MethodRegistryClass.tmpl
+++ b/Final2/gentools/templ.java/MethodRegistryClass.tmpl
diff --git a/Final/gentools/templ.java/PropertyContentHeaderClass.tmpl b/Final2/gentools/templ.java/PropertyContentHeaderClass.tmpl
index ab6406b1fe..ab6406b1fe 100644
--- a/Final/gentools/templ.java/PropertyContentHeaderClass.tmpl
+++ b/Final2/gentools/templ.java/PropertyContentHeaderClass.tmpl
diff --git a/Final/gentools/templ.java/ProtocolVersionListClass.tmpl b/Final2/gentools/templ.java/ProtocolVersionListClass.tmpl
index 4a2592d11b..4a2592d11b 100644
--- a/Final/gentools/templ.java/ProtocolVersionListClass.tmpl
+++ b/Final2/gentools/templ.java/ProtocolVersionListClass.tmpl
diff --git a/Final/gentools/xml-src/amqp-0.10.test.xml b/Final2/gentools/xml-src/amqp-0.10.test.xml
index 5d3d80648b..5d3d80648b 100644
--- a/Final/gentools/xml-src/amqp-0.10.test.xml
+++ b/Final2/gentools/xml-src/amqp-0.10.test.xml
diff --git a/Final/gentools/xml-src/amqp-0.8.test.xml b/Final2/gentools/xml-src/amqp-0.8.test.xml
index b0adf31828..b0adf31828 100644
--- a/Final/gentools/xml-src/amqp-0.8.test.xml
+++ b/Final2/gentools/xml-src/amqp-0.8.test.xml
diff --git a/Final/gentools/xml-src/amqp-0.9.test.xml b/Final2/gentools/xml-src/amqp-0.9.test.xml
index e12e9c787a..e12e9c787a 100644
--- a/Final/gentools/xml-src/amqp-0.9.test.xml
+++ b/Final2/gentools/xml-src/amqp-0.9.test.xml
diff --git a/Final/gentools/xml-src/cluster-0.9.test.xml b/Final2/gentools/xml-src/cluster-0.9.test.xml
index 142e6c9380..142e6c9380 100644
--- a/Final/gentools/xml-src/cluster-0.9.test.xml
+++ b/Final2/gentools/xml-src/cluster-0.9.test.xml
diff --git a/Final/java/broker/bin/msTool.sh b/Final2/java/broker/bin/msTool.sh
index 73b1eb2ec7..73b1eb2ec7 100755
--- a/Final/java/broker/bin/msTool.sh
+++ b/Final2/java/broker/bin/msTool.sh
diff --git a/Final/java/broker/bin/qpid-passwd b/Final2/java/broker/bin/qpid-passwd
index f046252522..f046252522 100644
--- a/Final/java/broker/bin/qpid-passwd
+++ b/Final2/java/broker/bin/qpid-passwd
diff --git a/Final/java/broker/bin/qpid-server b/Final2/java/broker/bin/qpid-server
index f1f4d72e64..f1f4d72e64 100644
--- a/Final/java/broker/bin/qpid-server
+++ b/Final2/java/broker/bin/qpid-server
diff --git a/Final/java/broker/bin/qpid-server-bdb.bat b/Final2/java/broker/bin/qpid-server-bdb.bat
index 8964e577df..8964e577df 100644
--- a/Final/java/broker/bin/qpid-server-bdb.bat
+++ b/Final2/java/broker/bin/qpid-server-bdb.bat
diff --git a/Final/java/broker/bin/qpid-server.bat b/Final2/java/broker/bin/qpid-server.bat
index a99022cd2d..a99022cd2d 100644
--- a/Final/java/broker/bin/qpid-server.bat
+++ b/Final2/java/broker/bin/qpid-server.bat
diff --git a/Final/java/broker/bin/qpid.start b/Final2/java/broker/bin/qpid.start
index 99f2d89f64..99f2d89f64 100644
--- a/Final/java/broker/bin/qpid.start
+++ b/Final2/java/broker/bin/qpid.start
diff --git a/Final/java/broker/bin/qpid.stop b/Final2/java/broker/bin/qpid.stop
index 6482fc3293..6482fc3293 100644
--- a/Final/java/broker/bin/qpid.stop
+++ b/Final2/java/broker/bin/qpid.stop
diff --git a/Final/java/broker/bin/qpid.stopall b/Final2/java/broker/bin/qpid.stopall
index d71f591de8..d71f591de8 100644
--- a/Final/java/broker/bin/qpid.stopall
+++ b/Final2/java/broker/bin/qpid.stopall
diff --git a/Final/java/broker/bin/run.bat b/Final2/java/broker/bin/run.bat
index 5b0aa0f23b..5b0aa0f23b 100755
--- a/Final/java/broker/bin/run.bat
+++ b/Final2/java/broker/bin/run.bat
diff --git a/Final/java/broker/bin/run.sh b/Final2/java/broker/bin/run.sh
index 6b62049e94..6b62049e94 100755
--- a/Final/java/broker/bin/run.sh
+++ b/Final2/java/broker/bin/run.sh
diff --git a/Final/java/broker/bin/runAll b/Final2/java/broker/bin/runAll
index 4ced1d263b..4ced1d263b 100644
--- a/Final/java/broker/bin/runAll
+++ b/Final2/java/broker/bin/runAll
diff --git a/Final/java/broker/distribution/pom.xml b/Final2/java/broker/distribution/pom.xml
index 8737d943eb..8737d943eb 100644
--- a/Final/java/broker/distribution/pom.xml
+++ b/Final2/java/broker/distribution/pom.xml
diff --git a/Final/java/broker/distribution/src/main/assembly/broker-bin-tests.xml b/Final2/java/broker/distribution/src/main/assembly/broker-bin-tests.xml
index fa017d6232..fa017d6232 100644
--- a/Final/java/broker/distribution/src/main/assembly/broker-bin-tests.xml
+++ b/Final2/java/broker/distribution/src/main/assembly/broker-bin-tests.xml
diff --git a/Final/java/broker/distribution/src/main/assembly/broker-bin.xml b/Final2/java/broker/distribution/src/main/assembly/broker-bin.xml
index e66190a3f4..e66190a3f4 100644
--- a/Final/java/broker/distribution/src/main/assembly/broker-bin.xml
+++ b/Final2/java/broker/distribution/src/main/assembly/broker-bin.xml
diff --git a/Final/java/broker/distribution/src/main/assembly/broker-src.xml b/Final2/java/broker/distribution/src/main/assembly/broker-src.xml
index 28a22c3851..28a22c3851 100644
--- a/Final/java/broker/distribution/src/main/assembly/broker-src.xml
+++ b/Final2/java/broker/distribution/src/main/assembly/broker-src.xml
diff --git a/Final/java/broker/etc/access b/Final2/java/broker/etc/access
index 58b7443fa9..58b7443fa9 100644
--- a/Final/java/broker/etc/access
+++ b/Final2/java/broker/etc/access
diff --git a/Final/java/broker/etc/config.xml b/Final2/java/broker/etc/config.xml
index b5b81bbeb0..b5b81bbeb0 100644
--- a/Final/java/broker/etc/config.xml
+++ b/Final2/java/broker/etc/config.xml
diff --git a/Final/java/broker/etc/debug.log4j.xml b/Final2/java/broker/etc/debug.log4j.xml
index e8fd7e119d..e8fd7e119d 100644
--- a/Final/java/broker/etc/debug.log4j.xml
+++ b/Final2/java/broker/etc/debug.log4j.xml
diff --git a/Final/java/broker/etc/jmxremote.access b/Final2/java/broker/etc/jmxremote.access
index 1a51a6991b..1a51a6991b 100644
--- a/Final/java/broker/etc/jmxremote.access
+++ b/Final2/java/broker/etc/jmxremote.access
diff --git a/Final/java/broker/etc/log4j.xml b/Final2/java/broker/etc/log4j.xml
index af8e7a8293..af8e7a8293 100644
--- a/Final/java/broker/etc/log4j.xml
+++ b/Final2/java/broker/etc/log4j.xml
diff --git a/Final/java/broker/etc/md5passwd b/Final2/java/broker/etc/md5passwd
index 6a149919de..6a149919de 100644
--- a/Final/java/broker/etc/md5passwd
+++ b/Final2/java/broker/etc/md5passwd
diff --git a/Final/java/broker/etc/mstool-log4j.xml b/Final2/java/broker/etc/mstool-log4j.xml
index 8c46010e2d..8c46010e2d 100644
--- a/Final/java/broker/etc/mstool-log4j.xml
+++ b/Final2/java/broker/etc/mstool-log4j.xml
diff --git a/Final/java/broker/etc/passwd b/Final2/java/broker/etc/passwd
index 966a16153d..966a16153d 100644
--- a/Final/java/broker/etc/passwd
+++ b/Final2/java/broker/etc/passwd
diff --git a/Final/java/broker/etc/passwdVhost b/Final2/java/broker/etc/passwdVhost
index 48ce8299b6..48ce8299b6 100644
--- a/Final/java/broker/etc/passwdVhost
+++ b/Final2/java/broker/etc/passwdVhost
diff --git a/Final/java/broker/etc/persistent_config.xml b/Final2/java/broker/etc/persistent_config.xml
index 178a73515c..178a73515c 100644
--- a/Final/java/broker/etc/persistent_config.xml
+++ b/Final2/java/broker/etc/persistent_config.xml
diff --git a/Final/java/broker/etc/qpid-server.conf b/Final2/java/broker/etc/qpid-server.conf
index c310094817..c310094817 100644
--- a/Final/java/broker/etc/qpid-server.conf
+++ b/Final2/java/broker/etc/qpid-server.conf
diff --git a/Final/java/broker/etc/qpid-server.conf.jpp b/Final2/java/broker/etc/qpid-server.conf.jpp
index 3ed2431ef3..3ed2431ef3 100644
--- a/Final/java/broker/etc/qpid-server.conf.jpp
+++ b/Final2/java/broker/etc/qpid-server.conf.jpp
diff --git a/Final/java/broker/etc/qpid.passwd b/Final2/java/broker/etc/qpid.passwd
index 79b5e11777..79b5e11777 100644
--- a/Final/java/broker/etc/qpid.passwd
+++ b/Final2/java/broker/etc/qpid.passwd
diff --git a/Final/java/broker/etc/transient_config.xml b/Final2/java/broker/etc/transient_config.xml
index 164d66cd1b..164d66cd1b 100644
--- a/Final/java/broker/etc/transient_config.xml
+++ b/Final2/java/broker/etc/transient_config.xml
diff --git a/Final/java/broker/etc/virtualhosts.xml b/Final2/java/broker/etc/virtualhosts.xml
index f62ec3f5d7..f62ec3f5d7 100644
--- a/Final/java/broker/etc/virtualhosts.xml
+++ b/Final2/java/broker/etc/virtualhosts.xml
diff --git a/Final/java/broker/pom.xml b/Final2/java/broker/pom.xml
index 914a272571..914a272571 100644
--- a/Final/java/broker/pom.xml
+++ b/Final2/java/broker/pom.xml
diff --git a/Final/java/broker/python-test.xml b/Final2/java/broker/python-test.xml
index e044207948..e044207948 100755
--- a/Final/java/broker/python-test.xml
+++ b/Final2/java/broker/python-test.xml
diff --git a/Final/java/broker/src/main/grammar/SelectorParser.jj b/Final2/java/broker/src/main/grammar/SelectorParser.jj
index adec1b348d..adec1b348d 100644
--- a/Final/java/broker/src/main/grammar/SelectorParser.jj
+++ b/Final2/java/broker/src/main/grammar/SelectorParser.jj
diff --git a/Final/java/broker/src/main/java/log4j.properties b/Final2/java/broker/src/main/java/log4j.properties
index 87f04f4991..87f04f4991 100644
--- a/Final/java/broker/src/main/java/log4j.properties
+++ b/Final2/java/broker/src/main/java/log4j.properties
diff --git a/Final/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java b/Final2/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
index 7e0c4defe1..7e0c4defe1 100644
--- a/Final/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
+++ b/Final2/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java b/Final2/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
index 40ff590a0a..40ff590a0a 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
index 9335723bc5..9335723bc5 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index d3b459c48a..d3b459c48a 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/ConsumerTagNotUniqueException.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/ConsumerTagNotUniqueException.java
index 9a98af5689..9a98af5689 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/ConsumerTagNotUniqueException.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/ConsumerTagNotUniqueException.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/Main.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/Main.java
index a87c704cf8..a87c704cf8 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/Main.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/Main.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/ManagedChannel.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/ManagedChannel.java
index e76f9c3f6c..e76f9c3f6c 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/ManagedChannel.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/ManagedChannel.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java
index d61bb8916a..d61bb8916a 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
index 5ca8d57f7c..5ca8d57f7c 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
index 7088c704ed..7088c704ed 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
index b69a917081..b69a917081 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
index 30bbdea2ef..30bbdea2ef 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/configuration/Configurator.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/configuration/Configurator.java
index 31c1b61a21..31c1b61a21 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/configuration/Configurator.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/configuration/Configurator.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
index 8573902af4..8573902af4 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index 9ebb893362..9ebb893362 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
index c349b44d6d..c349b44d6d 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
index 98abf7977a..98abf7977a 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
index 5edffc19ed..5edffc19ed 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
index b55dbcc792..b55dbcc792 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
index 37cd85a8f8..37cd85a8f8 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
index e07fd0b8fc..e07fd0b8fc 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
index c77f114428..c77f114428 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
index fe3b19e74e..fe3b19e74e 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
index aa13f1d8ee..aa13f1d8ee 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
index 2b7df4361a..2b7df4361a 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
index 3544e9d1f8..3544e9d1f8 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/Index.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/Index.java
index eacdad8a8e..eacdad8a8e 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/Index.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/Index.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
index 5d6d68b3c8..5d6d68b3c8 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
index 7508e80f7f..7508e80f7f 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/NoRouteException.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/NoRouteException.java
index 1d6ab3842d..1d6ab3842d 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/exchange/NoRouteException.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/exchange/NoRouteException.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
index fb5220f4da..fb5220f4da 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
index 024257bea9..024257bea9 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
index e28ff79820..e28ff79820 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
index 72a9ef7969..72a9ef7969 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
index 0e729cc521..0e729cc521 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
index 5f646c15db..5f646c15db 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManager.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManager.java
index c82de9fa15..c82de9fa15 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManager.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManager.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
index 311f0680ec..311f0680ec 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
index 2061803d65..2061803d65 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
index c8cbdb2125..c8cbdb2125 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/MessageFilter.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
index e6bfe974d5..e6bfe974d5 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
index 47ca930d12..47ca930d12 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
index 5ab360ca19..5ab360ca19 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
index 62a45f5420..62a45f5420 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
index 83b4ed5358..83b4ed5358 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
index f5454afae5..f5454afae5 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java
index f5debb607a..f5debb607a 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java
index 35d770fd5d..35d770fd5d 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
index a6972475a6..a6972475a6 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
index 8bab96a11b..8bab96a11b 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
index d1e4ae6aa6..d1e4ae6aa6 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java
index 782a89c704..782a89c704 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
index 68d4483df3..68d4483df3 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
index 3cd6a87f64..3cd6a87f64 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
index a436c35473..a436c35473 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java
index aca485f62a..aca485f62a 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
index 1f4f1f9221..1f4f1f9221 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java
index ad5604e7ea..ad5604e7ea 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
index bfa170cfc5..bfa170cfc5 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
index 03fc7a3926..03fc7a3926 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
index b086cad67f..b086cad67f 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java
index 853f4df435..853f4df435 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
index 30a40c5a75..30a40c5a75 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
index fef00942a0..fef00942a0 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
index bb9eeed1d4..bb9eeed1d4 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
index ab7695955c..ab7695955c 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java
index 162c03b025..162c03b025 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
index 8ab8366d9e..8ab8366d9e 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
index f9926c399c..f9926c399c 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java
index ac516b6133..ac516b6133 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
index 3e68069838..3e68069838 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
index 29697542be..29697542be 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
index eb7089afdc..eb7089afdc 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java
index 3e1937bb43..3e1937bb43 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
index 3d7ec286f9..3d7ec286f9 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
index f747f7a840..f747f7a840 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
index a9e478e301..a9e478e301 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/jms/JmsConsumer.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/jms/JmsConsumer.java
index c08fae4e4e..c08fae4e4e 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/jms/JmsConsumer.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/jms/JmsConsumer.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
index a2c2bd62a2..a2c2bd62a2 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
index 84526dbc11..84526dbc11 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
index 4caae2b26f..4caae2b26f 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/MBeanAttribute.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/MBeanAttribute.java
index 7d42297699..7d42297699 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/MBeanAttribute.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/MBeanAttribute.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/MBeanConstructor.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/MBeanConstructor.java
index 9138e03085..9138e03085 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/MBeanConstructor.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/MBeanConstructor.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/MBeanDescription.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/MBeanDescription.java
index 448fed3280..448fed3280 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/MBeanDescription.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/MBeanDescription.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
index 0c2ec2aebd..0c2ec2aebd 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
index 4fb260472d..4fb260472d 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperation.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperation.java
index a2dca3e51d..a2dca3e51d 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperation.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperation.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperationParameter.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperationParameter.java
index aba5ec70d8..aba5ec70d8 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperationParameter.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperationParameter.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java
index 166a2a376d..166a2a376d 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
index 45e2e91ed7..45e2e91ed7 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java
index 42ea8921a4..42ea8921a4 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
index d8d87ef881..d8d87ef881 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/ManagementConfiguration.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/ManagementConfiguration.java
index 042f626e8b..042f626e8b 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/ManagementConfiguration.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/ManagementConfiguration.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
index b4fbed6948..b4fbed6948 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverter.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverter.java
index e01c5aabbf..e01c5aabbf 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverter.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverter.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
index 8366c426dd..8366c426dd 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java
index 8462ed9557..8462ed9557 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
index 5bfd47b469..5bfd47b469 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java
index a7599a3e0d..a7599a3e0d 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
index 476e608b01..476e608b01 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPProtocolProvider.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPProtocolProvider.java
index 07c153bfe8..07c153bfe8 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPProtocolProvider.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPProtocolProvider.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
index 390117acf6..390117acf6 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
index 66f928a70e..66f928a70e 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/ExchangeInitialiser.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/ExchangeInitialiser.java
index 29d55ce763..29d55ce763 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/ExchangeInitialiser.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/ExchangeInitialiser.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/HeartbeatConfig.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/HeartbeatConfig.java
index 310deaaf55..310deaaf55 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/HeartbeatConfig.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/HeartbeatConfig.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
index e6e713ac6d..e6e713ac6d 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/UnknnownMessageTypeException.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/UnknnownMessageTypeException.java
index 6e72aa062f..6e72aa062f 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/protocol/UnknnownMessageTypeException.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/protocol/UnknnownMessageTypeException.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
index dd9f32a306..dd9f32a306 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessageHandle.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessageHandle.java
index ede55b3bbf..ede55b3bbf 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessageHandle.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessageHandle.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
index 0c52a358f7..0c52a358f7 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
index 07872d7644..07872d7644 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/AsyncDeliveryConfig.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/AsyncDeliveryConfig.java
index 290fedcf7b..290fedcf7b 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/AsyncDeliveryConfig.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/AsyncDeliveryConfig.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
index eabc8ebf38..eabc8ebf38 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
index cbe9246f09..cbe9246f09 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/DeliveryManager.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/DeliveryManager.java
index 153106d919..153106d919 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/DeliveryManager.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/DeliveryManager.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java
index 60c1a8f574..60c1a8f574 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
index 6466e81dd2..6466e81dd2 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/InMemoryMessageHandle.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/InMemoryMessageHandle.java
index 630186991b..630186991b 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/InMemoryMessageHandle.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/InMemoryMessageHandle.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
index 061ab56024..061ab56024 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
index 090096d3c3..090096d3c3 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/MessageHandleFactory.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/MessageHandleFactory.java
index 94ab935115..94ab935115 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/MessageHandleFactory.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/MessageHandleFactory.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/MessageMetaData.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/MessageMetaData.java
index 6118a4c11f..6118a4c11f 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/MessageMetaData.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/MessageMetaData.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/NoConsumersException.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/NoConsumersException.java
index d6fd1eec89..d6fd1eec89 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/NoConsumersException.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/NoConsumersException.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
index 6b3d65661f..6b3d65661f 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java
index 959ca03c80..959ca03c80 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
index 1210f0e97c..1210f0e97c 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/Subscription.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/Subscription.java
index 77688f19be..77688f19be 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/Subscription.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/Subscription.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java
index 917f7c4e97..917f7c4e97 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
index 1299c3a80c..1299c3a80c 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionManager.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionManager.java
index 4df88baebc..4df88baebc 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionManager.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionManager.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java
index b500247fa4..b500247fa4 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/TransientMessageData.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/TransientMessageData.java
index 79ee6b93a3..79ee6b93a3 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/TransientMessageData.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/TransientMessageData.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java
index 373a64e2eb..373a64e2eb 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/WeightedSubscriptionManager.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/WeightedSubscriptionManager.java
index 6c71571807..6c71571807 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/queue/WeightedSubscriptionManager.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/queue/WeightedSubscriptionManager.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
index 22fa0fab23..22fa0fab23 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
index 1cca259a8d..1cca259a8d 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
index 5a48431288..5a48431288 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java
index 2dc7fcbc1e..2dc7fcbc1e 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessManager.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessManager.java
index d70a6dc8f4..d70a6dc8f4 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessManager.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessManager.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessManagerImpl.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessManagerImpl.java
index 35d036d20f..35d036d20f 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessManagerImpl.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessManagerImpl.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessResult.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessResult.java
index b8d8fc605a..b8d8fc605a 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessResult.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessResult.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessRights.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessRights.java
index 1b79a5a0e0..1b79a5a0e0 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessRights.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessRights.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/Accessable.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/Accessable.java
index f51cf24caa..f51cf24caa 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/Accessable.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/Accessable.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/AllowAll.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/AllowAll.java
index 1ddca3a64e..1ddca3a64e 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/AllowAll.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/AllowAll.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/DenyAll.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/DenyAll.java
index bf40eeba4e..bf40eeba4e 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/DenyAll.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/DenyAll.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/FileAccessManager.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/FileAccessManager.java
index 291bc714ed..291bc714ed 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/FileAccessManager.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/FileAccessManager.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalDatabaseAccessManager.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalDatabaseAccessManager.java
index 6ccadb2e7d..6ccadb2e7d 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalDatabaseAccessManager.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalDatabaseAccessManager.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/UserManagement.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/UserManagement.java
index b8762aa43b..b8762aa43b 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/UserManagement.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/UserManagement.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/VirtualHostAccess.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/VirtualHostAccess.java
index 13151a66b8..13151a66b8 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/access/VirtualHostAccess.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/access/VirtualHostAccess.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
index 0e3aea4de0..0e3aea4de0 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
index 10adfdd9fc..10adfdd9fc 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java
index 2d3f5e5131..2d3f5e5131 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
index 352d41a0ba..352d41a0ba 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java
index 5c372f6c2c..5c372f6c2c 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java
index a82f9ed40b..a82f9ed40b 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabaseManager.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabaseManager.java
index 2c553ae76a..2c553ae76a 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabaseManager.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabaseManager.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java
index 73d58ca489..73d58ca489 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabaseManager.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabaseManager.java
index 6b86a46bd2..6b86a46bd2 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabaseManager.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabaseManager.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
index bb94e0b7bf..bb94e0b7bf 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
index ce5e0cd748..ce5e0cd748 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java
index 89e545d6f5..89e545d6f5 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/JCAProvider.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/JCAProvider.java
index fd4ad86055..fd4ad86055 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/JCAProvider.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/JCAProvider.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
index dd0bd096c3..dd0bd096c3 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipal.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipal.java
index d7c8383690..d7c8383690 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipal.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipal.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java
index 7acc6322d1..7acc6322d1 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java
index 7842f376fb..7842f376fb 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java
index 67d20136bf..67d20136bf 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java
index 97f9a4e91a..97f9a4e91a 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java
index f6cab084ea..f6cab084ea 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java
index 5298b5cc63..5298b5cc63 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java
index 264832888d..264832888d 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java
index 1d16cd8755..1d16cd8755 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
index 36aeb77fe1..36aeb77fe1 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java
index f0dd9eeb6d..f0dd9eeb6d 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java
index f427cc7206..f427cc7206 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
index f96900d0a9..f96900d0a9 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java
index cec67a8a6d..cec67a8a6d 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
index e3af0bc486..e3af0bc486 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java
index 00fc09867b..00fc09867b 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
index 8ccb0be0a8..8ccb0be0a8 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
index 2a83d9b649..2a83d9b649 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java
index 3ee49d58cf..3ee49d58cf 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
index a4ed859fa7..a4ed859fa7 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/transport/ThreadPoolFilter.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/transport/ThreadPoolFilter.java
index bdd27f2d1c..bdd27f2d1c 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/transport/ThreadPoolFilter.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/transport/ThreadPoolFilter.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java
index 988f589339..988f589339 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
index 9068f871cb..9068f871cb 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
index b3d69543d4..b3d69543d4 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/txn/StoreMessageOperation.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/txn/StoreMessageOperation.java
index 0e4d6c2030..0e4d6c2030 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/txn/StoreMessageOperation.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/txn/StoreMessageOperation.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionalContext.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionalContext.java
index fee25c07df..fee25c07df 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionalContext.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionalContext.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/txn/TxnBuffer.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/txn/TxnBuffer.java
index 46a68b6a23..46a68b6a23 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/txn/TxnBuffer.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/txn/TxnBuffer.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/txn/TxnOp.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/txn/TxnOp.java
index 919c078cf0..919c078cf0 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/txn/TxnOp.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/txn/TxnOp.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
index e730e2f3c3..e730e2f3c3 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/util/ConcurrentLinkedQueueNoSize.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/util/ConcurrentLinkedQueueNoSize.java
index cf5e71a6e2..cf5e71a6e2 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/util/ConcurrentLinkedQueueNoSize.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/util/ConcurrentLinkedQueueNoSize.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java
index eda97e0ed2..eda97e0ed2 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java
index 150b98b424..150b98b424 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
index 85d804457e..85d804457e 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
index b95772b680..b95772b680 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java b/Final2/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
index 27917fac8a..27917fac8a 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
index edc900f401..edc900f401 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java
index 5444197cb4..5444197cb4 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java
index b0006b3fe6..b0006b3fe6 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java
index bfa775a34a..bfa775a34a 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java
index a5b3a87616..a5b3a87616 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
index eea53252c6..eea53252c6 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java
index 0f9546541b..0f9546541b 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java
index df8b59ec19..df8b59ec19 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java
index 244a311c30..244a311c30 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java
index 25cff27445..25cff27445 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java
index f187e26593..f187e26593 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java
index a81bc07c38..a81bc07c38 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java
index fd7d4c3f13..fd7d4c3f13 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java
index 5988cdabfc..5988cdabfc 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java
index c27c52eb8e..c27c52eb8e 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java
index 986fea32cc..986fea32cc 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java
index cf457d1ea5..cf457d1ea5 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java
index 09444ccdd7..09444ccdd7 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java
diff --git a/Final/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java b/Final2/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java
index ec080a4611..ec080a4611 100644
--- a/Final/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java
+++ b/Final2/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java
diff --git a/Final/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java b/Final2/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
index b8803206e0..b8803206e0 100644
--- a/Final/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
+++ b/Final2/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
diff --git a/Final/java/broker/src/test/java/org/apache/qpid/server/configuration/TestPropertyUtils.java b/Final2/java/broker/src/test/java/org/apache/qpid/server/configuration/TestPropertyUtils.java
index 3b83190e42..3b83190e42 100644
--- a/Final/java/broker/src/test/java/org/apache/qpid/server/configuration/TestPropertyUtils.java
+++ b/Final2/java/broker/src/test/java/org/apache/qpid/server/configuration/TestPropertyUtils.java
diff --git a/Final/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java b/Final2/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
index 0a3bc93763..0a3bc93763 100644
--- a/Final/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
+++ b/Final2/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
diff --git a/Final/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java b/Final2/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
index 18d8592817..18d8592817 100644
--- a/Final/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
+++ b/Final2/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
diff --git a/Final/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java b/Final2/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
index 86ba96bf5d..86ba96bf5d 100644
--- a/Final/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
+++ b/Final2/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
diff --git a/Final/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java b/Final2/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java
index ff4d3ed9fb..ff4d3ed9fb 100644
--- a/Final/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java
+++ b/Final2/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java
diff --git a/Final/java/broker/src/test/java/org/apache/qpid/server/protocol/TestMinaProtocolSession.java b/Final2/java/broker/src/test/java/org/apache/qpid/server/protocol/TestMinaProtocolSession.java
index 0c0d8f471e..0c0d8f471e 100644
--- a/Final/java/broker/src/test/java/org/apache/qpid/server/protocol/TestMinaProtocolSession.java
+++ b/Final2/java/broker/src/test/java/org/apache/qpid/server/protocol/TestMinaProtocolSession.java
diff --git a/Final/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java b/Final2/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
index b718b9c861..b718b9c861 100644
--- a/Final/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
+++ b/Final2/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
diff --git a/Final/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/Final2/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
index 3caf6ad73d..3caf6ad73d 100644
--- a/Final/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
+++ b/Final2/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
diff --git a/Final/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java b/Final2/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
index 48d808142c..48d808142c 100644
--- a/Final/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
+++ b/Final2/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
diff --git a/Final/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java b/Final2/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
index c7db51016e..c7db51016e 100644
--- a/Final/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
+++ b/Final2/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
diff --git a/Final/java/client-java14/README.txt b/Final2/java/client-java14/README.txt
index 66621c7eb2..66621c7eb2 100644
--- a/Final/java/client-java14/README.txt
+++ b/Final2/java/client-java14/README.txt
diff --git a/Final/java/client-java14/etc/sasl.properties b/Final2/java/client-java14/etc/sasl.properties
index 04519e2a30..04519e2a30 100644
--- a/Final/java/client-java14/etc/sasl.properties
+++ b/Final2/java/client-java14/etc/sasl.properties
diff --git a/Final/java/client-java14/pom.xml b/Final2/java/client-java14/pom.xml
index a2da7800e6..a2da7800e6 100644
--- a/Final/java/client-java14/pom.xml
+++ b/Final2/java/client-java14/pom.xml
diff --git a/Final/java/client-java14/src/main/assembly/client-java14-bin.xml b/Final2/java/client-java14/src/main/assembly/client-java14-bin.xml
index 91e1f23975..91e1f23975 100644
--- a/Final/java/client-java14/src/main/assembly/client-java14-bin.xml
+++ b/Final2/java/client-java14/src/main/assembly/client-java14-bin.xml
diff --git a/Final/java/client-java14/src/main/assembly/jar-with-dependencies.xml b/Final2/java/client-java14/src/main/assembly/jar-with-dependencies.xml
index 091fd46427..091fd46427 100644
--- a/Final/java/client-java14/src/main/assembly/jar-with-dependencies.xml
+++ b/Final2/java/client-java14/src/main/assembly/jar-with-dependencies.xml
diff --git a/Final/java/client-java14/src/main/java/org/apache/qpid/sasl/ClientFactoryImpl.java b/Final2/java/client-java14/src/main/java/org/apache/qpid/sasl/ClientFactoryImpl.java
index 691020307a..691020307a 100644
--- a/Final/java/client-java14/src/main/java/org/apache/qpid/sasl/ClientFactoryImpl.java
+++ b/Final2/java/client-java14/src/main/java/org/apache/qpid/sasl/ClientFactoryImpl.java
diff --git a/Final/java/client-java14/src/main/java/org/apache/qpid/sasl/CramMD5Client.java b/Final2/java/client-java14/src/main/java/org/apache/qpid/sasl/CramMD5Client.java
index 7d15f03329..7d15f03329 100644
--- a/Final/java/client-java14/src/main/java/org/apache/qpid/sasl/CramMD5Client.java
+++ b/Final2/java/client-java14/src/main/java/org/apache/qpid/sasl/CramMD5Client.java
diff --git a/Final/java/client-java14/src/main/java/org/apache/qpid/sasl/PlainClient.java b/Final2/java/client-java14/src/main/java/org/apache/qpid/sasl/PlainClient.java
index 97e607c57e..97e607c57e 100644
--- a/Final/java/client-java14/src/main/java/org/apache/qpid/sasl/PlainClient.java
+++ b/Final2/java/client-java14/src/main/java/org/apache/qpid/sasl/PlainClient.java
diff --git a/Final/java/client-java14/src/main/java/org/apache/qpid/sasl/Provider.java b/Final2/java/client-java14/src/main/java/org/apache/qpid/sasl/Provider.java
index f9a5c42c3d..f9a5c42c3d 100644
--- a/Final/java/client-java14/src/main/java/org/apache/qpid/sasl/Provider.java
+++ b/Final2/java/client-java14/src/main/java/org/apache/qpid/sasl/Provider.java
diff --git a/Final/java/client-java14/src/test/java/org/apache/qpid/test/integration/client/ConnectionTest.java b/Final2/java/client-java14/src/test/java/org/apache/qpid/test/integration/client/ConnectionTest.java
index 468beda5b5..468beda5b5 100644
--- a/Final/java/client-java14/src/test/java/org/apache/qpid/test/integration/client/ConnectionTest.java
+++ b/Final2/java/client-java14/src/test/java/org/apache/qpid/test/integration/client/ConnectionTest.java
diff --git a/Final/java/client/distribution/pom.xml b/Final2/java/client/distribution/pom.xml
index bd97463d15..bd97463d15 100644
--- a/Final/java/client/distribution/pom.xml
+++ b/Final2/java/client/distribution/pom.xml
diff --git a/Final/java/client/distribution/src/main/assembly/client-bin-tests.xml b/Final2/java/client/distribution/src/main/assembly/client-bin-tests.xml
index ec4df1c9a7..ec4df1c9a7 100644
--- a/Final/java/client/distribution/src/main/assembly/client-bin-tests.xml
+++ b/Final2/java/client/distribution/src/main/assembly/client-bin-tests.xml
diff --git a/Final/java/client/distribution/src/main/assembly/client-bin.xml b/Final2/java/client/distribution/src/main/assembly/client-bin.xml
index 70874b09a4..70874b09a4 100644
--- a/Final/java/client/distribution/src/main/assembly/client-bin.xml
+++ b/Final2/java/client/distribution/src/main/assembly/client-bin.xml
diff --git a/Final/java/client/distribution/src/main/assembly/client-java1.4-bin.xml b/Final2/java/client/distribution/src/main/assembly/client-java1.4-bin.xml
index 6a2dd17c5c..6a2dd17c5c 100644
--- a/Final/java/client/distribution/src/main/assembly/client-java1.4-bin.xml
+++ b/Final2/java/client/distribution/src/main/assembly/client-java1.4-bin.xml
diff --git a/Final/java/client/distribution/src/main/assembly/client-src.xml b/Final2/java/client/distribution/src/main/assembly/client-src.xml
index b5055f05d7..b5055f05d7 100644
--- a/Final/java/client/distribution/src/main/assembly/client-src.xml
+++ b/Final2/java/client/distribution/src/main/assembly/client-src.xml
diff --git a/Final/java/client/example/bin/set_classpath.bat b/Final2/java/client/example/bin/set_classpath.bat
index d528967024..d528967024 100644
--- a/Final/java/client/example/bin/set_classpath.bat
+++ b/Final2/java/client/example/bin/set_classpath.bat
diff --git a/Final/java/client/example/bin/set_classpath.sh b/Final2/java/client/example/bin/set_classpath.sh
index 89e9bc8242..89e9bc8242 100755
--- a/Final/java/client/example/bin/set_classpath.sh
+++ b/Final2/java/client/example/bin/set_classpath.sh
diff --git a/Final/java/client/example/pom.xml b/Final2/java/client/example/pom.xml
index 3d4cf21a2d..3d4cf21a2d 100644
--- a/Final/java/client/example/pom.xml
+++ b/Final2/java/client/example/pom.xml
diff --git a/Final/java/client/example/source-jar.xml b/Final2/java/client/example/source-jar.xml
index 60451448b8..60451448b8 100644
--- a/Final/java/client/example/source-jar.xml
+++ b/Final2/java/client/example/source-jar.xml
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/log4j.xml b/Final2/java/client/example/src/main/java/org/apache/qpid/example/log4j.xml
index de64423a51..de64423a51 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/log4j.xml
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/log4j.xml
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
index 6a7626c51d..6a7626c51d 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java
index f3b21e3c64..f3b21e3c64 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java
index 0a4231c977..0a4231c977 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
index b6544db995..b6544db995 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java
index a67b602e58..a67b602e58 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
index 2bde4ec35c..2bde4ec35c 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
index 399cbc9427..399cbc9427 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java
index e32ee0ba73..e32ee0ba73 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java
index c4edd9034f..c4edd9034f 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java
index dd936e429f..dd936e429f 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java
index f2d736701f..f2d736701f 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java
index 6eb847ea9d..6eb847ea9d 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java
index bf805ab817..bf805ab817 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/shared/FileUtils.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/shared/FileUtils.java
index 54446cb6a7..54446cb6a7 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/shared/FileUtils.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/shared/FileUtils.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java
index 98a2c0d497..98a2c0d497 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/shared/Statics.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/shared/Statics.java
index c056f8a7da..c056f8a7da 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/shared/Statics.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/shared/Statics.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties b/Final2/java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties
index a60e3964ad..a60e3964ad 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
index 1d2e5e0e66..1d2e5e0e66 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
index d2f27da052..d2f27da052 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java
index d443dca828..d443dca828 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java
diff --git a/Final/java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java b/Final2/java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
index 32a0ef685c..32a0ef685c 100644
--- a/Final/java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
+++ b/Final2/java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
diff --git a/Final/java/client/pom.xml b/Final2/java/client/pom.xml
index 0f0757e9a3..0f0757e9a3 100644
--- a/Final/java/client/pom.xml
+++ b/Final2/java/client/pom.xml
diff --git a/Final/java/client/src/main/java/client.log4j b/Final2/java/client/src/main/java/client.log4j
index 525433e9a9..525433e9a9 100644
--- a/Final/java/client/src/main/java/client.log4j
+++ b/Final2/java/client/src/main/java/client.log4j
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
index b6fbb6c6bf..b6fbb6c6bf 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
index c04380ba8c..c04380ba8c 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
index 9abc94b3df..9abc94b3df 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
index 7c0803a61a..7c0803a61a 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
index 24f5ead2d0..24f5ead2d0 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
index cc5af07b20..cc5af07b20 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
index 1a2fe0d355..1a2fe0d355 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQNoConsumersException.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQNoConsumersException.java
index 54d5a0426f..54d5a0426f 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQNoConsumersException.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQNoConsumersException.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQNoRouteException.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQNoRouteException.java
index a314101acf..a314101acf 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQNoRouteException.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQNoRouteException.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
index 9185bc87e8..9185bc87e8 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
index 28e5992b26..28e5992b26 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java
index a8c83d8868..a8c83d8868 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index a0b79b135d..a0b79b135d 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQSessionAdapter.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQSessionAdapter.java
index 93f10761e2..93f10761e2 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQSessionAdapter.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQSessionAdapter.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java
index f54cb782c8..f54cb782c8 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
index 7b5781530b..7b5781530b 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
index 319e728edf..319e728edf 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
index f44f8414fa..f44f8414fa 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/AMQUndefinedDestination.java b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQUndefinedDestination.java
index 0f3723c58b..0f3723c58b 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/AMQUndefinedDestination.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/AMQUndefinedDestination.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java b/Final2/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
index ddaf0cfd93..ddaf0cfd93 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java b/Final2/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
index 0ee4882ec2..0ee4882ec2 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/Closeable.java b/Final2/java/client/src/main/java/org/apache/qpid/client/Closeable.java
index 7e119343a1..7e119343a1 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/Closeable.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/Closeable.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/ConnectionTuneParameters.java b/Final2/java/client/src/main/java/org/apache/qpid/client/ConnectionTuneParameters.java
index b1ec7216bc..b1ec7216bc 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/ConnectionTuneParameters.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/ConnectionTuneParameters.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java b/Final2/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
index a5e89ef4fc..a5e89ef4fc 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/DispatcherCallback.java b/Final2/java/client/src/main/java/org/apache/qpid/client/DispatcherCallback.java
index 81a55006ed..81a55006ed 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/DispatcherCallback.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/DispatcherCallback.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/JMSAMQException.java b/Final2/java/client/src/main/java/org/apache/qpid/client/JMSAMQException.java
index 0927ca3625..0927ca3625 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/JMSAMQException.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/JMSAMQException.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/JmsNotImplementedException.java b/Final2/java/client/src/main/java/org/apache/qpid/client/JmsNotImplementedException.java
index 903514c35f..903514c35f 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/JmsNotImplementedException.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/JmsNotImplementedException.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/MessageConsumerPair.java b/Final2/java/client/src/main/java/org/apache/qpid/client/MessageConsumerPair.java
index 585d6db3fd..585d6db3fd 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/MessageConsumerPair.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/MessageConsumerPair.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java b/Final2/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java
index 3bb5707417..3bb5707417 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/QueueReceiverAdaptor.java b/Final2/java/client/src/main/java/org/apache/qpid/client/QueueReceiverAdaptor.java
index 7059588367..7059588367 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/QueueReceiverAdaptor.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/QueueReceiverAdaptor.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java b/Final2/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java
index 493e2b5ec0..493e2b5ec0 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/SSLConfiguration.java b/Final2/java/client/src/main/java/org/apache/qpid/client/SSLConfiguration.java
index 2280cc9870..2280cc9870 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/SSLConfiguration.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/SSLConfiguration.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/TemporaryDestination.java b/Final2/java/client/src/main/java/org/apache/qpid/client/TemporaryDestination.java
index 03d25aa243..03d25aa243 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/TemporaryDestination.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/TemporaryDestination.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java b/Final2/java/client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java
index 81b9940ed5..81b9940ed5 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java b/Final2/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
index d4bec5d906..d4bec5d906 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/failover/FailoverException.java b/Final2/java/client/src/main/java/org/apache/qpid/client/failover/FailoverException.java
index 037b0dc2d1..037b0dc2d1 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/failover/FailoverException.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/failover/FailoverException.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
index 5303993331..5303993331 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/failover/FailoverNoopSupport.java b/Final2/java/client/src/main/java/org/apache/qpid/client/failover/FailoverNoopSupport.java
index 1ec98efe0e..1ec98efe0e 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/failover/FailoverNoopSupport.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/failover/FailoverNoopSupport.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/failover/FailoverProtectedOperation.java b/Final2/java/client/src/main/java/org/apache/qpid/client/failover/FailoverProtectedOperation.java
index 9a7f43926e..9a7f43926e 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/failover/FailoverProtectedOperation.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/failover/FailoverProtectedOperation.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/failover/FailoverRetrySupport.java b/Final2/java/client/src/main/java/org/apache/qpid/client/failover/FailoverRetrySupport.java
index 120a07f0fc..120a07f0fc 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/failover/FailoverRetrySupport.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/failover/FailoverRetrySupport.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/failover/FailoverState.java b/Final2/java/client/src/main/java/org/apache/qpid/client/failover/FailoverState.java
index 807a5f7d13..807a5f7d13 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/failover/FailoverState.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/failover/FailoverState.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java b/Final2/java/client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java
index ef2e7e1d65..ef2e7e1d65 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java
index 8f0ee05b3e..8f0ee05b3e 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
index 51120da55c..51120da55c 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
index 0f00c6a26e..0f00c6a26e 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
index 139a32370e..139a32370e 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
index e1fe2697e5..e1fe2697e5 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
index ca3f46d08b..ca3f46d08b 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
index df096d3c4e..df096d3c4e 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
index 2e0f273c32..2e0f273c32 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
index 213c0eba6e..213c0eba6e 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
index ab6acffeaf..ab6acffeaf 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
index f14e256172..f14e256172 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
index 68556991d7..68556991d7 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
index 862a9be8d4..862a9be8d4 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
index 65060d44d2..65060d44d2 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/AMQMessage.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/AMQMessage.java
index 8741a1cbb6..8741a1cbb6 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/AMQMessage.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/AMQMessage.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java
index af254fbbaf..af254fbbaf 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
index 3b8ce9a98a..3b8ce9a98a 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
index 2dfeb19268..2dfeb19268 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
index 87df7e1337..87df7e1337 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
index 19382b58c3..19382b58c3 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java
index fd2aae9feb..fd2aae9feb 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
index 39b4e1e27b..39b4e1e27b 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
index a70acbabbe..a70acbabbe 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java
index a6b9bb29a4..a6b9bb29a4 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
index caf8741280..caf8741280 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java
index 57ac4fb006..57ac4fb006 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java
index b4350c7a98..b4350c7a98 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java
index c34ee7175d..c34ee7175d 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
index 87cc80f21d..87cc80f21d 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java
index c5942dbe2a..c5942dbe2a 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
index f6b11c6f6c..f6b11c6f6c 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
index 0fe4af715d..0fe4af715d 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
index c2015f9e7c..c2015f9e7c 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/UnexpectedBodyReceivedException.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/UnexpectedBodyReceivedException.java
index 1f61a661d4..1f61a661d4 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/UnexpectedBodyReceivedException.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/UnexpectedBodyReceivedException.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java b/Final2/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java
index 5b199f2478..5b199f2478 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
index e7ff5afceb..e7ff5afceb 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java b/Final2/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
index 5fe6ffe6c6..5fe6ffe6c6 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java b/Final2/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
index 1badbb601c..1badbb601c 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatConfig.java b/Final2/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatConfig.java
index 35ea44a331..35ea44a331 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatConfig.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatConfig.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java b/Final2/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java
index d44faeab04..d44faeab04 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java b/Final2/java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java
index 93cc5e7ec3..93cc5e7ec3 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
index fbca444208..fbca444208 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java b/Final2/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java
index 140cbdeb75..140cbdeb75 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties b/Final2/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
index 89ee8337f8..89ee8337f8 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java b/Final2/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java
index 803b34b7fa..803b34b7fa 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties b/Final2/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
index 1bff43142b..1bff43142b 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/security/JCAProvider.java b/Final2/java/client/src/main/java/org/apache/qpid/client/security/JCAProvider.java
index 5a2c5ac5c1..5a2c5ac5c1 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/security/JCAProvider.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/security/JCAProvider.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java
index 66176dac3c..66176dac3c 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java b/Final2/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
index c50c62710f..c50c62710f 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java b/Final2/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java
index f8a25c630c..f8a25c630c 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java b/Final2/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java
index 30cc786890..30cc786890 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClientFactory.java b/Final2/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClientFactory.java
index 22bb1ac156..22bb1ac156 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClientFactory.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClientFactory.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/state/AMQState.java b/Final2/java/client/src/main/java/org/apache/qpid/client/state/AMQState.java
index 4996f59345..4996f59345 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/state/AMQState.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/state/AMQState.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/state/AMQStateChangedEvent.java b/Final2/java/client/src/main/java/org/apache/qpid/client/state/AMQStateChangedEvent.java
index edef54ccd6..edef54ccd6 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/state/AMQStateChangedEvent.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/state/AMQStateChangedEvent.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/state/AMQStateListener.java b/Final2/java/client/src/main/java/org/apache/qpid/client/state/AMQStateListener.java
index 110471aad0..110471aad0 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/state/AMQStateListener.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/state/AMQStateListener.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java b/Final2/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
index 227f23b540..227f23b540 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/state/IllegalStateTransitionException.java b/Final2/java/client/src/main/java/org/apache/qpid/client/state/IllegalStateTransitionException.java
index 41fa1ba704..41fa1ba704 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/state/IllegalStateTransitionException.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/state/IllegalStateTransitionException.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java b/Final2/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
index b3932533ce..b3932533ce 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/state/StateListener.java b/Final2/java/client/src/main/java/org/apache/qpid/client/state/StateListener.java
index df207a0a23..df207a0a23 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/state/StateListener.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/state/StateListener.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java b/Final2/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java
index 73d5a8a3d6..73d5a8a3d6 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java b/Final2/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
index 4a4f4a0a38..4a4f4a0a38 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/transport/AMQNoTransportForProtocolException.java b/Final2/java/client/src/main/java/org/apache/qpid/client/transport/AMQNoTransportForProtocolException.java
index da16baaad9..da16baaad9 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/transport/AMQNoTransportForProtocolException.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/transport/AMQNoTransportForProtocolException.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/transport/AMQTransportConnectionException.java b/Final2/java/client/src/main/java/org/apache/qpid/client/transport/AMQTransportConnectionException.java
index 24b4e03b39..24b4e03b39 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/transport/AMQTransportConnectionException.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/transport/AMQTransportConnectionException.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/transport/ITransportConnection.java b/Final2/java/client/src/main/java/org/apache/qpid/client/transport/ITransportConnection.java
index 7a24d6e15a..7a24d6e15a 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/transport/ITransportConnection.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/transport/ITransportConnection.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java b/Final2/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java
index 5482e48699..5482e48699 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java b/Final2/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
index 1d0d6a3491..1d0d6a3491 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java b/Final2/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java
index d9137dc8b1..d9137dc8b1 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java b/Final2/java/client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java
index 579b0d9e90..579b0d9e90 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java b/Final2/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
index 1791e7ede3..1791e7ede3 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java b/Final2/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
index 91f7710025..91f7710025 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jms/ChannelLimitReachedException.java b/Final2/java/client/src/main/java/org/apache/qpid/jms/ChannelLimitReachedException.java
index 3d4a4573ed..3d4a4573ed 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jms/ChannelLimitReachedException.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jms/ChannelLimitReachedException.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jms/Connection.java b/Final2/java/client/src/main/java/org/apache/qpid/jms/Connection.java
index 616c6dbbec..616c6dbbec 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jms/Connection.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jms/Connection.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jms/ConnectionListener.java b/Final2/java/client/src/main/java/org/apache/qpid/jms/ConnectionListener.java
index 11c235901c..11c235901c 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jms/ConnectionListener.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jms/ConnectionListener.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java b/Final2/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
index 2d91e290c4..2d91e290c4 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java b/Final2/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
index 6ec883ff0b..6ec883ff0b 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jms/Message.java b/Final2/java/client/src/main/java/org/apache/qpid/jms/Message.java
index 6752ee616f..6752ee616f 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jms/Message.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jms/Message.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jms/MessageConsumer.java b/Final2/java/client/src/main/java/org/apache/qpid/jms/MessageConsumer.java
index caac2b5c1f..caac2b5c1f 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jms/MessageConsumer.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jms/MessageConsumer.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jms/MessageProducer.java b/Final2/java/client/src/main/java/org/apache/qpid/jms/MessageProducer.java
index b91fc2d960..b91fc2d960 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jms/MessageProducer.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jms/MessageProducer.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jms/Session.java b/Final2/java/client/src/main/java/org/apache/qpid/jms/Session.java
index 5287381fae..5287381fae 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jms/Session.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jms/Session.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverMethod.java b/Final2/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverMethod.java
index d7ec46dea3..d7ec46dea3 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverMethod.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverMethod.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java b/Final2/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
index 4e0d0b79b5..4e0d0b79b5 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java b/Final2/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
index 68e6d25be0..68e6d25be0 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jndi/Example.properties b/Final2/java/client/src/main/java/org/apache/qpid/jndi/Example.properties
index c457e94cab..c457e94cab 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jndi/Example.properties
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jndi/Example.properties
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jndi/NameParserImpl.java b/Final2/java/client/src/main/java/org/apache/qpid/jndi/NameParserImpl.java
index a3174aec7a..a3174aec7a 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jndi/NameParserImpl.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jndi/NameParserImpl.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java b/Final2/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
index a46c7f3cd5..a46c7f3cd5 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
diff --git a/Final/java/client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java b/Final2/java/client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java
index 1719ea1219..1719ea1219 100644
--- a/Final/java/client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java
+++ b/Final2/java/client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java b/Final2/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
index 2c08f1e34a..2c08f1e34a 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java b/Final2/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
index 10e8b94311..10e8b94311 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java b/Final2/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
index ca071c1187..ca071c1187 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/README.txt b/Final2/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/README.txt
index 95ee9f9c77..95ee9f9c77 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/README.txt
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/README.txt
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/cluster/Client.java b/Final2/java/client/src/old_test/java/org/apache/qpid/cluster/Client.java
index cf8059a143..cf8059a143 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/cluster/Client.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/cluster/Client.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/codec/BasicDeliverTest.java b/Final2/java/client/src/old_test/java/org/apache/qpid/codec/BasicDeliverTest.java
index 1db7e200bd..1db7e200bd 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/codec/BasicDeliverTest.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/codec/BasicDeliverTest.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/codec/Client.java b/Final2/java/client/src/old_test/java/org/apache/qpid/codec/Client.java
index 3886021277..3886021277 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/codec/Client.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/codec/Client.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/codec/Server.java b/Final2/java/client/src/old_test/java/org/apache/qpid/codec/Server.java
index fa4295e0b2..fa4295e0b2 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/codec/Server.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/codec/Server.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java b/Final2/java/client/src/old_test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
index cac0064785..cac0064785 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/config/AbstractConfig.java b/Final2/java/client/src/old_test/java/org/apache/qpid/config/AbstractConfig.java
index 04381d66a0..04381d66a0 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/config/AbstractConfig.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/config/AbstractConfig.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java b/Final2/java/client/src/old_test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
index a9984eb09a..a9984eb09a 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/config/Connector.java b/Final2/java/client/src/old_test/java/org/apache/qpid/config/Connector.java
index ff2377f087..ff2377f087 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/config/Connector.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/config/Connector.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/config/ConnectorConfig.java b/Final2/java/client/src/old_test/java/org/apache/qpid/config/ConnectorConfig.java
index b120ed3f12..b120ed3f12 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/config/ConnectorConfig.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/config/ConnectorConfig.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java b/Final2/java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
index 44285efd96..44285efd96 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java b/Final2/java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java
index cb8adae18c..cb8adae18c 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java b/Final2/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
index a246352d8b..a246352d8b 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java b/Final2/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
index b0cde22349..b0cde22349 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/headers/Listener.java b/Final2/java/client/src/old_test/java/org/apache/qpid/headers/Listener.java
index cb5caefc1e..cb5caefc1e 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/headers/Listener.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/headers/Listener.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/headers/MessageFactory.java b/Final2/java/client/src/old_test/java/org/apache/qpid/headers/MessageFactory.java
index a2d575fdd4..a2d575fdd4 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/headers/MessageFactory.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/headers/MessageFactory.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/headers/Publisher.java b/Final2/java/client/src/old_test/java/org/apache/qpid/headers/Publisher.java
index d9ef702c48..d9ef702c48 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/headers/Publisher.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/headers/Publisher.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Bind.java b/Final2/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Bind.java
index ee6a12c233..ee6a12c233 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Bind.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Bind.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Lookup.java b/Final2/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Lookup.java
index 1c9d8b0fd5..1c9d8b0fd5 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Lookup.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Lookup.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Unbind.java b/Final2/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Unbind.java
index 1acead674c..1acead674c 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Unbind.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Unbind.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java b/Final2/java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java
index 4865a68dc4..4865a68dc4 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/mina/AcceptorTest.java b/Final2/java/client/src/old_test/java/org/apache/qpid/mina/AcceptorTest.java
index f0ac0e6902..f0ac0e6902 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/mina/AcceptorTest.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/mina/AcceptorTest.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/mina/BlockingAcceptorTest.java b/Final2/java/client/src/old_test/java/org/apache/qpid/mina/BlockingAcceptorTest.java
index bfe29c47e6..bfe29c47e6 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/mina/BlockingAcceptorTest.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/mina/BlockingAcceptorTest.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/mina/WriterTest.java b/Final2/java/client/src/old_test/java/org/apache/qpid/mina/WriterTest.java
index 910345624f..910345624f 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/mina/WriterTest.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/mina/WriterTest.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java b/Final2/java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java
index db02b9954a..db02b9954a 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java b/Final2/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java
index 33891142b5..33891142b5 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java b/Final2/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java
index 450d9b3914..450d9b3914 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/test/unit/client/connection/TestManyConnections.java b/Final2/java/client/src/old_test/java/org/apache/qpid/test/unit/client/connection/TestManyConnections.java
index f59b36166a..f59b36166a 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/test/unit/client/connection/TestManyConnections.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/test/unit/client/connection/TestManyConnections.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java b/Final2/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java
index 5ab5722146..5ab5722146 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/example.properties b/Final2/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/example.properties
index ea9dc5ae0e..ea9dc5ae0e 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/example.properties
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/example.properties
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/topic/Config.java b/Final2/java/client/src/old_test/java/org/apache/qpid/topic/Config.java
index bb740f9094..bb740f9094 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/topic/Config.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/topic/Config.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/topic/Listener.java b/Final2/java/client/src/old_test/java/org/apache/qpid/topic/Listener.java
index 47c608cfe4..47c608cfe4 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/topic/Listener.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/topic/Listener.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java b/Final2/java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java
index 39d64069d1..39d64069d1 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/topic/Publisher.java b/Final2/java/client/src/old_test/java/org/apache/qpid/topic/Publisher.java
index d788029ee9..d788029ee9 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/topic/Publisher.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/topic/Publisher.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/transacted/Config.java b/Final2/java/client/src/old_test/java/org/apache/qpid/transacted/Config.java
index bd104e5407..bd104e5407 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/transacted/Config.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/transacted/Config.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java b/Final2/java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java
index 8f15bf089e..8f15bf089e 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java b/Final2/java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java
index f4f4b20d7c..f4f4b20d7c 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/transacted/Relay.java b/Final2/java/client/src/old_test/java/org/apache/qpid/transacted/Relay.java
index cede95e5f0..cede95e5f0 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/transacted/Relay.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/transacted/Relay.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/transacted/Start.java b/Final2/java/client/src/old_test/java/org/apache/qpid/transacted/Start.java
index de718d828a..de718d828a 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/transacted/Start.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/transacted/Start.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceProvider.java b/Final2/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceProvider.java
index 71d806b338..71d806b338 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceProvider.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceProvider.java
diff --git a/Final/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java b/Final2/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
index 2f64a1dde5..2f64a1dde5 100644
--- a/Final/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
+++ b/Final2/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
diff --git a/Final/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java b/Final2/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
index 5323ad28bf..5323ad28bf 100644
--- a/Final/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
+++ b/Final2/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java b/Final2/java/client/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
index fe418535d6..fe418535d6 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/client/DispatcherTest.java b/Final2/java/client/src/test/java/org/apache/qpid/client/DispatcherTest.java
index 7cca22de6c..7cca22de6c 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/client/DispatcherTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/client/DispatcherTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java b/Final2/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java
index 7461f6c200..7461f6c200 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java b/Final2/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
index 20632e245f..20632e245f 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java b/Final2/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java
index 87630fad5b..87630fad5b 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java b/Final2/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java
index 21f3e273aa..21f3e273aa 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/client/SpecificMethodFrameListenerTest.java b/Final2/java/client/src/test/java/org/apache/qpid/client/SpecificMethodFrameListenerTest.java
index 4cffcecf8a..4cffcecf8a 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/client/SpecificMethodFrameListenerTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/client/SpecificMethodFrameListenerTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/client/message/NonQpidObjectMessage.java b/Final2/java/client/src/test/java/org/apache/qpid/client/message/NonQpidObjectMessage.java
index 60a26c8e62..60a26c8e62 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/client/message/NonQpidObjectMessage.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/client/message/NonQpidObjectMessage.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java b/Final2/java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java
index 9b477c19e2..9b477c19e2 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
index b6f46b4acc..b6f46b4acc 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
index da1b46ee2c..da1b46ee2c 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
index ddbc69826d..ddbc69826d 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
index aff496becf..aff496becf 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java
index 60ed688897..60ed688897 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
index 83846e0081..83846e0081 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
index 03698b2ab2..03698b2ab2 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
index 6708fefa86..6708fefa86 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
index 65b3d60ad9..65b3d60ad9 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
index 9237555734..9237555734 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
index dce9667ff2..dce9667ff2 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
index a3d0cf6dcd..a3d0cf6dcd 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java
index 668233f356..668233f356 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java
index 40c712c1c9..40c712c1c9 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
index cc18169a5b..cc18169a5b 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
index 000fb9ab88..000fb9ab88 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java
index 690ba7f01b..690ba7f01b 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
index 0e15341615..0e15341615 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
index 78b7976f55..78b7976f55 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
index e513f25e3d..e513f25e3d 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
index 575d542633..575d542633 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
index 559e9a4741..559e9a4741 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java
index f1099ca5ab..f1099ca5ab 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
index 9600d1e9d3..9600d1e9d3 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java
index d128f30727..d128f30727 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
index 1d108b9c5c..1d108b9c5c 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
index 56394fee27..56394fee27 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
index bfbba61913..bfbba61913 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
index 66be1ebc73..66be1ebc73 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
index 19ef612bcc..19ef612bcc 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
index 9cde24dd92..9cde24dd92 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java
index 6593f7d86a..6593f7d86a 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java
index be16f6b7ae..be16f6b7ae 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.java
index 27371b0397..27371b0397 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java
index bbabf0b57d..bbabf0b57d 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
index 3e04c36b38..3e04c36b38 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
index cd03b523d1..cd03b523d1 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java
index 802f1e6c2e..802f1e6c2e 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java
index 30f3b0b4eb..30f3b0b4eb 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/TestIoSession.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/TestIoSession.java
index d14e0b771f..d14e0b771f 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/TestIoSession.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/TestIoSession.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
index 241c9177a8..241c9177a8 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
index 5a61480f6a..5a61480f6a 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
index bf8802c803..bf8802c803 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
index 5e2703d5a5..5e2703d5a5 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java
index a1d9af558c..a1d9af558c 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
index 3012909daa..3012909daa 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
index fd425b9930..fd425b9930 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java
index df53c796b2..df53c796b2 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
index 9c4f2af107..9c4f2af107 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
index a0a8eb10ed..a0a8eb10ed 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
index 929e2799a9..929e2799a9 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
index 065b06a87d..065b06a87d 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
index 224463a446..224463a446 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
index 678474a18b..678474a18b 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/testutil/Config.java b/Final2/java/client/src/test/java/org/apache/qpid/testutil/Config.java
index b777cf93b6..b777cf93b6 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/testutil/Config.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/testutil/Config.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/testutil/QpidClientConnection.java b/Final2/java/client/src/test/java/org/apache/qpid/testutil/QpidClientConnection.java
index 7eb2abe7eb..7eb2abe7eb 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/testutil/QpidClientConnection.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/testutil/QpidClientConnection.java
diff --git a/Final/java/client/src/test/java/org/apache/qpid/testutil/VMBrokerSetup.java b/Final2/java/client/src/test/java/org/apache/qpid/testutil/VMBrokerSetup.java
index cedf1ac824..cedf1ac824 100644
--- a/Final/java/client/src/test/java/org/apache/qpid/testutil/VMBrokerSetup.java
+++ b/Final2/java/client/src/test/java/org/apache/qpid/testutil/VMBrokerSetup.java
diff --git a/Final/java/client/test/bin/IBM-JNDI-Setup.bat b/Final2/java/client/test/bin/IBM-JNDI-Setup.bat
index eb6a87fa9e..eb6a87fa9e 100644
--- a/Final/java/client/test/bin/IBM-JNDI-Setup.bat
+++ b/Final2/java/client/test/bin/IBM-JNDI-Setup.bat
diff --git a/Final/java/client/test/bin/IBM-JNDI-Setup.sh b/Final2/java/client/test/bin/IBM-JNDI-Setup.sh
index e3112f812d..e3112f812d 100755
--- a/Final/java/client/test/bin/IBM-JNDI-Setup.sh
+++ b/Final2/java/client/test/bin/IBM-JNDI-Setup.sh
diff --git a/Final/java/client/test/bin/IBM-Publisher.bat b/Final2/java/client/test/bin/IBM-Publisher.bat
index 5bb4343c4c..5bb4343c4c 100644
--- a/Final/java/client/test/bin/IBM-Publisher.bat
+++ b/Final2/java/client/test/bin/IBM-Publisher.bat
diff --git a/Final/java/client/test/bin/IBM-Publisher.sh b/Final2/java/client/test/bin/IBM-Publisher.sh
index adecf040bc..adecf040bc 100755
--- a/Final/java/client/test/bin/IBM-Publisher.sh
+++ b/Final2/java/client/test/bin/IBM-Publisher.sh
diff --git a/Final/java/client/test/bin/IBM-PutGet.bat b/Final2/java/client/test/bin/IBM-PutGet.bat
index c4316f1256..c4316f1256 100644
--- a/Final/java/client/test/bin/IBM-PutGet.bat
+++ b/Final2/java/client/test/bin/IBM-PutGet.bat
diff --git a/Final/java/client/test/bin/IBM-PutGet.sh b/Final2/java/client/test/bin/IBM-PutGet.sh
index c75667c9f6..c75667c9f6 100755
--- a/Final/java/client/test/bin/IBM-PutGet.sh
+++ b/Final2/java/client/test/bin/IBM-PutGet.sh
diff --git a/Final/java/client/test/bin/IBM-README.txt b/Final2/java/client/test/bin/IBM-README.txt
index b076f3b3ca..b076f3b3ca 100644
--- a/Final/java/client/test/bin/IBM-README.txt
+++ b/Final2/java/client/test/bin/IBM-README.txt
diff --git a/Final/java/client/test/bin/IBM-Receiver.bat b/Final2/java/client/test/bin/IBM-Receiver.bat
index dff44d472a..dff44d472a 100644
--- a/Final/java/client/test/bin/IBM-Receiver.bat
+++ b/Final2/java/client/test/bin/IBM-Receiver.bat
diff --git a/Final/java/client/test/bin/IBM-Receiver.sh b/Final2/java/client/test/bin/IBM-Receiver.sh
index f50f0f744e..f50f0f744e 100755
--- a/Final/java/client/test/bin/IBM-Receiver.sh
+++ b/Final2/java/client/test/bin/IBM-Receiver.sh
diff --git a/Final/java/client/test/bin/IBM-Sender.bat b/Final2/java/client/test/bin/IBM-Sender.bat
index b8826322e5..b8826322e5 100644
--- a/Final/java/client/test/bin/IBM-Sender.bat
+++ b/Final2/java/client/test/bin/IBM-Sender.bat
diff --git a/Final/java/client/test/bin/IBM-Sender.sh b/Final2/java/client/test/bin/IBM-Sender.sh
index b99429fd54..b99429fd54 100755
--- a/Final/java/client/test/bin/IBM-Sender.sh
+++ b/Final2/java/client/test/bin/IBM-Sender.sh
diff --git a/Final/java/client/test/bin/IBM-Subscriber.bat b/Final2/java/client/test/bin/IBM-Subscriber.bat
index 5245639eba..5245639eba 100644
--- a/Final/java/client/test/bin/IBM-Subscriber.bat
+++ b/Final2/java/client/test/bin/IBM-Subscriber.bat
diff --git a/Final/java/client/test/bin/IBM-Subscriber.sh b/Final2/java/client/test/bin/IBM-Subscriber.sh
index 43550100be..43550100be 100755
--- a/Final/java/client/test/bin/IBM-Subscriber.sh
+++ b/Final2/java/client/test/bin/IBM-Subscriber.sh
diff --git a/Final/java/client/test/bin/headersListener.sh b/Final2/java/client/test/bin/headersListener.sh
index 81930b7043..81930b7043 100755
--- a/Final/java/client/test/bin/headersListener.sh
+++ b/Final2/java/client/test/bin/headersListener.sh
diff --git a/Final/java/client/test/bin/headersListenerGroup.sh b/Final2/java/client/test/bin/headersListenerGroup.sh
index e1cc05cfd2..e1cc05cfd2 100755
--- a/Final/java/client/test/bin/headersListenerGroup.sh
+++ b/Final2/java/client/test/bin/headersListenerGroup.sh
diff --git a/Final/java/client/test/bin/headersPublisher.sh b/Final2/java/client/test/bin/headersPublisher.sh
index fd9fd26416..fd9fd26416 100755
--- a/Final/java/client/test/bin/headersPublisher.sh
+++ b/Final2/java/client/test/bin/headersPublisher.sh
diff --git a/Final/java/client/test/bin/run_many.sh b/Final2/java/client/test/bin/run_many.sh
index cca2ffec21..cca2ffec21 100755
--- a/Final/java/client/test/bin/run_many.sh
+++ b/Final2/java/client/test/bin/run_many.sh
diff --git a/Final/java/client/test/bin/serviceProvidingClient.sh b/Final2/java/client/test/bin/serviceProvidingClient.sh
index cbcf5a0f4b..cbcf5a0f4b 100755
--- a/Final/java/client/test/bin/serviceProvidingClient.sh
+++ b/Final2/java/client/test/bin/serviceProvidingClient.sh
diff --git a/Final/java/client/test/bin/serviceRequestingClient.sh b/Final2/java/client/test/bin/serviceRequestingClient.sh
index 213f44c00b..213f44c00b 100755
--- a/Final/java/client/test/bin/serviceRequestingClient.sh
+++ b/Final2/java/client/test/bin/serviceRequestingClient.sh
diff --git a/Final/java/client/test/bin/testService.sh b/Final2/java/client/test/bin/testService.sh
index 20161c3abf..20161c3abf 100755
--- a/Final/java/client/test/bin/testService.sh
+++ b/Final2/java/client/test/bin/testService.sh
diff --git a/Final/java/client/test/bin/topicListener.sh b/Final2/java/client/test/bin/topicListener.sh
index ac0cb63c91..ac0cb63c91 100755
--- a/Final/java/client/test/bin/topicListener.sh
+++ b/Final2/java/client/test/bin/topicListener.sh
diff --git a/Final/java/client/test/bin/topicPublisher.sh b/Final2/java/client/test/bin/topicPublisher.sh
index e35c131fe8..e35c131fe8 100755
--- a/Final/java/client/test/bin/topicPublisher.sh
+++ b/Final2/java/client/test/bin/topicPublisher.sh
diff --git a/Final/java/client/test/etc/ApacheDS.properties b/Final2/java/client/test/etc/ApacheDS.properties
index 6c5cb4cec4..6c5cb4cec4 100644
--- a/Final/java/client/test/etc/ApacheDS.properties
+++ b/Final2/java/client/test/etc/ApacheDS.properties
diff --git a/Final/java/client/test/example_build.xml b/Final2/java/client/test/example_build.xml
index a12862be04..a12862be04 100644
--- a/Final/java/client/test/example_build.xml
+++ b/Final2/java/client/test/example_build.xml
diff --git a/Final/java/cluster/doc/design.doc b/Final2/java/cluster/doc/design.doc
index c5bbf0f8a4..c5bbf0f8a4 100644
--- a/Final/java/cluster/doc/design.doc
+++ b/Final2/java/cluster/doc/design.doc
diff --git a/Final/java/cluster/pom.xml b/Final2/java/cluster/pom.xml
index aaaf7d2f26..aaaf7d2f26 100644
--- a/Final/java/cluster/pom.xml
+++ b/Final2/java/cluster/pom.xml
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQConnectionWaitException.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQConnectionWaitException.java
index 2baaa344ef..2baaa344ef 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQConnectionWaitException.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQConnectionWaitException.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedBodyTypeException.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedBodyTypeException.java
index 951bd22df0..951bd22df0 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedBodyTypeException.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedBodyTypeException.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedFrameTypeException.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedFrameTypeException.java
index 4dd318f90d..4dd318f90d 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedFrameTypeException.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedFrameTypeException.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/BlockingHandler.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/BlockingHandler.java
index 39508df566..39508df566 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/BlockingHandler.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/BlockingHandler.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/BroadcastPolicy.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/BroadcastPolicy.java
index 145aa58574..145aa58574 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/BroadcastPolicy.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/BroadcastPolicy.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/Broker.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/Broker.java
index 7e2cf6da83..7e2cf6da83 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/Broker.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/Broker.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/BrokerFactory.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/BrokerFactory.java
index 92c3c4e7bf..92c3c4e7bf 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/BrokerFactory.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/BrokerFactory.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/BrokerGroup.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/BrokerGroup.java
index 755a341607..755a341607 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/BrokerGroup.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/BrokerGroup.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClientAdapter.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClientAdapter.java
index 1b4a3e8327..1b4a3e8327 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClientAdapter.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClientAdapter.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClientHandlerRegistry.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClientHandlerRegistry.java
index c1caf8bbff..c1caf8bbff 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClientHandlerRegistry.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClientHandlerRegistry.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusterBuilder.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusterBuilder.java
index 80f9ef62b1..80f9ef62b1 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusterBuilder.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusterBuilder.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusterCapability.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusterCapability.java
index 57c48f0611..57c48f0611 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusterCapability.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusterCapability.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolHandler.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolHandler.java
index ee5aa48db9..ee5aa48db9 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolHandler.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolHandler.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolSession.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolSession.java
index eea660c4f0..eea660c4f0 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolSession.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolSession.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ConnectionStatusMonitor.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ConnectionStatusMonitor.java
index a1f01eff46..a1f01eff46 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ConnectionStatusMonitor.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ConnectionStatusMonitor.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java
index 2f473b63fb..2f473b63fb 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/GroupManager.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/GroupManager.java
index 5599ae4b1f..5599ae4b1f 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/GroupManager.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/GroupManager.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/GroupRequest.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/GroupRequest.java
index 8ab7856e87..8ab7856e87 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/GroupRequest.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/GroupRequest.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/GroupResponseHandler.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/GroupResponseHandler.java
index d2e9de2f39..d2e9de2f39 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/GroupResponseHandler.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/GroupResponseHandler.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/InductionBuffer.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/InductionBuffer.java
index 586d7d4ae8..586d7d4ae8 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/InductionBuffer.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/InductionBuffer.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/JoinState.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/JoinState.java
index 5f92aa2971..5f92aa2971 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/JoinState.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/JoinState.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/LoadTable.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/LoadTable.java
index 13465a8615..13465a8615 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/LoadTable.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/LoadTable.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/Main.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/Main.java
index 15752353d1..15752353d1 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/Main.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/Main.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/Member.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/Member.java
index 3fbdfdde70..3fbdfdde70 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/Member.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/Member.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MemberFailureListener.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MemberFailureListener.java
index 7ce45dffaa..7ce45dffaa 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MemberFailureListener.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MemberFailureListener.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MemberHandle.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MemberHandle.java
index b8099a12f7..b8099a12f7 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MemberHandle.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MemberHandle.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MembershipChangeListener.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MembershipChangeListener.java
index 591e652e32..591e652e32 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MembershipChangeListener.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MembershipChangeListener.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MethodHandler.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MethodHandler.java
index a83f034021..a83f034021 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MethodHandler.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MethodHandler.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MethodHandlerFactory.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MethodHandlerFactory.java
index 9bf04f5458..9bf04f5458 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MethodHandlerFactory.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MethodHandlerFactory.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MethodHandlerRegistry.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MethodHandlerRegistry.java
index 748a660bb8..748a660bb8 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MethodHandlerRegistry.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MethodHandlerRegistry.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MinaBrokerProxy.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MinaBrokerProxy.java
index b01ec491ec..b01ec491ec 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MinaBrokerProxy.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MinaBrokerProxy.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MinaBrokerProxyFactory.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MinaBrokerProxyFactory.java
index 5e70de7665..5e70de7665 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/MinaBrokerProxyFactory.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/MinaBrokerProxyFactory.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ResponseHandler.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ResponseHandler.java
index fe76ca6505..fe76ca6505 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ResponseHandler.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ResponseHandler.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/Sendable.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/Sendable.java
index 159612331c..159612331c 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/Sendable.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/Sendable.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ServerHandlerRegistry.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ServerHandlerRegistry.java
index aadcfa4b4c..aadcfa4b4c 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/ServerHandlerRegistry.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/ServerHandlerRegistry.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleBodySendable.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleBodySendable.java
index bd3757bf97..bd3757bf97 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleBodySendable.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleBodySendable.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleMemberHandle.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleMemberHandle.java
index 1255094b1d..1255094b1d 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleMemberHandle.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleMemberHandle.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleSendable.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleSendable.java
index 7e5563460f..7e5563460f 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleSendable.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleSendable.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChainedClusterMethodHandler.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChainedClusterMethodHandler.java
index 86710e8a31..86710e8a31 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChainedClusterMethodHandler.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChainedClusterMethodHandler.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChannelQueueManager.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChannelQueueManager.java
index c9f6dbfb37..c9f6dbfb37 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChannelQueueManager.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChannelQueueManager.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandler.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandler.java
index faab99b0f6..faab99b0f6 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandler.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandler.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandlerFactory.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandlerFactory.java
index e7509da32a..e7509da32a 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandlerFactory.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandlerFactory.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ExtendedHandler.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ExtendedHandler.java
index a2f62f714b..a2f62f714b 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ExtendedHandler.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ExtendedHandler.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/HandlerUtils.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/HandlerUtils.java
index 0dc7fe00d2..0dc7fe00d2 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/HandlerUtils.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/HandlerUtils.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/LocalQueueDeclareHandler.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/LocalQueueDeclareHandler.java
index f01a8349f2..f01a8349f2 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/LocalQueueDeclareHandler.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/LocalQueueDeclareHandler.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/NullListener.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/NullListener.java
index 8b0bb4b127..8b0bb4b127 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/NullListener.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/NullListener.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/PeerHandler.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/PeerHandler.java
index 447e51ccd9..447e51ccd9 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/PeerHandler.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/PeerHandler.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/QueueNameGenerator.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/QueueNameGenerator.java
index a669171d3c..a669171d3c 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/QueueNameGenerator.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/QueueNameGenerator.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteCancelHandler.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteCancelHandler.java
index f09763e1ad..f09763e1ad 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteCancelHandler.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteCancelHandler.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteConsumeHandler.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteConsumeHandler.java
index 073b13688c..073b13688c 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteConsumeHandler.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteConsumeHandler.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingConsumeHandler.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingConsumeHandler.java
index 897f8e4fb7..897f8e4fb7 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingConsumeHandler.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingConsumeHandler.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingHandler.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingHandler.java
index 888fa4e426..888fa4e426 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingHandler.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingHandler.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/WrappedListener.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/WrappedListener.java
index 8b0c638d63..8b0c638d63 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/WrappedListener.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/WrappedListener.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/WrappingMethodHandlerFactory.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/WrappingMethodHandlerFactory.java
index 5ec3c9660a..5ec3c9660a 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/WrappingMethodHandlerFactory.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/WrappingMethodHandlerFactory.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/AsynchBroadcastPolicy.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/AsynchBroadcastPolicy.java
index 79cb558ede..79cb558ede 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/AsynchBroadcastPolicy.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/AsynchBroadcastPolicy.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/MajorityResponseBroadcastPolicy.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/MajorityResponseBroadcastPolicy.java
index 42382c6e7a..42382c6e7a 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/MajorityResponseBroadcastPolicy.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/MajorityResponseBroadcastPolicy.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/OneResponseBroadcastPolicy.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/OneResponseBroadcastPolicy.java
index e3072a6a40..e3072a6a40 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/OneResponseBroadcastPolicy.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/OneResponseBroadcastPolicy.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/StandardPolicies.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/StandardPolicies.java
index dbaf690d3a..dbaf690d3a 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/StandardPolicies.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/StandardPolicies.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/SynchBroadcastPolicy.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/SynchBroadcastPolicy.java
index 605b8dd51e..605b8dd51e 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/SynchBroadcastPolicy.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/policy/SynchBroadcastPolicy.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ChainedMethodRecorder.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ChainedMethodRecorder.java
index 3664be58bc..3664be58bc 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ChainedMethodRecorder.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ChainedMethodRecorder.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ConsumerCounts.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ConsumerCounts.java
index 5a433b869b..5a433b869b 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ConsumerCounts.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ConsumerCounts.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/MethodRecorder.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/MethodRecorder.java
index e45810438e..e45810438e 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/MethodRecorder.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/MethodRecorder.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/RecordingMethodHandlerFactory.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/RecordingMethodHandlerFactory.java
index 4d3fe1dbed..4d3fe1dbed 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/RecordingMethodHandlerFactory.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/RecordingMethodHandlerFactory.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayManager.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayManager.java
index 898cb80cb3..898cb80cb3 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayManager.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayManager.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayStore.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayStore.java
index d7bbb1c36b..d7bbb1c36b 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayStore.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayStore.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/Bindings.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/Bindings.java
index 49de0a7cbf..49de0a7cbf 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/Bindings.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/Bindings.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/InvokeMultiple.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/InvokeMultiple.java
index 406fe45701..406fe45701 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/InvokeMultiple.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/InvokeMultiple.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/LogMessage.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/LogMessage.java
index 9be90298ea..9be90298ea 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/LogMessage.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/LogMessage.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/MultiValuedMap.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/MultiValuedMap.java
index ebe1fe47dd..ebe1fe47dd 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/MultiValuedMap.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/cluster/util/MultiValuedMap.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java
index 9fa96ece1e..9fa96ece1e 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredSubscriptionManager.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredSubscriptionManager.java
index 39ae7e3c3e..39ae7e3c3e 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredSubscriptionManager.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredSubscriptionManager.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/NestedSubscriptionManager.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/NestedSubscriptionManager.java
index 0566c5203b..0566c5203b 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/NestedSubscriptionManager.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/NestedSubscriptionManager.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java
index f8e4311a77..f8e4311a77 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/ProxiedQueueCleanup.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/ProxiedQueueCleanup.java
index efc0540c18..efc0540c18 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/ProxiedQueueCleanup.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/ProxiedQueueCleanup.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteQueueProxy.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteQueueProxy.java
index 2a83d65ae5..2a83d65ae5 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteQueueProxy.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteQueueProxy.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteSubscriptionImpl.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteSubscriptionImpl.java
index e396432cea..e396432cea 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteSubscriptionImpl.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteSubscriptionImpl.java
diff --git a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/SubscriberCleanup.java b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/SubscriberCleanup.java
index cc951a4709..cc951a4709 100644
--- a/Final/java/cluster/src/main/java/org/apache/qpid/server/queue/SubscriberCleanup.java
+++ b/Final2/java/cluster/src/main/java/org/apache/qpid/server/queue/SubscriberCleanup.java
diff --git a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerGroupTest.java b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerGroupTest.java
index b91d7140e0..b91d7140e0 100644
--- a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerGroupTest.java
+++ b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerGroupTest.java
diff --git a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java
index f1da312eea..f1da312eea 100644
--- a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java
+++ b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java
diff --git a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java
index 830a00f4c2..830a00f4c2 100644
--- a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java
+++ b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java
diff --git a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/InductionBufferTest.java b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/InductionBufferTest.java
index 7e58add91e..7e58add91e 100644
--- a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/InductionBufferTest.java
+++ b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/InductionBufferTest.java
diff --git a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBroker.java b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBroker.java
index 1ec5154a98..1ec5154a98 100644
--- a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBroker.java
+++ b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBroker.java
diff --git a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBrokerFactory.java b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBrokerFactory.java
index d3e972e273..d3e972e273 100644
--- a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBrokerFactory.java
+++ b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBrokerFactory.java
diff --git a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java
index 86cde3cee7..86cde3cee7 100644
--- a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java
+++ b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java
diff --git a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleMemberHandleTest.java b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleMemberHandleTest.java
index 8ff8357377..8ff8357377 100644
--- a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleMemberHandleTest.java
+++ b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleMemberHandleTest.java
diff --git a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBroker.java b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBroker.java
index d3ccbf0ac6..d3ccbf0ac6 100644
--- a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBroker.java
+++ b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBroker.java
diff --git a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBrokerFactory.java b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBrokerFactory.java
index 92eaec876a..92eaec876a 100644
--- a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBrokerFactory.java
+++ b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBrokerFactory.java
diff --git a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestReplayManager.java b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestReplayManager.java
index c529c83cc0..c529c83cc0 100644
--- a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestReplayManager.java
+++ b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestReplayManager.java
diff --git a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestSession.java b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestSession.java
index 86ec808924..86ec808924 100644
--- a/Final/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestSession.java
+++ b/Final2/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestSession.java
diff --git a/Final/java/common/bin/qpid-run b/Final2/java/common/bin/qpid-run
index c9e37b21a1..c9e37b21a1 100644
--- a/Final/java/common/bin/qpid-run
+++ b/Final2/java/common/bin/qpid-run
diff --git a/Final/java/common/etc/qpid-run.conf b/Final2/java/common/etc/qpid-run.conf
index b9765fe3ce..b9765fe3ce 100644
--- a/Final/java/common/etc/qpid-run.conf
+++ b/Final2/java/common/etc/qpid-run.conf
diff --git a/Final/java/common/etc/qpid-run.conf.dev b/Final2/java/common/etc/qpid-run.conf.dev
index a5419eb4e8..a5419eb4e8 100644
--- a/Final/java/common/etc/qpid-run.conf.dev
+++ b/Final2/java/common/etc/qpid-run.conf.dev
diff --git a/Final/java/common/pom.xml b/Final2/java/common/pom.xml
index b08982fde3..b08982fde3 100644
--- a/Final/java/common/pom.xml
+++ b/Final2/java/common/pom.xml
diff --git a/Final/java/common/protocol-version.xml b/Final2/java/common/protocol-version.xml
index 40331a8a84..40331a8a84 100644
--- a/Final/java/common/protocol-version.xml
+++ b/Final2/java/common/protocol-version.xml
diff --git a/Final/java/common/readme.txt b/Final2/java/common/readme.txt
index 12841fa08d..12841fa08d 100644
--- a/Final/java/common/readme.txt
+++ b/Final2/java/common/readme.txt
diff --git a/Final/java/common/src/main/java/log4j.properties b/Final2/java/common/src/main/java/log4j.properties
index 6d596d1d19..6d596d1d19 100644
--- a/Final/java/common/src/main/java/log4j.properties
+++ b/Final2/java/common/src/main/java/log4j.properties
diff --git a/Final/java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java b/Final2/java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java
index 251e91c1b9..251e91c1b9 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/AMQChannelException.java b/Final2/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
index 9efd271e4d..9efd271e4d 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java b/Final2/java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java
index eb736d437f..eb736d437f 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java b/Final2/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
index 7edfa648ed..7edfa648ed 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java b/Final2/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
index f78307d16f..f78307d16f 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java b/Final2/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java
index e62b2c10a2..e62b2c10a2 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/AMQException.java b/Final2/java/common/src/main/java/org/apache/qpid/AMQException.java
index 41599ed880..41599ed880 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/AMQException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/AMQException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java b/Final2/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
index 278128f924..278128f924 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java b/Final2/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
index b5ec9845d6..b5ec9845d6 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java b/Final2/java/common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java
index a0574efa72..a0574efa72 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java b/Final2/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java
index 0f8d9c47db..0f8d9c47db 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java b/Final2/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java
index 03220cc95e..03220cc95e 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java b/Final2/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java
index a1e7088817..a1e7088817 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java b/Final2/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
index 6cc9c3fe00..6cc9c3fe00 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/codec/AMQCodecFactory.java b/Final2/java/common/src/main/java/org/apache/qpid/codec/AMQCodecFactory.java
index fa890d0ebb..fa890d0ebb 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/codec/AMQCodecFactory.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/codec/AMQCodecFactory.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java b/Final2/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
index 02ae3cb089..02ae3cb089 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/codec/AMQEncoder.java b/Final2/java/common/src/main/java/org/apache/qpid/codec/AMQEncoder.java
index 53f48ae1c8..53f48ae1c8 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/codec/AMQEncoder.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/codec/AMQEncoder.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/common/AMQPFilterTypes.java b/Final2/java/common/src/main/java/org/apache/qpid/common/AMQPFilterTypes.java
index 9ed915cc35..9ed915cc35 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/common/AMQPFilterTypes.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/common/AMQPFilterTypes.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/common/ClientProperties.java b/Final2/java/common/src/main/java/org/apache/qpid/common/ClientProperties.java
index 67f16e6a87..67f16e6a87 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/common/ClientProperties.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/common/ClientProperties.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java b/Final2/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java
index 2c783aeaa4..2c783aeaa4 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/configuration/Configured.java b/Final2/java/common/src/main/java/org/apache/qpid/configuration/Configured.java
index 22903888fe..22903888fe 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/configuration/Configured.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/configuration/Configured.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java b/Final2/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java
index 1e5cc57fff..1e5cc57fff 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java b/Final2/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java
index b3c310d23c..b3c310d23c 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java b/Final2/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
index 123901b577..123901b577 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
index ebeea8d2b4..ebeea8d2b4 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlock.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlock.java
index 903b5bfa7a..903b5bfa7a 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlock.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlock.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
index 82ffc60802..82ffc60802 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockEncoder.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockEncoder.java
index 05fd2bb480..05fd2bb480 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockEncoder.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockEncoder.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java
index 11f505fd4b..11f505fd4b 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
index cd5ccf8e04..cd5ccf8e04 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
index f2e91083ca..f2e91083ca 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
index cf85bdab31..cf85bdab31 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
index 359efe7eb7..359efe7eb7 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java
index e48fd2e7f9..e48fd2e7f9 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java
index 1ce49aba83..1ce49aba83 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java
index 9049eace2a..9049eace2a 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java
index 9074931617..9074931617 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
index ec501951af..ec501951af 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQType.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
index 6dda91a488..6dda91a488 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
index 1419dd75b1..1419dd75b1 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
index 7193580884..7193580884 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
index 61f2f891e5..61f2f891e5 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/BodyFactory.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/BodyFactory.java
index 59646577e1..59646577e1 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/BodyFactory.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/BodyFactory.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java
index 6a608a8bff..6a608a8bff 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/CompositeAMQDataBlock.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/CompositeAMQDataBlock.java
index 5ec62ede93..5ec62ede93 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/CompositeAMQDataBlock.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/CompositeAMQDataBlock.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/Content.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/Content.java
index e5feeec2a4..e5feeec2a4 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/Content.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/Content.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
index be38695384..be38695384 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/ContentBodyFactory.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/ContentBodyFactory.java
index c42995d148..c42995d148 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/ContentBodyFactory.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/ContentBodyFactory.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
index 02631a5f88..02631a5f88 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBodyFactory.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBodyFactory.java
index 8d5e2f9fb4..8d5e2f9fb4 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBodyFactory.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBodyFactory.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderProperties.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderProperties.java
index 561d7852fd..561d7852fd 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderProperties.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderProperties.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
index 712eb437db..712eb437db 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/EncodableAMQDataBlock.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/EncodableAMQDataBlock.java
index 9cf96e698c..9cf96e698c 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/EncodableAMQDataBlock.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/EncodableAMQDataBlock.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
index ccba8bd41e..ccba8bd41e 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
index 46b10b5963..46b10b5963 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java
index e9d75137ef..e9d75137ef 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
index 7246c4a1cf..7246c4a1cf 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBodyFactory.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBodyFactory.java
index c7ada708dc..c7ada708dc 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBodyFactory.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBodyFactory.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/MethodConverter_8_0.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/MethodConverter_8_0.java
index 9a113f452b..9a113f452b 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/MethodConverter_8_0.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/MethodConverter_8_0.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
index 8b40fe72eb..8b40fe72eb 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java
index 26c048e34a..26c048e34a 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java
index 6006e9793c..6006e9793c 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java
index 1c335f3036..1c335f3036 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/abstraction/ContentChunk.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/abstraction/ContentChunk.java
index 6312e478a8..6312e478a8 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/abstraction/ContentChunk.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/abstraction/ContentChunk.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java
index 706499c1b0..706499c1b0 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java
index 42e2f7ad97..42e2f7ad97 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java b/Final2/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
index 99588a0908..99588a0908 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/pool/Event.java b/Final2/java/common/src/main/java/org/apache/qpid/pool/Event.java
index 5996cbf89c..5996cbf89c 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/pool/Event.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/pool/Event.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/pool/Job.java b/Final2/java/common/src/main/java/org/apache/qpid/pool/Job.java
index ba3c5d03fa..ba3c5d03fa 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/pool/Job.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/pool/Job.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java b/Final2/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
index cbe08a192e..cbe08a192e 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/pool/ReadWriteThreadModel.java b/Final2/java/common/src/main/java/org/apache/qpid/pool/ReadWriteThreadModel.java
index 8cea70e597..8cea70e597 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/pool/ReadWriteThreadModel.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/pool/ReadWriteThreadModel.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java b/Final2/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java
index 84c9e1f465..84c9e1f465 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java b/Final2/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
index 375df2a45d..375df2a45d 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java b/Final2/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java
index fd6907a152..fd6907a152 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java b/Final2/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
index 2fbeeda1d4..2fbeeda1d4 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java b/Final2/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java
index 65884e4950..65884e4950 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java b/Final2/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
index 7c1d6fdaa0..7c1d6fdaa0 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java b/Final2/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
index 60a7f30185..60a7f30185 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java b/Final2/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java
index 950279fff1..950279fff1 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java b/Final2/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
index 1774fa1194..1774fa1194 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/url/BindingURL.java b/Final2/java/common/src/main/java/org/apache/qpid/url/BindingURL.java
index 67be2db86f..67be2db86f 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/url/BindingURL.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/url/BindingURL.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/url/URLHelper.java b/Final2/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
index c08b443acf..c08b443acf 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java b/Final2/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
index 3ff7195794..3ff7195794 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java b/Final2/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
index dc73bce28f..dc73bce28f 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java b/Final2/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java
index 461cf9591d..461cf9591d 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java b/Final2/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
index c4d7683a02..c4d7683a02 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueNoSize.java b/Final2/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueNoSize.java
index 1f168345a1..1f168345a1 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueNoSize.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueNoSize.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/util/FileUtils.java b/Final2/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
index 3b8ebc1666..3b8ebc1666 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/util/MessageQueue.java b/Final2/java/common/src/main/java/org/apache/qpid/util/MessageQueue.java
index b5efaa61b6..b5efaa61b6 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/util/MessageQueue.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/util/MessageQueue.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/util/PrettyPrintingUtils.java b/Final2/java/common/src/main/java/org/apache/qpid/util/PrettyPrintingUtils.java
index 10f6a27293..10f6a27293 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/util/PrettyPrintingUtils.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/util/PrettyPrintingUtils.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/util/PropertiesUtils.java b/Final2/java/common/src/main/java/org/apache/qpid/util/PropertiesUtils.java
index 63cf6f252b..63cf6f252b 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/util/PropertiesUtils.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/util/PropertiesUtils.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/util/ReflectionUtils.java b/Final2/java/common/src/main/java/org/apache/qpid/util/ReflectionUtils.java
index 495918911a..495918911a 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/util/ReflectionUtils.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/util/ReflectionUtils.java
diff --git a/Final/java/common/src/main/java/org/apache/qpid/util/ReflectionUtilsException.java b/Final2/java/common/src/main/java/org/apache/qpid/util/ReflectionUtilsException.java
index 20499641ac..20499641ac 100644
--- a/Final/java/common/src/main/java/org/apache/qpid/util/ReflectionUtilsException.java
+++ b/Final2/java/common/src/main/java/org/apache/qpid/util/ReflectionUtilsException.java
diff --git a/Final/java/common/src/main/resources/org/apache/qpid/ssl/qpid.cert b/Final2/java/common/src/main/resources/org/apache/qpid/ssl/qpid.cert
index e6702108e6..e6702108e6 100644
--- a/Final/java/common/src/main/resources/org/apache/qpid/ssl/qpid.cert
+++ b/Final2/java/common/src/main/resources/org/apache/qpid/ssl/qpid.cert
diff --git a/Final/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java b/Final2/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
index 4fd1f60d69..4fd1f60d69 100644
--- a/Final/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
+++ b/Final2/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
diff --git a/Final/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java b/Final2/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
index e63b0df770..e63b0df770 100644
--- a/Final/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
+++ b/Final2/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
diff --git a/Final/java/common/src/test/java/org/apache/qpid/pool/PoolingFilterTest.java b/Final2/java/common/src/test/java/org/apache/qpid/pool/PoolingFilterTest.java
index 6383d52298..6383d52298 100644
--- a/Final/java/common/src/test/java/org/apache/qpid/pool/PoolingFilterTest.java
+++ b/Final2/java/common/src/test/java/org/apache/qpid/pool/PoolingFilterTest.java
diff --git a/Final/java/common/src/test/java/org/apache/qpid/session/TestSession.java b/Final2/java/common/src/test/java/org/apache/qpid/session/TestSession.java
index aafc91b03b..aafc91b03b 100644
--- a/Final/java/common/src/test/java/org/apache/qpid/session/TestSession.java
+++ b/Final2/java/common/src/test/java/org/apache/qpid/session/TestSession.java
diff --git a/Final/java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java b/Final2/java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java
index 66fb3252df..66fb3252df 100644
--- a/Final/java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java
+++ b/Final2/java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java
diff --git a/Final/java/distribution/pom.xml b/Final2/java/distribution/pom.xml
index ecfdfd5345..ecfdfd5345 100644
--- a/Final/java/distribution/pom.xml
+++ b/Final2/java/distribution/pom.xml
diff --git a/Final/java/distribution/src/main/assembly/bin-test.xml b/Final2/java/distribution/src/main/assembly/bin-test.xml
index 04d83916e4..04d83916e4 100644
--- a/Final/java/distribution/src/main/assembly/bin-test.xml
+++ b/Final2/java/distribution/src/main/assembly/bin-test.xml
diff --git a/Final/java/distribution/src/main/assembly/bin.xml b/Final2/java/distribution/src/main/assembly/bin.xml
index 3620659e48..3620659e48 100644
--- a/Final/java/distribution/src/main/assembly/bin.xml
+++ b/Final2/java/distribution/src/main/assembly/bin.xml
diff --git a/Final/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml b/Final2/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml
index 02ede019e5..02ede019e5 100644
--- a/Final/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml
+++ b/Final2/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml
diff --git a/Final/java/distribution/src/main/assembly/management-eclipse-plugin.xml b/Final2/java/distribution/src/main/assembly/management-eclipse-plugin.xml
index 05df2c030b..05df2c030b 100644
--- a/Final/java/distribution/src/main/assembly/management-eclipse-plugin.xml
+++ b/Final2/java/distribution/src/main/assembly/management-eclipse-plugin.xml
diff --git a/Final/java/distribution/src/main/assembly/src.xml b/Final2/java/distribution/src/main/assembly/src.xml
index efdc4d98f4..efdc4d98f4 100644
--- a/Final/java/distribution/src/main/assembly/src.xml
+++ b/Final2/java/distribution/src/main/assembly/src.xml
diff --git a/Final/java/doc/AMQBlazeDetailedDesign.vsd b/Final2/java/doc/AMQBlazeDetailedDesign.vsd
index 90577c69cf..90577c69cf 100644
--- a/Final/java/doc/AMQBlazeDetailedDesign.vsd
+++ b/Final2/java/doc/AMQBlazeDetailedDesign.vsd
diff --git a/Final/java/doc/FramingClassDiagram.vsd b/Final2/java/doc/FramingClassDiagram.vsd
index 8db65255ea..8db65255ea 100644
--- a/Final/java/doc/FramingClassDiagram.vsd
+++ b/Final2/java/doc/FramingClassDiagram.vsd
diff --git a/Final/java/etc/coding_standards.xml b/Final2/java/etc/coding_standards.xml
index 8f8b808884..8f8b808884 100644
--- a/Final/java/etc/coding_standards.xml
+++ b/Final2/java/etc/coding_standards.xml
diff --git a/Final/java/etc/license_header.txt b/Final2/java/etc/license_header.txt
index 02ee6e8f98..02ee6e8f98 100644
--- a/Final/java/etc/license_header.txt
+++ b/Final2/java/etc/license_header.txt
diff --git a/Final/java/etc/log4j.xml b/Final2/java/etc/log4j.xml
index 266c466a3a..266c466a3a 100644
--- a/Final/java/etc/log4j.xml
+++ b/Final2/java/etc/log4j.xml
diff --git a/Final/java/integrationtests/README.txt b/Final2/java/integrationtests/README.txt
index 00a21883a9..00a21883a9 100644
--- a/Final/java/integrationtests/README.txt
+++ b/Final2/java/integrationtests/README.txt
diff --git a/Final/java/integrationtests/docs/RunningSustainedTests.txt b/Final2/java/integrationtests/docs/RunningSustainedTests.txt
index db4405a32d..db4405a32d 100644
--- a/Final/java/integrationtests/docs/RunningSustainedTests.txt
+++ b/Final2/java/integrationtests/docs/RunningSustainedTests.txt
diff --git a/Final/java/integrationtests/jar-with-dependencies.xml b/Final2/java/integrationtests/jar-with-dependencies.xml
index 3e95e7ab22..3e95e7ab22 100644
--- a/Final/java/integrationtests/jar-with-dependencies.xml
+++ b/Final2/java/integrationtests/jar-with-dependencies.xml
diff --git a/Final/java/integrationtests/pom.xml b/Final2/java/integrationtests/pom.xml
index c13e300386..c13e300386 100644
--- a/Final/java/integrationtests/pom.xml
+++ b/Final2/java/integrationtests/pom.xml
diff --git a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase1DummyRun.java b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase1DummyRun.java
index 45bbfcd148..45bbfcd148 100644
--- a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase1DummyRun.java
+++ b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase1DummyRun.java
diff --git a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase2BasicP2P.java b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase2BasicP2P.java
index 1d30ff7ca6..1d30ff7ca6 100644
--- a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase2BasicP2P.java
+++ b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase2BasicP2P.java
diff --git a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase3BasicPubSub.java b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase3BasicPubSub.java
index 622ddc2f64..622ddc2f64 100644
--- a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase3BasicPubSub.java
+++ b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase3BasicPubSub.java
diff --git a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase4P2PMessageSize.java b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase4P2PMessageSize.java
index 0388c56678..0388c56678 100644
--- a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase4P2PMessageSize.java
+++ b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase4P2PMessageSize.java
diff --git a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java
index ab59e16ab3..ab59e16ab3 100644
--- a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java
+++ b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java
diff --git a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase1DummyRun.java b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase1DummyRun.java
index 60cd9f47f3..60cd9f47f3 100644
--- a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase1DummyRun.java
+++ b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase1DummyRun.java
diff --git a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase2BasicP2P.java b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase2BasicP2P.java
index 8983249daa..8983249daa 100644
--- a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase2BasicP2P.java
+++ b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase2BasicP2P.java
diff --git a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase3BasicPubSub.java b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase3BasicPubSub.java
index 6e87c3e3ee..6e87c3e3ee 100644
--- a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase3BasicPubSub.java
+++ b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase3BasicPubSub.java
diff --git a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase4P2PMessageSize.java b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase4P2PMessageSize.java
index c3f450ec42..c3f450ec42 100644
--- a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase4P2PMessageSize.java
+++ b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase4P2PMessageSize.java
diff --git a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase5PubSubMessageSize.java b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase5PubSubMessageSize.java
index 86a0a60ea4..86a0a60ea4 100644
--- a/Final/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase5PubSubMessageSize.java
+++ b/Final2/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase5PubSubMessageSize.java
diff --git a/Final/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedClientTestCase.java b/Final2/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedClientTestCase.java
index 2764f2c3aa..2764f2c3aa 100644
--- a/Final/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedClientTestCase.java
+++ b/Final2/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedClientTestCase.java
diff --git a/Final/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestCase.java b/Final2/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestCase.java
index 5979a459ec..5979a459ec 100644
--- a/Final/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestCase.java
+++ b/Final2/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestCase.java
diff --git a/Final/java/integrationtests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java b/Final2/java/integrationtests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
index 8f0ef193ef..8f0ef193ef 100644
--- a/Final/java/integrationtests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
+++ b/Final2/java/integrationtests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
diff --git a/Final/java/integrationtests/src/resources/sustained-log4j.xml b/Final2/java/integrationtests/src/resources/sustained-log4j.xml
index c5ab3137bf..c5ab3137bf 100644
--- a/Final/java/integrationtests/src/resources/sustained-log4j.xml
+++ b/Final2/java/integrationtests/src/resources/sustained-log4j.xml
diff --git a/Final/java/management/eclipse-plugin/META-INF/MANIFEST.MF b/Final2/java/management/eclipse-plugin/META-INF/MANIFEST.MF
index a03c35c457..a03c35c457 100644
--- a/Final/java/management/eclipse-plugin/META-INF/MANIFEST.MF
+++ b/Final2/java/management/eclipse-plugin/META-INF/MANIFEST.MF
diff --git a/Final/java/management/eclipse-plugin/README.txt b/Final2/java/management/eclipse-plugin/README.txt
index 5325bf27ec..5325bf27ec 100644
--- a/Final/java/management/eclipse-plugin/README.txt
+++ b/Final2/java/management/eclipse-plugin/README.txt
diff --git a/Final/java/management/eclipse-plugin/bin/qpidmc.bat b/Final2/java/management/eclipse-plugin/bin/qpidmc.bat
index 1f3207f043..1f3207f043 100644
--- a/Final/java/management/eclipse-plugin/bin/qpidmc.bat
+++ b/Final2/java/management/eclipse-plugin/bin/qpidmc.bat
diff --git a/Final/java/management/eclipse-plugin/bin/qpidmc.sh b/Final2/java/management/eclipse-plugin/bin/qpidmc.sh
index 2472545a14..2472545a14 100755
--- a/Final/java/management/eclipse-plugin/bin/qpidmc.sh
+++ b/Final2/java/management/eclipse-plugin/bin/qpidmc.sh
diff --git a/Final/java/management/eclipse-plugin/bin/qpidmc_gtk.sh b/Final2/java/management/eclipse-plugin/bin/qpidmc_gtk.sh
index 10b463d63b..10b463d63b 100755
--- a/Final/java/management/eclipse-plugin/bin/qpidmc_gtk.sh
+++ b/Final2/java/management/eclipse-plugin/bin/qpidmc_gtk.sh
diff --git a/Final/java/management/eclipse-plugin/bin/qpidmc_motif.sh b/Final2/java/management/eclipse-plugin/bin/qpidmc_motif.sh
index f53be75d87..f53be75d87 100755
--- a/Final/java/management/eclipse-plugin/bin/qpidmc_motif.sh
+++ b/Final2/java/management/eclipse-plugin/bin/qpidmc_motif.sh
diff --git a/Final/java/management/eclipse-plugin/icons/Thumbs.db b/Final2/java/management/eclipse-plugin/icons/Thumbs.db
index 306bfb2eda..306bfb2eda 100644
--- a/Final/java/management/eclipse-plugin/icons/Thumbs.db
+++ b/Final2/java/management/eclipse-plugin/icons/Thumbs.db
diff --git a/Final/java/management/eclipse-plugin/icons/add.gif b/Final2/java/management/eclipse-plugin/icons/add.gif
index 252d7ebcb8..252d7ebcb8 100644
--- a/Final/java/management/eclipse-plugin/icons/add.gif
+++ b/Final2/java/management/eclipse-plugin/icons/add.gif
diff --git a/Final/java/management/eclipse-plugin/icons/delete.gif b/Final2/java/management/eclipse-plugin/icons/delete.gif
index 6f647666d3..6f647666d3 100644
--- a/Final/java/management/eclipse-plugin/icons/delete.gif
+++ b/Final2/java/management/eclipse-plugin/icons/delete.gif
diff --git a/Final/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif b/Final2/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif
index beb6ed134c..beb6ed134c 100644
--- a/Final/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif
+++ b/Final2/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif
diff --git a/Final/java/management/eclipse-plugin/icons/icon_OpenFolder.gif b/Final2/java/management/eclipse-plugin/icons/icon_OpenFolder.gif
index a9c777343c..a9c777343c 100644
--- a/Final/java/management/eclipse-plugin/icons/icon_OpenFolder.gif
+++ b/Final2/java/management/eclipse-plugin/icons/icon_OpenFolder.gif
diff --git a/Final/java/management/eclipse-plugin/icons/mbean_view.png b/Final2/java/management/eclipse-plugin/icons/mbean_view.png
index 9871b72bb8..9871b72bb8 100644
--- a/Final/java/management/eclipse-plugin/icons/mbean_view.png
+++ b/Final2/java/management/eclipse-plugin/icons/mbean_view.png
diff --git a/Final/java/management/eclipse-plugin/icons/notifications.gif b/Final2/java/management/eclipse-plugin/icons/notifications.gif
index f1e585bdf7..f1e585bdf7 100644
--- a/Final/java/management/eclipse-plugin/icons/notifications.gif
+++ b/Final2/java/management/eclipse-plugin/icons/notifications.gif
diff --git a/Final/java/management/eclipse-plugin/icons/qpidConnections.gif b/Final2/java/management/eclipse-plugin/icons/qpidConnections.gif
index 89489f11f2..89489f11f2 100644
--- a/Final/java/management/eclipse-plugin/icons/qpidConnections.gif
+++ b/Final2/java/management/eclipse-plugin/icons/qpidConnections.gif
diff --git a/Final/java/management/eclipse-plugin/icons/qpidmc.gif b/Final2/java/management/eclipse-plugin/icons/qpidmc.gif
index baf929fbc5..baf929fbc5 100644
--- a/Final/java/management/eclipse-plugin/icons/qpidmc.gif
+++ b/Final2/java/management/eclipse-plugin/icons/qpidmc.gif
diff --git a/Final/java/management/eclipse-plugin/icons/qpidmc16.gif b/Final2/java/management/eclipse-plugin/icons/qpidmc16.gif
index 4df535bb9a..4df535bb9a 100644
--- a/Final/java/management/eclipse-plugin/icons/qpidmc16.gif
+++ b/Final2/java/management/eclipse-plugin/icons/qpidmc16.gif
diff --git a/Final/java/management/eclipse-plugin/icons/qpidmc32.bmp b/Final2/java/management/eclipse-plugin/icons/qpidmc32.bmp
index e42ce01dff..e42ce01dff 100644
--- a/Final/java/management/eclipse-plugin/icons/qpidmc32.bmp
+++ b/Final2/java/management/eclipse-plugin/icons/qpidmc32.bmp
diff --git a/Final/java/management/eclipse-plugin/icons/qpidmc32.gif b/Final2/java/management/eclipse-plugin/icons/qpidmc32.gif
index e42ce01dff..e42ce01dff 100644
--- a/Final/java/management/eclipse-plugin/icons/qpidmc32.gif
+++ b/Final2/java/management/eclipse-plugin/icons/qpidmc32.gif
diff --git a/Final/java/management/eclipse-plugin/icons/reconnect.gif b/Final2/java/management/eclipse-plugin/icons/reconnect.gif
index e2f8c3e1fe..e2f8c3e1fe 100644
--- a/Final/java/management/eclipse-plugin/icons/reconnect.gif
+++ b/Final2/java/management/eclipse-plugin/icons/reconnect.gif
diff --git a/Final/java/management/eclipse-plugin/icons/refresh.gif b/Final2/java/management/eclipse-plugin/icons/refresh.gif
index a063c230ac..a063c230ac 100644
--- a/Final/java/management/eclipse-plugin/icons/refresh.gif
+++ b/Final2/java/management/eclipse-plugin/icons/refresh.gif
diff --git a/Final/java/management/eclipse-plugin/icons/splash.bmp b/Final2/java/management/eclipse-plugin/icons/splash.bmp
index b528a508c5..b528a508c5 100644
--- a/Final/java/management/eclipse-plugin/icons/splash.bmp
+++ b/Final2/java/management/eclipse-plugin/icons/splash.bmp
diff --git a/Final/java/management/eclipse-plugin/icons/stop.gif b/Final2/java/management/eclipse-plugin/icons/stop.gif
index dc47edf069..dc47edf069 100644
--- a/Final/java/management/eclipse-plugin/icons/stop.gif
+++ b/Final2/java/management/eclipse-plugin/icons/stop.gif
diff --git a/Final/java/management/eclipse-plugin/plugin.properties b/Final2/java/management/eclipse-plugin/plugin.properties
index 8507441886..8507441886 100644
--- a/Final/java/management/eclipse-plugin/plugin.properties
+++ b/Final2/java/management/eclipse-plugin/plugin.properties
diff --git a/Final/java/management/eclipse-plugin/plugin.xml b/Final2/java/management/eclipse-plugin/plugin.xml
index 5774859b47..5774859b47 100644
--- a/Final/java/management/eclipse-plugin/plugin.xml
+++ b/Final2/java/management/eclipse-plugin/plugin.xml
diff --git a/Final/java/management/eclipse-plugin/pom.xml b/Final2/java/management/eclipse-plugin/pom.xml
index fd8bdce74f..fd8bdce74f 100644
--- a/Final/java/management/eclipse-plugin/pom.xml
+++ b/Final2/java/management/eclipse-plugin/pom.xml
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
index 5eab267c28..5eab267c28 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java
index a1c4b7ddb0..a1c4b7ddb0 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java
index b5c1b5074a..b5c1b5074a 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
index 0ad85dbf33..0ad85dbf33 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java
index a46fa870e4..a46fa870e4 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java
index e3aedef28e..e3aedef28e 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
index d6f895b64a..d6f895b64a 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
index 31825e925d..31825e925d 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java
index 96e0fa46c6..96e0fa46c6 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java
index 480fdb429a..480fdb429a 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java
index f93200cadf..f93200cadf 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
index 313e143df5..313e143df5 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java
index 53aa927299..53aa927299 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
index 7a36ca6160..7a36ca6160 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java
index a3e52149df..a3e52149df 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/EditAttribute.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/EditAttribute.java
index d3af3661b0..d3af3661b0 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/EditAttribute.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/EditAttribute.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
index dd9e792912..dd9e792912 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
index 34251c12d7..34251c12d7 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java
index e329255414..e329255414 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java
index 11db02f5a2..11db02f5a2 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java
index 672426a59d..672426a59d 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/ManagementConsoleException.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/ManagementConsoleException.java
index 17c127c01a..17c127c01a 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/ManagementConsoleException.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/ManagementConsoleException.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
index 2be0ddbebf..2be0ddbebf 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java
index c6ecda4b4c..c6ecda4b4c 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
index 3561e16098..3561e16098 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
index f671a1dc9a..f671a1dc9a 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
index 2d1883533b..2d1883533b 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
index ccd4cf8df8..ccd4cf8df8 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
index b3219f15ea..b3219f15ea 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java
index 6d4160889e..6d4160889e 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
index 926e5f0a24..926e5f0a24 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
index bf3b730b3e..bf3b730b3e 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java
index 96964a81ef..96964a81ef 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
index d12217c6eb..d12217c6eb 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/CRAMMD5HashedSaslClientFactory.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/CRAMMD5HashedSaslClientFactory.java
index 32a0c12344..32a0c12344 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/CRAMMD5HashedSaslClientFactory.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/CRAMMD5HashedSaslClientFactory.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/ClientSaslFactory.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/ClientSaslFactory.java
index ce9a273eaa..ce9a273eaa 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/ClientSaslFactory.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/ClientSaslFactory.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/JCAProvider.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/JCAProvider.java
index d8189f3ac3..d8189f3ac3 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/JCAProvider.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/JCAProvider.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/PlainSaslClient.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/PlainSaslClient.java
index 22190f29eb..22190f29eb 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/PlainSaslClient.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/PlainSaslClient.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/SaslProvider.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/SaslProvider.java
index 2917de8740..2917de8740 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/SaslProvider.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/SaslProvider.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UserPasswordCallbackHandler.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UserPasswordCallbackHandler.java
index 1602229c85..1602229c85 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UserPasswordCallbackHandler.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UserPasswordCallbackHandler.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UsernameHashedPasswordCallbackHandler.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UsernameHashedPasswordCallbackHandler.java
index f4e3d2661e..f4e3d2661e 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UsernameHashedPasswordCallbackHandler.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UsernameHashedPasswordCallbackHandler.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
index 3234503fb5..3234503fb5 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ConnectionTypeTabControl.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ConnectionTypeTabControl.java
index d891a45210..d891a45210 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ConnectionTypeTabControl.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ConnectionTypeTabControl.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ExchangeTypeTabControl.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ExchangeTypeTabControl.java
index ee55b251ee..ee55b251ee 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ExchangeTypeTabControl.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ExchangeTypeTabControl.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java
index bc560b6064..bc560b6064 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
index 24dfb519fd..24dfb519fd 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
index 344c3c4e7f..344c3c4e7f 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
index 1da13a9b56..1da13a9b56 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
index 6894080859..6894080859 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NumberVerifyListener.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NumberVerifyListener.java
index 1774209dae..1774209dae 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NumberVerifyListener.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NumberVerifyListener.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
index f2cd594684..f2cd594684 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java
index 31a0bc857b..31a0bc857b 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
index c13c92066c..c13c92066c 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
index 9545ed9876..9545ed9876 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
index be25707bd3..be25707bd3 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
diff --git a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
index 4f2b70f869..4f2b70f869 100644
--- a/Final/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
+++ b/Final2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
diff --git a/Final/java/management/eclipse-plugin/src/main/resources/.eclipseproduct b/Final2/java/management/eclipse-plugin/src/main/resources/.eclipseproduct
index 28ee27ca17..28ee27ca17 100644
--- a/Final/java/management/eclipse-plugin/src/main/resources/.eclipseproduct
+++ b/Final2/java/management/eclipse-plugin/src/main/resources/.eclipseproduct
diff --git a/Final/java/management/eclipse-plugin/src/main/resources/eclipse.exe b/Final2/java/management/eclipse-plugin/src/main/resources/eclipse.exe
index 7826d1ed80..7826d1ed80 100644
--- a/Final/java/management/eclipse-plugin/src/main/resources/eclipse.exe
+++ b/Final2/java/management/eclipse-plugin/src/main/resources/eclipse.exe
diff --git a/Final/java/management/eclipse-plugin/src/main/resources/eclipse.ini b/Final2/java/management/eclipse-plugin/src/main/resources/eclipse.ini
index 6a4ecb5b5d..6a4ecb5b5d 100644
--- a/Final/java/management/eclipse-plugin/src/main/resources/eclipse.ini
+++ b/Final2/java/management/eclipse-plugin/src/main/resources/eclipse.ini
diff --git a/Final/java/management/eclipse-plugin/src/main/resources/license.eclipse.txt b/Final2/java/management/eclipse-plugin/src/main/resources/license.eclipse.txt
index da433e89f9..da433e89f9 100644
--- a/Final/java/management/eclipse-plugin/src/main/resources/license.eclipse.txt
+++ b/Final2/java/management/eclipse-plugin/src/main/resources/license.eclipse.txt
diff --git a/Final/java/management/eclipse-plugin/src/main/resources/sasl/MANIFEST.MF b/Final2/java/management/eclipse-plugin/src/main/resources/sasl/MANIFEST.MF
index d18b1a073d..d18b1a073d 100644
--- a/Final/java/management/eclipse-plugin/src/main/resources/sasl/MANIFEST.MF
+++ b/Final2/java/management/eclipse-plugin/src/main/resources/sasl/MANIFEST.MF
diff --git a/Final/java/management/eclipse-plugin/src/main/resources/startup.jar b/Final2/java/management/eclipse-plugin/src/main/resources/startup.jar
index 2f26eceece..2f26eceece 100644
--- a/Final/java/management/eclipse-plugin/src/main/resources/startup.jar
+++ b/Final2/java/management/eclipse-plugin/src/main/resources/startup.jar
diff --git a/Final/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini b/Final2/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini
index aa2d21fd48..aa2d21fd48 100644
--- a/Final/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini
+++ b/Final2/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini
diff --git a/Final/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini b/Final2/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini
index e83321e650..e83321e650 100644
--- a/Final/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini
+++ b/Final2/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini
diff --git a/Final/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java b/Final2/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
index 56eadbb3b2..56eadbb3b2 100644
--- a/Final/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
+++ b/Final2/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
diff --git a/Final/java/perftests/RunningPerformanceTests.txt b/Final2/java/perftests/RunningPerformanceTests.txt
index 54291483bf..54291483bf 100644
--- a/Final/java/perftests/RunningPerformanceTests.txt
+++ b/Final2/java/perftests/RunningPerformanceTests.txt
diff --git a/Final/java/perftests/bin/run_many.sh b/Final2/java/perftests/bin/run_many.sh
index cca2ffec21..cca2ffec21 100755
--- a/Final/java/perftests/bin/run_many.sh
+++ b/Final2/java/perftests/bin/run_many.sh
diff --git a/Final/java/perftests/bin/topicListener.sh b/Final2/java/perftests/bin/topicListener.sh
index a728592cd7..a728592cd7 100755
--- a/Final/java/perftests/bin/topicListener.sh
+++ b/Final2/java/perftests/bin/topicListener.sh
diff --git a/Final/java/perftests/bin/topicPublisher.sh b/Final2/java/perftests/bin/topicPublisher.sh
index f9b6bc19fe..f9b6bc19fe 100755
--- a/Final/java/perftests/bin/topicPublisher.sh
+++ b/Final2/java/perftests/bin/topicPublisher.sh
diff --git a/Final/java/perftests/dist-zip.xml b/Final2/java/perftests/dist-zip.xml
index 0039bfb157..0039bfb157 100644
--- a/Final/java/perftests/dist-zip.xml
+++ b/Final2/java/perftests/dist-zip.xml
diff --git a/Final/java/perftests/distribution/pom.xml b/Final2/java/perftests/distribution/pom.xml
index 24b9bd6b67..24b9bd6b67 100644
--- a/Final/java/perftests/distribution/pom.xml
+++ b/Final2/java/perftests/distribution/pom.xml
diff --git a/Final/java/perftests/distribution/src/main/assembly/performance.xml b/Final2/java/perftests/distribution/src/main/assembly/performance.xml
index a564261a24..a564261a24 100644
--- a/Final/java/perftests/distribution/src/main/assembly/performance.xml
+++ b/Final2/java/perftests/distribution/src/main/assembly/performance.xml
diff --git a/Final/java/perftests/etc/scripts/CTQ-Qpid-1.sh b/Final2/java/perftests/etc/scripts/CTQ-Qpid-1.sh
index 057dec5c63..057dec5c63 100755
--- a/Final/java/perftests/etc/scripts/CTQ-Qpid-1.sh
+++ b/Final2/java/perftests/etc/scripts/CTQ-Qpid-1.sh
diff --git a/Final/java/perftests/etc/scripts/CTQ-Qpid-2.sh b/Final2/java/perftests/etc/scripts/CTQ-Qpid-2.sh
index 08057cbf44..08057cbf44 100755
--- a/Final/java/perftests/etc/scripts/CTQ-Qpid-2.sh
+++ b/Final2/java/perftests/etc/scripts/CTQ-Qpid-2.sh
diff --git a/Final/java/perftests/etc/scripts/CTQ-Qpid-3.sh b/Final2/java/perftests/etc/scripts/CTQ-Qpid-3.sh
index 0bb7e25197..0bb7e25197 100755
--- a/Final/java/perftests/etc/scripts/CTQ-Qpid-3.sh
+++ b/Final2/java/perftests/etc/scripts/CTQ-Qpid-3.sh
diff --git a/Final/java/perftests/etc/scripts/CTQ-Qpid-4.sh b/Final2/java/perftests/etc/scripts/CTQ-Qpid-4.sh
index 278e44d12b..278e44d12b 100755
--- a/Final/java/perftests/etc/scripts/CTQ-Qpid-4.sh
+++ b/Final2/java/perftests/etc/scripts/CTQ-Qpid-4.sh
diff --git a/Final/java/perftests/etc/scripts/CTQ-Qpid-5.sh b/Final2/java/perftests/etc/scripts/CTQ-Qpid-5.sh
index 5dee0176b2..5dee0176b2 100755
--- a/Final/java/perftests/etc/scripts/CTQ-Qpid-5.sh
+++ b/Final2/java/perftests/etc/scripts/CTQ-Qpid-5.sh
diff --git a/Final/java/perftests/etc/scripts/CTQ-Qpid-6.sh b/Final2/java/perftests/etc/scripts/CTQ-Qpid-6.sh
index b9996da77d..b9996da77d 100755
--- a/Final/java/perftests/etc/scripts/CTQ-Qpid-6.sh
+++ b/Final2/java/perftests/etc/scripts/CTQ-Qpid-6.sh
diff --git a/Final/java/perftests/etc/scripts/PT-Qpid-13.sh b/Final2/java/perftests/etc/scripts/PT-Qpid-13.sh
index c2c6d6fd81..c2c6d6fd81 100755
--- a/Final/java/perftests/etc/scripts/PT-Qpid-13.sh
+++ b/Final2/java/perftests/etc/scripts/PT-Qpid-13.sh
diff --git a/Final/java/perftests/etc/scripts/PT-Qpid-14.sh b/Final2/java/perftests/etc/scripts/PT-Qpid-14.sh
index f0adaa1c30..f0adaa1c30 100755
--- a/Final/java/perftests/etc/scripts/PT-Qpid-14.sh
+++ b/Final2/java/perftests/etc/scripts/PT-Qpid-14.sh
diff --git a/Final/java/perftests/etc/scripts/sendAndWaitClient.sh b/Final2/java/perftests/etc/scripts/sendAndWaitClient.sh
index af4b788658..af4b788658 100755
--- a/Final/java/perftests/etc/scripts/sendAndWaitClient.sh
+++ b/Final2/java/perftests/etc/scripts/sendAndWaitClient.sh
diff --git a/Final/java/perftests/jar-with-dependencies.xml b/Final2/java/perftests/jar-with-dependencies.xml
index 5813b6334b..5813b6334b 100644
--- a/Final/java/perftests/jar-with-dependencies.xml
+++ b/Final2/java/perftests/jar-with-dependencies.xml
diff --git a/Final/java/perftests/pom.xml b/Final2/java/perftests/pom.xml
index e62c316d85..e62c316d85 100644
--- a/Final/java/perftests/pom.xml
+++ b/Final2/java/perftests/pom.xml
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java b/Final2/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java
index 64ccb719b6..64ccb719b6 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java b/Final2/java/perftests/src/main/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
index cac0064785..cac0064785 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/config/AbstractConfig.java b/Final2/java/perftests/src/main/java/org/apache/qpid/config/AbstractConfig.java
index 14db74438f..14db74438f 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/config/AbstractConfig.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/config/AbstractConfig.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java b/Final2/java/perftests/src/main/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
index a9984eb09a..a9984eb09a 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/config/Connector.java b/Final2/java/perftests/src/main/java/org/apache/qpid/config/Connector.java
index ff2377f087..ff2377f087 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/config/Connector.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/config/Connector.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/config/ConnectorConfig.java b/Final2/java/perftests/src/main/java/org/apache/qpid/config/ConnectorConfig.java
index b120ed3f12..b120ed3f12 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/config/ConnectorConfig.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/config/ConnectorConfig.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java b/Final2/java/perftests/src/main/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
index a0248a8f79..a0248a8f79 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/oldtopic/Config.java b/Final2/java/perftests/src/main/java/org/apache/qpid/oldtopic/Config.java
index 5b6169ed2d..5b6169ed2d 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/oldtopic/Config.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/oldtopic/Config.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/oldtopic/Listener.java b/Final2/java/perftests/src/main/java/org/apache/qpid/oldtopic/Listener.java
index 4732782d4c..4732782d4c 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/oldtopic/Listener.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/oldtopic/Listener.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/oldtopic/MessageFactory.java b/Final2/java/perftests/src/main/java/org/apache/qpid/oldtopic/MessageFactory.java
index b2fbeb7e35..b2fbeb7e35 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/oldtopic/MessageFactory.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/oldtopic/MessageFactory.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java b/Final2/java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java
index f811704323..f811704323 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/perftests/QpidTestThroughputPerf.java b/Final2/java/perftests/src/main/java/org/apache/qpid/perftests/QpidTestThroughputPerf.java
index 760d1c84a4..760d1c84a4 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/perftests/QpidTestThroughputPerf.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/perftests/QpidTestThroughputPerf.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/ping/PingAsyncTestPerf.java b/Final2/java/perftests/src/main/java/org/apache/qpid/ping/PingAsyncTestPerf.java
index 06081e6ebf..06081e6ebf 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/ping/PingAsyncTestPerf.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/ping/PingAsyncTestPerf.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java b/Final2/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
index b9632eee4c..b9632eee4c 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java b/Final2/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
index db6f384914..db6f384914 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java b/Final2/java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java
index 16a6e9c501..16a6e9c501 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java b/Final2/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
index 2879f0c322..2879f0c322 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java b/Final2/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java
index 0c2aa80a09..0c2aa80a09 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongBouncer.java b/Final2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongBouncer.java
index 82b36bf233..82b36bf233 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongBouncer.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongBouncer.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java b/Final2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
index 99ed9f8367..99ed9f8367 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongTestPerf.java b/Final2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongTestPerf.java
index e52deeecf1..e52deeecf1 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongTestPerf.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongTestPerf.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/topic/Config.java b/Final2/java/perftests/src/main/java/org/apache/qpid/topic/Config.java
index d5c0979399..d5c0979399 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/topic/Config.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/topic/Config.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/topic/Listener.java b/Final2/java/perftests/src/main/java/org/apache/qpid/topic/Listener.java
index 6dcea42bfe..6dcea42bfe 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/topic/Listener.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/topic/Listener.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/topic/MessageFactory.java b/Final2/java/perftests/src/main/java/org/apache/qpid/topic/MessageFactory.java
index 4efdc1cb56..4efdc1cb56 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/topic/MessageFactory.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/topic/MessageFactory.java
diff --git a/Final/java/perftests/src/main/java/org/apache/qpid/topic/Publisher.java b/Final2/java/perftests/src/main/java/org/apache/qpid/topic/Publisher.java
index c3b19b558a..c3b19b558a 100644
--- a/Final/java/perftests/src/main/java/org/apache/qpid/topic/Publisher.java
+++ b/Final2/java/perftests/src/main/java/org/apache/qpid/topic/Publisher.java
diff --git a/Final/java/perftests/src/main/java/perftests.log4j b/Final2/java/perftests/src/main/java/perftests.log4j
index 3bd8c201f8..3bd8c201f8 100644
--- a/Final/java/perftests/src/main/java/perftests.log4j
+++ b/Final2/java/perftests/src/main/java/perftests.log4j
diff --git a/Final/java/pom.xml b/Final2/java/pom.xml
index 28db0467d2..28db0467d2 100644
--- a/Final/java/pom.xml
+++ b/Final2/java/pom.xml
diff --git a/Final/java/release-docs/RELEASE_NOTES.txt b/Final2/java/release-docs/RELEASE_NOTES.txt
index ed93f3e450..ed93f3e450 100644
--- a/Final/java/release-docs/RELEASE_NOTES.txt
+++ b/Final2/java/release-docs/RELEASE_NOTES.txt
diff --git a/Final/java/resources/DISCLAIMER b/Final2/java/resources/DISCLAIMER
index c321113c9e..c321113c9e 100644
--- a/Final/java/resources/DISCLAIMER
+++ b/Final2/java/resources/DISCLAIMER
diff --git a/Final/java/resources/LICENSE b/Final2/java/resources/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/Final/java/resources/LICENSE
+++ b/Final2/java/resources/LICENSE
diff --git a/Final/java/resources/META-INF/DISCLAIMER b/Final2/java/resources/META-INF/DISCLAIMER
index 1ca63e46e2..1ca63e46e2 100644
--- a/Final/java/resources/META-INF/DISCLAIMER
+++ b/Final2/java/resources/META-INF/DISCLAIMER
diff --git a/Final/java/resources/META-INF/LICENSE b/Final2/java/resources/META-INF/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/Final/java/resources/META-INF/LICENSE
+++ b/Final2/java/resources/META-INF/LICENSE
diff --git a/Final/java/resources/META-INF/NOTICE b/Final2/java/resources/META-INF/NOTICE
index f62ec14896..f62ec14896 100644
--- a/Final/java/resources/META-INF/NOTICE
+++ b/Final2/java/resources/META-INF/NOTICE
diff --git a/Final/java/resources/NOTICE b/Final2/java/resources/NOTICE
index d550578281..d550578281 100644
--- a/Final/java/resources/NOTICE
+++ b/Final2/java/resources/NOTICE
diff --git a/Final/java/resources/README b/Final2/java/resources/README
index 1d52d487fb..1d52d487fb 100644
--- a/Final/java/resources/README
+++ b/Final2/java/resources/README
diff --git a/Final/java/systests/distribution/pom.xml b/Final2/java/systests/distribution/pom.xml
index 172a59d3a1..172a59d3a1 100644
--- a/Final/java/systests/distribution/pom.xml
+++ b/Final2/java/systests/distribution/pom.xml
diff --git a/Final/java/systests/distribution/src/main/assembly/systests.xml b/Final2/java/systests/distribution/src/main/assembly/systests.xml
index 2d6a6d8572..2d6a6d8572 100644
--- a/Final/java/systests/distribution/src/main/assembly/systests.xml
+++ b/Final2/java/systests/distribution/src/main/assembly/systests.xml
diff --git a/Final/java/systests/etc/bin/testclients.sh b/Final2/java/systests/etc/bin/testclients.sh
index 6aaa7c408e..6aaa7c408e 100644
--- a/Final/java/systests/etc/bin/testclients.sh
+++ b/Final2/java/systests/etc/bin/testclients.sh
diff --git a/Final/java/systests/pom.xml b/Final2/java/systests/pom.xml
index b18bfc93de..b18bfc93de 100644
--- a/Final/java/systests/pom.xml
+++ b/Final2/java/systests/pom.xml
diff --git a/Final/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java b/Final2/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
index 5323ad28bf..5323ad28bf 100644
--- a/Final/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
+++ b/Final2/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
index 370c2b43a7..370c2b43a7 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
index 3ee8277eba..3ee8277eba 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index ff5517bdd5..ff5517bdd5 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
index eca642b556..eca642b556 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java
index 9b5c9c3d00..9b5c9c3d00 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java
index df99d044d2..df99d044d2 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
index ebbffd8a71..ebbffd8a71 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/failure/DeadlockTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/failure/DeadlockTest.java
index a25af30008..a25af30008 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/failure/DeadlockTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/failure/DeadlockTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
index 4117fe6720..4117fe6720 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
index 04376a3067..04376a3067 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
index ae02c1c28c..ae02c1c28c 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/protocol/MockIoSession.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/protocol/MockIoSession.java
index cf6366b513..cf6366b513 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/protocol/MockIoSession.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/protocol/MockIoSession.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
index 29952a6d9b..29952a6d9b 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java
index 068f37574d..068f37574d 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/DeliveryManagerTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
index dc5a6d3cf6..dc5a6d3cf6 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/MessageReturnTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/MessageReturnTest.java
index 45bf73bd9d..45bf73bd9d 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/MessageReturnTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/MessageReturnTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
index 88272023e8..88272023e8 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
index 0ad6502755..0ad6502755 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
index d01284cb8a..d01284cb8a 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
index 7bbfdb5543..7bbfdb5543 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java
index d3ec3c11d4..d3ec3c11d4 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionSetTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionSetTest.java
index bcf54693d3..bcf54693d3 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionSetTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionSetTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
index fe947ef3bc..fe947ef3bc 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
index 06956ba52f..06956ba52f 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java
index 6ffa3e0e02..6ffa3e0e02 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
index ab6d9742e4..ab6d9742e4 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
index 48d808142c..48d808142c 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java
index 025f8d89f6..025f8d89f6 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/txn/TxnTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/txn/TxnTest.java
index 2957dda869..2957dda869 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/txn/TxnTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/txn/TxnTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java
index 1d17985ab5..1d17985ab5 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/util/RunStats.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/util/RunStats.java
index ec67fc68b3..ec67fc68b3 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/util/RunStats.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/util/RunStats.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java
index bd7ed60d1d..bd7ed60d1d 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/server/util/TimedRun.java b/Final2/java/systests/src/main/java/org/apache/qpid/server/util/TimedRun.java
index 1291380311..1291380311 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/server/util/TimedRun.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/server/util/TimedRun.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/VMBrokerSetup.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/VMBrokerSetup.java
index e859fac4af..e859fac4af 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/VMBrokerSetup.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/VMBrokerSetup.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
index 9629f87d46..9629f87d46 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTest.java
index ec9df8f1b3..ec9df8f1b3 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/Assertion.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/Assertion.java
index 75c1c97999..75c1c97999 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/Assertion.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/Assertion.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/AssertionBase.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/AssertionBase.java
index 3d83224513..3d83224513 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/AssertionBase.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/AssertionBase.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/Circuit.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/Circuit.java
index d665acb62c..d665acb62c 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/Circuit.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/Circuit.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEnd.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEnd.java
index e557620cf5..e557620cf5 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEnd.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEnd.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java
index 251b216c45..251b216c45 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java
index 12cf0d79d5..12cf0d79d5 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java
index 9f1207202e..9f1207202e 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
index 77bb7a5c52..77bb7a5c52 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java
index 2456ba1709..2456ba1709 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/MessageMonitor.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/MessageMonitor.java
index a2dba45616..a2dba45616 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/MessageMonitor.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/MessageMonitor.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java
index f6664a78d9..f6664a78d9 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java
index df35579533..df35579533 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java
index e01b272d5a..e01b272d5a 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java
index 1e5807cba8..1e5807cba8 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java
index 569eac425c..569eac425c 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java
index b04ab0f9b0..b04ab0f9b0 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java
index 3a2655340e..3a2655340e 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java
index d0fd16d715..d0fd16d715 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/LocalClockSynchronizer.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/LocalClockSynchronizer.java
index 4f34e1c047..4f34e1c047 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/LocalClockSynchronizer.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/LocalClockSynchronizer.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java
index f6195aa553..f6195aa553 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java
index 78f05767d3..78f05767d3 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
index 628729cb51..628729cb51 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java
index 9e3054964c..9e3054964c 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java
index 4a77906448..4a77906448 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java
index 621d16ec9b..621d16ec9b 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
index 90a44e3b6b..90a44e3b6b 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
index c2f34b44fc..c2f34b44fc 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
index 995aa5e71d..995aa5e71d 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
index 918f0f9177..918f0f9177 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java
index fcdac20ca2..fcdac20ca2 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClientControlledTest.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClientControlledTest.java
index 893a022b97..893a022b97 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClientControlledTest.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClientControlledTest.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
index 014dd21292..014dd21292 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
index 010669a7c2..010669a7c2 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java
index 93a137dffa..93a137dffa 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java
index 1b5acf92de..1b5acf92de 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/package.html b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/package.html
index f07a5118e7..f07a5118e7 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/package.html
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/package.html
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java
index 555071760e..555071760e 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
index 82caa20d79..82caa20d79 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
index 673b47df03..673b47df03 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
index 35bcf78b72..35bcf78b72 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/testutil/QpidClientConnectionHelper.java b/Final2/java/systests/src/main/java/org/apache/qpid/testutil/QpidClientConnectionHelper.java
index 398e3e7800..398e3e7800 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/testutil/QpidClientConnectionHelper.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/testutil/QpidClientConnectionHelper.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java b/Final2/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java
index bad49060ca..bad49060ca 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java
diff --git a/Final/java/systests/src/main/java/org/apache/qpid/util/ConversationFactory.java b/Final2/java/systests/src/main/java/org/apache/qpid/util/ConversationFactory.java
index a325e7025e..a325e7025e 100644
--- a/Final/java/systests/src/main/java/org/apache/qpid/util/ConversationFactory.java
+++ b/Final2/java/systests/src/main/java/org/apache/qpid/util/ConversationFactory.java
diff --git a/Final/java/systests/src/main/java/systests.log4j b/Final2/java/systests/src/main/java/systests.log4j
index 6d596d1d19..6d596d1d19 100644
--- a/Final/java/systests/src/main/java/systests.log4j
+++ b/Final2/java/systests/src/main/java/systests.log4j
diff --git a/Final/java/systests/src/old_test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java b/Final2/java/systests/src/old_test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
index ff0d58ad69..ff0d58ad69 100644
--- a/Final/java/systests/src/old_test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
+++ b/Final2/java/systests/src/old_test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
diff --git a/Final/java/systests/src/old_test/java/org/apache/qpid/server/protocol/TestProtocolInitiation.java b/Final2/java/systests/src/old_test/java/org/apache/qpid/server/protocol/TestProtocolInitiation.java
index e76c164f64..e76c164f64 100644
--- a/Final/java/systests/src/old_test/java/org/apache/qpid/server/protocol/TestProtocolInitiation.java
+++ b/Final2/java/systests/src/old_test/java/org/apache/qpid/server/protocol/TestProtocolInitiation.java
diff --git a/Final/java/systests/src/old_test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java b/Final2/java/systests/src/old_test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
index 11c0026455..11c0026455 100644
--- a/Final/java/systests/src/old_test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
+++ b/Final2/java/systests/src/old_test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
diff --git a/Final/java/systests/src/old_test/java/org/apache/qpid/server/queue/QueuePerfTest.java b/Final2/java/systests/src/old_test/java/org/apache/qpid/server/queue/QueuePerfTest.java
index 5b3857396d..5b3857396d 100644
--- a/Final/java/systests/src/old_test/java/org/apache/qpid/server/queue/QueuePerfTest.java
+++ b/Final2/java/systests/src/old_test/java/org/apache/qpid/server/queue/QueuePerfTest.java
diff --git a/Final/java/systests/src/old_test/java/org/apache/qpid/server/queue/SendPerfTest.java b/Final2/java/systests/src/old_test/java/org/apache/qpid/server/queue/SendPerfTest.java
index 2c5712fd35..2c5712fd35 100644
--- a/Final/java/systests/src/old_test/java/org/apache/qpid/server/queue/SendPerfTest.java
+++ b/Final2/java/systests/src/old_test/java/org/apache/qpid/server/queue/SendPerfTest.java
diff --git a/Final/java/systests/src/old_test/java/org/apache/qpid/server/util/ConcurrentTest.java b/Final2/java/systests/src/old_test/java/org/apache/qpid/server/util/ConcurrentTest.java
index 1ae8d3205d..1ae8d3205d 100644
--- a/Final/java/systests/src/old_test/java/org/apache/qpid/server/util/ConcurrentTest.java
+++ b/Final2/java/systests/src/old_test/java/org/apache/qpid/server/util/ConcurrentTest.java
diff --git a/Final/java/systests/src/old_test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java b/Final2/java/systests/src/old_test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
index 3e35e3c85b..3e35e3c85b 100644
--- a/Final/java/systests/src/old_test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
+++ b/Final2/java/systests/src/old_test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
diff --git a/Final/python/LICENSE.txt b/Final2/python/LICENSE.txt
index 6b0b1270ff..6b0b1270ff 100755
--- a/Final/python/LICENSE.txt
+++ b/Final2/python/LICENSE.txt
diff --git a/Final/python/NOTICE.txt b/Final2/python/NOTICE.txt
index 32ccdb70c4..32ccdb70c4 100644
--- a/Final/python/NOTICE.txt
+++ b/Final2/python/NOTICE.txt
diff --git a/Final/python/README.txt b/Final2/python/README.txt
index 0a64f0e2f2..0a64f0e2f2 100644
--- a/Final/python/README.txt
+++ b/Final2/python/README.txt
diff --git a/Final/python/RELEASE_NOTES b/Final2/python/RELEASE_NOTES
index 7005aa83cb..7005aa83cb 100644
--- a/Final/python/RELEASE_NOTES
+++ b/Final2/python/RELEASE_NOTES
diff --git a/Final/python/amqp-doc b/Final2/python/amqp-doc
index 0e7f9e862a..0e7f9e862a 100755
--- a/Final/python/amqp-doc
+++ b/Final2/python/amqp-doc
diff --git a/Final/python/cpp_failing.txt b/Final2/python/cpp_failing.txt
index e69de29bb2..e69de29bb2 100644
--- a/Final/python/cpp_failing.txt
+++ b/Final2/python/cpp_failing.txt
diff --git a/Final/python/doc/test-requirements.txt b/Final2/python/doc/test-requirements.txt
index a1ba414eb2..a1ba414eb2 100644
--- a/Final/python/doc/test-requirements.txt
+++ b/Final2/python/doc/test-requirements.txt
diff --git a/Final/python/java_failing.txt b/Final2/python/java_failing.txt
index e69de29bb2..e69de29bb2 100644
--- a/Final/python/java_failing.txt
+++ b/Final2/python/java_failing.txt
diff --git a/Final/python/pal2py b/Final2/python/pal2py
index 544151bf76..544151bf76 100755
--- a/Final/python/pal2py
+++ b/Final2/python/pal2py
diff --git a/Final/python/qpid/__init__.py b/Final2/python/qpid/__init__.py
index 4363f175fb..4363f175fb 100644
--- a/Final/python/qpid/__init__.py
+++ b/Final2/python/qpid/__init__.py
diff --git a/Final/python/qpid/client.py b/Final2/python/qpid/client.py
index b4a282f251..b4a282f251 100644
--- a/Final/python/qpid/client.py
+++ b/Final2/python/qpid/client.py
diff --git a/Final/python/qpid/codec.py b/Final2/python/qpid/codec.py
index 69c7ca8afa..69c7ca8afa 100644
--- a/Final/python/qpid/codec.py
+++ b/Final2/python/qpid/codec.py
diff --git a/Final/python/qpid/connection.py b/Final2/python/qpid/connection.py
index 0b788e091b..0b788e091b 100644
--- a/Final/python/qpid/connection.py
+++ b/Final2/python/qpid/connection.py
diff --git a/Final/python/qpid/content.py b/Final2/python/qpid/content.py
index bcbea1697c..bcbea1697c 100644
--- a/Final/python/qpid/content.py
+++ b/Final2/python/qpid/content.py
diff --git a/Final/python/qpid/delegate.py b/Final2/python/qpid/delegate.py
index 035bb3c476..035bb3c476 100644
--- a/Final/python/qpid/delegate.py
+++ b/Final2/python/qpid/delegate.py
diff --git a/Final/python/qpid/message.py b/Final2/python/qpid/message.py
index 914b878147..914b878147 100644
--- a/Final/python/qpid/message.py
+++ b/Final2/python/qpid/message.py
diff --git a/Final/python/qpid/peer.py b/Final2/python/qpid/peer.py
index 7c6cf91dea..7c6cf91dea 100644
--- a/Final/python/qpid/peer.py
+++ b/Final2/python/qpid/peer.py
diff --git a/Final/python/qpid/queue.py b/Final2/python/qpid/queue.py
index 5438b328ab..5438b328ab 100644
--- a/Final/python/qpid/queue.py
+++ b/Final2/python/qpid/queue.py
diff --git a/Final/python/qpid/spec.py b/Final2/python/qpid/spec.py
index 0e3a477066..0e3a477066 100644
--- a/Final/python/qpid/spec.py
+++ b/Final2/python/qpid/spec.py
diff --git a/Final/python/qpid/testlib.py b/Final2/python/qpid/testlib.py
index 39bad75b86..39bad75b86 100644
--- a/Final/python/qpid/testlib.py
+++ b/Final2/python/qpid/testlib.py
diff --git a/Final/python/qpid/xmlutil.py b/Final2/python/qpid/xmlutil.py
index 585516b44f..585516b44f 100644
--- a/Final/python/qpid/xmlutil.py
+++ b/Final2/python/qpid/xmlutil.py
diff --git a/Final/python/rule2test b/Final2/python/rule2test
index 10f151366e..10f151366e 100755
--- a/Final/python/rule2test
+++ b/Final2/python/rule2test
diff --git a/Final/python/run-tests b/Final2/python/run-tests
index 90c0200d01..90c0200d01 100755
--- a/Final/python/run-tests
+++ b/Final2/python/run-tests
diff --git a/Final/python/setup.py b/Final2/python/setup.py
index a49fa6ca51..a49fa6ca51 100644
--- a/Final/python/setup.py
+++ b/Final2/python/setup.py
diff --git a/Final/python/tests/__init__.py b/Final2/python/tests/__init__.py
index 9a09d2d04f..9a09d2d04f 100644
--- a/Final/python/tests/__init__.py
+++ b/Final2/python/tests/__init__.py
diff --git a/Final/python/tests/basic.py b/Final2/python/tests/basic.py
index bbbfa8ebf9..bbbfa8ebf9 100644
--- a/Final/python/tests/basic.py
+++ b/Final2/python/tests/basic.py
diff --git a/Final/python/tests/broker.py b/Final2/python/tests/broker.py
index 90009b6847..90009b6847 100644
--- a/Final/python/tests/broker.py
+++ b/Final2/python/tests/broker.py
diff --git a/Final/python/tests/example.py b/Final2/python/tests/example.py
index bc84f002e0..bc84f002e0 100644
--- a/Final/python/tests/example.py
+++ b/Final2/python/tests/example.py
diff --git a/Final/python/tests/exchange.py b/Final2/python/tests/exchange.py
index 56d6fa82e4..56d6fa82e4 100644
--- a/Final/python/tests/exchange.py
+++ b/Final2/python/tests/exchange.py
diff --git a/Final/python/tests/queue.py b/Final2/python/tests/queue.py
index 60ac4c3dfb..60ac4c3dfb 100644
--- a/Final/python/tests/queue.py
+++ b/Final2/python/tests/queue.py
diff --git a/Final/python/tests/testlib.py b/Final2/python/tests/testlib.py
index cab07cc4ac..cab07cc4ac 100644
--- a/Final/python/tests/testlib.py
+++ b/Final2/python/tests/testlib.py
diff --git a/Final/python/tests/tx.py b/Final2/python/tests/tx.py
index 054fb8d8b7..054fb8d8b7 100644
--- a/Final/python/tests/tx.py
+++ b/Final2/python/tests/tx.py
diff --git a/Final/ruby/LICENSE.txt b/Final2/ruby/LICENSE.txt
index 6b0b1270ff..6b0b1270ff 100755
--- a/Final/ruby/LICENSE.txt
+++ b/Final2/ruby/LICENSE.txt
diff --git a/Final/ruby/NOTICE.txt b/Final2/ruby/NOTICE.txt
index fff2bca45c..fff2bca45c 100644
--- a/Final/ruby/NOTICE.txt
+++ b/Final2/ruby/NOTICE.txt
diff --git a/Final/ruby/RELEASE_NOTES b/Final2/ruby/RELEASE_NOTES
index 5ea0bd8eec..5ea0bd8eec 100644
--- a/Final/ruby/RELEASE_NOTES
+++ b/Final2/ruby/RELEASE_NOTES
diff --git a/Final/ruby/qpid.rb b/Final2/ruby/qpid.rb
index 25cd26f362..25cd26f362 100644
--- a/Final/ruby/qpid.rb
+++ b/Final2/ruby/qpid.rb
diff --git a/Final/ruby/qpid/client.rb b/Final2/ruby/qpid/client.rb
index f10f2e564b..f10f2e564b 100644
--- a/Final/ruby/qpid/client.rb
+++ b/Final2/ruby/qpid/client.rb
diff --git a/Final/ruby/qpid/codec.rb b/Final2/ruby/qpid/codec.rb
index 8d80e10aee..8d80e10aee 100644
--- a/Final/ruby/qpid/codec.rb
+++ b/Final2/ruby/qpid/codec.rb
diff --git a/Final/ruby/qpid/connection.rb b/Final2/ruby/qpid/connection.rb
index f6ee9cf1e4..f6ee9cf1e4 100644
--- a/Final/ruby/qpid/connection.rb
+++ b/Final2/ruby/qpid/connection.rb
diff --git a/Final/ruby/qpid/fields.rb b/Final2/ruby/qpid/fields.rb
index 91484af850..91484af850 100644
--- a/Final/ruby/qpid/fields.rb
+++ b/Final2/ruby/qpid/fields.rb
diff --git a/Final/ruby/qpid/peer.rb b/Final2/ruby/qpid/peer.rb
index 320808fdc6..320808fdc6 100644
--- a/Final/ruby/qpid/peer.rb
+++ b/Final2/ruby/qpid/peer.rb
diff --git a/Final/ruby/qpid/queue.rb b/Final2/ruby/qpid/queue.rb
index 350310882f..350310882f 100644
--- a/Final/ruby/qpid/queue.rb
+++ b/Final2/ruby/qpid/queue.rb
diff --git a/Final/ruby/qpid/spec.rb b/Final2/ruby/qpid/spec.rb
index 9a04f584d0..9a04f584d0 100644
--- a/Final/ruby/qpid/spec.rb
+++ b/Final2/ruby/qpid/spec.rb
diff --git a/Final/ruby/qpid/test.rb b/Final2/ruby/qpid/test.rb
index f8107143ab..f8107143ab 100644
--- a/Final/ruby/qpid/test.rb
+++ b/Final2/ruby/qpid/test.rb
diff --git a/Final/ruby/qpid/traverse.rb b/Final2/ruby/qpid/traverse.rb
index 67358a7eb1..67358a7eb1 100644
--- a/Final/ruby/qpid/traverse.rb
+++ b/Final2/ruby/qpid/traverse.rb
diff --git a/Final/ruby/run-tests b/Final2/ruby/run-tests
index b4c51a75ed..b4c51a75ed 100755
--- a/Final/ruby/run-tests
+++ b/Final2/ruby/run-tests
diff --git a/Final/ruby/tests/basic.rb b/Final2/ruby/tests/basic.rb
index 0018050fe2..0018050fe2 100644
--- a/Final/ruby/tests/basic.rb
+++ b/Final2/ruby/tests/basic.rb
diff --git a/Final/ruby/tests/channel.rb b/Final2/ruby/tests/channel.rb
index 31c5f19d92..31c5f19d92 100644
--- a/Final/ruby/tests/channel.rb
+++ b/Final2/ruby/tests/channel.rb
diff --git a/Final/specs/amqp.0-8.xml b/Final2/specs/amqp.0-8.xml
index bfb9ee4658..bfb9ee4658 100644
--- a/Final/specs/amqp.0-8.xml
+++ b/Final2/specs/amqp.0-8.xml
diff --git a/Final/specs/amqp.0-9.xml b/Final2/specs/amqp.0-9.xml
index 9d1b488c03..9d1b488c03 100644
--- a/Final/specs/amqp.0-9.xml
+++ b/Final2/specs/amqp.0-9.xml
diff --git a/Final/specs/cluster.0-8.xml b/Final2/specs/cluster.0-8.xml
index 09e8ca0787..09e8ca0787 100644
--- a/Final/specs/cluster.0-8.xml
+++ b/Final2/specs/cluster.0-8.xml
diff --git a/Final/specs/cluster.0-9.xml b/Final2/specs/cluster.0-9.xml
index 142e6c9380..142e6c9380 100644
--- a/Final/specs/cluster.0-9.xml
+++ b/Final2/specs/cluster.0-9.xml