QPID-5409: Recreating branch

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha@1549894 13f79535-47bb-0310-9956-ffa450edef68

6066 files changed, 182 insertions, 97 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..97872000d8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,93 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+#Python
+*.pyc
+*.out
+#CPP
+*.o
+*.la
+*.lo
+*.vglog
+.dirstamp
+Makefile.in
+config(?!\.sh)\.*
+configure
+.deps
+.libs
+autom4te.cache
+*.m4
+developer.doxygen
+user.doxygen
+qpid/cpp/libtool
+qpidc.spec
+qpid/cpp/src/gen/
+*gen.mk
+*.timestamp
+*.pcl
+qpid/cpp/managementgen/management-types.xml
+
+#Java
+*.class
+velocity.log*
+qpid/java/build
+release
+.classpath
+.project
+.settings
+generated/
+target
+classes
+qpid/java/lib/*.jar
+qpid/java/lib/required
+qpid/java/lib/bdbstore
+qpid/java/lib/cobertura
+qpid/java/lib/findbugs
+qpid/java/lib/ivy
+qpid/java/lib/csvjdbc
+qpid/java/lib/jfree
+qpid/java/lib/bonecp
+qpid/java/build.overrides
+qpid/java/felix-cache/*
+qpid/java/eclipse-projects
+qpid/java/derby.log
+# Intellij Project files
+*.iml
+*.ipr
+*.iws
+# Emacs
+*~
+# Microsoft Visual Studio artifacts
+*.vcproj.*.*.user
+*.ncb
+*.suo
+*.ilk
+*.pdb
+# Windows build results
+*.exe
+*.lib
+*.dll
+# MacOS File
+.DS_Store
+
+#Eclipse workspace
+workspace/
+
+*.swp
+
diff --git a/KEYS b/qpid/KEYS
index ca3ef4d0fd..ca3ef4d0fd 100644
--- a/KEYS
+++ b/qpid/KEYS
diff --git a/LICENSE b/qpid/LICENSE
index cd0c8d0a8b..cd0c8d0a8b 100644
--- a/LICENSE
+++ b/qpid/LICENSE
diff --git a/NOTICE b/qpid/NOTICE
index 5691e0e1ac..5691e0e1ac 100644
--- a/NOTICE
+++ b/qpid/NOTICE
diff --git a/QPID_VERSION.txt b/qpid/QPID_VERSION.txt
index 5a9e6bda25..5a9e6bda25 100644
--- a/QPID_VERSION.txt
+++ b/qpid/QPID_VERSION.txt
diff --git a/README.txt b/qpid/README.txt
index ccd92c757b..ccd92c757b 100644
--- a/README.txt
+++ b/qpid/README.txt
diff --git a/bin/LICENSE b/qpid/bin/LICENSE
index bc46b77047..bc46b77047 100644
--- a/bin/LICENSE
+++ b/qpid/bin/LICENSE
diff --git a/bin/NOTICE b/qpid/bin/NOTICE
index 05f39ba176..05f39ba176 100644
--- a/bin/NOTICE
+++ b/qpid/bin/NOTICE
diff --git a/bin/install-cpp-python b/qpid/bin/install-cpp-python
index d43e8e4899..d43e8e4899 100755
--- a/bin/install-cpp-python
+++ b/qpid/bin/install-cpp-python
diff --git a/bin/mvn-deploy-qpid-java.sh b/qpid/bin/mvn-deploy-qpid-java.sh
index 3c2a9fd05f..3c2a9fd05f 100755
--- a/bin/mvn-deploy-qpid-java.sh
+++ b/qpid/bin/mvn-deploy-qpid-java.sh
diff --git a/bin/release.sh b/qpid/bin/release.sh
index f5645f36dc..f5645f36dc 100755
--- a/bin/release.sh
+++ b/qpid/bin/release.sh
diff --git a/bin/set_svn_properties.sh b/qpid/bin/set_svn_properties.sh
index cc29490eea..cc29490eea 100755
--- a/bin/set_svn_properties.sh
+++ b/qpid/bin/set_svn_properties.sh
diff --git a/buildtools/LICENSE b/qpid/buildtools/LICENSE
index bc46b77047..bc46b77047 100644
--- a/buildtools/LICENSE
+++ b/qpid/buildtools/LICENSE
diff --git a/buildtools/NOTICE b/qpid/buildtools/NOTICE
index 5813a7a09a..5813a7a09a 100644
--- a/buildtools/NOTICE
+++ b/qpid/buildtools/NOTICE
diff --git a/buildtools/buildCreator/build.config b/qpid/buildtools/buildCreator/build.config
index cb45e99a6e..cb45e99a6e 100644
--- a/buildtools/buildCreator/build.config
+++ b/qpid/buildtools/buildCreator/build.config
diff --git a/buildtools/buildCreator/buildCreator.py b/qpid/buildtools/buildCreator/buildCreator.py
index 0a26ce09b0..0a26ce09b0 100755
--- a/buildtools/buildCreator/buildCreator.py
+++ b/qpid/buildtools/buildCreator/buildCreator.py
diff --git a/buildtools/buildCreator/qpid.build b/qpid/buildtools/buildCreator/qpid.build
index f55025dc8d..f55025dc8d 100644
--- a/buildtools/buildCreator/qpid.build
+++ b/qpid/buildtools/buildCreator/qpid.build
diff --git a/cpp/.gitignore b/qpid/cpp/.gitignore
index 63a3f41f28..63a3f41f28 100644
--- a/cpp/.gitignore
+++ b/qpid/cpp/.gitignore
diff --git a/cpp/AMQP_1.0 b/qpid/cpp/AMQP_1.0
index 39e58bacf4..39e58bacf4 100644
--- a/cpp/AMQP_1.0
+++ b/qpid/cpp/AMQP_1.0
diff --git a/cpp/BuildInstallSettings.cmake b/qpid/cpp/BuildInstallSettings.cmake
index a980c81e8f..a980c81e8f 100644
--- a/cpp/BuildInstallSettings.cmake
+++ b/qpid/cpp/BuildInstallSettings.cmake
diff --git a/cpp/CMakeLists.txt b/qpid/cpp/CMakeLists.txt
index 837a71cd44..837a71cd44 100644
--- a/cpp/CMakeLists.txt
+++ b/qpid/cpp/CMakeLists.txt
diff --git a/cpp/CTestConfig.cmake b/qpid/cpp/CTestConfig.cmake
index 7b8a6cb3cf..7b8a6cb3cf 100755
--- a/cpp/CTestConfig.cmake
+++ b/qpid/cpp/CTestConfig.cmake
diff --git a/cpp/DESIGN b/qpid/cpp/DESIGN
index c814f1c53d..c814f1c53d 100644
--- a/cpp/DESIGN
+++ b/qpid/cpp/DESIGN
diff --git a/cpp/INSTALL b/qpid/cpp/INSTALL
index 6295a23cc9..6295a23cc9 100644
--- a/cpp/INSTALL
+++ b/qpid/cpp/INSTALL
diff --git a/cpp/INSTALL-WINDOWS b/qpid/cpp/INSTALL-WINDOWS
index c3578a3dba..c3578a3dba 100644
--- a/cpp/INSTALL-WINDOWS
+++ b/qpid/cpp/INSTALL-WINDOWS
diff --git a/cpp/LICENSE b/qpid/cpp/LICENSE
index cff2a5e25d..cff2a5e25d 100644
--- a/cpp/LICENSE
+++ b/qpid/cpp/LICENSE
diff --git a/cpp/NOTICE b/qpid/cpp/NOTICE
index 5de355a56c..5de355a56c 100644
--- a/cpp/NOTICE
+++ b/qpid/cpp/NOTICE
diff --git a/cpp/QPID_VERSION.txt b/qpid/cpp/QPID_VERSION.txt
index 5a9e6bda25..5a9e6bda25 100644
--- a/cpp/QPID_VERSION.txt
+++ b/qpid/cpp/QPID_VERSION.txt
diff --git a/cpp/README-HA.txt b/qpid/cpp/README-HA.txt
index 4e95ea1041..4e95ea1041 100644
--- a/cpp/README-HA.txt
+++ b/qpid/cpp/README-HA.txt
diff --git a/cpp/README-winsdk.txt b/qpid/cpp/README-winsdk.txt
index 3e4899f8e6..3e4899f8e6 100644
--- a/cpp/README-winsdk.txt
+++ b/qpid/cpp/README-winsdk.txt
diff --git a/cpp/README.txt b/qpid/cpp/README.txt
index 9e11474bb7..9e11474bb7 100644
--- a/cpp/README.txt
+++ b/qpid/cpp/README.txt
diff --git a/cpp/RELEASE_NOTES b/qpid/cpp/RELEASE_NOTES
index b3fecf7415..b3fecf7415 100644
--- a/cpp/RELEASE_NOTES
+++ b/qpid/cpp/RELEASE_NOTES
diff --git a/cpp/SSL b/qpid/cpp/SSL
index 5added62d9..5added62d9 100644
--- a/cpp/SSL
+++ b/qpid/cpp/SSL
diff --git a/cpp/bindings/CMakeLists.txt b/qpid/cpp/bindings/CMakeLists.txt
index d64d59b9d6..d64d59b9d6 100644
--- a/cpp/bindings/CMakeLists.txt
+++ b/qpid/cpp/bindings/CMakeLists.txt
diff --git a/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt b/qpid/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt
index 0e1e00d34e..0e1e00d34e 100644
--- a/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt
diff --git a/cpp/bindings/qmf2/examples/cpp/README.txt b/qpid/cpp/bindings/qmf2/examples/cpp/README.txt
index 8ab3d17517..8ab3d17517 100644
--- a/cpp/bindings/qmf2/examples/cpp/README.txt
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/README.txt
diff --git a/cpp/bindings/qmf2/examples/cpp/agent.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
index 8751ed4b38..8751ed4b38 100644
--- a/cpp/bindings/qmf2/examples/cpp/agent.cpp
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
diff --git a/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp
index 0b09bbf85f..0b09bbf85f 100644
--- a/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp
diff --git a/cpp/bindings/qmf2/examples/cpp/list_agents.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
index 5fff985118..5fff985118 100644
--- a/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
diff --git a/cpp/bindings/qmf2/examples/cpp/print_events.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp
index 413c01bb62..413c01bb62 100644
--- a/cpp/bindings/qmf2/examples/cpp/print_events.cpp
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp
diff --git a/cpp/bindings/qmf2/examples/python/agent.py b/qpid/cpp/bindings/qmf2/examples/python/agent.py
index a9f1a14349..a9f1a14349 100755
--- a/cpp/bindings/qmf2/examples/python/agent.py
+++ b/qpid/cpp/bindings/qmf2/examples/python/agent.py
diff --git a/cpp/bindings/qmf2/examples/python/find_agents.py b/qpid/cpp/bindings/qmf2/examples/python/find_agents.py
index 852f23f747..852f23f747 100644
--- a/cpp/bindings/qmf2/examples/python/find_agents.py
+++ b/qpid/cpp/bindings/qmf2/examples/python/find_agents.py
diff --git a/cpp/bindings/qmf2/examples/ruby/agent_external.rb b/qpid/cpp/bindings/qmf2/examples/ruby/agent_external.rb
index 75171931ed..75171931ed 100644
--- a/cpp/bindings/qmf2/examples/ruby/agent_external.rb
+++ b/qpid/cpp/bindings/qmf2/examples/ruby/agent_external.rb
diff --git a/cpp/bindings/qmf2/examples/ruby/agent_internal.rb b/qpid/cpp/bindings/qmf2/examples/ruby/agent_internal.rb
index fc49a885f7..fc49a885f7 100644
--- a/cpp/bindings/qmf2/examples/ruby/agent_internal.rb
+++ b/qpid/cpp/bindings/qmf2/examples/ruby/agent_internal.rb
diff --git a/cpp/bindings/qmf2/examples/ruby/find_agents.rb b/qpid/cpp/bindings/qmf2/examples/ruby/find_agents.rb
index 41de7e5abe..41de7e5abe 100644
--- a/cpp/bindings/qmf2/examples/ruby/find_agents.rb
+++ b/qpid/cpp/bindings/qmf2/examples/ruby/find_agents.rb
diff --git a/cpp/bindings/qmf2/python/CMakeLists.txt b/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
index b000937ee6..b000937ee6 100644
--- a/cpp/bindings/qmf2/python/CMakeLists.txt
+++ b/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
diff --git a/cpp/bindings/qmf2/python/cqmf2.i b/qpid/cpp/bindings/qmf2/python/cqmf2.i
index 6b5326f8cf..6b5326f8cf 100644
--- a/cpp/bindings/qmf2/python/cqmf2.i
+++ b/qpid/cpp/bindings/qmf2/python/cqmf2.i
diff --git a/cpp/bindings/qmf2/python/qmf2.py b/qpid/cpp/bindings/qmf2/python/qmf2.py
index 601e68f7b6..601e68f7b6 100644
--- a/cpp/bindings/qmf2/python/qmf2.py
+++ b/qpid/cpp/bindings/qmf2/python/qmf2.py
diff --git a/cpp/bindings/qmf2/ruby/CMakeLists.txt b/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
index c40480ff4a..c40480ff4a 100644
--- a/cpp/bindings/qmf2/ruby/CMakeLists.txt
+++ b/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
diff --git a/cpp/bindings/qmf2/ruby/qmf2.rb b/qpid/cpp/bindings/qmf2/ruby/qmf2.rb
index b38aeae6dc..b38aeae6dc 100644
--- a/cpp/bindings/qmf2/ruby/qmf2.rb
+++ b/qpid/cpp/bindings/qmf2/ruby/qmf2.rb
diff --git a/cpp/bindings/qmf2/ruby/ruby.i b/qpid/cpp/bindings/qmf2/ruby/ruby.i
index 0254017555..0254017555 100644
--- a/cpp/bindings/qmf2/ruby/ruby.i
+++ b/qpid/cpp/bindings/qmf2/ruby/ruby.i
diff --git a/cpp/bindings/qpid/dotnet/ReadMe.txt b/qpid/cpp/bindings/qpid/dotnet/ReadMe.txt
index 61f29bddc4..61f29bddc4 100644
--- a/cpp/bindings/qpid/dotnet/ReadMe.txt
+++ b/qpid/cpp/bindings/qpid/dotnet/ReadMe.txt
diff --git a/cpp/bindings/qpid/dotnet/configure-windows.ps1 b/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
index e62e5e8bc3..e62e5e8bc3 100644
--- a/cpp/bindings/qpid/dotnet/configure-windows.ps1
+++ b/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs
index 6976be5d02..6976be5d02 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs
index 592a05ab29..592a05ab29 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs
index 12368def8e..12368def8e 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs
index a0ac742a45..a0ac742a45 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.client/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/Properties/AssemblyInfo.cs
index eddb759ef1..eddb759ef1 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.client/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.cs
index 19a5267297..19a5267297 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs
index 4e065803f6..4e065803f6 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.cs
index 06267bf719..06267bf719 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Options.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Options.cs
index 6059f76442..6059f76442 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Options.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Options.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Properties/AssemblyInfo.cs
index d949dde644..d949dde644 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
index da8218bbf7..da8218bbf7 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/Properties/AssemblyInfo.cs
index 17bbd842b0..17bbd842b0 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.cs
index 336970a3ba..336970a3ba 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.server/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/Properties/AssemblyInfo.cs
index 7f0fd52997..7f0fd52997 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.server/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.cs
index 1d93649195..1d93649195 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Options.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Options.cs
index 9ceb11e520..9ceb11e520 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Options.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Options.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Properties/AssemblyInfo.cs
index f07c780571..f07c780571 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.cs
index 531abadd4c..531abadd4c 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
index 459130ec6c..459130ec6c 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs
index 3bc22b2ce8..3bc22b2ce8 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
index 2be4011f19..2be4011f19 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs
index 4cc88564e7..4cc88564e7 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs
index f11ce8c220..f11ce8c220 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.cs
index 5219ee789a..5219ee789a 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs
index ee09057f18..ee09057f18 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs
index 9001eb8e0b..9001eb8e0b 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/app.config b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/app.config
index cb2586beb1..cb2586beb1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/app.config
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/app.config
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/csharp.direct.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/csharp.direct.receiver.csproj
index 6339256927..6339256927 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/csharp.direct.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/csharp.direct.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/app.config b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/app.config
index cb2586beb1..cb2586beb1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/app.config
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/app.config
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/csharp.direct.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/csharp.direct.sender.csproj
index 5d5bcaa2ea..5d5bcaa2ea 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/csharp.direct.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/csharp.direct.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/app.config b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/app.config
index cb2586beb1..cb2586beb1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/app.config
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/app.config
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/csharp.example.client.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/csharp.example.client.csproj
index 1d98e01505..1d98e01505 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/csharp.example.client.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/csharp.example.client.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/app.config b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/app.config
index cb2586beb1..cb2586beb1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/app.config
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/app.config
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/csharp.example.declare_queues.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/csharp.example.declare_queues.csproj
index 2fb157a453..2fb157a453 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/csharp.example.declare_queues.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/csharp.example.declare_queues.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/app.config b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/app.config
index cb2586beb1..cb2586beb1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/app.config
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/app.config
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/csharp.example.drain.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/csharp.example.drain.csproj
index 48572dcfb7..48572dcfb7 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/csharp.example.drain.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/csharp.example.drain.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/app.config b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/app.config
index cb2586beb1..cb2586beb1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/app.config
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/app.config
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/csharp.example.helloworld.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/csharp.example.helloworld.csproj
index b67a2dc9c0..b67a2dc9c0 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/csharp.example.helloworld.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/csharp.example.helloworld.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/app.config b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/app.config
index cb2586beb1..cb2586beb1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/app.config
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/app.config
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/csharp.example.server.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/csharp.example.server.csproj
index d2d425b40e..d2d425b40e 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/csharp.example.server.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/csharp.example.server.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/app.config b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/app.config
index cb2586beb1..cb2586beb1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/app.config
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/app.config
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/csharp.example.spout.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/csharp.example.spout.csproj
index 863e1426cb..863e1426cb 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/csharp.example.spout.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/csharp.example.spout.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/app.config b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/app.config
index cb2586beb1..cb2586beb1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/app.config
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/app.config
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
index d5155822ab..d5155822ab 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/app.config b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/app.config
index cb2586beb1..cb2586beb1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/app.config
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/app.config
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/csharp.map.callback.sender.csproj
index 82753f4d66..82753f4d66 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/csharp.map.callback.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/app.config b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/app.config
index cb2586beb1..cb2586beb1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/app.config
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/app.config
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/csharp.map.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/csharp.map.receiver.csproj
index 01c9ccc993..01c9ccc993 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/csharp.map.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/csharp.map.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/app.config b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/app.config
index cb2586beb1..cb2586beb1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/app.config
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/app.config
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/csharp.map.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/csharp.map.sender.csproj
index 25cc785144..25cc785144 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/csharp.map.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/csharp.map.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.receiver/csharp.direct.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.receiver/csharp.direct.receiver.csproj
index 8cea3d7a62..8cea3d7a62 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.receiver/csharp.direct.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.receiver/csharp.direct.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.sender/csharp.direct.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.sender/csharp.direct.sender.csproj
index 1df7b57d2c..1df7b57d2c 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.sender/csharp.direct.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.sender/csharp.direct.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.client/csharp.example.client.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.client/csharp.example.client.csproj
index fa1e3de6b1..fa1e3de6b1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.client/csharp.example.client.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.client/csharp.example.client.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.declare_queues/csharp.example.declare_queues.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.declare_queues/csharp.example.declare_queues.csproj
index faabb4e099..faabb4e099 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.declare_queues/csharp.example.declare_queues.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.declare_queues/csharp.example.declare_queues.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj
index 940b9a2467..940b9a2467 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.helloworld/csharp.example.helloworld.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.helloworld/csharp.example.helloworld.csproj
index b9c99b98a9..b9c99b98a9 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.helloworld/csharp.example.helloworld.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.helloworld/csharp.example.helloworld.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.server/csharp.example.server.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.server/csharp.example.server.csproj
index eaec965e19..eaec965e19 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.server/csharp.example.server.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.server/csharp.example.server.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj
index a8b84252f7..a8b84252f7 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
index e2c667e6b4..e2c667e6b4 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj
index eef31c4be2..eef31c4be2 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.receiver/csharp.map.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.receiver/csharp.map.receiver.csproj
index a2631b5cd1..a2631b5cd1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.receiver/csharp.map.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.receiver/csharp.map.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.sender/csharp.map.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.sender/csharp.map.sender.csproj
index 93735c9ec8..93735c9ec8 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.sender/csharp.map.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.sender/csharp.map.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln b/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln
index 2500c2cb9d..2500c2cb9d 100644
--- a/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln
+++ b/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln
diff --git a/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln b/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln
index 184fcb9452..184fcb9452 100644
--- a/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln
+++ b/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln
diff --git a/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln b/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
index 112511e5e5..112511e5e5 100644
--- a/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
+++ b/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
diff --git a/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln b/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln
index 4ab296ec44..4ab296ec44 100644
--- a/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln
+++ b/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln
diff --git a/cpp/bindings/qpid/dotnet/src/Address.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp
index e47db9f925..e47db9f925 100644
--- a/cpp/bindings/qpid/dotnet/src/Address.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Address.h b/qpid/cpp/bindings/qpid/dotnet/src/Address.h
index 108a265923..108a265923 100644
--- a/cpp/bindings/qpid/dotnet/src/Address.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Address.h
diff --git a/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp b/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp
index 00d50900f6..00d50900f6 100644
--- a/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Connection.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp
index 9171b5e9fc..9171b5e9fc 100644
--- a/cpp/bindings/qpid/dotnet/src/Connection.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Connection.h b/qpid/cpp/bindings/qpid/dotnet/src/Connection.h
index 27381d8d5e..27381d8d5e 100644
--- a/cpp/bindings/qpid/dotnet/src/Connection.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Connection.h
diff --git a/cpp/bindings/qpid/dotnet/src/Duration.h b/qpid/cpp/bindings/qpid/dotnet/src/Duration.h
index c77f5fc868..c77f5fc868 100644
--- a/cpp/bindings/qpid/dotnet/src/Duration.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Duration.h
diff --git a/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp b/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
index 4397789f42..4397789f42 100644
--- a/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h b/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h
index 1ad5c4b42b..1ad5c4b42b 100644
--- a/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h
diff --git a/cpp/bindings/qpid/dotnet/src/Message.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp
index ca7d796b9e..ca7d796b9e 100644
--- a/cpp/bindings/qpid/dotnet/src/Message.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Message.h b/qpid/cpp/bindings/qpid/dotnet/src/Message.h
index a0d77b056b..a0d77b056b 100644
--- a/cpp/bindings/qpid/dotnet/src/Message.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Message.h
diff --git a/cpp/bindings/qpid/dotnet/src/QpidException.h b/qpid/cpp/bindings/qpid/dotnet/src/QpidException.h
index dc042ed939..dc042ed939 100644
--- a/cpp/bindings/qpid/dotnet/src/QpidException.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/QpidException.h
diff --git a/cpp/bindings/qpid/dotnet/src/QpidMarshal.h b/qpid/cpp/bindings/qpid/dotnet/src/QpidMarshal.h
index 60f40afe04..60f40afe04 100644
--- a/cpp/bindings/qpid/dotnet/src/QpidMarshal.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/QpidMarshal.h
diff --git a/cpp/bindings/qpid/dotnet/src/QpidTypeCheck.h b/qpid/cpp/bindings/qpid/dotnet/src/QpidTypeCheck.h
index a3fdaf99c2..a3fdaf99c2 100644
--- a/cpp/bindings/qpid/dotnet/src/QpidTypeCheck.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/QpidTypeCheck.h
diff --git a/cpp/bindings/qpid/dotnet/src/ReadMe.txt b/qpid/cpp/bindings/qpid/dotnet/src/ReadMe.txt
index f7287af573..f7287af573 100644
--- a/cpp/bindings/qpid/dotnet/src/ReadMe.txt
+++ b/qpid/cpp/bindings/qpid/dotnet/src/ReadMe.txt
diff --git a/cpp/bindings/qpid/dotnet/src/Receiver.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp
index 43bb7dd3cb..43bb7dd3cb 100644
--- a/cpp/bindings/qpid/dotnet/src/Receiver.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Receiver.h b/qpid/cpp/bindings/qpid/dotnet/src/Receiver.h
index 77b361851e..77b361851e 100644
--- a/cpp/bindings/qpid/dotnet/src/Receiver.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Receiver.h
diff --git a/cpp/bindings/qpid/dotnet/src/Sender.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp
index 4e3502f2fd..4e3502f2fd 100644
--- a/cpp/bindings/qpid/dotnet/src/Sender.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Sender.h b/qpid/cpp/bindings/qpid/dotnet/src/Sender.h
index 0d477b795f..0d477b795f 100644
--- a/cpp/bindings/qpid/dotnet/src/Sender.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Sender.h
diff --git a/cpp/bindings/qpid/dotnet/src/Session.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp
index 294004b537..294004b537 100644
--- a/cpp/bindings/qpid/dotnet/src/Session.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Session.h b/qpid/cpp/bindings/qpid/dotnet/src/Session.h
index 42e9475c6c..42e9475c6c 100644
--- a/cpp/bindings/qpid/dotnet/src/Session.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Session.h
diff --git a/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp b/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp
index 6c67191576..6c67191576 100644
--- a/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/TypeTranslator.h b/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.h
index add30a862c..add30a862c 100644
--- a/cpp/bindings/qpid/dotnet/src/TypeTranslator.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.h
diff --git a/cpp/bindings/qpid/dotnet/src/app.rc b/qpid/cpp/bindings/qpid/dotnet/src/app.rc
index 35b3d8df68..35b3d8df68 100644
--- a/cpp/bindings/qpid/dotnet/src/app.rc
+++ b/qpid/cpp/bindings/qpid/dotnet/src/app.rc
diff --git a/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj b/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj
index 9b06cc86b8..9b06cc86b8 100644
--- a/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj
+++ b/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj
diff --git a/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters b/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters
index c4a857e0bf..c4a857e0bf 100644
--- a/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters
+++ b/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters
diff --git a/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj b/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj
index 9a02d625f5..9a02d625f5 100644
--- a/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj
+++ b/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj
diff --git a/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc b/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
index 1c529c285a..1c529c285a 100644
--- a/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
+++ b/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
diff --git a/cpp/bindings/qpid/dotnet/src/qpid.snk b/qpid/cpp/bindings/qpid/dotnet/src/qpid.snk
index 9faafd8f8b..9faafd8f8b 100644
--- a/cpp/bindings/qpid/dotnet/src/qpid.snk
+++ b/qpid/cpp/bindings/qpid/dotnet/src/qpid.snk
diff --git a/cpp/bindings/qpid/dotnet/src/resource1.h b/qpid/cpp/bindings/qpid/dotnet/src/resource1.h
index 12cc93450b..12cc93450b 100644
--- a/cpp/bindings/qpid/dotnet/src/resource1.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/resource1.h
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/sessionreceiver-AssemblyInfo-template.cs b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/sessionreceiver-AssemblyInfo-template.cs
index de057ce9be..de057ce9be 100644
--- a/cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/sessionreceiver-AssemblyInfo-template.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/sessionreceiver-AssemblyInfo-template.cs
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc10/org.apache.qpid.messaging.sessionreceiver.csproj b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc10/org.apache.qpid.messaging.sessionreceiver.csproj
index fd24983a87..fd24983a87 100644
--- a/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc10/org.apache.qpid.messaging.sessionreceiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc10/org.apache.qpid.messaging.sessionreceiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj
index 8020d95591..8020d95591 100644
--- a/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/qpid.snk b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/qpid.snk
index 9faafd8f8b..9faafd8f8b 100644
--- a/cpp/bindings/qpid/dotnet/src/sessionreceiver/qpid.snk
+++ b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/qpid.snk
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs
index a15a8d60fe..a15a8d60fe 100644
--- a/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs
index 81a89ce393..81a89ce393 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.address.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.address.cs
index 22ad186c9a..22ad186c9a 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.address.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.address.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.connection.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.connection.cs
index dd368b5e5e..dd368b5e5e 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.connection.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.connection.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs
index dc7af0a7c8..dc7af0a7c8 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.duration.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.duration.cs
index 2512d7936c..2512d7936c 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.duration.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.duration.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.message.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.message.cs
index ac834047ad..ac834047ad 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.message.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.message.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/msvc10/messaging.test.csproj b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/msvc10/messaging.test.csproj
index 673877e121..673877e121 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/msvc10/messaging.test.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/msvc10/messaging.test.csproj
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/msvc9/messaging.test.csproj b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/msvc9/messaging.test.csproj
index 8e02304f85..8e02304f85 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/msvc9/messaging.test.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/msvc9/messaging.test.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.receiver/csharp.direct.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
index 1efc9de594..1efc9de594 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.sender/csharp.direct.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.sender/csharp.direct.sender.csproj
index b40ad1145d..b40ad1145d 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.sender/csharp.direct.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.sender/csharp.direct.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.client/csharp.example.client.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.client/csharp.example.client.csproj
index f49ba9e639..f49ba9e639 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.client/csharp.example.client.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.client/csharp.example.client.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
index 5e59fbc369..5e59fbc369 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.drain/csharp.example.drain.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.drain/csharp.example.drain.csproj
index 2e2c97370e..2e2c97370e 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.drain/csharp.example.drain.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.drain/csharp.example.drain.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.helloworld/csharp.example.helloworld.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
index de54c0feb8..de54c0feb8 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.server/csharp.example.server.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.server/csharp.example.server.csproj
index 52e73ee86c..52e73ee86c 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.server/csharp.example.server.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.server/csharp.example.server.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.spout/csharp.example.spout.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.spout/csharp.example.spout.csproj
index bb26be87a7..bb26be87a7 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.spout/csharp.example.spout.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.spout/csharp.example.spout.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
index efedc1eb67..efedc1eb67 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
index 148c79bd40..148c79bd40 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.receiver/csharp.map.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.receiver/csharp.map.receiver.csproj
index 3b73be2d5c..3b73be2d5c 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.receiver/csharp.map.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.receiver/csharp.map.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.sender/csharp.map.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.sender/csharp.map.sender.csproj
index 3d5f94e2e1..3d5f94e2e1 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.sender/csharp.map.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.sender/csharp.map.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/winsdk_dotnet_examples.sln b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/winsdk_dotnet_examples.sln
index d823e9de63..d823e9de63 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/winsdk_dotnet_examples.sln
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/winsdk_dotnet_examples.sln
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
index 45258fa843..45258fa843 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj
index f11603ac69..f11603ac69 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj
index 1d78ff1a66..1d78ff1a66 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
index d3082838ef..d3082838ef 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj
index 0f6832b069..0f6832b069 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
index a8b1b1465e..a8b1b1465e 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj
index d3958ef68f..d3958ef68f 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj
index b009ddbf1d..b009ddbf1d 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
index ddd5523ba6..ddd5523ba6 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
index 747ca6fb3f..747ca6fb3f 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj
index b71e1667b9..b71e1667b9 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj
index 6775913ede..6775913ede 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/winsdk_dotnet_examples.sln b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/winsdk_dotnet_examples.sln
index 6db55b5590..6db55b5590 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/winsdk_dotnet_examples.sln
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/winsdk_dotnet_examples.sln
diff --git a/cpp/bindings/qpid/examples/perl/client.pl b/qpid/cpp/bindings/qpid/examples/perl/client.pl
index 586beb787e..586beb787e 100755
--- a/cpp/bindings/qpid/examples/perl/client.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/client.pl
diff --git a/cpp/bindings/qpid/examples/perl/drain.pl b/qpid/cpp/bindings/qpid/examples/perl/drain.pl
index f7a710c485..f7a710c485 100755
--- a/cpp/bindings/qpid/examples/perl/drain.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/drain.pl
diff --git a/cpp/bindings/qpid/examples/perl/hello_world.pl b/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl
index 6ec7d52f1f..6ec7d52f1f 100755
--- a/cpp/bindings/qpid/examples/perl/hello_world.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl
diff --git a/cpp/bindings/qpid/examples/perl/hello_xml.pl b/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl
index 8d77c4b2b8..8d77c4b2b8 100755
--- a/cpp/bindings/qpid/examples/perl/hello_xml.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl
diff --git a/cpp/bindings/qpid/examples/perl/map_receiver.pl b/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl
index a538adf380..a538adf380 100755
--- a/cpp/bindings/qpid/examples/perl/map_receiver.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl
diff --git a/cpp/bindings/qpid/examples/perl/map_sender.pl b/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl
index 27063ef780..27063ef780 100755
--- a/cpp/bindings/qpid/examples/perl/map_sender.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl
diff --git a/cpp/bindings/qpid/examples/perl/server.pl b/qpid/cpp/bindings/qpid/examples/perl/server.pl
index be43655aeb..be43655aeb 100755
--- a/cpp/bindings/qpid/examples/perl/server.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/server.pl
diff --git a/cpp/bindings/qpid/examples/perl/spout.pl b/qpid/cpp/bindings/qpid/examples/perl/spout.pl
index 7468a25a3a..7468a25a3a 100755
--- a/cpp/bindings/qpid/examples/perl/spout.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/spout.pl
diff --git a/cpp/bindings/qpid/examples/python/console b/qpid/cpp/bindings/qpid/examples/python/console
index 2facc368c3..2facc368c3 100755
--- a/cpp/bindings/qpid/examples/python/console
+++ b/qpid/cpp/bindings/qpid/examples/python/console
diff --git a/cpp/bindings/qpid/examples/python/drain b/qpid/cpp/bindings/qpid/examples/python/drain
index 2b15a50500..2b15a50500 100755
--- a/cpp/bindings/qpid/examples/python/drain
+++ b/qpid/cpp/bindings/qpid/examples/python/drain
diff --git a/cpp/bindings/qpid/examples/python/hello b/qpid/cpp/bindings/qpid/examples/python/hello
index 52ea955093..52ea955093 100755
--- a/cpp/bindings/qpid/examples/python/hello
+++ b/qpid/cpp/bindings/qpid/examples/python/hello
diff --git a/cpp/bindings/qpid/examples/python/hello_xml b/qpid/cpp/bindings/qpid/examples/python/hello_xml
index 05fa5cc7ba..05fa5cc7ba 100755
--- a/cpp/bindings/qpid/examples/python/hello_xml
+++ b/qpid/cpp/bindings/qpid/examples/python/hello_xml
diff --git a/cpp/bindings/qpid/examples/python/server b/qpid/cpp/bindings/qpid/examples/python/server
index fb87951bad..fb87951bad 100755
--- a/cpp/bindings/qpid/examples/python/server
+++ b/qpid/cpp/bindings/qpid/examples/python/server
diff --git a/cpp/bindings/qpid/examples/python/spout b/qpid/cpp/bindings/qpid/examples/python/spout
index 48921d4387..48921d4387 100755
--- a/cpp/bindings/qpid/examples/python/spout
+++ b/qpid/cpp/bindings/qpid/examples/python/spout
diff --git a/cpp/bindings/qpid/examples/python/statistics.py b/qpid/cpp/bindings/qpid/examples/python/statistics.py
index 089b81b740..089b81b740 100644
--- a/cpp/bindings/qpid/examples/python/statistics.py
+++ b/qpid/cpp/bindings/qpid/examples/python/statistics.py
diff --git a/cpp/bindings/qpid/perl/CMakeLists.txt b/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
index 540c0da2de..540c0da2de 100644
--- a/cpp/bindings/qpid/perl/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
diff --git a/cpp/bindings/qpid/perl/ChangeLog b/qpid/cpp/bindings/qpid/perl/ChangeLog
index d55d76ae27..d55d76ae27 100644
--- a/cpp/bindings/qpid/perl/ChangeLog
+++ b/qpid/cpp/bindings/qpid/perl/ChangeLog
diff --git a/cpp/bindings/qpid/perl/LICENSE b/qpid/cpp/bindings/qpid/perl/LICENSE
index bc46b77047..bc46b77047 100644
--- a/cpp/bindings/qpid/perl/LICENSE
+++ b/qpid/cpp/bindings/qpid/perl/LICENSE
diff --git a/cpp/bindings/qpid/perl/Makefile.PL b/qpid/cpp/bindings/qpid/perl/Makefile.PL
index db9737a1dd..db9737a1dd 100644
--- a/cpp/bindings/qpid/perl/Makefile.PL
+++ b/qpid/cpp/bindings/qpid/perl/Makefile.PL
diff --git a/cpp/bindings/qpid/perl/Makefile.PL.in b/qpid/cpp/bindings/qpid/perl/Makefile.PL.in
index 75586cfe74..75586cfe74 100644
--- a/cpp/bindings/qpid/perl/Makefile.PL.in
+++ b/qpid/cpp/bindings/qpid/perl/Makefile.PL.in
diff --git a/cpp/bindings/qpid/perl/README b/qpid/cpp/bindings/qpid/perl/README
index ca5a96e539..ca5a96e539 100644
--- a/cpp/bindings/qpid/perl/README
+++ b/qpid/cpp/bindings/qpid/perl/README
diff --git a/cpp/bindings/qpid/perl/lib/qpid.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid.pm
index 88b98353a8..88b98353a8 100644
--- a/cpp/bindings/qpid/perl/lib/qpid.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging.pm
index c9d6845eb9..c9d6845eb9 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging/Address.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Address.pm
index d417770b1c..d417770b1c 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging/Address.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Address.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging/Connection.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Connection.pm
index 6d478cdf0c..6d478cdf0c 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging/Connection.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Connection.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging/Duration.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Duration.pm
index 7d05daeeab..7d05daeeab 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging/Duration.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Duration.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging/Message.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Message.pm
index 6437290244..6437290244 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging/Message.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Message.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging/Receiver.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Receiver.pm
index c3bc4bb8a8..c3bc4bb8a8 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging/Receiver.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Receiver.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging/Sender.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Sender.pm
index 5d0896ff79..5d0896ff79 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging/Sender.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Sender.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging/Session.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Session.pm
index 316f1fa817..316f1fa817 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging/Session.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Session.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid_messaging.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid_messaging.pm
index 524bbaa5ac..524bbaa5ac 100644
--- a/cpp/bindings/qpid/perl/lib/qpid_messaging.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid_messaging.pm
diff --git a/cpp/bindings/qpid/perl/perl.i b/qpid/cpp/bindings/qpid/perl/perl.i
index 0d118ae0fb..0d118ae0fb 100644
--- a/cpp/bindings/qpid/perl/perl.i
+++ b/qpid/cpp/bindings/qpid/perl/perl.i
diff --git a/cpp/bindings/qpid/perl/t/Address.t b/qpid/cpp/bindings/qpid/perl/t/Address.t
index 4e74f8cad2..4e74f8cad2 100644
--- a/cpp/bindings/qpid/perl/t/Address.t
+++ b/qpid/cpp/bindings/qpid/perl/t/Address.t
diff --git a/cpp/bindings/qpid/perl/t/Duration.t b/qpid/cpp/bindings/qpid/perl/t/Duration.t
index 6975e8006f..6975e8006f 100644
--- a/cpp/bindings/qpid/perl/t/Duration.t
+++ b/qpid/cpp/bindings/qpid/perl/t/Duration.t
diff --git a/cpp/bindings/qpid/perl/t/Message.t b/qpid/cpp/bindings/qpid/perl/t/Message.t
index c656a7cf90..c656a7cf90 100644
--- a/cpp/bindings/qpid/perl/t/Message.t
+++ b/qpid/cpp/bindings/qpid/perl/t/Message.t
diff --git a/cpp/bindings/qpid/perl/t/utils.pm b/qpid/cpp/bindings/qpid/perl/t/utils.pm
index db8093d324..db8093d324 100644
--- a/cpp/bindings/qpid/perl/t/utils.pm
+++ b/qpid/cpp/bindings/qpid/perl/t/utils.pm
diff --git a/cpp/bindings/qpid/python/CMakeLists.txt b/qpid/cpp/bindings/qpid/python/CMakeLists.txt
index 56ea0e9349..56ea0e9349 100644
--- a/cpp/bindings/qpid/python/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/python/CMakeLists.txt
diff --git a/cpp/bindings/qpid/python/ChangeLog b/qpid/cpp/bindings/qpid/python/ChangeLog
index ff6704cdd6..ff6704cdd6 100644
--- a/cpp/bindings/qpid/python/ChangeLog
+++ b/qpid/cpp/bindings/qpid/python/ChangeLog
diff --git a/cpp/bindings/qpid/python/LICENSE b/qpid/cpp/bindings/qpid/python/LICENSE
index bc46b77047..bc46b77047 100644
--- a/cpp/bindings/qpid/python/LICENSE
+++ b/qpid/cpp/bindings/qpid/python/LICENSE
diff --git a/cpp/bindings/qpid/python/README b/qpid/cpp/bindings/qpid/python/README
index eae32cd8ab..eae32cd8ab 100644
--- a/cpp/bindings/qpid/python/README
+++ b/qpid/cpp/bindings/qpid/python/README
diff --git a/cpp/bindings/qpid/python/extra_dist/CMakeLists.txt b/qpid/cpp/bindings/qpid/python/extra_dist/CMakeLists.txt
index 8ddd7869ae..8ddd7869ae 100644
--- a/cpp/bindings/qpid/python/extra_dist/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/python/extra_dist/CMakeLists.txt
diff --git a/cpp/bindings/qpid/python/qpid_messaging.i b/qpid/cpp/bindings/qpid/python/qpid_messaging.i
index 624cee35bc..624cee35bc 100644
--- a/cpp/bindings/qpid/python/qpid_messaging.i
+++ b/qpid/cpp/bindings/qpid/python/qpid_messaging.i
diff --git a/cpp/bindings/qpid/ruby/.gitignore b/qpid/cpp/bindings/qpid/ruby/.gitignore
index 769576fafd..769576fafd 100644
--- a/cpp/bindings/qpid/ruby/.gitignore
+++ b/qpid/cpp/bindings/qpid/ruby/.gitignore
diff --git a/cpp/bindings/qpid/ruby/CMakeLists.txt b/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
index f80f134366..f80f134366 100644
--- a/cpp/bindings/qpid/ruby/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
diff --git a/cpp/bindings/qpid/ruby/ChangeLog b/qpid/cpp/bindings/qpid/ruby/ChangeLog
index 5eca9644d3..5eca9644d3 100644
--- a/cpp/bindings/qpid/ruby/ChangeLog
+++ b/qpid/cpp/bindings/qpid/ruby/ChangeLog
diff --git a/cpp/bindings/qpid/ruby/LICENSE b/qpid/cpp/bindings/qpid/ruby/LICENSE
index 261eeb9e9f..261eeb9e9f 100644
--- a/cpp/bindings/qpid/ruby/LICENSE
+++ b/qpid/cpp/bindings/qpid/ruby/LICENSE
diff --git a/cpp/bindings/qpid/ruby/README.rdoc b/qpid/cpp/bindings/qpid/ruby/README.rdoc
index fce87ac3e1..fce87ac3e1 100644
--- a/cpp/bindings/qpid/ruby/README.rdoc
+++ b/qpid/cpp/bindings/qpid/ruby/README.rdoc
diff --git a/cpp/bindings/qpid/ruby/TODO b/qpid/cpp/bindings/qpid/ruby/TODO
index db2aca0195..db2aca0195 100644
--- a/cpp/bindings/qpid/ruby/TODO
+++ b/qpid/cpp/bindings/qpid/ruby/TODO
diff --git a/cpp/bindings/qpid/ruby/examples/client.rb b/qpid/cpp/bindings/qpid/ruby/examples/client.rb
index f400acfd13..f400acfd13 100644
--- a/cpp/bindings/qpid/ruby/examples/client.rb
+++ b/qpid/cpp/bindings/qpid/ruby/examples/client.rb
diff --git a/cpp/bindings/qpid/ruby/examples/drain.rb b/qpid/cpp/bindings/qpid/ruby/examples/drain.rb
index 8e506ea5cd..8e506ea5cd 100644
--- a/cpp/bindings/qpid/ruby/examples/drain.rb
+++ b/qpid/cpp/bindings/qpid/ruby/examples/drain.rb
diff --git a/cpp/bindings/qpid/ruby/examples/hello_world.rb b/qpid/cpp/bindings/qpid/ruby/examples/hello_world.rb
index 1f4954dde9..1f4954dde9 100644
--- a/cpp/bindings/qpid/ruby/examples/hello_world.rb
+++ b/qpid/cpp/bindings/qpid/ruby/examples/hello_world.rb
diff --git a/cpp/bindings/qpid/ruby/examples/map_receiver.rb b/qpid/cpp/bindings/qpid/ruby/examples/map_receiver.rb
index 16704dd48e..16704dd48e 100644
--- a/cpp/bindings/qpid/ruby/examples/map_receiver.rb
+++ b/qpid/cpp/bindings/qpid/ruby/examples/map_receiver.rb
diff --git a/cpp/bindings/qpid/ruby/examples/map_sender.rb b/qpid/cpp/bindings/qpid/ruby/examples/map_sender.rb
index 1908774c31..1908774c31 100644
--- a/cpp/bindings/qpid/ruby/examples/map_sender.rb
+++ b/qpid/cpp/bindings/qpid/ruby/examples/map_sender.rb
diff --git a/cpp/bindings/qpid/ruby/examples/server.rb b/qpid/cpp/bindings/qpid/ruby/examples/server.rb
index a589bea799..a589bea799 100644
--- a/cpp/bindings/qpid/ruby/examples/server.rb
+++ b/qpid/cpp/bindings/qpid/ruby/examples/server.rb
diff --git a/cpp/bindings/qpid/ruby/examples/spout.rb b/qpid/cpp/bindings/qpid/ruby/examples/spout.rb
index 6a0751e682..6a0751e682 100644
--- a/cpp/bindings/qpid/ruby/examples/spout.rb
+++ b/qpid/cpp/bindings/qpid/ruby/examples/spout.rb
diff --git a/cpp/bindings/qpid/ruby/ext/cqpid/extconf.rb b/qpid/cpp/bindings/qpid/ruby/ext/cqpid/extconf.rb
index 27cb41af3c..27cb41af3c 100644
--- a/cpp/bindings/qpid/ruby/ext/cqpid/extconf.rb
+++ b/qpid/cpp/bindings/qpid/ruby/ext/cqpid/extconf.rb
diff --git a/cpp/bindings/qpid/ruby/features/closing_a_connection.feature b/qpid/cpp/bindings/qpid/ruby/features/closing_a_connection.feature
index a57bf764c4..a57bf764c4 100644
--- a/cpp/bindings/qpid/ruby/features/closing_a_connection.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/closing_a_connection.feature
diff --git a/cpp/bindings/qpid/ruby/features/closing_a_session.feature b/qpid/cpp/bindings/qpid/ruby/features/closing_a_session.feature
index 9ff9858e96..9ff9858e96 100644
--- a/cpp/bindings/qpid/ruby/features/closing_a_session.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/closing_a_session.feature
diff --git a/cpp/bindings/qpid/ruby/features/connecting_to_a_broker.feature b/qpid/cpp/bindings/qpid/ruby/features/connecting_to_a_broker.feature
index 95db50be8e..95db50be8e 100644
--- a/cpp/bindings/qpid/ruby/features/connecting_to_a_broker.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/connecting_to_a_broker.feature
diff --git a/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature b/qpid/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature
index def686f881..def686f881 100644
--- a/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature
diff --git a/cpp/bindings/qpid/ruby/features/creating_a_sender.feature b/qpid/cpp/bindings/qpid/ruby/features/creating_a_sender.feature
index c12b10e054..c12b10e054 100644
--- a/cpp/bindings/qpid/ruby/features/creating_a_sender.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/creating_a_sender.feature
diff --git a/cpp/bindings/qpid/ruby/features/creating_a_session.feature b/qpid/cpp/bindings/qpid/ruby/features/creating_a_session.feature
index aa8226edef..aa8226edef 100644
--- a/cpp/bindings/qpid/ruby/features/creating_a_session.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/creating_a_session.feature
diff --git a/cpp/bindings/qpid/ruby/features/getting_the_connections_authenticated_username.feature b/qpid/cpp/bindings/qpid/ruby/features/getting_the_connections_authenticated_username.feature
index 2382b975da..2382b975da 100644
--- a/cpp/bindings/qpid/ruby/features/getting_the_connections_authenticated_username.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/getting_the_connections_authenticated_username.feature
diff --git a/cpp/bindings/qpid/ruby/features/receiving_a_message.feature b/qpid/cpp/bindings/qpid/ruby/features/receiving_a_message.feature
index 7b6db4a5ac..7b6db4a5ac 100644
--- a/cpp/bindings/qpid/ruby/features/receiving_a_message.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/receiving_a_message.feature
diff --git a/cpp/bindings/qpid/ruby/features/sending_a_message.feature b/qpid/cpp/bindings/qpid/ruby/features/sending_a_message.feature
index 45cbd42f06..45cbd42f06 100644
--- a/cpp/bindings/qpid/ruby/features/sending_a_message.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/sending_a_message.feature
diff --git a/cpp/bindings/qpid/ruby/features/session_returns_its_connection.feature b/qpid/cpp/bindings/qpid/ruby/features/session_returns_its_connection.feature
index fe3dd0fe35..fe3dd0fe35 100644
--- a/cpp/bindings/qpid/ruby/features/session_returns_its_connection.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/session_returns_its_connection.feature
diff --git a/cpp/bindings/qpid/ruby/features/sessions_have_names.feature b/qpid/cpp/bindings/qpid/ruby/features/sessions_have_names.feature
index 9afaa569d2..9afaa569d2 100644
--- a/cpp/bindings/qpid/ruby/features/sessions_have_names.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/sessions_have_names.feature
diff --git a/cpp/bindings/qpid/ruby/features/step_definitions/address_steps.rb b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/address_steps.rb
index a7eca6f9ce..a7eca6f9ce 100644
--- a/cpp/bindings/qpid/ruby/features/step_definitions/address_steps.rb
+++ b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/address_steps.rb
diff --git a/cpp/bindings/qpid/ruby/features/step_definitions/connection_steps.rb b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/connection_steps.rb
index 3fe3e6941f..3fe3e6941f 100644
--- a/cpp/bindings/qpid/ruby/features/step_definitions/connection_steps.rb
+++ b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/connection_steps.rb
diff --git a/cpp/bindings/qpid/ruby/features/step_definitions/receiver_steps.rb b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/receiver_steps.rb
index e454dac345..e454dac345 100644
--- a/cpp/bindings/qpid/ruby/features/step_definitions/receiver_steps.rb
+++ b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/receiver_steps.rb
diff --git a/cpp/bindings/qpid/ruby/features/step_definitions/sender_steps.rb b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/sender_steps.rb
index 93dbd2d5c0..93dbd2d5c0 100644
--- a/cpp/bindings/qpid/ruby/features/step_definitions/sender_steps.rb
+++ b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/sender_steps.rb
diff --git a/cpp/bindings/qpid/ruby/features/step_definitions/session_steps.rb b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/session_steps.rb
index cf775d917d..cf775d917d 100644
--- a/cpp/bindings/qpid/ruby/features/step_definitions/session_steps.rb
+++ b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/session_steps.rb
diff --git a/cpp/bindings/qpid/ruby/features/support/env.rb b/qpid/cpp/bindings/qpid/ruby/features/support/env.rb
index cc0097ca8b..cc0097ca8b 100644
--- a/cpp/bindings/qpid/ruby/features/support/env.rb
+++ b/qpid/cpp/bindings/qpid/ruby/features/support/env.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging.rb
index 2b5348f298..2b5348f298 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb
index 0879f0fcd1..0879f0fcd1 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/connection.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/connection.rb
index 6d637a1665..6d637a1665 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/connection.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/connection.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/duration.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/duration.rb
index 11c903dade..11c903dade 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/duration.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/duration.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/encoding.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/encoding.rb
index ac0fbc32a7..ac0fbc32a7 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/encoding.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/encoding.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb
index e167800455..e167800455 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/receiver.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/receiver.rb
index 05ee925212..05ee925212 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/receiver.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/receiver.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/sender.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/sender.rb
index 4ce1393dc7..4ce1393dc7 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/sender.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/sender.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/session.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/session.rb
index 7e6e11f654..7e6e11f654 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/session.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/session.rb
diff --git a/cpp/bindings/qpid/ruby/qpid_messaging.gemspec b/qpid/cpp/bindings/qpid/ruby/qpid_messaging.gemspec
index 7ab7ee8fa9..7ab7ee8fa9 100644
--- a/cpp/bindings/qpid/ruby/qpid_messaging.gemspec
+++ b/qpid/cpp/bindings/qpid/ruby/qpid_messaging.gemspec
diff --git a/cpp/bindings/qpid/ruby/ruby.i b/qpid/cpp/bindings/qpid/ruby/ruby.i
index 34388a2b16..34388a2b16 100644
--- a/cpp/bindings/qpid/ruby/ruby.i
+++ b/qpid/cpp/bindings/qpid/ruby/ruby.i
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/address_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/address_spec.rb
index 05c97ddf30..05c97ddf30 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/address_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/address_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/connection_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/connection_spec.rb
index 50038a0fc0..50038a0fc0 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/connection_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/connection_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/duration_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/duration_spec.rb
index 202332d232..202332d232 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/duration_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/duration_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/encoding_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/encoding_spec.rb
index 58b8447278..58b8447278 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/encoding_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/encoding_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/message_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/message_spec.rb
index be19b3591e..be19b3591e 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/message_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/message_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/receiver_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/receiver_spec.rb
index 81ae935dcb..81ae935dcb 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/receiver_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/receiver_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/sender_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/sender_spec.rb
index fa3a2a5b1f..fa3a2a5b1f 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/sender_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/sender_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/session_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/session_spec.rb
index cb1e94a72f..cb1e94a72f 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/session_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/session_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/spec_helper.rb b/qpid/cpp/bindings/qpid/ruby/spec/spec_helper.rb
index 865e60e0e2..865e60e0e2 100644
--- a/cpp/bindings/qpid/ruby/spec/spec_helper.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/spec_helper.rb
diff --git a/cpp/bld-winsdk.ps1 b/qpid/cpp/bld-winsdk.ps1
index 2f00f203dd..2f00f203dd 100644
--- a/cpp/bld-winsdk.ps1
+++ b/qpid/cpp/bld-winsdk.ps1
diff --git a/cpp/cmake_uninstall.cmake.in b/qpid/cpp/cmake_uninstall.cmake.in
index c6d809418e..c6d809418e 100644
--- a/cpp/cmake_uninstall.cmake.in
+++ b/qpid/cpp/cmake_uninstall.cmake.in
diff --git a/cpp/design_docs/broker-acl-work.txt b/qpid/cpp/design_docs/broker-acl-work.txt
index e89e446a56..e89e446a56 100644
--- a/cpp/design_docs/broker-acl-work.txt
+++ b/qpid/cpp/design_docs/broker-acl-work.txt
diff --git a/cpp/design_docs/ha-transactions.md b/qpid/cpp/design_docs/ha-transactions.md
index ab4b1c6925..ab4b1c6925 100644
--- a/cpp/design_docs/ha-transactions.md
+++ b/qpid/cpp/design_docs/ha-transactions.md
diff --git a/cpp/design_docs/log-model-category-for-correlation.txt b/qpid/cpp/design_docs/log-model-category-for-correlation.txt
index 69253a417a..69253a417a 100644
--- a/cpp/design_docs/log-model-category-for-correlation.txt
+++ b/qpid/cpp/design_docs/log-model-category-for-correlation.txt
diff --git a/cpp/design_docs/new-ha-design.txt b/qpid/cpp/design_docs/new-ha-design.txt
index df6c7242eb..df6c7242eb 100644
--- a/cpp/design_docs/new-ha-design.txt
+++ b/qpid/cpp/design_docs/new-ha-design.txt
diff --git a/cpp/design_docs/old-cluster-issues.txt b/qpid/cpp/design_docs/old-cluster-issues.txt
index c552a67c9a..c552a67c9a 100644
--- a/cpp/design_docs/old-cluster-issues.txt
+++ b/qpid/cpp/design_docs/old-cluster-issues.txt
diff --git a/cpp/design_docs/windows_clfs_store_design.txt b/qpid/cpp/design_docs/windows_clfs_store_design.txt
index 76ae419b40..76ae419b40 100644
--- a/cpp/design_docs/windows_clfs_store_design.txt
+++ b/qpid/cpp/design_docs/windows_clfs_store_design.txt
diff --git a/cpp/docs/api/CMakeLists.txt b/qpid/cpp/docs/api/CMakeLists.txt
index 79e0d58db5..79e0d58db5 100644
--- a/cpp/docs/api/CMakeLists.txt
+++ b/qpid/cpp/docs/api/CMakeLists.txt
diff --git a/cpp/docs/api/developer.doxygen.in b/qpid/cpp/docs/api/developer.doxygen.in
index 1e1fddab80..1e1fddab80 100644
--- a/cpp/docs/api/developer.doxygen.in
+++ b/qpid/cpp/docs/api/developer.doxygen.in
diff --git a/cpp/docs/api/doxygen.css b/qpid/cpp/docs/api/doxygen.css
index 3292768f0c..3292768f0c 100644
--- a/cpp/docs/api/doxygen.css
+++ b/qpid/cpp/docs/api/doxygen.css
diff --git a/cpp/docs/api/doxygen_developer_mainpage.h b/qpid/cpp/docs/api/doxygen_developer_mainpage.h
index 107b72260b..107b72260b 100644
--- a/cpp/docs/api/doxygen_developer_mainpage.h
+++ b/qpid/cpp/docs/api/doxygen_developer_mainpage.h
diff --git a/cpp/docs/api/doxygen_mainpage.h b/qpid/cpp/docs/api/doxygen_mainpage.h
index 9acae52da4..9acae52da4 100644
--- a/cpp/docs/api/doxygen_mainpage.h
+++ b/qpid/cpp/docs/api/doxygen_mainpage.h
diff --git a/cpp/docs/api/footer.html b/qpid/cpp/docs/api/footer.html
index 5a31e81821..5a31e81821 100644
--- a/cpp/docs/api/footer.html
+++ b/qpid/cpp/docs/api/footer.html
diff --git a/cpp/docs/api/header.html b/qpid/cpp/docs/api/header.html
index d2faa02984..d2faa02984 100644
--- a/cpp/docs/api/header.html
+++ b/qpid/cpp/docs/api/header.html
diff --git a/cpp/docs/api/stylesheet.css b/qpid/cpp/docs/api/stylesheet.css
index 3292768f0c..3292768f0c 100644
--- a/cpp/docs/api/stylesheet.css
+++ b/qpid/cpp/docs/api/stylesheet.css
diff --git a/cpp/docs/api/tabs.css b/qpid/cpp/docs/api/tabs.css
index 56f0e04564..56f0e04564 100644
--- a/cpp/docs/api/tabs.css
+++ b/qpid/cpp/docs/api/tabs.css
diff --git a/cpp/docs/api/user.doxygen.in b/qpid/cpp/docs/api/user.doxygen.in
index ec0fd1361c..ec0fd1361c 100644
--- a/cpp/docs/api/user.doxygen.in
+++ b/qpid/cpp/docs/api/user.doxygen.in
diff --git a/cpp/docs/man/CMakeLists.txt b/qpid/cpp/docs/man/CMakeLists.txt
index fe94dc25f2..fe94dc25f2 100644
--- a/cpp/docs/man/CMakeLists.txt
+++ b/qpid/cpp/docs/man/CMakeLists.txt
diff --git a/cpp/docs/man/generate_manpage b/qpid/cpp/docs/man/generate_manpage
index 2fe57250be..2fe57250be 100755
--- a/cpp/docs/man/generate_manpage
+++ b/qpid/cpp/docs/man/generate_manpage
diff --git a/cpp/docs/man/groffify_options.sed b/qpid/cpp/docs/man/groffify_options.sed
index c0f295eb47..c0f295eb47 100644
--- a/cpp/docs/man/groffify_options.sed
+++ b/qpid/cpp/docs/man/groffify_options.sed
diff --git a/cpp/docs/man/groffify_template.sed b/qpid/cpp/docs/man/groffify_template.sed
index 74aaed3a5d..74aaed3a5d 100644
--- a/cpp/docs/man/groffify_template.sed
+++ b/qpid/cpp/docs/man/groffify_template.sed
diff --git a/cpp/docs/man/qpidd.1 b/qpid/cpp/docs/man/qpidd.1
index d2cff454cf..d2cff454cf 100644
--- a/cpp/docs/man/qpidd.1
+++ b/qpid/cpp/docs/man/qpidd.1
diff --git a/cpp/docs/man/qpidd.x b/qpid/cpp/docs/man/qpidd.x
index 0ccf3b562a..0ccf3b562a 100644
--- a/cpp/docs/man/qpidd.x
+++ b/qpid/cpp/docs/man/qpidd.x
diff --git a/cpp/docs/src/CONTENTS b/qpid/cpp/docs/src/CONTENTS
index b7a9d411ac..b7a9d411ac 100644
--- a/cpp/docs/src/CONTENTS
+++ b/qpid/cpp/docs/src/CONTENTS
diff --git a/cpp/docs/src/DispatchHandle.odg b/qpid/cpp/docs/src/DispatchHandle.odg
index c08b3a4e1a..c08b3a4e1a 100644
--- a/cpp/docs/src/DispatchHandle.odg
+++ b/qpid/cpp/docs/src/DispatchHandle.odg
diff --git a/cpp/etc/CMakeLists.txt b/qpid/cpp/etc/CMakeLists.txt
index 6158b9e27b..6158b9e27b 100644
--- a/cpp/etc/CMakeLists.txt
+++ b/qpid/cpp/etc/CMakeLists.txt
diff --git a/cpp/etc/cluster.conf-example.xml.in b/qpid/cpp/etc/cluster.conf-example.xml.in
index 14b961a363..14b961a363 100644
--- a/cpp/etc/cluster.conf-example.xml.in
+++ b/qpid/cpp/etc/cluster.conf-example.xml.in
diff --git a/cpp/etc/emacs/qpid-c++-mode.el b/qpid/cpp/etc/emacs/qpid-c++-mode.el
index ed1b4aa44b..ed1b4aa44b 100644
--- a/cpp/etc/emacs/qpid-c++-mode.el
+++ b/qpid/cpp/etc/emacs/qpid-c++-mode.el
diff --git a/cpp/etc/qpidc.conf b/qpid/cpp/etc/qpidc.conf
index 588999c074..588999c074 100644
--- a/cpp/etc/qpidc.conf
+++ b/qpid/cpp/etc/qpidc.conf
diff --git a/cpp/etc/qpidd-primary.in b/qpid/cpp/etc/qpidd-primary.in
index 64537b9b1d..64537b9b1d 100755
--- a/cpp/etc/qpidd-primary.in
+++ b/qpid/cpp/etc/qpidd-primary.in
diff --git a/cpp/etc/qpidd.conf b/qpid/cpp/etc/qpidd.conf
index 0f78f49750..0f78f49750 100644
--- a/cpp/etc/qpidd.conf
+++ b/qpid/cpp/etc/qpidd.conf
diff --git a/cpp/etc/qpidd.in b/qpid/cpp/etc/qpidd.in
index b8d0e87038..b8d0e87038 100755
--- a/cpp/etc/qpidd.in
+++ b/qpid/cpp/etc/qpidd.in
diff --git a/cpp/etc/sasl2/qpidd.conf b/qpid/cpp/etc/sasl2/qpidd.conf
index 3d13a6d650..3d13a6d650 100644
--- a/cpp/etc/sasl2/qpidd.conf
+++ b/qpid/cpp/etc/sasl2/qpidd.conf
diff --git a/cpp/etc/selinux/.gitignore b/qpid/cpp/etc/selinux/.gitignore
index aca772170b..aca772170b 100644
--- a/cpp/etc/selinux/.gitignore
+++ b/qpid/cpp/etc/selinux/.gitignore
diff --git a/cpp/etc/selinux/qpidd.te b/qpid/cpp/etc/selinux/qpidd.te
index 52b8e29509..52b8e29509 100644
--- a/cpp/etc/selinux/qpidd.te
+++ b/qpid/cpp/etc/selinux/qpidd.te
diff --git a/cpp/etc/selinux/qpiddevel.te b/qpid/cpp/etc/selinux/qpiddevel.te
index 10c5dfc880..10c5dfc880 100644
--- a/cpp/etc/selinux/qpiddevel.te
+++ b/qpid/cpp/etc/selinux/qpiddevel.te
diff --git a/cpp/examples/CMakeLists.txt b/qpid/cpp/examples/CMakeLists.txt
index 3c4b4039d4..3c4b4039d4 100644
--- a/cpp/examples/CMakeLists.txt
+++ b/qpid/cpp/examples/CMakeLists.txt
diff --git a/cpp/examples/README.txt b/qpid/cpp/examples/README.txt
index 74de2788c3..74de2788c3 100644
--- a/cpp/examples/README.txt
+++ b/qpid/cpp/examples/README.txt
diff --git a/cpp/examples/examples.sln b/qpid/cpp/examples/examples.sln
index 8511fe3cce..8511fe3cce 100644
--- a/cpp/examples/examples.sln
+++ b/qpid/cpp/examples/examples.sln
diff --git a/cpp/examples/messaging/CMakeLists.txt b/qpid/cpp/examples/messaging/CMakeLists.txt
index 5481f2f0bf..5481f2f0bf 100644
--- a/cpp/examples/messaging/CMakeLists.txt
+++ b/qpid/cpp/examples/messaging/CMakeLists.txt
diff --git a/cpp/examples/messaging/OptionParser.cpp b/qpid/cpp/examples/messaging/OptionParser.cpp
index 661d0a988a..661d0a988a 100644
--- a/cpp/examples/messaging/OptionParser.cpp
+++ b/qpid/cpp/examples/messaging/OptionParser.cpp
diff --git a/cpp/examples/messaging/OptionParser.h b/qpid/cpp/examples/messaging/OptionParser.h
index 4cda53f92a..4cda53f92a 100644
--- a/cpp/examples/messaging/OptionParser.h
+++ b/qpid/cpp/examples/messaging/OptionParser.h
diff --git a/cpp/examples/messaging/client.cpp b/qpid/cpp/examples/messaging/client.cpp
index 983f0a8878..983f0a8878 100644
--- a/cpp/examples/messaging/client.cpp
+++ b/qpid/cpp/examples/messaging/client.cpp
diff --git a/cpp/examples/messaging/drain.cpp b/qpid/cpp/examples/messaging/drain.cpp
index 6ac1d3a236..6ac1d3a236 100644
--- a/cpp/examples/messaging/drain.cpp
+++ b/qpid/cpp/examples/messaging/drain.cpp
diff --git a/cpp/examples/messaging/extra_dist/CMakeLists.txt b/qpid/cpp/examples/messaging/extra_dist/CMakeLists.txt
index 88df55337c..88df55337c 100644
--- a/cpp/examples/messaging/extra_dist/CMakeLists.txt
+++ b/qpid/cpp/examples/messaging/extra_dist/CMakeLists.txt
diff --git a/cpp/examples/messaging/hello_world.cpp b/qpid/cpp/examples/messaging/hello_world.cpp
index a868a64b5e..a868a64b5e 100644
--- a/cpp/examples/messaging/hello_world.cpp
+++ b/qpid/cpp/examples/messaging/hello_world.cpp
diff --git a/cpp/examples/messaging/hello_xml.cpp b/qpid/cpp/examples/messaging/hello_xml.cpp
index 00e1b6c8e1..00e1b6c8e1 100644
--- a/cpp/examples/messaging/hello_xml.cpp
+++ b/qpid/cpp/examples/messaging/hello_xml.cpp
diff --git a/cpp/examples/messaging/map_receiver.cpp b/qpid/cpp/examples/messaging/map_receiver.cpp
index 96bc76b821..96bc76b821 100644
--- a/cpp/examples/messaging/map_receiver.cpp
+++ b/qpid/cpp/examples/messaging/map_receiver.cpp
diff --git a/cpp/examples/messaging/map_sender.cpp b/qpid/cpp/examples/messaging/map_sender.cpp
index 81ac7320d8..81ac7320d8 100644
--- a/cpp/examples/messaging/map_sender.cpp
+++ b/qpid/cpp/examples/messaging/map_sender.cpp
diff --git a/cpp/examples/messaging/messaging_client.vcproj b/qpid/cpp/examples/messaging/messaging_client.vcproj
index ff66891855..ff66891855 100644
--- a/cpp/examples/messaging/messaging_client.vcproj
+++ b/qpid/cpp/examples/messaging/messaging_client.vcproj
diff --git a/cpp/examples/messaging/messaging_drain.vcproj b/qpid/cpp/examples/messaging/messaging_drain.vcproj
index 3fc0ebe3f8..3fc0ebe3f8 100644
--- a/cpp/examples/messaging/messaging_drain.vcproj
+++ b/qpid/cpp/examples/messaging/messaging_drain.vcproj
diff --git a/cpp/examples/messaging/messaging_map_receiver.vcproj b/qpid/cpp/examples/messaging/messaging_map_receiver.vcproj
index 9242156ae9..9242156ae9 100644
--- a/cpp/examples/messaging/messaging_map_receiver.vcproj
+++ b/qpid/cpp/examples/messaging/messaging_map_receiver.vcproj
diff --git a/cpp/examples/messaging/messaging_map_sender.vcproj b/qpid/cpp/examples/messaging/messaging_map_sender.vcproj
index b68d88f97c..b68d88f97c 100644
--- a/cpp/examples/messaging/messaging_map_sender.vcproj
+++ b/qpid/cpp/examples/messaging/messaging_map_sender.vcproj
diff --git a/cpp/examples/messaging/messaging_server.vcproj b/qpid/cpp/examples/messaging/messaging_server.vcproj
index 7050f8b9e1..7050f8b9e1 100644
--- a/cpp/examples/messaging/messaging_server.vcproj
+++ b/qpid/cpp/examples/messaging/messaging_server.vcproj
diff --git a/cpp/examples/messaging/messaging_server_reconnect.vcproj b/qpid/cpp/examples/messaging/messaging_server_reconnect.vcproj
index dfde201178..dfde201178 100644
--- a/cpp/examples/messaging/messaging_server_reconnect.vcproj
+++ b/qpid/cpp/examples/messaging/messaging_server_reconnect.vcproj
diff --git a/cpp/examples/messaging/messaging_spout.vcproj b/qpid/cpp/examples/messaging/messaging_spout.vcproj
index 79043b8958..79043b8958 100644
--- a/cpp/examples/messaging/messaging_spout.vcproj
+++ b/qpid/cpp/examples/messaging/messaging_spout.vcproj
diff --git a/cpp/examples/messaging/readme.txt b/qpid/cpp/examples/messaging/readme.txt
index ff145e0160..ff145e0160 100644
--- a/cpp/examples/messaging/readme.txt
+++ b/qpid/cpp/examples/messaging/readme.txt
diff --git a/cpp/examples/messaging/server.cpp b/qpid/cpp/examples/messaging/server.cpp
index aa271d91f9..aa271d91f9 100644
--- a/cpp/examples/messaging/server.cpp
+++ b/qpid/cpp/examples/messaging/server.cpp
diff --git a/cpp/examples/messaging/server_reconnect.cpp b/qpid/cpp/examples/messaging/server_reconnect.cpp
index ab7147760f..ab7147760f 100644
--- a/cpp/examples/messaging/server_reconnect.cpp
+++ b/qpid/cpp/examples/messaging/server_reconnect.cpp
diff --git a/cpp/examples/messaging/spout.cpp b/qpid/cpp/examples/messaging/spout.cpp
index d3451c084b..d3451c084b 100644
--- a/cpp/examples/messaging/spout.cpp
+++ b/qpid/cpp/examples/messaging/spout.cpp
diff --git a/cpp/examples/test.txt b/qpid/cpp/examples/test.txt
index 96921efce5..96921efce5 100644
--- a/cpp/examples/test.txt
+++ b/qpid/cpp/examples/test.txt
diff --git a/cpp/examples/winsdk-cmake/CMakeLists.txt b/qpid/cpp/examples/winsdk-cmake/CMakeLists.txt
index b0423250bf..b0423250bf 100644
--- a/cpp/examples/winsdk-cmake/CMakeLists.txt
+++ b/qpid/cpp/examples/winsdk-cmake/CMakeLists.txt
diff --git a/cpp/include/qmf/Agent.h b/qpid/cpp/include/qmf/Agent.h
index 457b1495de..457b1495de 100644
--- a/cpp/include/qmf/Agent.h
+++ b/qpid/cpp/include/qmf/Agent.h
diff --git a/cpp/include/qmf/AgentEvent.h b/qpid/cpp/include/qmf/AgentEvent.h
index b3f4bfaa9b..b3f4bfaa9b 100644
--- a/cpp/include/qmf/AgentEvent.h
+++ b/qpid/cpp/include/qmf/AgentEvent.h
diff --git a/cpp/include/qmf/AgentSession.h b/qpid/cpp/include/qmf/AgentSession.h
index 25778f0198..25778f0198 100644
--- a/cpp/include/qmf/AgentSession.h
+++ b/qpid/cpp/include/qmf/AgentSession.h
diff --git a/cpp/include/qmf/BrokerImportExport.h b/qpid/cpp/include/qmf/BrokerImportExport.h
index ee05788063..ee05788063 100644
--- a/cpp/include/qmf/BrokerImportExport.h
+++ b/qpid/cpp/include/qmf/BrokerImportExport.h
diff --git a/cpp/include/qmf/ConsoleEvent.h b/qpid/cpp/include/qmf/ConsoleEvent.h
index 1419b45de0..1419b45de0 100644
--- a/cpp/include/qmf/ConsoleEvent.h
+++ b/qpid/cpp/include/qmf/ConsoleEvent.h
diff --git a/cpp/include/qmf/ConsoleSession.h b/qpid/cpp/include/qmf/ConsoleSession.h
index 8d34032b1f..8d34032b1f 100644
--- a/cpp/include/qmf/ConsoleSession.h
+++ b/qpid/cpp/include/qmf/ConsoleSession.h
diff --git a/cpp/include/qmf/Data.h b/qpid/cpp/include/qmf/Data.h
index 5067c3432a..5067c3432a 100644
--- a/cpp/include/qmf/Data.h
+++ b/qpid/cpp/include/qmf/Data.h
diff --git a/cpp/include/qmf/DataAddr.h b/qpid/cpp/include/qmf/DataAddr.h
index 7964f1cd02..7964f1cd02 100644
--- a/cpp/include/qmf/DataAddr.h
+++ b/qpid/cpp/include/qmf/DataAddr.h
diff --git a/cpp/include/qmf/Handle.h b/qpid/cpp/include/qmf/Handle.h
index b0715a2145..b0715a2145 100644
--- a/cpp/include/qmf/Handle.h
+++ b/qpid/cpp/include/qmf/Handle.h
diff --git a/cpp/include/qmf/ImportExport.h b/qpid/cpp/include/qmf/ImportExport.h
index 7405c15259..7405c15259 100644
--- a/cpp/include/qmf/ImportExport.h
+++ b/qpid/cpp/include/qmf/ImportExport.h
diff --git a/cpp/include/qmf/Query.h b/qpid/cpp/include/qmf/Query.h
index dbd28c12de..dbd28c12de 100644
--- a/cpp/include/qmf/Query.h
+++ b/qpid/cpp/include/qmf/Query.h
diff --git a/cpp/include/qmf/Schema.h b/qpid/cpp/include/qmf/Schema.h
index 836eb271bd..836eb271bd 100644
--- a/cpp/include/qmf/Schema.h
+++ b/qpid/cpp/include/qmf/Schema.h
diff --git a/cpp/include/qmf/SchemaId.h b/qpid/cpp/include/qmf/SchemaId.h
index 7d074c93de..7d074c93de 100644
--- a/cpp/include/qmf/SchemaId.h
+++ b/qpid/cpp/include/qmf/SchemaId.h
diff --git a/cpp/include/qmf/SchemaMethod.h b/qpid/cpp/include/qmf/SchemaMethod.h
index 66b2be2300..66b2be2300 100644
--- a/cpp/include/qmf/SchemaMethod.h
+++ b/qpid/cpp/include/qmf/SchemaMethod.h
diff --git a/cpp/include/qmf/SchemaProperty.h b/qpid/cpp/include/qmf/SchemaProperty.h
index cb2dec8d2c..cb2dec8d2c 100644
--- a/cpp/include/qmf/SchemaProperty.h
+++ b/qpid/cpp/include/qmf/SchemaProperty.h
diff --git a/cpp/include/qmf/SchemaTypes.h b/qpid/cpp/include/qmf/SchemaTypes.h
index b44d32a157..b44d32a157 100644
--- a/cpp/include/qmf/SchemaTypes.h
+++ b/qpid/cpp/include/qmf/SchemaTypes.h
diff --git a/cpp/include/qmf/Subscription.h b/qpid/cpp/include/qmf/Subscription.h
index adda2a75ab..adda2a75ab 100644
--- a/cpp/include/qmf/Subscription.h
+++ b/qpid/cpp/include/qmf/Subscription.h
diff --git a/cpp/include/qmf/exceptions.h b/qpid/cpp/include/qmf/exceptions.h
index 1a2e5dd2e8..1a2e5dd2e8 100644
--- a/cpp/include/qmf/exceptions.h
+++ b/qpid/cpp/include/qmf/exceptions.h
diff --git a/cpp/include/qmf/posix/EventNotifier.h b/qpid/cpp/include/qmf/posix/EventNotifier.h
index c95a95dddf..c95a95dddf 100644
--- a/cpp/include/qmf/posix/EventNotifier.h
+++ b/qpid/cpp/include/qmf/posix/EventNotifier.h
diff --git a/cpp/include/qmf/qmf2.i b/qpid/cpp/include/qmf/qmf2.i
index 7c54197f6d..7c54197f6d 100644
--- a/cpp/include/qmf/qmf2.i
+++ b/qpid/cpp/include/qmf/qmf2.i
diff --git a/cpp/include/qpid/ImportExport.h b/qpid/cpp/include/qpid/ImportExport.h
index eecc9503bc..eecc9503bc 100644
--- a/cpp/include/qpid/ImportExport.h
+++ b/qpid/cpp/include/qpid/ImportExport.h
diff --git a/cpp/include/qpid/messaging/Address.h b/qpid/cpp/include/qpid/messaging/Address.h
index 224a70b193..224a70b193 100644
--- a/cpp/include/qpid/messaging/Address.h
+++ b/qpid/cpp/include/qpid/messaging/Address.h
diff --git a/cpp/include/qpid/messaging/Connection.h b/qpid/cpp/include/qpid/messaging/Connection.h
index bb83685731..bb83685731 100644
--- a/cpp/include/qpid/messaging/Connection.h
+++ b/qpid/cpp/include/qpid/messaging/Connection.h
diff --git a/cpp/include/qpid/messaging/Duration.h b/qpid/cpp/include/qpid/messaging/Duration.h
index 6b8f05c7c6..6b8f05c7c6 100644
--- a/cpp/include/qpid/messaging/Duration.h
+++ b/qpid/cpp/include/qpid/messaging/Duration.h
diff --git a/cpp/include/qpid/messaging/FailoverUpdates.h b/qpid/cpp/include/qpid/messaging/FailoverUpdates.h
index 6d7314620a..6d7314620a 100644
--- a/cpp/include/qpid/messaging/FailoverUpdates.h
+++ b/qpid/cpp/include/qpid/messaging/FailoverUpdates.h
diff --git a/cpp/include/qpid/messaging/Handle.h b/qpid/cpp/include/qpid/messaging/Handle.h
index 2edab26744..2edab26744 100644
--- a/cpp/include/qpid/messaging/Handle.h
+++ b/qpid/cpp/include/qpid/messaging/Handle.h
diff --git a/cpp/include/qpid/messaging/ImportExport.h b/qpid/cpp/include/qpid/messaging/ImportExport.h
index ab5f21f618..ab5f21f618 100644
--- a/cpp/include/qpid/messaging/ImportExport.h
+++ b/qpid/cpp/include/qpid/messaging/ImportExport.h
diff --git a/cpp/include/qpid/messaging/Message.h b/qpid/cpp/include/qpid/messaging/Message.h
index 6315d3e86f..6315d3e86f 100644
--- a/cpp/include/qpid/messaging/Message.h
+++ b/qpid/cpp/include/qpid/messaging/Message.h
diff --git a/cpp/include/qpid/messaging/Receiver.h b/qpid/cpp/include/qpid/messaging/Receiver.h
index 6c6fdaa7cb..6c6fdaa7cb 100644
--- a/cpp/include/qpid/messaging/Receiver.h
+++ b/qpid/cpp/include/qpid/messaging/Receiver.h
diff --git a/cpp/include/qpid/messaging/Sender.h b/qpid/cpp/include/qpid/messaging/Sender.h
index 9c7bca1905..9c7bca1905 100644
--- a/cpp/include/qpid/messaging/Sender.h
+++ b/qpid/cpp/include/qpid/messaging/Sender.h
diff --git a/cpp/include/qpid/messaging/Session.h b/qpid/cpp/include/qpid/messaging/Session.h
index 94522e4c13..94522e4c13 100644
--- a/cpp/include/qpid/messaging/Session.h
+++ b/qpid/cpp/include/qpid/messaging/Session.h
diff --git a/cpp/include/qpid/messaging/exceptions.h b/qpid/cpp/include/qpid/messaging/exceptions.h
index a9fa8e2506..a9fa8e2506 100644
--- a/cpp/include/qpid/messaging/exceptions.h
+++ b/qpid/cpp/include/qpid/messaging/exceptions.h
diff --git a/cpp/include/qpid/qpid.i b/qpid/cpp/include/qpid/qpid.i
index 28a9064ebb..28a9064ebb 100644
--- a/cpp/include/qpid/qpid.i
+++ b/qpid/cpp/include/qpid/qpid.i
diff --git a/cpp/include/qpid/swig_perl_typemaps.i b/qpid/cpp/include/qpid/swig_perl_typemaps.i
index f1425ebd67..f1425ebd67 100644
--- a/cpp/include/qpid/swig_perl_typemaps.i
+++ b/qpid/cpp/include/qpid/swig_perl_typemaps.i
diff --git a/cpp/include/qpid/swig_python_typemaps.i b/qpid/cpp/include/qpid/swig_python_typemaps.i
index 9d44a1e1ef..9d44a1e1ef 100644
--- a/cpp/include/qpid/swig_python_typemaps.i
+++ b/qpid/cpp/include/qpid/swig_python_typemaps.i
diff --git a/cpp/include/qpid/swig_ruby_typemaps.i b/qpid/cpp/include/qpid/swig_ruby_typemaps.i
index 1a07cc86b0..1a07cc86b0 100644
--- a/cpp/include/qpid/swig_ruby_typemaps.i
+++ b/qpid/cpp/include/qpid/swig_ruby_typemaps.i
diff --git a/cpp/include/qpid/sys/IntegerTypes.h b/qpid/cpp/include/qpid/sys/IntegerTypes.h
index 75fa921de0..75fa921de0 100755
--- a/cpp/include/qpid/sys/IntegerTypes.h
+++ b/qpid/cpp/include/qpid/sys/IntegerTypes.h
diff --git a/cpp/include/qpid/sys/posix/IntegerTypes.h b/qpid/cpp/include/qpid/sys/posix/IntegerTypes.h
index ce97f7bde8..ce97f7bde8 100755
--- a/cpp/include/qpid/sys/posix/IntegerTypes.h
+++ b/qpid/cpp/include/qpid/sys/posix/IntegerTypes.h
diff --git a/cpp/include/qpid/sys/windows/IntegerTypes.h b/qpid/cpp/include/qpid/sys/windows/IntegerTypes.h
index 28b82da1a0..28b82da1a0 100755
--- a/cpp/include/qpid/sys/windows/IntegerTypes.h
+++ b/qpid/cpp/include/qpid/sys/windows/IntegerTypes.h
diff --git a/cpp/include/qpid/types/Exception.h b/qpid/cpp/include/qpid/types/Exception.h
index 483d104cc8..483d104cc8 100644
--- a/cpp/include/qpid/types/Exception.h
+++ b/qpid/cpp/include/qpid/types/Exception.h
diff --git a/cpp/include/qpid/types/ImportExport.h b/qpid/cpp/include/qpid/types/ImportExport.h
index 8fa41884fb..8fa41884fb 100644
--- a/cpp/include/qpid/types/ImportExport.h
+++ b/qpid/cpp/include/qpid/types/ImportExport.h
diff --git a/cpp/include/qpid/types/Uuid.h b/qpid/cpp/include/qpid/types/Uuid.h
index 6384103f43..6384103f43 100644
--- a/cpp/include/qpid/types/Uuid.h
+++ b/qpid/cpp/include/qpid/types/Uuid.h
diff --git a/cpp/include/qpid/types/Variant.h b/qpid/cpp/include/qpid/types/Variant.h
index faba5fe9a4..faba5fe9a4 100644
--- a/cpp/include/qpid/types/Variant.h
+++ b/qpid/cpp/include/qpid/types/Variant.h
diff --git a/cpp/managementgen/CMakeLists.txt b/qpid/cpp/managementgen/CMakeLists.txt
index b6fa5803d2..b6fa5803d2 100644
--- a/cpp/managementgen/CMakeLists.txt
+++ b/qpid/cpp/managementgen/CMakeLists.txt
diff --git a/cpp/managementgen/qmf-gen b/qpid/cpp/managementgen/qmf-gen
index fc2f284578..fc2f284578 100755
--- a/cpp/managementgen/qmf-gen
+++ b/qpid/cpp/managementgen/qmf-gen
diff --git a/cpp/managementgen/qmfgen/__init__.py b/qpid/cpp/managementgen/qmfgen/__init__.py
index 63a3f41f28..63a3f41f28 100644
--- a/cpp/managementgen/qmfgen/__init__.py
+++ b/qpid/cpp/managementgen/qmfgen/__init__.py
diff --git a/cpp/managementgen/qmfgen/generate.py b/qpid/cpp/managementgen/qmfgen/generate.py
index a7ad43cc30..a7ad43cc30 100755
--- a/cpp/managementgen/qmfgen/generate.py
+++ b/qpid/cpp/managementgen/qmfgen/generate.py
diff --git a/cpp/managementgen/qmfgen/management-types.xml b/qpid/cpp/managementgen/qmfgen/management-types.xml
index efa8322806..efa8322806 100644
--- a/cpp/managementgen/qmfgen/management-types.xml
+++ b/qpid/cpp/managementgen/qmfgen/management-types.xml
diff --git a/cpp/managementgen/qmfgen/schema.py b/qpid/cpp/managementgen/qmfgen/schema.py
index 7bf161dc2b..7bf161dc2b 100755
--- a/cpp/managementgen/qmfgen/schema.py
+++ b/qpid/cpp/managementgen/qmfgen/schema.py
diff --git a/cpp/managementgen/qmfgen/templates/Args.h b/qpid/cpp/managementgen/qmfgen/templates/Args.h
index 89a5bec9b9..89a5bec9b9 100644
--- a/cpp/managementgen/qmfgen/templates/Args.h
+++ b/qpid/cpp/managementgen/qmfgen/templates/Args.h
diff --git a/cpp/managementgen/qmfgen/templates/CMakeLists.cmake b/qpid/cpp/managementgen/qmfgen/templates/CMakeLists.cmake
index d8a3b91b10..d8a3b91b10 100644
--- a/cpp/managementgen/qmfgen/templates/CMakeLists.cmake
+++ b/qpid/cpp/managementgen/qmfgen/templates/CMakeLists.cmake
diff --git a/cpp/managementgen/qmfgen/templates/Class.cpp b/qpid/cpp/managementgen/qmfgen/templates/Class.cpp
index bb7bd66fc6..bb7bd66fc6 100644
--- a/cpp/managementgen/qmfgen/templates/Class.cpp
+++ b/qpid/cpp/managementgen/qmfgen/templates/Class.cpp
diff --git a/cpp/managementgen/qmfgen/templates/Class.h b/qpid/cpp/managementgen/qmfgen/templates/Class.h
index 84fe3df5da..84fe3df5da 100644
--- a/cpp/managementgen/qmfgen/templates/Class.h
+++ b/qpid/cpp/managementgen/qmfgen/templates/Class.h
diff --git a/cpp/managementgen/qmfgen/templates/Event.cpp b/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
index a6043ffa15..a6043ffa15 100644
--- a/cpp/managementgen/qmfgen/templates/Event.cpp
+++ b/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
diff --git a/cpp/managementgen/qmfgen/templates/Event.h b/qpid/cpp/managementgen/qmfgen/templates/Event.h
index e5f5f53c1f..e5f5f53c1f 100644
--- a/cpp/managementgen/qmfgen/templates/Event.h
+++ b/qpid/cpp/managementgen/qmfgen/templates/Event.h
diff --git a/cpp/managementgen/qmfgen/templates/Package.cpp b/qpid/cpp/managementgen/qmfgen/templates/Package.cpp
index f6bd7f4654..f6bd7f4654 100644
--- a/cpp/managementgen/qmfgen/templates/Package.cpp
+++ b/qpid/cpp/managementgen/qmfgen/templates/Package.cpp
diff --git a/cpp/managementgen/qmfgen/templates/Package.h b/qpid/cpp/managementgen/qmfgen/templates/Package.h
index 3260b03cce..3260b03cce 100644
--- a/cpp/managementgen/qmfgen/templates/Package.h
+++ b/qpid/cpp/managementgen/qmfgen/templates/Package.h
diff --git a/cpp/managementgen/qmfgen/templates/V2Package.cpp b/qpid/cpp/managementgen/qmfgen/templates/V2Package.cpp
index 2b6e231fe9..2b6e231fe9 100644
--- a/cpp/managementgen/qmfgen/templates/V2Package.cpp
+++ b/qpid/cpp/managementgen/qmfgen/templates/V2Package.cpp
diff --git a/cpp/managementgen/qmfgen/templates/V2Package.h b/qpid/cpp/managementgen/qmfgen/templates/V2Package.h
index 1d4f907ab3..1d4f907ab3 100644
--- a/cpp/managementgen/qmfgen/templates/V2Package.h
+++ b/qpid/cpp/managementgen/qmfgen/templates/V2Package.h
diff --git a/cpp/packaging/NSIS/qpid-icon.ico b/qpid/cpp/packaging/NSIS/qpid-icon.ico
index 112f5d8f1f..112f5d8f1f 100644
--- a/cpp/packaging/NSIS/qpid-icon.ico
+++ b/qpid/cpp/packaging/NSIS/qpid-icon.ico
diff --git a/cpp/packaging/NSIS/qpid-icon.png b/qpid/cpp/packaging/NSIS/qpid-icon.png
index d9bcc5657f..d9bcc5657f 100644
--- a/cpp/packaging/NSIS/qpid-icon.png
+++ b/qpid/cpp/packaging/NSIS/qpid-icon.png
diff --git a/cpp/packaging/NSIS/qpid-install-banner.bmp b/qpid/cpp/packaging/NSIS/qpid-install-banner.bmp
index 1dac04c685..1dac04c685 100644
--- a/cpp/packaging/NSIS/qpid-install-banner.bmp
+++ b/qpid/cpp/packaging/NSIS/qpid-install-banner.bmp
diff --git a/cpp/packaging/NSIS/qpid-install-banner.png b/qpid/cpp/packaging/NSIS/qpid-install-banner.png
index be70d02ee6..be70d02ee6 100644
--- a/cpp/packaging/NSIS/qpid-install-banner.png
+++ b/qpid/cpp/packaging/NSIS/qpid-install-banner.png
diff --git a/cpp/rubygen/0-10/allsegmenttypes.rb b/qpid/cpp/rubygen/0-10/allsegmenttypes.rb
index 26363d6a1f..26363d6a1f 100755
--- a/cpp/rubygen/0-10/allsegmenttypes.rb
+++ b/qpid/cpp/rubygen/0-10/allsegmenttypes.rb
diff --git a/cpp/rubygen/0-10/exceptions.rb b/qpid/cpp/rubygen/0-10/exceptions.rb
index fed8fdac5b..fed8fdac5b 100755
--- a/cpp/rubygen/0-10/exceptions.rb
+++ b/qpid/cpp/rubygen/0-10/exceptions.rb
diff --git a/cpp/rubygen/0-10/handlers.rb b/qpid/cpp/rubygen/0-10/handlers.rb
index 981ea890e6..981ea890e6 100755
--- a/cpp/rubygen/0-10/handlers.rb
+++ b/qpid/cpp/rubygen/0-10/handlers.rb
diff --git a/cpp/rubygen/0-10/specification.rb b/qpid/cpp/rubygen/0-10/specification.rb
index ef193f5fd0..ef193f5fd0 100755
--- a/cpp/rubygen/0-10/specification.rb
+++ b/qpid/cpp/rubygen/0-10/specification.rb
diff --git a/cpp/rubygen/0-10/typecode.rb b/qpid/cpp/rubygen/0-10/typecode.rb
index 0ab9c4be5d..0ab9c4be5d 100755
--- a/cpp/rubygen/0-10/typecode.rb
+++ b/qpid/cpp/rubygen/0-10/typecode.rb
diff --git a/cpp/rubygen/MethodBodyDefaultVisitor.rb b/qpid/cpp/rubygen/MethodBodyDefaultVisitor.rb
index 11dbcb8f83..11dbcb8f83 100755
--- a/cpp/rubygen/MethodBodyDefaultVisitor.rb
+++ b/qpid/cpp/rubygen/MethodBodyDefaultVisitor.rb
diff --git a/cpp/rubygen/README.txt b/qpid/cpp/rubygen/README.txt
index a1fd6cfec8..a1fd6cfec8 100644
--- a/cpp/rubygen/README.txt
+++ b/qpid/cpp/rubygen/README.txt
diff --git a/cpp/rubygen/amqpgen.rb b/qpid/cpp/rubygen/amqpgen.rb
index f42e177225..f42e177225 100755
--- a/cpp/rubygen/amqpgen.rb
+++ b/qpid/cpp/rubygen/amqpgen.rb
diff --git a/cpp/rubygen/cppgen.rb b/qpid/cpp/rubygen/cppgen.rb
index 3d21e7d4fa..3d21e7d4fa 100755
--- a/cpp/rubygen/cppgen.rb
+++ b/qpid/cpp/rubygen/cppgen.rb
diff --git a/cpp/rubygen/framing.0-10/MethodBodyConstVisitor.rb b/qpid/cpp/rubygen/framing.0-10/MethodBodyConstVisitor.rb
index d784e589df..d784e589df 100755
--- a/cpp/rubygen/framing.0-10/MethodBodyConstVisitor.rb
+++ b/qpid/cpp/rubygen/framing.0-10/MethodBodyConstVisitor.rb
diff --git a/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb b/qpid/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb
index 4c58ff2bbb..4c58ff2bbb 100755
--- a/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb
+++ b/qpid/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb
diff --git a/cpp/rubygen/framing.0-10/MethodBodyFactory.rb b/qpid/cpp/rubygen/framing.0-10/MethodBodyFactory.rb
index 28a5d94e32..28a5d94e32 100644
--- a/cpp/rubygen/framing.0-10/MethodBodyFactory.rb
+++ b/qpid/cpp/rubygen/framing.0-10/MethodBodyFactory.rb
diff --git a/cpp/rubygen/framing.0-10/Operations.rb b/qpid/cpp/rubygen/framing.0-10/Operations.rb
index cd6a363c56..cd6a363c56 100755
--- a/cpp/rubygen/framing.0-10/Operations.rb
+++ b/qpid/cpp/rubygen/framing.0-10/Operations.rb
diff --git a/cpp/rubygen/framing.0-10/OperationsInvoker.rb b/qpid/cpp/rubygen/framing.0-10/OperationsInvoker.rb
index f9b5ce58d8..f9b5ce58d8 100755
--- a/cpp/rubygen/framing.0-10/OperationsInvoker.rb
+++ b/qpid/cpp/rubygen/framing.0-10/OperationsInvoker.rb
diff --git a/cpp/rubygen/framing.0-10/Proxy.rb b/qpid/cpp/rubygen/framing.0-10/Proxy.rb
index 3325616754..3325616754 100755
--- a/cpp/rubygen/framing.0-10/Proxy.rb
+++ b/qpid/cpp/rubygen/framing.0-10/Proxy.rb
diff --git a/cpp/rubygen/framing.0-10/Session.rb b/qpid/cpp/rubygen/framing.0-10/Session.rb
index 28165448ed..28165448ed 100755
--- a/cpp/rubygen/framing.0-10/Session.rb
+++ b/qpid/cpp/rubygen/framing.0-10/Session.rb
diff --git a/cpp/rubygen/framing.0-10/all_method_bodies.rb b/qpid/cpp/rubygen/framing.0-10/all_method_bodies.rb
index 4c7fccfff5..4c7fccfff5 100755
--- a/cpp/rubygen/framing.0-10/all_method_bodies.rb
+++ b/qpid/cpp/rubygen/framing.0-10/all_method_bodies.rb
diff --git a/cpp/rubygen/framing.0-10/constants.rb b/qpid/cpp/rubygen/framing.0-10/constants.rb
index 589d94e23d..589d94e23d 100755
--- a/cpp/rubygen/framing.0-10/constants.rb
+++ b/qpid/cpp/rubygen/framing.0-10/constants.rb
diff --git a/cpp/rubygen/framing.0-10/frame_body_lists.rb b/qpid/cpp/rubygen/framing.0-10/frame_body_lists.rb
index 4f1b976032..4f1b976032 100644
--- a/cpp/rubygen/framing.0-10/frame_body_lists.rb
+++ b/qpid/cpp/rubygen/framing.0-10/frame_body_lists.rb
diff --git a/cpp/rubygen/framing.0-10/structs.rb b/qpid/cpp/rubygen/framing.0-10/structs.rb
index f93742e57e..f93742e57e 100755
--- a/cpp/rubygen/framing.0-10/structs.rb
+++ b/qpid/cpp/rubygen/framing.0-10/structs.rb
diff --git a/cpp/rubygen/generate b/qpid/cpp/rubygen/generate
index 89b9b99520..89b9b99520 100755
--- a/cpp/rubygen/generate
+++ b/qpid/cpp/rubygen/generate
diff --git a/cpp/specs/amqp.0-10-qpid-errata.stripped.xml b/qpid/cpp/specs/amqp.0-10-qpid-errata.stripped.xml
index 83ddf709e9..83ddf709e9 100644
--- a/cpp/specs/amqp.0-10-qpid-errata.stripped.xml
+++ b/qpid/cpp/specs/amqp.0-10-qpid-errata.stripped.xml
diff --git a/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt
index 822de0b77f..822de0b77f 100644
--- a/cpp/src/CMakeLists.txt
+++ b/qpid/cpp/src/CMakeLists.txt
diff --git a/cpp/src/CMakeWinVersions.cmake b/qpid/cpp/src/CMakeWinVersions.cmake
index 0bac7cab47..0bac7cab47 100644
--- a/cpp/src/CMakeWinVersions.cmake
+++ b/qpid/cpp/src/CMakeWinVersions.cmake
diff --git a/cpp/src/amqp.cmake b/qpid/cpp/src/amqp.cmake
index 05336cb2bb..05336cb2bb 100644
--- a/cpp/src/amqp.cmake
+++ b/qpid/cpp/src/amqp.cmake
diff --git a/cpp/src/check-abi b/qpid/cpp/src/check-abi
index 55e64e02f5..55e64e02f5 100755
--- a/cpp/src/check-abi
+++ b/qpid/cpp/src/check-abi
diff --git a/cpp/src/config.h.cmake b/qpid/cpp/src/config.h.cmake
index fcbfc8e280..fcbfc8e280 100644
--- a/cpp/src/config.h.cmake
+++ b/qpid/cpp/src/config.h.cmake
diff --git a/cpp/src/finddb.cmake b/qpid/cpp/src/finddb.cmake
index 2f2f94f469..2f2f94f469 100644
--- a/cpp/src/finddb.cmake
+++ b/qpid/cpp/src/finddb.cmake
diff --git a/cpp/src/legacystore.cmake b/qpid/cpp/src/legacystore.cmake
index de589189c3..de589189c3 100644
--- a/cpp/src/legacystore.cmake
+++ b/qpid/cpp/src/legacystore.cmake
diff --git a/cpp/src/libqpidmessaging-api-symbols.txt b/qpid/cpp/src/libqpidmessaging-api-symbols.txt
index dc889afaed..dc889afaed 100644
--- a/cpp/src/libqpidmessaging-api-symbols.txt
+++ b/qpid/cpp/src/libqpidmessaging-api-symbols.txt
diff --git a/cpp/src/libqpidtypes-api-symbols.txt b/qpid/cpp/src/libqpidtypes-api-symbols.txt
index 5703ed7fb8..5703ed7fb8 100644
--- a/cpp/src/libqpidtypes-api-symbols.txt
+++ b/qpid/cpp/src/libqpidtypes-api-symbols.txt
diff --git a/cpp/src/linearstore.cmake b/qpid/cpp/src/linearstore.cmake
index d576f78bef..d576f78bef 100644
--- a/cpp/src/linearstore.cmake
+++ b/qpid/cpp/src/linearstore.cmake
diff --git a/cpp/src/msvc.cmake b/qpid/cpp/src/msvc.cmake
index dc248f4f96..dc248f4f96 100644
--- a/cpp/src/msvc.cmake
+++ b/qpid/cpp/src/msvc.cmake
diff --git a/cpp/src/posix/QpiddBroker.cpp b/qpid/cpp/src/posix/QpiddBroker.cpp
index 831b2e0641..831b2e0641 100644
--- a/cpp/src/posix/QpiddBroker.cpp
+++ b/qpid/cpp/src/posix/QpiddBroker.cpp
diff --git a/cpp/src/prof b/qpid/cpp/src/prof
index fa470f5f84..fa470f5f84 100755
--- a/cpp/src/prof
+++ b/qpid/cpp/src/prof
diff --git a/cpp/src/qmf/Agent.cpp b/qpid/cpp/src/qmf/Agent.cpp
index fa3987e0c9..fa3987e0c9 100644
--- a/cpp/src/qmf/Agent.cpp
+++ b/qpid/cpp/src/qmf/Agent.cpp
diff --git a/cpp/src/qmf/AgentEvent.cpp b/qpid/cpp/src/qmf/AgentEvent.cpp
index 2dc24ecac1..2dc24ecac1 100644
--- a/cpp/src/qmf/AgentEvent.cpp
+++ b/qpid/cpp/src/qmf/AgentEvent.cpp
diff --git a/cpp/src/qmf/AgentEventImpl.h b/qpid/cpp/src/qmf/AgentEventImpl.h
index 1ecb41775a..1ecb41775a 100644
--- a/cpp/src/qmf/AgentEventImpl.h
+++ b/qpid/cpp/src/qmf/AgentEventImpl.h
diff --git a/cpp/src/qmf/AgentImpl.h b/qpid/cpp/src/qmf/AgentImpl.h
index 09754a3a7e..09754a3a7e 100644
--- a/cpp/src/qmf/AgentImpl.h
+++ b/qpid/cpp/src/qmf/AgentImpl.h
diff --git a/cpp/src/qmf/AgentSession.cpp b/qpid/cpp/src/qmf/AgentSession.cpp
index 1afdc14021..1afdc14021 100644
--- a/cpp/src/qmf/AgentSession.cpp
+++ b/qpid/cpp/src/qmf/AgentSession.cpp
diff --git a/cpp/src/qmf/AgentSessionImpl.h b/qpid/cpp/src/qmf/AgentSessionImpl.h
index 64a39ab2e8..64a39ab2e8 100644
--- a/cpp/src/qmf/AgentSessionImpl.h
+++ b/qpid/cpp/src/qmf/AgentSessionImpl.h
diff --git a/cpp/src/qmf/AgentSubscription.cpp b/qpid/cpp/src/qmf/AgentSubscription.cpp
index 4dc5cb74a4..4dc5cb74a4 100644
--- a/cpp/src/qmf/AgentSubscription.cpp
+++ b/qpid/cpp/src/qmf/AgentSubscription.cpp
diff --git a/cpp/src/qmf/AgentSubscription.h b/qpid/cpp/src/qmf/AgentSubscription.h
index 01e8f43e9f..01e8f43e9f 100644
--- a/cpp/src/qmf/AgentSubscription.h
+++ b/qpid/cpp/src/qmf/AgentSubscription.h
diff --git a/cpp/src/qmf/ConsoleEvent.cpp b/qpid/cpp/src/qmf/ConsoleEvent.cpp
index b2a5e321c7..b2a5e321c7 100644
--- a/cpp/src/qmf/ConsoleEvent.cpp
+++ b/qpid/cpp/src/qmf/ConsoleEvent.cpp
diff --git a/cpp/src/qmf/ConsoleEventImpl.h b/qpid/cpp/src/qmf/ConsoleEventImpl.h
index 9843971456..9843971456 100644
--- a/cpp/src/qmf/ConsoleEventImpl.h
+++ b/qpid/cpp/src/qmf/ConsoleEventImpl.h
diff --git a/cpp/src/qmf/ConsoleSession.cpp b/qpid/cpp/src/qmf/ConsoleSession.cpp
index 2dfc894c58..2dfc894c58 100644
--- a/cpp/src/qmf/ConsoleSession.cpp
+++ b/qpid/cpp/src/qmf/ConsoleSession.cpp
diff --git a/cpp/src/qmf/ConsoleSessionImpl.h b/qpid/cpp/src/qmf/ConsoleSessionImpl.h
index 2c06df030c..2c06df030c 100644
--- a/cpp/src/qmf/ConsoleSessionImpl.h
+++ b/qpid/cpp/src/qmf/ConsoleSessionImpl.h
diff --git a/cpp/src/qmf/Data.cpp b/qpid/cpp/src/qmf/Data.cpp
index c503bab445..c503bab445 100644
--- a/cpp/src/qmf/Data.cpp
+++ b/qpid/cpp/src/qmf/Data.cpp
diff --git a/cpp/src/qmf/DataAddr.cpp b/qpid/cpp/src/qmf/DataAddr.cpp
index 08b64d5b5d..08b64d5b5d 100644
--- a/cpp/src/qmf/DataAddr.cpp
+++ b/qpid/cpp/src/qmf/DataAddr.cpp
diff --git a/cpp/src/qmf/DataAddrImpl.h b/qpid/cpp/src/qmf/DataAddrImpl.h
index 11d512f0c4..11d512f0c4 100644
--- a/cpp/src/qmf/DataAddrImpl.h
+++ b/qpid/cpp/src/qmf/DataAddrImpl.h
diff --git a/cpp/src/qmf/DataImpl.h b/qpid/cpp/src/qmf/DataImpl.h
index 4ac3197da0..4ac3197da0 100644
--- a/cpp/src/qmf/DataImpl.h
+++ b/qpid/cpp/src/qmf/DataImpl.h
diff --git a/cpp/src/qmf/EventNotifierImpl.cpp b/qpid/cpp/src/qmf/EventNotifierImpl.cpp
index 81b6d637a3..81b6d637a3 100644
--- a/cpp/src/qmf/EventNotifierImpl.cpp
+++ b/qpid/cpp/src/qmf/EventNotifierImpl.cpp
diff --git a/cpp/src/qmf/EventNotifierImpl.h b/qpid/cpp/src/qmf/EventNotifierImpl.h
index d85f9979d2..d85f9979d2 100644
--- a/cpp/src/qmf/EventNotifierImpl.h
+++ b/qpid/cpp/src/qmf/EventNotifierImpl.h
diff --git a/cpp/src/qmf/Expression.cpp b/qpid/cpp/src/qmf/Expression.cpp
index 7d48678c15..7d48678c15 100644
--- a/cpp/src/qmf/Expression.cpp
+++ b/qpid/cpp/src/qmf/Expression.cpp
diff --git a/cpp/src/qmf/Expression.h b/qpid/cpp/src/qmf/Expression.h
index 6fbfdbc4ba..6fbfdbc4ba 100644
--- a/cpp/src/qmf/Expression.h
+++ b/qpid/cpp/src/qmf/Expression.h
diff --git a/cpp/src/qmf/Hash.cpp b/qpid/cpp/src/qmf/Hash.cpp
index 86738dda2f..86738dda2f 100644
--- a/cpp/src/qmf/Hash.cpp
+++ b/qpid/cpp/src/qmf/Hash.cpp
diff --git a/cpp/src/qmf/Hash.h b/qpid/cpp/src/qmf/Hash.h
index 4bd76832aa..4bd76832aa 100644
--- a/cpp/src/qmf/Hash.h
+++ b/qpid/cpp/src/qmf/Hash.h
diff --git a/cpp/src/qmf/PosixEventNotifier.cpp b/qpid/cpp/src/qmf/PosixEventNotifier.cpp
index a364cc155d..a364cc155d 100644
--- a/cpp/src/qmf/PosixEventNotifier.cpp
+++ b/qpid/cpp/src/qmf/PosixEventNotifier.cpp
diff --git a/cpp/src/qmf/PosixEventNotifierImpl.cpp b/qpid/cpp/src/qmf/PosixEventNotifierImpl.cpp
index 011dbcc214..011dbcc214 100644
--- a/cpp/src/qmf/PosixEventNotifierImpl.cpp
+++ b/qpid/cpp/src/qmf/PosixEventNotifierImpl.cpp
diff --git a/cpp/src/qmf/PosixEventNotifierImpl.h b/qpid/cpp/src/qmf/PosixEventNotifierImpl.h
index c8a7446bd5..c8a7446bd5 100644
--- a/cpp/src/qmf/PosixEventNotifierImpl.h
+++ b/qpid/cpp/src/qmf/PosixEventNotifierImpl.h
diff --git a/cpp/src/qmf/PrivateImplRef.h b/qpid/cpp/src/qmf/PrivateImplRef.h
index c0c07d7e1b..c0c07d7e1b 100644
--- a/cpp/src/qmf/PrivateImplRef.h
+++ b/qpid/cpp/src/qmf/PrivateImplRef.h
diff --git a/cpp/src/qmf/Query.cpp b/qpid/cpp/src/qmf/Query.cpp
index ee8ca38e59..ee8ca38e59 100644
--- a/cpp/src/qmf/Query.cpp
+++ b/qpid/cpp/src/qmf/Query.cpp
diff --git a/cpp/src/qmf/QueryImpl.h b/qpid/cpp/src/qmf/QueryImpl.h
index 27ec427684..27ec427684 100644
--- a/cpp/src/qmf/QueryImpl.h
+++ b/qpid/cpp/src/qmf/QueryImpl.h
diff --git a/cpp/src/qmf/Schema.cpp b/qpid/cpp/src/qmf/Schema.cpp
index 872aad724c..872aad724c 100644
--- a/cpp/src/qmf/Schema.cpp
+++ b/qpid/cpp/src/qmf/Schema.cpp
diff --git a/cpp/src/qmf/SchemaCache.cpp b/qpid/cpp/src/qmf/SchemaCache.cpp
index 74ca4044fd..74ca4044fd 100644
--- a/cpp/src/qmf/SchemaCache.cpp
+++ b/qpid/cpp/src/qmf/SchemaCache.cpp
diff --git a/cpp/src/qmf/SchemaCache.h b/qpid/cpp/src/qmf/SchemaCache.h
index a1f104233f..a1f104233f 100644
--- a/cpp/src/qmf/SchemaCache.h
+++ b/qpid/cpp/src/qmf/SchemaCache.h
diff --git a/cpp/src/qmf/SchemaId.cpp b/qpid/cpp/src/qmf/SchemaId.cpp
index 25fa9915ae..25fa9915ae 100644
--- a/cpp/src/qmf/SchemaId.cpp
+++ b/qpid/cpp/src/qmf/SchemaId.cpp
diff --git a/cpp/src/qmf/SchemaIdImpl.h b/qpid/cpp/src/qmf/SchemaIdImpl.h
index ae1a3d8d3b..ae1a3d8d3b 100644
--- a/cpp/src/qmf/SchemaIdImpl.h
+++ b/qpid/cpp/src/qmf/SchemaIdImpl.h
diff --git a/cpp/src/qmf/SchemaImpl.h b/qpid/cpp/src/qmf/SchemaImpl.h
index 1c88f87808..1c88f87808 100644
--- a/cpp/src/qmf/SchemaImpl.h
+++ b/qpid/cpp/src/qmf/SchemaImpl.h
diff --git a/cpp/src/qmf/SchemaMethod.cpp b/qpid/cpp/src/qmf/SchemaMethod.cpp
index e267878238..e267878238 100644
--- a/cpp/src/qmf/SchemaMethod.cpp
+++ b/qpid/cpp/src/qmf/SchemaMethod.cpp
diff --git a/cpp/src/qmf/SchemaMethodImpl.h b/qpid/cpp/src/qmf/SchemaMethodImpl.h
index 930d48509c..930d48509c 100644
--- a/cpp/src/qmf/SchemaMethodImpl.h
+++ b/qpid/cpp/src/qmf/SchemaMethodImpl.h
diff --git a/cpp/src/qmf/SchemaProperty.cpp b/qpid/cpp/src/qmf/SchemaProperty.cpp
index 106127261b..106127261b 100644
--- a/cpp/src/qmf/SchemaProperty.cpp
+++ b/qpid/cpp/src/qmf/SchemaProperty.cpp
diff --git a/cpp/src/qmf/SchemaPropertyImpl.h b/qpid/cpp/src/qmf/SchemaPropertyImpl.h
index cdfc29066f..cdfc29066f 100644
--- a/cpp/src/qmf/SchemaPropertyImpl.h
+++ b/qpid/cpp/src/qmf/SchemaPropertyImpl.h
diff --git a/cpp/src/qmf/Subscription.cpp b/qpid/cpp/src/qmf/Subscription.cpp
index 73afc8c79d..73afc8c79d 100644
--- a/cpp/src/qmf/Subscription.cpp
+++ b/qpid/cpp/src/qmf/Subscription.cpp
diff --git a/cpp/src/qmf/SubscriptionImpl.h b/qpid/cpp/src/qmf/SubscriptionImpl.h
index 053e3cd00e..053e3cd00e 100644
--- a/cpp/src/qmf/SubscriptionImpl.h
+++ b/qpid/cpp/src/qmf/SubscriptionImpl.h
diff --git a/cpp/src/qmf/agentCapability.h b/qpid/cpp/src/qmf/agentCapability.h
index 6a3f6f8534..6a3f6f8534 100644
--- a/cpp/src/qmf/agentCapability.h
+++ b/qpid/cpp/src/qmf/agentCapability.h
diff --git a/cpp/src/qmf/constants.cpp b/qpid/cpp/src/qmf/constants.cpp
index 6e2fd935a9..6e2fd935a9 100644
--- a/cpp/src/qmf/constants.cpp
+++ b/qpid/cpp/src/qmf/constants.cpp
diff --git a/cpp/src/qmf/constants.h b/qpid/cpp/src/qmf/constants.h
index 79beaaf1ca..79beaaf1ca 100644
--- a/cpp/src/qmf/constants.h
+++ b/qpid/cpp/src/qmf/constants.h
diff --git a/cpp/src/qmf/exceptions.cpp b/qpid/cpp/src/qmf/exceptions.cpp
index be212f62f7..be212f62f7 100644
--- a/cpp/src/qmf/exceptions.cpp
+++ b/qpid/cpp/src/qmf/exceptions.cpp
diff --git a/cpp/src/qmf2.pc.in b/qpid/cpp/src/qmf2.pc.in
index cbe01b3ee2..cbe01b3ee2 100644
--- a/cpp/src/qmf2.pc.in
+++ b/qpid/cpp/src/qmf2.pc.in
diff --git a/cpp/src/qpid.linkmap b/qpid/cpp/src/qpid.linkmap
index 4556985b1b..4556985b1b 100644
--- a/cpp/src/qpid.linkmap
+++ b/qpid/cpp/src/qpid.linkmap
diff --git a/cpp/src/qpid.pc.in b/qpid/cpp/src/qpid.pc.in
index 626b1ba9c0..626b1ba9c0 100644
--- a/cpp/src/qpid.pc.in
+++ b/qpid/cpp/src/qpid.pc.in
diff --git a/cpp/src/qpid/Address.cpp b/qpid/cpp/src/qpid/Address.cpp
index 01770524c8..01770524c8 100644
--- a/cpp/src/qpid/Address.cpp
+++ b/qpid/cpp/src/qpid/Address.cpp
diff --git a/cpp/src/qpid/Address.h b/qpid/cpp/src/qpid/Address.h
index fe43f3847d..fe43f3847d 100755
--- a/cpp/src/qpid/Address.h
+++ b/qpid/cpp/src/qpid/Address.h
diff --git a/cpp/src/qpid/BufferRef.h b/qpid/cpp/src/qpid/BufferRef.h
index bfe1f9ebaa..bfe1f9ebaa 100644
--- a/cpp/src/qpid/BufferRef.h
+++ b/qpid/cpp/src/qpid/BufferRef.h
diff --git a/cpp/src/qpid/CommonImportExport.h b/qpid/cpp/src/qpid/CommonImportExport.h
index dd2b900b73..dd2b900b73 100644
--- a/cpp/src/qpid/CommonImportExport.h
+++ b/qpid/cpp/src/qpid/CommonImportExport.h
diff --git a/cpp/src/qpid/DataDir.cpp b/qpid/cpp/src/qpid/DataDir.cpp
index cfdb536d2c..cfdb536d2c 100644
--- a/cpp/src/qpid/DataDir.cpp
+++ b/qpid/cpp/src/qpid/DataDir.cpp
diff --git a/cpp/src/qpid/DataDir.h b/qpid/cpp/src/qpid/DataDir.h
index 828299f3ba..828299f3ba 100644
--- a/cpp/src/qpid/DataDir.h
+++ b/qpid/cpp/src/qpid/DataDir.h
diff --git a/cpp/src/qpid/DisableExceptionLogging.h b/qpid/cpp/src/qpid/DisableExceptionLogging.h
index 04a9240513..04a9240513 100644
--- a/cpp/src/qpid/DisableExceptionLogging.h
+++ b/qpid/cpp/src/qpid/DisableExceptionLogging.h
diff --git a/cpp/src/qpid/Exception.cpp b/qpid/cpp/src/qpid/Exception.cpp
index a6696f06e1..a6696f06e1 100644
--- a/cpp/src/qpid/Exception.cpp
+++ b/qpid/cpp/src/qpid/Exception.cpp
diff --git a/cpp/src/qpid/Exception.h b/qpid/cpp/src/qpid/Exception.h
index cbd175214d..cbd175214d 100644
--- a/cpp/src/qpid/Exception.h
+++ b/qpid/cpp/src/qpid/Exception.h
diff --git a/cpp/src/qpid/InlineAllocator.h b/qpid/cpp/src/qpid/InlineAllocator.h
index 2502545dcb..2502545dcb 100644
--- a/cpp/src/qpid/InlineAllocator.h
+++ b/qpid/cpp/src/qpid/InlineAllocator.h
diff --git a/cpp/src/qpid/InlineVector.h b/qpid/cpp/src/qpid/InlineVector.h
index c55db295f3..c55db295f3 100644
--- a/cpp/src/qpid/InlineVector.h
+++ b/qpid/cpp/src/qpid/InlineVector.h
diff --git a/cpp/src/qpid/Modules.cpp b/qpid/cpp/src/qpid/Modules.cpp
index 049ededaa7..049ededaa7 100644
--- a/cpp/src/qpid/Modules.cpp
+++ b/qpid/cpp/src/qpid/Modules.cpp
diff --git a/cpp/src/qpid/Modules.h b/qpid/cpp/src/qpid/Modules.h
index 9fb91d60eb..9fb91d60eb 100644
--- a/cpp/src/qpid/Modules.h
+++ b/qpid/cpp/src/qpid/Modules.h
diff --git a/cpp/src/qpid/Msg.h b/qpid/cpp/src/qpid/Msg.h
index 5f0b11bc60..5f0b11bc60 100644
--- a/cpp/src/qpid/Msg.h
+++ b/qpid/cpp/src/qpid/Msg.h
diff --git a/cpp/src/qpid/NullSaslClient.cpp b/qpid/cpp/src/qpid/NullSaslClient.cpp
index d1f2706f50..d1f2706f50 100644
--- a/cpp/src/qpid/NullSaslClient.cpp
+++ b/qpid/cpp/src/qpid/NullSaslClient.cpp
diff --git a/cpp/src/qpid/NullSaslClient.h b/qpid/cpp/src/qpid/NullSaslClient.h
index b0a63a8ecb..b0a63a8ecb 100644
--- a/cpp/src/qpid/NullSaslClient.h
+++ b/qpid/cpp/src/qpid/NullSaslClient.h
diff --git a/cpp/src/qpid/NullSaslServer.cpp b/qpid/cpp/src/qpid/NullSaslServer.cpp
index 40bd9ebbc6..40bd9ebbc6 100644
--- a/cpp/src/qpid/NullSaslServer.cpp
+++ b/qpid/cpp/src/qpid/NullSaslServer.cpp
diff --git a/cpp/src/qpid/NullSaslServer.h b/qpid/cpp/src/qpid/NullSaslServer.h
index 22a1b293a3..22a1b293a3 100644
--- a/cpp/src/qpid/NullSaslServer.h
+++ b/qpid/cpp/src/qpid/NullSaslServer.h
diff --git a/cpp/src/qpid/Options.cpp b/qpid/cpp/src/qpid/Options.cpp
index 98aa0fee07..98aa0fee07 100644
--- a/cpp/src/qpid/Options.cpp
+++ b/qpid/cpp/src/qpid/Options.cpp
diff --git a/cpp/src/qpid/Options.h b/qpid/cpp/src/qpid/Options.h
index 6c908518b8..6c908518b8 100644
--- a/cpp/src/qpid/Options.h
+++ b/qpid/cpp/src/qpid/Options.h
diff --git a/cpp/src/qpid/Plugin.cpp b/qpid/cpp/src/qpid/Plugin.cpp
index 196b5c2333..196b5c2333 100644
--- a/cpp/src/qpid/Plugin.cpp
+++ b/qpid/cpp/src/qpid/Plugin.cpp
diff --git a/cpp/src/qpid/Plugin.h b/qpid/cpp/src/qpid/Plugin.h
index 4e057872b9..4e057872b9 100644
--- a/cpp/src/qpid/Plugin.h
+++ b/qpid/cpp/src/qpid/Plugin.h
diff --git a/cpp/src/qpid/RangeSet.h b/qpid/cpp/src/qpid/RangeSet.h
index ef0ad032da..ef0ad032da 100644
--- a/cpp/src/qpid/RangeSet.h
+++ b/qpid/cpp/src/qpid/RangeSet.h
diff --git a/cpp/src/qpid/RefCounted.h b/qpid/cpp/src/qpid/RefCounted.h
index 26e3e2c4ba..26e3e2c4ba 100644
--- a/cpp/src/qpid/RefCounted.h
+++ b/qpid/cpp/src/qpid/RefCounted.h
diff --git a/cpp/src/qpid/RefCountedBuffer.cpp b/qpid/cpp/src/qpid/RefCountedBuffer.cpp
index a82e1a02ab..a82e1a02ab 100644
--- a/cpp/src/qpid/RefCountedBuffer.cpp
+++ b/qpid/cpp/src/qpid/RefCountedBuffer.cpp
diff --git a/cpp/src/qpid/RefCountedBuffer.h b/qpid/cpp/src/qpid/RefCountedBuffer.h
index f0ea86130b..f0ea86130b 100644
--- a/cpp/src/qpid/RefCountedBuffer.h
+++ b/qpid/cpp/src/qpid/RefCountedBuffer.h
diff --git a/cpp/src/qpid/Sasl.h b/qpid/cpp/src/qpid/Sasl.h
index 1164fb5ec3..1164fb5ec3 100644
--- a/cpp/src/qpid/Sasl.h
+++ b/qpid/cpp/src/qpid/Sasl.h
diff --git a/cpp/src/qpid/SaslFactory.cpp b/qpid/cpp/src/qpid/SaslFactory.cpp
index f5b2b0108f..f5b2b0108f 100644
--- a/cpp/src/qpid/SaslFactory.cpp
+++ b/qpid/cpp/src/qpid/SaslFactory.cpp
diff --git a/cpp/src/qpid/SaslFactory.h b/qpid/cpp/src/qpid/SaslFactory.h
index 5d99bd2e51..5d99bd2e51 100644
--- a/cpp/src/qpid/SaslFactory.h
+++ b/qpid/cpp/src/qpid/SaslFactory.h
diff --git a/cpp/src/qpid/SaslServer.h b/qpid/cpp/src/qpid/SaslServer.h
index 88909c69a9..88909c69a9 100644
--- a/cpp/src/qpid/SaslServer.h
+++ b/qpid/cpp/src/qpid/SaslServer.h
diff --git a/cpp/src/qpid/Serializer.h b/qpid/cpp/src/qpid/Serializer.h
index a8ded9f5e0..a8ded9f5e0 100644
--- a/cpp/src/qpid/Serializer.h
+++ b/qpid/cpp/src/qpid/Serializer.h
diff --git a/cpp/src/qpid/SessionId.cpp b/qpid/cpp/src/qpid/SessionId.cpp
index c7e83f83d7..c7e83f83d7 100644
--- a/cpp/src/qpid/SessionId.cpp
+++ b/qpid/cpp/src/qpid/SessionId.cpp
diff --git a/cpp/src/qpid/SessionId.h b/qpid/cpp/src/qpid/SessionId.h
index e18b360999..e18b360999 100644
--- a/cpp/src/qpid/SessionId.h
+++ b/qpid/cpp/src/qpid/SessionId.h
diff --git a/cpp/src/qpid/SessionState.cpp b/qpid/cpp/src/qpid/SessionState.cpp
index e5019604d2..e5019604d2 100644
--- a/cpp/src/qpid/SessionState.cpp
+++ b/qpid/cpp/src/qpid/SessionState.cpp
diff --git a/cpp/src/qpid/SessionState.h b/qpid/cpp/src/qpid/SessionState.h
index 02853b1143..02853b1143 100644
--- a/cpp/src/qpid/SessionState.h
+++ b/qpid/cpp/src/qpid/SessionState.h
diff --git a/cpp/src/qpid/SharedObject.h b/qpid/cpp/src/qpid/SharedObject.h
index 852a036ab9..852a036ab9 100644
--- a/cpp/src/qpid/SharedObject.h
+++ b/qpid/cpp/src/qpid/SharedObject.h
diff --git a/cpp/src/qpid/StringUtils.cpp b/qpid/cpp/src/qpid/StringUtils.cpp
index c436441c56..c436441c56 100644
--- a/cpp/src/qpid/StringUtils.cpp
+++ b/qpid/cpp/src/qpid/StringUtils.cpp
diff --git a/cpp/src/qpid/StringUtils.h b/qpid/cpp/src/qpid/StringUtils.h
index 4130fae017..4130fae017 100644
--- a/cpp/src/qpid/StringUtils.h
+++ b/qpid/cpp/src/qpid/StringUtils.h
diff --git a/cpp/src/qpid/Url.cpp b/qpid/cpp/src/qpid/Url.cpp
index 21de32aaa3..21de32aaa3 100644
--- a/cpp/src/qpid/Url.cpp
+++ b/qpid/cpp/src/qpid/Url.cpp
diff --git a/cpp/src/qpid/Url.h b/qpid/cpp/src/qpid/Url.h
index f9ed87c24b..f9ed87c24b 100644
--- a/cpp/src/qpid/Url.h
+++ b/qpid/cpp/src/qpid/Url.h
diff --git a/cpp/src/qpid/UrlArray.cpp b/qpid/cpp/src/qpid/UrlArray.cpp
index 9ebacbd945..9ebacbd945 100644
--- a/cpp/src/qpid/UrlArray.cpp
+++ b/qpid/cpp/src/qpid/UrlArray.cpp
diff --git a/cpp/src/qpid/UrlArray.h b/qpid/cpp/src/qpid/UrlArray.h
index f0065f0f0c..f0065f0f0c 100644
--- a/cpp/src/qpid/UrlArray.h
+++ b/qpid/cpp/src/qpid/UrlArray.h
diff --git a/cpp/src/qpid/Version.h b/qpid/cpp/src/qpid/Version.h
index 6a06566907..6a06566907 100755
--- a/cpp/src/qpid/Version.h
+++ b/qpid/cpp/src/qpid/Version.h
diff --git a/cpp/src/qpid/acl/Acl.cpp b/qpid/cpp/src/qpid/acl/Acl.cpp
index aeee42563c..aeee42563c 100644
--- a/cpp/src/qpid/acl/Acl.cpp
+++ b/qpid/cpp/src/qpid/acl/Acl.cpp
diff --git a/cpp/src/qpid/acl/Acl.h b/qpid/cpp/src/qpid/acl/Acl.h
index ea3c6586a3..ea3c6586a3 100644
--- a/cpp/src/qpid/acl/Acl.h
+++ b/qpid/cpp/src/qpid/acl/Acl.h
diff --git a/cpp/src/qpid/acl/AclConnectionCounter.cpp b/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp
index 7a5d0ab53d..7a5d0ab53d 100644
--- a/cpp/src/qpid/acl/AclConnectionCounter.cpp
+++ b/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp
diff --git a/cpp/src/qpid/acl/AclConnectionCounter.h b/qpid/cpp/src/qpid/acl/AclConnectionCounter.h
index e8ef35c1ba..e8ef35c1ba 100644
--- a/cpp/src/qpid/acl/AclConnectionCounter.h
+++ b/qpid/cpp/src/qpid/acl/AclConnectionCounter.h
diff --git a/cpp/src/qpid/acl/AclData.cpp b/qpid/cpp/src/qpid/acl/AclData.cpp
index a205ddabfc..a205ddabfc 100644
--- a/cpp/src/qpid/acl/AclData.cpp
+++ b/qpid/cpp/src/qpid/acl/AclData.cpp
diff --git a/cpp/src/qpid/acl/AclData.h b/qpid/cpp/src/qpid/acl/AclData.h
index fd0eac5b13..fd0eac5b13 100644
--- a/cpp/src/qpid/acl/AclData.h
+++ b/qpid/cpp/src/qpid/acl/AclData.h
diff --git a/cpp/src/qpid/acl/AclPlugin.cpp b/qpid/cpp/src/qpid/acl/AclPlugin.cpp
index 2e254f7a9a..2e254f7a9a 100644
--- a/cpp/src/qpid/acl/AclPlugin.cpp
+++ b/qpid/cpp/src/qpid/acl/AclPlugin.cpp
diff --git a/cpp/src/qpid/acl/AclReader.cpp b/qpid/cpp/src/qpid/acl/AclReader.cpp
index 8f2e6f1fad..8f2e6f1fad 100644
--- a/cpp/src/qpid/acl/AclReader.cpp
+++ b/qpid/cpp/src/qpid/acl/AclReader.cpp
diff --git a/cpp/src/qpid/acl/AclReader.h b/qpid/cpp/src/qpid/acl/AclReader.h
index e3a345998d..e3a345998d 100644
--- a/cpp/src/qpid/acl/AclReader.h
+++ b/qpid/cpp/src/qpid/acl/AclReader.h
diff --git a/cpp/src/qpid/acl/AclResourceCounter.cpp b/qpid/cpp/src/qpid/acl/AclResourceCounter.cpp
index 2527af6375..2527af6375 100644
--- a/cpp/src/qpid/acl/AclResourceCounter.cpp
+++ b/qpid/cpp/src/qpid/acl/AclResourceCounter.cpp
diff --git a/cpp/src/qpid/acl/AclResourceCounter.h b/qpid/cpp/src/qpid/acl/AclResourceCounter.h
index 79c4d43e38..79c4d43e38 100644
--- a/cpp/src/qpid/acl/AclResourceCounter.h
+++ b/qpid/cpp/src/qpid/acl/AclResourceCounter.h
diff --git a/cpp/src/qpid/acl/AclTopicMatch.h b/qpid/cpp/src/qpid/acl/AclTopicMatch.h
index 654d1d63d4..654d1d63d4 100644
--- a/cpp/src/qpid/acl/AclTopicMatch.h
+++ b/qpid/cpp/src/qpid/acl/AclTopicMatch.h
diff --git a/cpp/src/qpid/acl/AclValidator.cpp b/qpid/cpp/src/qpid/acl/AclValidator.cpp
index a077667a33..a077667a33 100644
--- a/cpp/src/qpid/acl/AclValidator.cpp
+++ b/qpid/cpp/src/qpid/acl/AclValidator.cpp
diff --git a/cpp/src/qpid/acl/AclValidator.h b/qpid/cpp/src/qpid/acl/AclValidator.h
index 76eb222d2f..76eb222d2f 100644
--- a/cpp/src/qpid/acl/AclValidator.h
+++ b/qpid/cpp/src/qpid/acl/AclValidator.h
diff --git a/cpp/src/qpid/acl/management-schema.xml b/qpid/cpp/src/qpid/acl/management-schema.xml
index 2ac20bb324..2ac20bb324 100644
--- a/cpp/src/qpid/acl/management-schema.xml
+++ b/qpid/cpp/src/qpid/acl/management-schema.xml
diff --git a/cpp/src/qpid/amqp/CharSequence.cpp b/qpid/cpp/src/qpid/amqp/CharSequence.cpp
index 7e433bd26e..7e433bd26e 100644
--- a/cpp/src/qpid/amqp/CharSequence.cpp
+++ b/qpid/cpp/src/qpid/amqp/CharSequence.cpp
diff --git a/cpp/src/qpid/amqp/CharSequence.h b/qpid/cpp/src/qpid/amqp/CharSequence.h
index 752097c913..752097c913 100644
--- a/cpp/src/qpid/amqp/CharSequence.h
+++ b/qpid/cpp/src/qpid/amqp/CharSequence.h
diff --git a/cpp/src/qpid/amqp/Codec.h b/qpid/cpp/src/qpid/amqp/Codec.h
index c91cd0a96b..c91cd0a96b 100644
--- a/cpp/src/qpid/amqp/Codec.h
+++ b/qpid/cpp/src/qpid/amqp/Codec.h
diff --git a/cpp/src/qpid/amqp/Constructor.h b/qpid/cpp/src/qpid/amqp/Constructor.h
index 444e455670..444e455670 100644
--- a/cpp/src/qpid/amqp/Constructor.h
+++ b/qpid/cpp/src/qpid/amqp/Constructor.h
diff --git a/cpp/src/qpid/amqp/DataBuilder.cpp b/qpid/cpp/src/qpid/amqp/DataBuilder.cpp
index aeb9b9c612..aeb9b9c612 100644
--- a/cpp/src/qpid/amqp/DataBuilder.cpp
+++ b/qpid/cpp/src/qpid/amqp/DataBuilder.cpp
diff --git a/cpp/src/qpid/amqp/DataBuilder.h b/qpid/cpp/src/qpid/amqp/DataBuilder.h
index 51ee3da5f8..51ee3da5f8 100644
--- a/cpp/src/qpid/amqp/DataBuilder.h
+++ b/qpid/cpp/src/qpid/amqp/DataBuilder.h
diff --git a/cpp/src/qpid/amqp/Decoder.cpp b/qpid/cpp/src/qpid/amqp/Decoder.cpp
index 1058f83e38..1058f83e38 100644
--- a/cpp/src/qpid/amqp/Decoder.cpp
+++ b/qpid/cpp/src/qpid/amqp/Decoder.cpp
diff --git a/cpp/src/qpid/amqp/Decoder.h b/qpid/cpp/src/qpid/amqp/Decoder.h
index a78518be2b..a78518be2b 100644
--- a/cpp/src/qpid/amqp/Decoder.h
+++ b/qpid/cpp/src/qpid/amqp/Decoder.h
diff --git a/cpp/src/qpid/amqp/Descriptor.cpp b/qpid/cpp/src/qpid/amqp/Descriptor.cpp
index 384eba15b0..384eba15b0 100644
--- a/cpp/src/qpid/amqp/Descriptor.cpp
+++ b/qpid/cpp/src/qpid/amqp/Descriptor.cpp
diff --git a/cpp/src/qpid/amqp/Descriptor.h b/qpid/cpp/src/qpid/amqp/Descriptor.h
index b9a83628e7..b9a83628e7 100644
--- a/cpp/src/qpid/amqp/Descriptor.h
+++ b/qpid/cpp/src/qpid/amqp/Descriptor.h
diff --git a/cpp/src/qpid/amqp/Encoder.cpp b/qpid/cpp/src/qpid/amqp/Encoder.cpp
index 627cc4aed6..627cc4aed6 100644
--- a/cpp/src/qpid/amqp/Encoder.cpp
+++ b/qpid/cpp/src/qpid/amqp/Encoder.cpp
diff --git a/cpp/src/qpid/amqp/Encoder.h b/qpid/cpp/src/qpid/amqp/Encoder.h
index e79ed76726..e79ed76726 100644
--- a/cpp/src/qpid/amqp/Encoder.h
+++ b/qpid/cpp/src/qpid/amqp/Encoder.h
diff --git a/cpp/src/qpid/amqp/ListBuilder.cpp b/qpid/cpp/src/qpid/amqp/ListBuilder.cpp
index f2ca8e8805..f2ca8e8805 100644
--- a/cpp/src/qpid/amqp/ListBuilder.cpp
+++ b/qpid/cpp/src/qpid/amqp/ListBuilder.cpp
diff --git a/cpp/src/qpid/amqp/ListBuilder.h b/qpid/cpp/src/qpid/amqp/ListBuilder.h
index 825f384f56..825f384f56 100644
--- a/cpp/src/qpid/amqp/ListBuilder.h
+++ b/qpid/cpp/src/qpid/amqp/ListBuilder.h
diff --git a/cpp/src/qpid/amqp/ListReader.h b/qpid/cpp/src/qpid/amqp/ListReader.h
index fafe2a1f9c..fafe2a1f9c 100644
--- a/cpp/src/qpid/amqp/ListReader.h
+++ b/qpid/cpp/src/qpid/amqp/ListReader.h
diff --git a/cpp/src/qpid/amqp/LoggingReader.h b/qpid/cpp/src/qpid/amqp/LoggingReader.h
index ed5cab1cbd..ed5cab1cbd 100644
--- a/cpp/src/qpid/amqp/LoggingReader.h
+++ b/qpid/cpp/src/qpid/amqp/LoggingReader.h
diff --git a/cpp/src/qpid/amqp/MapBuilder.cpp b/qpid/cpp/src/qpid/amqp/MapBuilder.cpp
index ce8eea038e..ce8eea038e 100644
--- a/cpp/src/qpid/amqp/MapBuilder.cpp
+++ b/qpid/cpp/src/qpid/amqp/MapBuilder.cpp
diff --git a/cpp/src/qpid/amqp/MapBuilder.h b/qpid/cpp/src/qpid/amqp/MapBuilder.h
index fd94ae04af..fd94ae04af 100644
--- a/cpp/src/qpid/amqp/MapBuilder.h
+++ b/qpid/cpp/src/qpid/amqp/MapBuilder.h
diff --git a/cpp/src/qpid/amqp/MapEncoder.cpp b/qpid/cpp/src/qpid/amqp/MapEncoder.cpp
index cf8ef4ecb5..cf8ef4ecb5 100644
--- a/cpp/src/qpid/amqp/MapEncoder.cpp
+++ b/qpid/cpp/src/qpid/amqp/MapEncoder.cpp
diff --git a/cpp/src/qpid/amqp/MapEncoder.h b/qpid/cpp/src/qpid/amqp/MapEncoder.h
index 42fb819932..42fb819932 100644
--- a/cpp/src/qpid/amqp/MapEncoder.h
+++ b/qpid/cpp/src/qpid/amqp/MapEncoder.h
diff --git a/cpp/src/qpid/amqp/MapHandler.h b/qpid/cpp/src/qpid/amqp/MapHandler.h
index 14994ccac7..14994ccac7 100644
--- a/cpp/src/qpid/amqp/MapHandler.h
+++ b/qpid/cpp/src/qpid/amqp/MapHandler.h
diff --git a/cpp/src/qpid/amqp/MapReader.cpp b/qpid/cpp/src/qpid/amqp/MapReader.cpp
index b6c31849f0..b6c31849f0 100644
--- a/cpp/src/qpid/amqp/MapReader.cpp
+++ b/qpid/cpp/src/qpid/amqp/MapReader.cpp
diff --git a/cpp/src/qpid/amqp/MapReader.h b/qpid/cpp/src/qpid/amqp/MapReader.h
index 875f919d63..875f919d63 100644
--- a/cpp/src/qpid/amqp/MapReader.h
+++ b/qpid/cpp/src/qpid/amqp/MapReader.h
diff --git a/cpp/src/qpid/amqp/MapSizeCalculator.cpp b/qpid/cpp/src/qpid/amqp/MapSizeCalculator.cpp
index 2da152108f..2da152108f 100644
--- a/cpp/src/qpid/amqp/MapSizeCalculator.cpp
+++ b/qpid/cpp/src/qpid/amqp/MapSizeCalculator.cpp
diff --git a/cpp/src/qpid/amqp/MapSizeCalculator.h b/qpid/cpp/src/qpid/amqp/MapSizeCalculator.h
index 35c9ad732d..35c9ad732d 100644
--- a/cpp/src/qpid/amqp/MapSizeCalculator.h
+++ b/qpid/cpp/src/qpid/amqp/MapSizeCalculator.h
diff --git a/cpp/src/qpid/amqp/MessageEncoder.cpp b/qpid/cpp/src/qpid/amqp/MessageEncoder.cpp
index beaea2befd..beaea2befd 100644
--- a/cpp/src/qpid/amqp/MessageEncoder.cpp
+++ b/qpid/cpp/src/qpid/amqp/MessageEncoder.cpp
diff --git a/cpp/src/qpid/amqp/MessageEncoder.h b/qpid/cpp/src/qpid/amqp/MessageEncoder.h
index 05e1714004..05e1714004 100644
--- a/cpp/src/qpid/amqp/MessageEncoder.h
+++ b/qpid/cpp/src/qpid/amqp/MessageEncoder.h
diff --git a/cpp/src/qpid/amqp/MessageId.cpp b/qpid/cpp/src/qpid/amqp/MessageId.cpp
index 69ec4ce7f5..69ec4ce7f5 100644
--- a/cpp/src/qpid/amqp/MessageId.cpp
+++ b/qpid/cpp/src/qpid/amqp/MessageId.cpp
diff --git a/cpp/src/qpid/amqp/MessageId.h b/qpid/cpp/src/qpid/amqp/MessageId.h
index 4505469148..4505469148 100644
--- a/cpp/src/qpid/amqp/MessageId.h
+++ b/qpid/cpp/src/qpid/amqp/MessageId.h
diff --git a/cpp/src/qpid/amqp/MessageReader.cpp b/qpid/cpp/src/qpid/amqp/MessageReader.cpp
index 70374f4cd6..70374f4cd6 100644
--- a/cpp/src/qpid/amqp/MessageReader.cpp
+++ b/qpid/cpp/src/qpid/amqp/MessageReader.cpp
diff --git a/cpp/src/qpid/amqp/MessageReader.h b/qpid/cpp/src/qpid/amqp/MessageReader.h
index 4e2248070b..4e2248070b 100644
--- a/cpp/src/qpid/amqp/MessageReader.h
+++ b/qpid/cpp/src/qpid/amqp/MessageReader.h
diff --git a/cpp/src/qpid/amqp/Reader.h b/qpid/cpp/src/qpid/amqp/Reader.h
index 32f33dc33f..32f33dc33f 100644
--- a/cpp/src/qpid/amqp/Reader.h
+++ b/qpid/cpp/src/qpid/amqp/Reader.h
diff --git a/cpp/src/qpid/amqp/Sasl.cpp b/qpid/cpp/src/qpid/amqp/Sasl.cpp
index a7c2eea35b..a7c2eea35b 100644
--- a/cpp/src/qpid/amqp/Sasl.cpp
+++ b/qpid/cpp/src/qpid/amqp/Sasl.cpp
diff --git a/cpp/src/qpid/amqp/Sasl.h b/qpid/cpp/src/qpid/amqp/Sasl.h
index 24a8de7dc4..24a8de7dc4 100644
--- a/cpp/src/qpid/amqp/Sasl.h
+++ b/qpid/cpp/src/qpid/amqp/Sasl.h
diff --git a/cpp/src/qpid/amqp/SaslClient.cpp b/qpid/cpp/src/qpid/amqp/SaslClient.cpp
index d8a38750c5..d8a38750c5 100644
--- a/cpp/src/qpid/amqp/SaslClient.cpp
+++ b/qpid/cpp/src/qpid/amqp/SaslClient.cpp
diff --git a/cpp/src/qpid/amqp/SaslClient.h b/qpid/cpp/src/qpid/amqp/SaslClient.h
index d22887de1a..d22887de1a 100644
--- a/cpp/src/qpid/amqp/SaslClient.h
+++ b/qpid/cpp/src/qpid/amqp/SaslClient.h
diff --git a/cpp/src/qpid/amqp/SaslServer.cpp b/qpid/cpp/src/qpid/amqp/SaslServer.cpp
index 250858bda0..250858bda0 100644
--- a/cpp/src/qpid/amqp/SaslServer.cpp
+++ b/qpid/cpp/src/qpid/amqp/SaslServer.cpp
diff --git a/cpp/src/qpid/amqp/SaslServer.h b/qpid/cpp/src/qpid/amqp/SaslServer.h
index 68d0854488..68d0854488 100644
--- a/cpp/src/qpid/amqp/SaslServer.h
+++ b/qpid/cpp/src/qpid/amqp/SaslServer.h
diff --git a/cpp/src/qpid/amqp/descriptors.h b/qpid/cpp/src/qpid/amqp/descriptors.h
index 857231ddda..857231ddda 100644
--- a/cpp/src/qpid/amqp/descriptors.h
+++ b/qpid/cpp/src/qpid/amqp/descriptors.h
diff --git a/cpp/src/qpid/amqp/typecodes.h b/qpid/cpp/src/qpid/amqp/typecodes.h
index 915b75ca3f..915b75ca3f 100644
--- a/cpp/src/qpid/amqp/typecodes.h
+++ b/qpid/cpp/src/qpid/amqp/typecodes.h
diff --git a/cpp/src/qpid/amqp_0_10/Array.cpp b/qpid/cpp/src/qpid/amqp_0_10/Array.cpp
index 2ee47546f2..2ee47546f2 100644
--- a/cpp/src/qpid/amqp_0_10/Array.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/Array.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Array.h b/qpid/cpp/src/qpid/amqp_0_10/Array.h
index 6e8a419df7..6e8a419df7 100644
--- a/cpp/src/qpid/amqp_0_10/Array.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Array.h
diff --git a/cpp/src/qpid/amqp_0_10/Body.h b/qpid/cpp/src/qpid/amqp_0_10/Body.h
index c96931551c..c96931551c 100644
--- a/cpp/src/qpid/amqp_0_10/Body.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Body.h
diff --git a/cpp/src/qpid/amqp_0_10/Codec.h b/qpid/cpp/src/qpid/amqp_0_10/Codec.h
index fd006a348e..fd006a348e 100644
--- a/cpp/src/qpid/amqp_0_10/Codec.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Codec.h
diff --git a/cpp/src/qpid/amqp_0_10/Codecs.cpp b/qpid/cpp/src/qpid/amqp_0_10/Codecs.cpp
index 49d152cc05..49d152cc05 100644
--- a/cpp/src/qpid/amqp_0_10/Codecs.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/Codecs.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Codecs.h b/qpid/cpp/src/qpid/amqp_0_10/Codecs.h
index 79d76bcc4b..79d76bcc4b 100644
--- a/cpp/src/qpid/amqp_0_10/Codecs.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Codecs.h
diff --git a/cpp/src/qpid/amqp_0_10/CodecsInternal.h b/qpid/cpp/src/qpid/amqp_0_10/CodecsInternal.h
index cf9a7d0447..cf9a7d0447 100644
--- a/cpp/src/qpid/amqp_0_10/CodecsInternal.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/CodecsInternal.h
diff --git a/cpp/src/qpid/amqp_0_10/Command.h b/qpid/cpp/src/qpid/amqp_0_10/Command.h
index b1d3607a84..b1d3607a84 100644
--- a/cpp/src/qpid/amqp_0_10/Command.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Command.h
diff --git a/cpp/src/qpid/amqp_0_10/CommmandPacker.h b/qpid/cpp/src/qpid/amqp_0_10/CommmandPacker.h
index 51ebfe8186..51ebfe8186 100644
--- a/cpp/src/qpid/amqp_0_10/CommmandPacker.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/CommmandPacker.h
diff --git a/cpp/src/qpid/amqp_0_10/Connection.cpp b/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp
index 751ca15b74..751ca15b74 100644
--- a/cpp/src/qpid/amqp_0_10/Connection.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Connection.h b/qpid/cpp/src/qpid/amqp_0_10/Connection.h
index 5f58df307d..5f58df307d 100644
--- a/cpp/src/qpid/amqp_0_10/Connection.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Connection.h
diff --git a/cpp/src/qpid/amqp_0_10/Control.h b/qpid/cpp/src/qpid/amqp_0_10/Control.h
index ce188ae6d8..ce188ae6d8 100644
--- a/cpp/src/qpid/amqp_0_10/Control.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Control.h
diff --git a/cpp/src/qpid/amqp_0_10/Decimal.h b/qpid/cpp/src/qpid/amqp_0_10/Decimal.h
index 50fc457c76..50fc457c76 100644
--- a/cpp/src/qpid/amqp_0_10/Decimal.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Decimal.h
diff --git a/cpp/src/qpid/amqp_0_10/Exception.h b/qpid/cpp/src/qpid/amqp_0_10/Exception.h
index 6d526c1706..6d526c1706 100644
--- a/cpp/src/qpid/amqp_0_10/Exception.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Exception.h
diff --git a/cpp/src/qpid/amqp_0_10/FrameHeader.cpp b/qpid/cpp/src/qpid/amqp_0_10/FrameHeader.cpp
index 371e3c1bcb..371e3c1bcb 100644
--- a/cpp/src/qpid/amqp_0_10/FrameHeader.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/FrameHeader.cpp
diff --git a/cpp/src/qpid/amqp_0_10/FrameHeader.h b/qpid/cpp/src/qpid/amqp_0_10/FrameHeader.h
index b2f0619f9b..b2f0619f9b 100644
--- a/cpp/src/qpid/amqp_0_10/FrameHeader.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/FrameHeader.h
diff --git a/cpp/src/qpid/amqp_0_10/Header.cpp b/qpid/cpp/src/qpid/amqp_0_10/Header.cpp
index d83814e969..d83814e969 100644
--- a/cpp/src/qpid/amqp_0_10/Header.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/Header.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Header.h b/qpid/cpp/src/qpid/amqp_0_10/Header.h
index 0ce6ad9135..0ce6ad9135 100644
--- a/cpp/src/qpid/amqp_0_10/Header.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Header.h
diff --git a/cpp/src/qpid/amqp_0_10/Holder.h b/qpid/cpp/src/qpid/amqp_0_10/Holder.h
index 605d2e0ed5..605d2e0ed5 100644
--- a/cpp/src/qpid/amqp_0_10/Holder.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Holder.h
diff --git a/cpp/src/qpid/amqp_0_10/Map.cpp b/qpid/cpp/src/qpid/amqp_0_10/Map.cpp
index af3b302d25..af3b302d25 100644
--- a/cpp/src/qpid/amqp_0_10/Map.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/Map.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Map.h b/qpid/cpp/src/qpid/amqp_0_10/Map.h
index 4093b1a0aa..4093b1a0aa 100644
--- a/cpp/src/qpid/amqp_0_10/Map.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Map.h
diff --git a/cpp/src/qpid/amqp_0_10/Packer.h b/qpid/cpp/src/qpid/amqp_0_10/Packer.h
index c38e3a7efa..c38e3a7efa 100644
--- a/cpp/src/qpid/amqp_0_10/Packer.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Packer.h
diff --git a/cpp/src/qpid/amqp_0_10/SerializableString.h b/qpid/cpp/src/qpid/amqp_0_10/SerializableString.h
index 485b7ca6a8..485b7ca6a8 100644
--- a/cpp/src/qpid/amqp_0_10/SerializableString.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/SerializableString.h
diff --git a/cpp/src/qpid/amqp_0_10/SessionHandler.cpp b/qpid/cpp/src/qpid/amqp_0_10/SessionHandler.cpp
index 5eedafc77b..5eedafc77b 100644
--- a/cpp/src/qpid/amqp_0_10/SessionHandler.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/SessionHandler.cpp
diff --git a/cpp/src/qpid/amqp_0_10/SessionHandler.h b/qpid/cpp/src/qpid/amqp_0_10/SessionHandler.h
index 8b072fa05c..8b072fa05c 100644
--- a/cpp/src/qpid/amqp_0_10/SessionHandler.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/SessionHandler.h
diff --git a/cpp/src/qpid/amqp_0_10/Struct.h b/qpid/cpp/src/qpid/amqp_0_10/Struct.h
index 29ece84f6e..29ece84f6e 100644
--- a/cpp/src/qpid/amqp_0_10/Struct.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Struct.h
diff --git a/cpp/src/qpid/amqp_0_10/Struct32.cpp b/qpid/cpp/src/qpid/amqp_0_10/Struct32.cpp
index 2d38c09c21..2d38c09c21 100644
--- a/cpp/src/qpid/amqp_0_10/Struct32.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/Struct32.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Struct32.h b/qpid/cpp/src/qpid/amqp_0_10/Struct32.h
index 2ed73e0b4c..2ed73e0b4c 100644
--- a/cpp/src/qpid/amqp_0_10/Struct32.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Struct32.h
diff --git a/cpp/src/qpid/amqp_0_10/Unit.cpp b/qpid/cpp/src/qpid/amqp_0_10/Unit.cpp
index 381de76dcc..381de76dcc 100644
--- a/cpp/src/qpid/amqp_0_10/Unit.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/Unit.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Unit.h b/qpid/cpp/src/qpid/amqp_0_10/Unit.h
index 0229e07419..0229e07419 100644
--- a/cpp/src/qpid/amqp_0_10/Unit.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Unit.h
diff --git a/cpp/src/qpid/amqp_0_10/UnitHandler.h b/qpid/cpp/src/qpid/amqp_0_10/UnitHandler.h
index 93a8ce573a..93a8ce573a 100644
--- a/cpp/src/qpid/amqp_0_10/UnitHandler.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/UnitHandler.h
diff --git a/cpp/src/qpid/amqp_0_10/UnknownStruct.cpp b/qpid/cpp/src/qpid/amqp_0_10/UnknownStruct.cpp
index 35445054c9..35445054c9 100644
--- a/cpp/src/qpid/amqp_0_10/UnknownStruct.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/UnknownStruct.cpp
diff --git a/cpp/src/qpid/amqp_0_10/UnknownStruct.h b/qpid/cpp/src/qpid/amqp_0_10/UnknownStruct.h
index 1c66d8e6af..1c66d8e6af 100644
--- a/cpp/src/qpid/amqp_0_10/UnknownStruct.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/UnknownStruct.h
diff --git a/cpp/src/qpid/amqp_0_10/UnknownType.cpp b/qpid/cpp/src/qpid/amqp_0_10/UnknownType.cpp
index cd45dd76db..cd45dd76db 100644
--- a/cpp/src/qpid/amqp_0_10/UnknownType.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/UnknownType.cpp
diff --git a/cpp/src/qpid/amqp_0_10/UnknownType.h b/qpid/cpp/src/qpid/amqp_0_10/UnknownType.h
index 77498871b3..77498871b3 100644
--- a/cpp/src/qpid/amqp_0_10/UnknownType.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/UnknownType.h
diff --git a/cpp/src/qpid/amqp_0_10/apply.h b/qpid/cpp/src/qpid/amqp_0_10/apply.h
index f32b3482ef..f32b3482ef 100644
--- a/cpp/src/qpid/amqp_0_10/apply.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/apply.h
diff --git a/cpp/src/qpid/amqp_0_10/built_in_types.h b/qpid/cpp/src/qpid/amqp_0_10/built_in_types.h
index e95d1cf3e9..e95d1cf3e9 100644
--- a/cpp/src/qpid/amqp_0_10/built_in_types.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/built_in_types.h
diff --git a/cpp/src/qpid/amqp_0_10/complex_types.cpp b/qpid/cpp/src/qpid/amqp_0_10/complex_types.cpp
index 656d363ba6..656d363ba6 100644
--- a/cpp/src/qpid/amqp_0_10/complex_types.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/complex_types.cpp
diff --git a/cpp/src/qpid/assert.cpp b/qpid/cpp/src/qpid/assert.cpp
index 801bfa6ae5..801bfa6ae5 100644
--- a/cpp/src/qpid/assert.cpp
+++ b/qpid/cpp/src/qpid/assert.cpp
diff --git a/cpp/src/qpid/assert.h b/qpid/cpp/src/qpid/assert.h
index 49e7c5355d..49e7c5355d 100644
--- a/cpp/src/qpid/assert.h
+++ b/qpid/cpp/src/qpid/assert.h
diff --git a/cpp/src/qpid/broker/AclModule.h b/qpid/cpp/src/qpid/broker/AclModule.h
index c01697ace9..c01697ace9 100644
--- a/cpp/src/qpid/broker/AclModule.h
+++ b/qpid/cpp/src/qpid/broker/AclModule.h
diff --git a/cpp/src/qpid/broker/AsyncCommandCallback.cpp b/qpid/cpp/src/qpid/broker/AsyncCommandCallback.cpp
index 2b1f3ad8e4..2b1f3ad8e4 100644
--- a/cpp/src/qpid/broker/AsyncCommandCallback.cpp
+++ b/qpid/cpp/src/qpid/broker/AsyncCommandCallback.cpp
diff --git a/cpp/src/qpid/broker/AsyncCommandCallback.h b/qpid/cpp/src/qpid/broker/AsyncCommandCallback.h
index dd8214683a..dd8214683a 100644
--- a/cpp/src/qpid/broker/AsyncCommandCallback.h
+++ b/qpid/cpp/src/qpid/broker/AsyncCommandCallback.h
diff --git a/cpp/src/qpid/broker/AsyncCompletion.h b/qpid/cpp/src/qpid/broker/AsyncCompletion.h
index 1ab69f32d3..1ab69f32d3 100644
--- a/cpp/src/qpid/broker/AsyncCompletion.h
+++ b/qpid/cpp/src/qpid/broker/AsyncCompletion.h
diff --git a/cpp/src/qpid/broker/Bridge.cpp b/qpid/cpp/src/qpid/broker/Bridge.cpp
index b7fbb1a9aa..b7fbb1a9aa 100644
--- a/cpp/src/qpid/broker/Bridge.cpp
+++ b/qpid/cpp/src/qpid/broker/Bridge.cpp
diff --git a/cpp/src/qpid/broker/Bridge.h b/qpid/cpp/src/qpid/broker/Bridge.h
index 3eac8f2af2..3eac8f2af2 100644
--- a/cpp/src/qpid/broker/Bridge.h
+++ b/qpid/cpp/src/qpid/broker/Bridge.h
diff --git a/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp
index 9a5f05ccb2..9a5f05ccb2 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/qpid/cpp/src/qpid/broker/Broker.cpp
diff --git a/cpp/src/qpid/broker/Broker.h b/qpid/cpp/src/qpid/broker/Broker.h
index 4e46b71cc9..4e46b71cc9 100644
--- a/cpp/src/qpid/broker/Broker.h
+++ b/qpid/cpp/src/qpid/broker/Broker.h
diff --git a/cpp/src/qpid/broker/BrokerImportExport.h b/qpid/cpp/src/qpid/broker/BrokerImportExport.h
index ee05788063..ee05788063 100644
--- a/cpp/src/qpid/broker/BrokerImportExport.h
+++ b/qpid/cpp/src/qpid/broker/BrokerImportExport.h
diff --git a/cpp/src/qpid/broker/BrokerObserver.h b/qpid/cpp/src/qpid/broker/BrokerObserver.h
index a9573b9e12..a9573b9e12 100644
--- a/cpp/src/qpid/broker/BrokerObserver.h
+++ b/qpid/cpp/src/qpid/broker/BrokerObserver.h
diff --git a/cpp/src/qpid/broker/BrokerObservers.h b/qpid/cpp/src/qpid/broker/BrokerObservers.h
index 8a9bdd4fd4..8a9bdd4fd4 100644
--- a/cpp/src/qpid/broker/BrokerObservers.h
+++ b/qpid/cpp/src/qpid/broker/BrokerObservers.h
diff --git a/cpp/src/qpid/broker/Connection.h b/qpid/cpp/src/qpid/broker/Connection.h
index ecc48123cf..ecc48123cf 100644
--- a/cpp/src/qpid/broker/Connection.h
+++ b/qpid/cpp/src/qpid/broker/Connection.h
diff --git a/cpp/src/qpid/broker/ConnectionHandler.cpp b/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp
index 09f774da62..09f774da62 100644
--- a/cpp/src/qpid/broker/ConnectionHandler.cpp
+++ b/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp
diff --git a/cpp/src/qpid/broker/ConnectionHandler.h b/qpid/cpp/src/qpid/broker/ConnectionHandler.h
index 7af2fe3cb4..7af2fe3cb4 100644
--- a/cpp/src/qpid/broker/ConnectionHandler.h
+++ b/qpid/cpp/src/qpid/broker/ConnectionHandler.h
diff --git a/cpp/src/qpid/broker/ConnectionObserver.h b/qpid/cpp/src/qpid/broker/ConnectionObserver.h
index eea2981185..eea2981185 100644
--- a/cpp/src/qpid/broker/ConnectionObserver.h
+++ b/qpid/cpp/src/qpid/broker/ConnectionObserver.h
diff --git a/cpp/src/qpid/broker/ConnectionObservers.h b/qpid/cpp/src/qpid/broker/ConnectionObservers.h
index e9014c80c3..e9014c80c3 100644
--- a/cpp/src/qpid/broker/ConnectionObservers.h
+++ b/qpid/cpp/src/qpid/broker/ConnectionObservers.h
diff --git a/cpp/src/qpid/broker/Consumer.h b/qpid/cpp/src/qpid/broker/Consumer.h
index 662b0f937d..662b0f937d 100644
--- a/cpp/src/qpid/broker/Consumer.h
+++ b/qpid/cpp/src/qpid/broker/Consumer.h
diff --git a/cpp/src/qpid/broker/ConsumerFactory.h b/qpid/cpp/src/qpid/broker/ConsumerFactory.h
index 1c0f2571e2..1c0f2571e2 100644
--- a/cpp/src/qpid/broker/ConsumerFactory.h
+++ b/qpid/cpp/src/qpid/broker/ConsumerFactory.h
diff --git a/cpp/src/qpid/broker/Credit.cpp b/qpid/cpp/src/qpid/broker/Credit.cpp
index c0e0b3b3d3..c0e0b3b3d3 100644
--- a/cpp/src/qpid/broker/Credit.cpp
+++ b/qpid/cpp/src/qpid/broker/Credit.cpp
diff --git a/cpp/src/qpid/broker/Credit.h b/qpid/cpp/src/qpid/broker/Credit.h
index 7f98c8d071..7f98c8d071 100644
--- a/cpp/src/qpid/broker/Credit.h
+++ b/qpid/cpp/src/qpid/broker/Credit.h
diff --git a/cpp/src/qpid/broker/Daemon.cpp b/qpid/cpp/src/qpid/broker/Daemon.cpp
index 281345bc95..281345bc95 100644
--- a/cpp/src/qpid/broker/Daemon.cpp
+++ b/qpid/cpp/src/qpid/broker/Daemon.cpp
diff --git a/cpp/src/qpid/broker/Daemon.h b/qpid/cpp/src/qpid/broker/Daemon.h
index 2bb9fc5577..2bb9fc5577 100644
--- a/cpp/src/qpid/broker/Daemon.h
+++ b/qpid/cpp/src/qpid/broker/Daemon.h
diff --git a/cpp/src/qpid/broker/Deliverable.h b/qpid/cpp/src/qpid/broker/Deliverable.h
index 4dc67fdcfc..4dc67fdcfc 100644
--- a/cpp/src/qpid/broker/Deliverable.h
+++ b/qpid/cpp/src/qpid/broker/Deliverable.h
diff --git a/cpp/src/qpid/broker/DeliverableMessage.cpp b/qpid/cpp/src/qpid/broker/DeliverableMessage.cpp
index 31823709ce..31823709ce 100644
--- a/cpp/src/qpid/broker/DeliverableMessage.cpp
+++ b/qpid/cpp/src/qpid/broker/DeliverableMessage.cpp
diff --git a/cpp/src/qpid/broker/DeliverableMessage.h b/qpid/cpp/src/qpid/broker/DeliverableMessage.h
index 6e8275770d..6e8275770d 100644
--- a/cpp/src/qpid/broker/DeliverableMessage.h
+++ b/qpid/cpp/src/qpid/broker/DeliverableMessage.h
diff --git a/cpp/src/qpid/broker/DeliveryId.h b/qpid/cpp/src/qpid/broker/DeliveryId.h
index 05b19f032e..05b19f032e 100644
--- a/cpp/src/qpid/broker/DeliveryId.h
+++ b/qpid/cpp/src/qpid/broker/DeliveryId.h
diff --git a/cpp/src/qpid/broker/DeliveryRecord.cpp b/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
index 06ecf62ed4..06ecf62ed4 100644
--- a/cpp/src/qpid/broker/DeliveryRecord.cpp
+++ b/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
diff --git a/cpp/src/qpid/broker/DeliveryRecord.h b/qpid/cpp/src/qpid/broker/DeliveryRecord.h
index 37ce8dc709..37ce8dc709 100644
--- a/cpp/src/qpid/broker/DeliveryRecord.h
+++ b/qpid/cpp/src/qpid/broker/DeliveryRecord.h
diff --git a/cpp/src/qpid/broker/DirectExchange.cpp b/qpid/cpp/src/qpid/broker/DirectExchange.cpp
index 65c8287d4f..65c8287d4f 100644
--- a/cpp/src/qpid/broker/DirectExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/DirectExchange.cpp
diff --git a/cpp/src/qpid/broker/DirectExchange.h b/qpid/cpp/src/qpid/broker/DirectExchange.h
index cbf9aa5975..cbf9aa5975 100644
--- a/cpp/src/qpid/broker/DirectExchange.h
+++ b/qpid/cpp/src/qpid/broker/DirectExchange.h
diff --git a/cpp/src/qpid/broker/DtxAck.cpp b/qpid/cpp/src/qpid/broker/DtxAck.cpp
index c558681d62..c558681d62 100644
--- a/cpp/src/qpid/broker/DtxAck.cpp
+++ b/qpid/cpp/src/qpid/broker/DtxAck.cpp
diff --git a/cpp/src/qpid/broker/DtxAck.h b/qpid/cpp/src/qpid/broker/DtxAck.h
index 5775edf5de..5775edf5de 100644
--- a/cpp/src/qpid/broker/DtxAck.h
+++ b/qpid/cpp/src/qpid/broker/DtxAck.h
diff --git a/cpp/src/qpid/broker/DtxBuffer.cpp b/qpid/cpp/src/qpid/broker/DtxBuffer.cpp
index 13177d3b72..13177d3b72 100644
--- a/cpp/src/qpid/broker/DtxBuffer.cpp
+++ b/qpid/cpp/src/qpid/broker/DtxBuffer.cpp
diff --git a/cpp/src/qpid/broker/DtxBuffer.h b/qpid/cpp/src/qpid/broker/DtxBuffer.h
index 21ca76c8f4..21ca76c8f4 100644
--- a/cpp/src/qpid/broker/DtxBuffer.h
+++ b/qpid/cpp/src/qpid/broker/DtxBuffer.h
diff --git a/cpp/src/qpid/broker/DtxManager.cpp b/qpid/cpp/src/qpid/broker/DtxManager.cpp
index 5ba1ce4dac..5ba1ce4dac 100644
--- a/cpp/src/qpid/broker/DtxManager.cpp
+++ b/qpid/cpp/src/qpid/broker/DtxManager.cpp
diff --git a/cpp/src/qpid/broker/DtxManager.h b/qpid/cpp/src/qpid/broker/DtxManager.h
index 000fc7b4b8..000fc7b4b8 100644
--- a/cpp/src/qpid/broker/DtxManager.h
+++ b/qpid/cpp/src/qpid/broker/DtxManager.h
diff --git a/cpp/src/qpid/broker/DtxTimeout.cpp b/qpid/cpp/src/qpid/broker/DtxTimeout.cpp
index 58700846ef..58700846ef 100644
--- a/cpp/src/qpid/broker/DtxTimeout.cpp
+++ b/qpid/cpp/src/qpid/broker/DtxTimeout.cpp
diff --git a/cpp/src/qpid/broker/DtxTimeout.h b/qpid/cpp/src/qpid/broker/DtxTimeout.h
index 1fcb4cee2a..1fcb4cee2a 100644
--- a/cpp/src/qpid/broker/DtxTimeout.h
+++ b/qpid/cpp/src/qpid/broker/DtxTimeout.h
diff --git a/cpp/src/qpid/broker/DtxWorkRecord.cpp b/qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp
index 04d19dc43e..04d19dc43e 100644
--- a/cpp/src/qpid/broker/DtxWorkRecord.cpp
+++ b/qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp
diff --git a/cpp/src/qpid/broker/DtxWorkRecord.h b/qpid/cpp/src/qpid/broker/DtxWorkRecord.h
index 91fda797d1..91fda797d1 100644
--- a/cpp/src/qpid/broker/DtxWorkRecord.h
+++ b/qpid/cpp/src/qpid/broker/DtxWorkRecord.h
diff --git a/cpp/src/qpid/broker/Exchange.cpp b/qpid/cpp/src/qpid/broker/Exchange.cpp
index feef911f21..feef911f21 100644
--- a/cpp/src/qpid/broker/Exchange.cpp
+++ b/qpid/cpp/src/qpid/broker/Exchange.cpp
diff --git a/cpp/src/qpid/broker/Exchange.h b/qpid/cpp/src/qpid/broker/Exchange.h
index a0d0604be8..a0d0604be8 100644
--- a/cpp/src/qpid/broker/Exchange.h
+++ b/qpid/cpp/src/qpid/broker/Exchange.h
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.cpp b/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
index c43e6afc89..c43e6afc89 100644
--- a/cpp/src/qpid/broker/ExchangeRegistry.cpp
+++ b/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.h b/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
index 99caf30269..99caf30269 100644
--- a/cpp/src/qpid/broker/ExchangeRegistry.h
+++ b/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
diff --git a/cpp/src/qpid/broker/ExpiryPolicy.cpp b/qpid/cpp/src/qpid/broker/ExpiryPolicy.cpp
index 687eac7817..687eac7817 100644
--- a/cpp/src/qpid/broker/ExpiryPolicy.cpp
+++ b/qpid/cpp/src/qpid/broker/ExpiryPolicy.cpp
diff --git a/cpp/src/qpid/broker/ExpiryPolicy.h b/qpid/cpp/src/qpid/broker/ExpiryPolicy.h
index 1fb41ccd29..1fb41ccd29 100644
--- a/cpp/src/qpid/broker/ExpiryPolicy.h
+++ b/qpid/cpp/src/qpid/broker/ExpiryPolicy.h
diff --git a/cpp/src/qpid/broker/Fairshare.cpp b/qpid/cpp/src/qpid/broker/Fairshare.cpp
index ec8ae9a037..ec8ae9a037 100644
--- a/cpp/src/qpid/broker/Fairshare.cpp
+++ b/qpid/cpp/src/qpid/broker/Fairshare.cpp
diff --git a/cpp/src/qpid/broker/Fairshare.h b/qpid/cpp/src/qpid/broker/Fairshare.h
index e7c8b04ecf..e7c8b04ecf 100644
--- a/cpp/src/qpid/broker/Fairshare.h
+++ b/qpid/cpp/src/qpid/broker/Fairshare.h
diff --git a/cpp/src/qpid/broker/FanOutExchange.cpp b/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
index 8c1d3f4954..8c1d3f4954 100644
--- a/cpp/src/qpid/broker/FanOutExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
diff --git a/cpp/src/qpid/broker/FanOutExchange.h b/qpid/cpp/src/qpid/broker/FanOutExchange.h
index a92ff7ce97..a92ff7ce97 100644
--- a/cpp/src/qpid/broker/FanOutExchange.h
+++ b/qpid/cpp/src/qpid/broker/FanOutExchange.h
diff --git a/cpp/src/qpid/broker/FedOps.h b/qpid/cpp/src/qpid/broker/FedOps.h
index dc4a38e244..dc4a38e244 100644
--- a/cpp/src/qpid/broker/FedOps.h
+++ b/qpid/cpp/src/qpid/broker/FedOps.h
diff --git a/cpp/src/qpid/broker/FifoDistributor.cpp b/qpid/cpp/src/qpid/broker/FifoDistributor.cpp
index e1c0d268ce..e1c0d268ce 100644
--- a/cpp/src/qpid/broker/FifoDistributor.cpp
+++ b/qpid/cpp/src/qpid/broker/FifoDistributor.cpp
diff --git a/cpp/src/qpid/broker/FifoDistributor.h b/qpid/cpp/src/qpid/broker/FifoDistributor.h
index aa5ebe28c5..aa5ebe28c5 100644
--- a/cpp/src/qpid/broker/FifoDistributor.h
+++ b/qpid/cpp/src/qpid/broker/FifoDistributor.h
diff --git a/cpp/src/qpid/broker/HandlerImpl.h b/qpid/cpp/src/qpid/broker/HandlerImpl.h
index c41438fd90..c41438fd90 100644
--- a/cpp/src/qpid/broker/HandlerImpl.h
+++ b/qpid/cpp/src/qpid/broker/HandlerImpl.h
diff --git a/cpp/src/qpid/broker/HeadersExchange.cpp b/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
index 19c7f107f6..19c7f107f6 100644
--- a/cpp/src/qpid/broker/HeadersExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
diff --git a/cpp/src/qpid/broker/HeadersExchange.h b/qpid/cpp/src/qpid/broker/HeadersExchange.h
index 54c69491e9..54c69491e9 100644
--- a/cpp/src/qpid/broker/HeadersExchange.h
+++ b/qpid/cpp/src/qpid/broker/HeadersExchange.h
diff --git a/cpp/src/qpid/broker/IndexedDeque.h b/qpid/cpp/src/qpid/broker/IndexedDeque.h
index 229b4e3009..229b4e3009 100644
--- a/cpp/src/qpid/broker/IndexedDeque.h
+++ b/qpid/cpp/src/qpid/broker/IndexedDeque.h
diff --git a/cpp/src/qpid/broker/IngressCompletion.cpp b/qpid/cpp/src/qpid/broker/IngressCompletion.cpp
index 51eafb8d86..51eafb8d86 100644
--- a/cpp/src/qpid/broker/IngressCompletion.cpp
+++ b/qpid/cpp/src/qpid/broker/IngressCompletion.cpp
diff --git a/cpp/src/qpid/broker/IngressCompletion.h b/qpid/cpp/src/qpid/broker/IngressCompletion.h
index ca21ec9837..ca21ec9837 100644
--- a/cpp/src/qpid/broker/IngressCompletion.h
+++ b/qpid/cpp/src/qpid/broker/IngressCompletion.h
diff --git a/cpp/src/qpid/broker/Link.cpp b/qpid/cpp/src/qpid/broker/Link.cpp
index fc200adbea..fc200adbea 100644
--- a/cpp/src/qpid/broker/Link.cpp
+++ b/qpid/cpp/src/qpid/broker/Link.cpp
diff --git a/cpp/src/qpid/broker/Link.h b/qpid/cpp/src/qpid/broker/Link.h
index ceee0186f3..ceee0186f3 100644
--- a/cpp/src/qpid/broker/Link.h
+++ b/qpid/cpp/src/qpid/broker/Link.h
diff --git a/cpp/src/qpid/broker/LinkRegistry.cpp b/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
index ed1e314bda..ed1e314bda 100644
--- a/cpp/src/qpid/broker/LinkRegistry.cpp
+++ b/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
diff --git a/cpp/src/qpid/broker/LinkRegistry.h b/qpid/cpp/src/qpid/broker/LinkRegistry.h
index a156a53624..a156a53624 100644
--- a/cpp/src/qpid/broker/LinkRegistry.h
+++ b/qpid/cpp/src/qpid/broker/LinkRegistry.h
diff --git a/cpp/src/qpid/broker/LossyQueue.cpp b/qpid/cpp/src/qpid/broker/LossyQueue.cpp
index ee13d7733a..ee13d7733a 100644
--- a/cpp/src/qpid/broker/LossyQueue.cpp
+++ b/qpid/cpp/src/qpid/broker/LossyQueue.cpp
diff --git a/cpp/src/qpid/broker/LossyQueue.h b/qpid/cpp/src/qpid/broker/LossyQueue.h
index 3e62151d6f..3e62151d6f 100644
--- a/cpp/src/qpid/broker/LossyQueue.h
+++ b/qpid/cpp/src/qpid/broker/LossyQueue.h
diff --git a/cpp/src/qpid/broker/Lvq.cpp b/qpid/cpp/src/qpid/broker/Lvq.cpp
index 34f080c57f..34f080c57f 100644
--- a/cpp/src/qpid/broker/Lvq.cpp
+++ b/qpid/cpp/src/qpid/broker/Lvq.cpp
diff --git a/cpp/src/qpid/broker/Lvq.h b/qpid/cpp/src/qpid/broker/Lvq.h
index 335270a073..335270a073 100644
--- a/cpp/src/qpid/broker/Lvq.h
+++ b/qpid/cpp/src/qpid/broker/Lvq.h
diff --git a/cpp/src/qpid/broker/Message.cpp b/qpid/cpp/src/qpid/broker/Message.cpp
index db6149158a..db6149158a 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/qpid/cpp/src/qpid/broker/Message.cpp
diff --git a/cpp/src/qpid/broker/Message.h b/qpid/cpp/src/qpid/broker/Message.h
index 38cfb2c1b8..38cfb2c1b8 100644
--- a/cpp/src/qpid/broker/Message.h
+++ b/qpid/cpp/src/qpid/broker/Message.h
diff --git a/cpp/src/qpid/broker/MessageAdapter.cpp b/qpid/cpp/src/qpid/broker/MessageAdapter.cpp
index 0eb4a6fa22..0eb4a6fa22 100644
--- a/cpp/src/qpid/broker/MessageAdapter.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageAdapter.cpp
diff --git a/cpp/src/qpid/broker/MessageAdapter.h b/qpid/cpp/src/qpid/broker/MessageAdapter.h
index df50db4063..df50db4063 100644
--- a/cpp/src/qpid/broker/MessageAdapter.h
+++ b/qpid/cpp/src/qpid/broker/MessageAdapter.h
diff --git a/cpp/src/qpid/broker/MessageBuilder.cpp b/qpid/cpp/src/qpid/broker/MessageBuilder.cpp
index 7cb99514d5..7cb99514d5 100644
--- a/cpp/src/qpid/broker/MessageBuilder.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageBuilder.cpp
diff --git a/cpp/src/qpid/broker/MessageBuilder.h b/qpid/cpp/src/qpid/broker/MessageBuilder.h
index 5ca6fa0c66..5ca6fa0c66 100644
--- a/cpp/src/qpid/broker/MessageBuilder.h
+++ b/qpid/cpp/src/qpid/broker/MessageBuilder.h
diff --git a/cpp/src/qpid/broker/MessageDeque.cpp b/qpid/cpp/src/qpid/broker/MessageDeque.cpp
index 1529d4ac94..1529d4ac94 100644
--- a/cpp/src/qpid/broker/MessageDeque.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageDeque.cpp
diff --git a/cpp/src/qpid/broker/MessageDeque.h b/qpid/cpp/src/qpid/broker/MessageDeque.h
index ec67476926..ec67476926 100644
--- a/cpp/src/qpid/broker/MessageDeque.h
+++ b/qpid/cpp/src/qpid/broker/MessageDeque.h
diff --git a/cpp/src/qpid/broker/MessageDistributor.h b/qpid/cpp/src/qpid/broker/MessageDistributor.h
index c11e4495a1..c11e4495a1 100644
--- a/cpp/src/qpid/broker/MessageDistributor.h
+++ b/qpid/cpp/src/qpid/broker/MessageDistributor.h
diff --git a/cpp/src/qpid/broker/MessageGroupManager.cpp b/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
index c083e4ee0f..c083e4ee0f 100644
--- a/cpp/src/qpid/broker/MessageGroupManager.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
diff --git a/cpp/src/qpid/broker/MessageGroupManager.h b/qpid/cpp/src/qpid/broker/MessageGroupManager.h
index bf45e776c8..bf45e776c8 100644
--- a/cpp/src/qpid/broker/MessageGroupManager.h
+++ b/qpid/cpp/src/qpid/broker/MessageGroupManager.h
diff --git a/cpp/src/qpid/broker/MessageInterceptor.h b/qpid/cpp/src/qpid/broker/MessageInterceptor.h
index 3ada86b6f7..3ada86b6f7 100644
--- a/cpp/src/qpid/broker/MessageInterceptor.h
+++ b/qpid/cpp/src/qpid/broker/MessageInterceptor.h
diff --git a/cpp/src/qpid/broker/MessageMap.cpp b/qpid/cpp/src/qpid/broker/MessageMap.cpp
index 4cdd83c9aa..4cdd83c9aa 100644
--- a/cpp/src/qpid/broker/MessageMap.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageMap.cpp
diff --git a/cpp/src/qpid/broker/MessageMap.h b/qpid/cpp/src/qpid/broker/MessageMap.h
index c30606d0ff..c30606d0ff 100644
--- a/cpp/src/qpid/broker/MessageMap.h
+++ b/qpid/cpp/src/qpid/broker/MessageMap.h
diff --git a/cpp/src/qpid/broker/MessageStore.h b/qpid/cpp/src/qpid/broker/MessageStore.h
index 68b5da7852..68b5da7852 100644
--- a/cpp/src/qpid/broker/MessageStore.h
+++ b/qpid/cpp/src/qpid/broker/MessageStore.h
diff --git a/cpp/src/qpid/broker/MessageStoreModule.cpp b/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp
index edfe6e7819..edfe6e7819 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp
diff --git a/cpp/src/qpid/broker/MessageStoreModule.h b/qpid/cpp/src/qpid/broker/MessageStoreModule.h
index a71e8cc9b6..a71e8cc9b6 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.h
+++ b/qpid/cpp/src/qpid/broker/MessageStoreModule.h
diff --git a/cpp/src/qpid/broker/Messages.h b/qpid/cpp/src/qpid/broker/Messages.h
index cd846a4973..cd846a4973 100644
--- a/cpp/src/qpid/broker/Messages.h
+++ b/qpid/cpp/src/qpid/broker/Messages.h
diff --git a/cpp/src/qpid/broker/NameGenerator.cpp b/qpid/cpp/src/qpid/broker/NameGenerator.cpp
index e7f193d546..e7f193d546 100644
--- a/cpp/src/qpid/broker/NameGenerator.cpp
+++ b/qpid/cpp/src/qpid/broker/NameGenerator.cpp
diff --git a/cpp/src/qpid/broker/NameGenerator.h b/qpid/cpp/src/qpid/broker/NameGenerator.h
index 2e9f7febe2..2e9f7febe2 100644
--- a/cpp/src/qpid/broker/NameGenerator.h
+++ b/qpid/cpp/src/qpid/broker/NameGenerator.h
diff --git a/cpp/src/qpid/broker/NullMessageStore.cpp b/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
index 800731d304..800731d304 100644
--- a/cpp/src/qpid/broker/NullMessageStore.cpp
+++ b/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
diff --git a/cpp/src/qpid/broker/NullMessageStore.h b/qpid/cpp/src/qpid/broker/NullMessageStore.h
index 7afc0a47a8..7afc0a47a8 100644
--- a/cpp/src/qpid/broker/NullMessageStore.h
+++ b/qpid/cpp/src/qpid/broker/NullMessageStore.h
diff --git a/cpp/src/qpid/broker/ObjectFactory.cpp b/qpid/cpp/src/qpid/broker/ObjectFactory.cpp
index 2dd182c428..2dd182c428 100644
--- a/cpp/src/qpid/broker/ObjectFactory.cpp
+++ b/qpid/cpp/src/qpid/broker/ObjectFactory.cpp
diff --git a/cpp/src/qpid/broker/ObjectFactory.h b/qpid/cpp/src/qpid/broker/ObjectFactory.h
index d1b570da2f..d1b570da2f 100644
--- a/cpp/src/qpid/broker/ObjectFactory.h
+++ b/qpid/cpp/src/qpid/broker/ObjectFactory.h
diff --git a/cpp/src/qpid/broker/Observers.h b/qpid/cpp/src/qpid/broker/Observers.h
index d50c21e559..d50c21e559 100644
--- a/cpp/src/qpid/broker/Observers.h
+++ b/qpid/cpp/src/qpid/broker/Observers.h
diff --git a/cpp/src/qpid/broker/OwnershipToken.h b/qpid/cpp/src/qpid/broker/OwnershipToken.h
index 2fc51408b6..2fc51408b6 100644
--- a/cpp/src/qpid/broker/OwnershipToken.h
+++ b/qpid/cpp/src/qpid/broker/OwnershipToken.h
diff --git a/cpp/src/qpid/broker/PagedQueue.cpp b/qpid/cpp/src/qpid/broker/PagedQueue.cpp
index 9701617b01..9701617b01 100644
--- a/cpp/src/qpid/broker/PagedQueue.cpp
+++ b/qpid/cpp/src/qpid/broker/PagedQueue.cpp
diff --git a/cpp/src/qpid/broker/PagedQueue.h b/qpid/cpp/src/qpid/broker/PagedQueue.h
index 4bb4953ba6..4bb4953ba6 100644
--- a/cpp/src/qpid/broker/PagedQueue.h
+++ b/qpid/cpp/src/qpid/broker/PagedQueue.h
diff --git a/cpp/src/qpid/broker/Persistable.h b/qpid/cpp/src/qpid/broker/Persistable.h
index 444aca3295..444aca3295 100644
--- a/cpp/src/qpid/broker/Persistable.h
+++ b/qpid/cpp/src/qpid/broker/Persistable.h
diff --git a/cpp/src/qpid/broker/PersistableConfig.h b/qpid/cpp/src/qpid/broker/PersistableConfig.h
index 8ddb84d129..8ddb84d129 100644
--- a/cpp/src/qpid/broker/PersistableConfig.h
+++ b/qpid/cpp/src/qpid/broker/PersistableConfig.h
diff --git a/cpp/src/qpid/broker/PersistableExchange.h b/qpid/cpp/src/qpid/broker/PersistableExchange.h
index e1a0853247..e1a0853247 100644
--- a/cpp/src/qpid/broker/PersistableExchange.h
+++ b/qpid/cpp/src/qpid/broker/PersistableExchange.h
diff --git a/cpp/src/qpid/broker/PersistableMessage.cpp b/qpid/cpp/src/qpid/broker/PersistableMessage.cpp
index afc0976d61..afc0976d61 100644
--- a/cpp/src/qpid/broker/PersistableMessage.cpp
+++ b/qpid/cpp/src/qpid/broker/PersistableMessage.cpp
diff --git a/cpp/src/qpid/broker/PersistableMessage.h b/qpid/cpp/src/qpid/broker/PersistableMessage.h
index cfcf8f0afc..cfcf8f0afc 100644
--- a/cpp/src/qpid/broker/PersistableMessage.h
+++ b/qpid/cpp/src/qpid/broker/PersistableMessage.h
diff --git a/cpp/src/qpid/broker/PersistableObject.cpp b/qpid/cpp/src/qpid/broker/PersistableObject.cpp
index 575ef09270..575ef09270 100644
--- a/cpp/src/qpid/broker/PersistableObject.cpp
+++ b/qpid/cpp/src/qpid/broker/PersistableObject.cpp
diff --git a/cpp/src/qpid/broker/PersistableObject.h b/qpid/cpp/src/qpid/broker/PersistableObject.h
index da4bd44601..da4bd44601 100644
--- a/cpp/src/qpid/broker/PersistableObject.h
+++ b/qpid/cpp/src/qpid/broker/PersistableObject.h
diff --git a/cpp/src/qpid/broker/PersistableQueue.h b/qpid/cpp/src/qpid/broker/PersistableQueue.h
index 655d26bc74..655d26bc74 100644
--- a/cpp/src/qpid/broker/PersistableQueue.h
+++ b/qpid/cpp/src/qpid/broker/PersistableQueue.h
diff --git a/cpp/src/qpid/broker/PriorityQueue.cpp b/qpid/cpp/src/qpid/broker/PriorityQueue.cpp
index 5e60fe5cce..5e60fe5cce 100644
--- a/cpp/src/qpid/broker/PriorityQueue.cpp
+++ b/qpid/cpp/src/qpid/broker/PriorityQueue.cpp
diff --git a/cpp/src/qpid/broker/PriorityQueue.h b/qpid/cpp/src/qpid/broker/PriorityQueue.h
index 16432bfb54..16432bfb54 100644
--- a/cpp/src/qpid/broker/PriorityQueue.h
+++ b/qpid/cpp/src/qpid/broker/PriorityQueue.h
diff --git a/cpp/src/qpid/broker/Protocol.cpp b/qpid/cpp/src/qpid/broker/Protocol.cpp
index a98160e502..a98160e502 100644
--- a/cpp/src/qpid/broker/Protocol.cpp
+++ b/qpid/cpp/src/qpid/broker/Protocol.cpp
diff --git a/cpp/src/qpid/broker/Protocol.h b/qpid/cpp/src/qpid/broker/Protocol.h
index e736e4b367..e736e4b367 100644
--- a/cpp/src/qpid/broker/Protocol.h
+++ b/qpid/cpp/src/qpid/broker/Protocol.h
diff --git a/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index 3eaab30394..3eaab30394 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
diff --git a/cpp/src/qpid/broker/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h
index 3622b06dbd..3622b06dbd 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/qpid/cpp/src/qpid/broker/Queue.h
diff --git a/cpp/src/qpid/broker/QueueBindings.cpp b/qpid/cpp/src/qpid/broker/QueueBindings.cpp
index 1cc3486d9a..1cc3486d9a 100644
--- a/cpp/src/qpid/broker/QueueBindings.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueBindings.cpp
diff --git a/cpp/src/qpid/broker/QueueBindings.h b/qpid/cpp/src/qpid/broker/QueueBindings.h
index f9b07e7431..f9b07e7431 100644
--- a/cpp/src/qpid/broker/QueueBindings.h
+++ b/qpid/cpp/src/qpid/broker/QueueBindings.h
diff --git a/cpp/src/qpid/broker/QueueCleaner.cpp b/qpid/cpp/src/qpid/broker/QueueCleaner.cpp
index 8d9e3f43dd..8d9e3f43dd 100644
--- a/cpp/src/qpid/broker/QueueCleaner.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueCleaner.cpp
diff --git a/cpp/src/qpid/broker/QueueCleaner.h b/qpid/cpp/src/qpid/broker/QueueCleaner.h
index 896af1dcd5..896af1dcd5 100644
--- a/cpp/src/qpid/broker/QueueCleaner.h
+++ b/qpid/cpp/src/qpid/broker/QueueCleaner.h
diff --git a/cpp/src/qpid/broker/QueueCursor.cpp b/qpid/cpp/src/qpid/broker/QueueCursor.cpp
index e48b18b748..e48b18b748 100644
--- a/cpp/src/qpid/broker/QueueCursor.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueCursor.cpp
diff --git a/cpp/src/qpid/broker/QueueCursor.h b/qpid/cpp/src/qpid/broker/QueueCursor.h
index c7368177e9..c7368177e9 100644
--- a/cpp/src/qpid/broker/QueueCursor.h
+++ b/qpid/cpp/src/qpid/broker/QueueCursor.h
diff --git a/cpp/src/qpid/broker/QueueDepth.cpp b/qpid/cpp/src/qpid/broker/QueueDepth.cpp
index 69ec0ab4ac..69ec0ab4ac 100644
--- a/cpp/src/qpid/broker/QueueDepth.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueDepth.cpp
diff --git a/cpp/src/qpid/broker/QueueDepth.h b/qpid/cpp/src/qpid/broker/QueueDepth.h
index d93acb2a7a..d93acb2a7a 100644
--- a/cpp/src/qpid/broker/QueueDepth.h
+++ b/qpid/cpp/src/qpid/broker/QueueDepth.h
diff --git a/cpp/src/qpid/broker/QueueFactory.cpp b/qpid/cpp/src/qpid/broker/QueueFactory.cpp
index e5d9431555..e5d9431555 100644
--- a/cpp/src/qpid/broker/QueueFactory.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueFactory.cpp
diff --git a/cpp/src/qpid/broker/QueueFactory.h b/qpid/cpp/src/qpid/broker/QueueFactory.h
index b6a79f1f1a..b6a79f1f1a 100644
--- a/cpp/src/qpid/broker/QueueFactory.h
+++ b/qpid/cpp/src/qpid/broker/QueueFactory.h
diff --git a/cpp/src/qpid/broker/QueueFlowLimit.cpp b/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
index 3a609d67f1..3a609d67f1 100644
--- a/cpp/src/qpid/broker/QueueFlowLimit.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
diff --git a/cpp/src/qpid/broker/QueueFlowLimit.h b/qpid/cpp/src/qpid/broker/QueueFlowLimit.h
index 92bd7f76a0..92bd7f76a0 100644
--- a/cpp/src/qpid/broker/QueueFlowLimit.h
+++ b/qpid/cpp/src/qpid/broker/QueueFlowLimit.h
diff --git a/cpp/src/qpid/broker/QueueListeners.cpp b/qpid/cpp/src/qpid/broker/QueueListeners.cpp
index 0338a674cf..0338a674cf 100644
--- a/cpp/src/qpid/broker/QueueListeners.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueListeners.cpp
diff --git a/cpp/src/qpid/broker/QueueListeners.h b/qpid/cpp/src/qpid/broker/QueueListeners.h
index ca844fd47e..ca844fd47e 100644
--- a/cpp/src/qpid/broker/QueueListeners.h
+++ b/qpid/cpp/src/qpid/broker/QueueListeners.h
diff --git a/cpp/src/qpid/broker/QueueObserver.h b/qpid/cpp/src/qpid/broker/QueueObserver.h
index 6d29f83721..6d29f83721 100644
--- a/cpp/src/qpid/broker/QueueObserver.h
+++ b/qpid/cpp/src/qpid/broker/QueueObserver.h
diff --git a/cpp/src/qpid/broker/QueueRegistry.cpp b/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
index 1283a42e6d..1283a42e6d 100644
--- a/cpp/src/qpid/broker/QueueRegistry.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
diff --git a/cpp/src/qpid/broker/QueueRegistry.h b/qpid/cpp/src/qpid/broker/QueueRegistry.h
index 0eede36f3f..0eede36f3f 100644
--- a/cpp/src/qpid/broker/QueueRegistry.h
+++ b/qpid/cpp/src/qpid/broker/QueueRegistry.h
diff --git a/cpp/src/qpid/broker/QueueSettings.cpp b/qpid/cpp/src/qpid/broker/QueueSettings.cpp
index 8de8539579..8de8539579 100644
--- a/cpp/src/qpid/broker/QueueSettings.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueSettings.cpp
diff --git a/cpp/src/qpid/broker/QueueSettings.h b/qpid/cpp/src/qpid/broker/QueueSettings.h
index 9fda51e17a..9fda51e17a 100644
--- a/cpp/src/qpid/broker/QueueSettings.h
+++ b/qpid/cpp/src/qpid/broker/QueueSettings.h
diff --git a/cpp/src/qpid/broker/QueuedMessage.cpp b/qpid/cpp/src/qpid/broker/QueuedMessage.cpp
index d40cc901ff..d40cc901ff 100644
--- a/cpp/src/qpid/broker/QueuedMessage.cpp
+++ b/qpid/cpp/src/qpid/broker/QueuedMessage.cpp
diff --git a/cpp/src/qpid/broker/QueuedMessage.h b/qpid/cpp/src/qpid/broker/QueuedMessage.h
index c80fff900a..c80fff900a 100644
--- a/cpp/src/qpid/broker/QueuedMessage.h
+++ b/qpid/cpp/src/qpid/broker/QueuedMessage.h
diff --git a/cpp/src/qpid/broker/RecoverableConfig.h b/qpid/cpp/src/qpid/broker/RecoverableConfig.h
index 838a8582dc..838a8582dc 100644
--- a/cpp/src/qpid/broker/RecoverableConfig.h
+++ b/qpid/cpp/src/qpid/broker/RecoverableConfig.h
diff --git a/cpp/src/qpid/broker/RecoverableExchange.h b/qpid/cpp/src/qpid/broker/RecoverableExchange.h
index f8c08b2989..f8c08b2989 100644
--- a/cpp/src/qpid/broker/RecoverableExchange.h
+++ b/qpid/cpp/src/qpid/broker/RecoverableExchange.h
diff --git a/cpp/src/qpid/broker/RecoverableMessage.h b/qpid/cpp/src/qpid/broker/RecoverableMessage.h
index 888dc364e9..888dc364e9 100644
--- a/cpp/src/qpid/broker/RecoverableMessage.h
+++ b/qpid/cpp/src/qpid/broker/RecoverableMessage.h
diff --git a/cpp/src/qpid/broker/RecoverableMessageImpl.h b/qpid/cpp/src/qpid/broker/RecoverableMessageImpl.h
index 6f0bd8e4a9..6f0bd8e4a9 100644
--- a/cpp/src/qpid/broker/RecoverableMessageImpl.h
+++ b/qpid/cpp/src/qpid/broker/RecoverableMessageImpl.h
diff --git a/cpp/src/qpid/broker/RecoverableQueue.h b/qpid/cpp/src/qpid/broker/RecoverableQueue.h
index ab300dbce9..ab300dbce9 100644
--- a/cpp/src/qpid/broker/RecoverableQueue.h
+++ b/qpid/cpp/src/qpid/broker/RecoverableQueue.h
diff --git a/cpp/src/qpid/broker/RecoverableTransaction.h b/qpid/cpp/src/qpid/broker/RecoverableTransaction.h
index 1b7d94bd1a..1b7d94bd1a 100644
--- a/cpp/src/qpid/broker/RecoverableTransaction.h
+++ b/qpid/cpp/src/qpid/broker/RecoverableTransaction.h
diff --git a/cpp/src/qpid/broker/RecoveredDequeue.cpp b/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp
index 6e21a5bc21..6e21a5bc21 100644
--- a/cpp/src/qpid/broker/RecoveredDequeue.cpp
+++ b/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp
diff --git a/cpp/src/qpid/broker/RecoveredDequeue.h b/qpid/cpp/src/qpid/broker/RecoveredDequeue.h
index b85919975c..b85919975c 100644
--- a/cpp/src/qpid/broker/RecoveredDequeue.h
+++ b/qpid/cpp/src/qpid/broker/RecoveredDequeue.h
diff --git a/cpp/src/qpid/broker/RecoveredEnqueue.cpp b/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp
index 296d5194c0..296d5194c0 100644
--- a/cpp/src/qpid/broker/RecoveredEnqueue.cpp
+++ b/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp
diff --git a/cpp/src/qpid/broker/RecoveredEnqueue.h b/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h
index 01c350af92..01c350af92 100644
--- a/cpp/src/qpid/broker/RecoveredEnqueue.h
+++ b/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h
diff --git a/cpp/src/qpid/broker/RecoveryManager.h b/qpid/cpp/src/qpid/broker/RecoveryManager.h
index 2929e92250..2929e92250 100644
--- a/cpp/src/qpid/broker/RecoveryManager.h
+++ b/qpid/cpp/src/qpid/broker/RecoveryManager.h
diff --git a/cpp/src/qpid/broker/RecoveryManagerImpl.cpp b/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
index 5a11db81bb..5a11db81bb 100644
--- a/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
+++ b/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
diff --git a/cpp/src/qpid/broker/RecoveryManagerImpl.h b/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.h
index 22ea6f8d04..22ea6f8d04 100644
--- a/cpp/src/qpid/broker/RecoveryManagerImpl.h
+++ b/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.h
diff --git a/cpp/src/qpid/broker/RetryList.cpp b/qpid/cpp/src/qpid/broker/RetryList.cpp
index b0477dd0f7..b0477dd0f7 100644
--- a/cpp/src/qpid/broker/RetryList.cpp
+++ b/qpid/cpp/src/qpid/broker/RetryList.cpp
diff --git a/cpp/src/qpid/broker/RetryList.h b/qpid/cpp/src/qpid/broker/RetryList.h
index 9c4b779bcb..9c4b779bcb 100644
--- a/cpp/src/qpid/broker/RetryList.h
+++ b/qpid/cpp/src/qpid/broker/RetryList.h
diff --git a/cpp/src/qpid/broker/SaslAuthenticator.cpp b/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
index e5d6db1a04..e5d6db1a04 100644
--- a/cpp/src/qpid/broker/SaslAuthenticator.cpp
+++ b/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
diff --git a/cpp/src/qpid/broker/SaslAuthenticator.h b/qpid/cpp/src/qpid/broker/SaslAuthenticator.h
index 97434d6ffe..97434d6ffe 100644
--- a/cpp/src/qpid/broker/SaslAuthenticator.h
+++ b/qpid/cpp/src/qpid/broker/SaslAuthenticator.h
diff --git a/cpp/src/qpid/broker/SecureConnection.cpp b/qpid/cpp/src/qpid/broker/SecureConnection.cpp
index 59ac9ef132..59ac9ef132 100644
--- a/cpp/src/qpid/broker/SecureConnection.cpp
+++ b/qpid/cpp/src/qpid/broker/SecureConnection.cpp
diff --git a/cpp/src/qpid/broker/SecureConnection.h b/qpid/cpp/src/qpid/broker/SecureConnection.h
index 632087350e..632087350e 100644
--- a/cpp/src/qpid/broker/SecureConnection.h
+++ b/qpid/cpp/src/qpid/broker/SecureConnection.h
diff --git a/cpp/src/qpid/broker/SecureConnectionFactory.cpp b/qpid/cpp/src/qpid/broker/SecureConnectionFactory.cpp
index 0258350043..0258350043 100644
--- a/cpp/src/qpid/broker/SecureConnectionFactory.cpp
+++ b/qpid/cpp/src/qpid/broker/SecureConnectionFactory.cpp
diff --git a/cpp/src/qpid/broker/SecureConnectionFactory.h b/qpid/cpp/src/qpid/broker/SecureConnectionFactory.h
index e64776d5ec..e64776d5ec 100644
--- a/cpp/src/qpid/broker/SecureConnectionFactory.h
+++ b/qpid/cpp/src/qpid/broker/SecureConnectionFactory.h
diff --git a/cpp/src/qpid/broker/Selector.cpp b/qpid/cpp/src/qpid/broker/Selector.cpp
index 0c25e7338b..0c25e7338b 100644
--- a/cpp/src/qpid/broker/Selector.cpp
+++ b/qpid/cpp/src/qpid/broker/Selector.cpp
diff --git a/cpp/src/qpid/broker/Selector.h b/qpid/cpp/src/qpid/broker/Selector.h
index 0e151ecd0e..0e151ecd0e 100644
--- a/cpp/src/qpid/broker/Selector.h
+++ b/qpid/cpp/src/qpid/broker/Selector.h
diff --git a/cpp/src/qpid/broker/SelectorExpression.cpp b/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
index e64fd327d5..e64fd327d5 100644
--- a/cpp/src/qpid/broker/SelectorExpression.cpp
+++ b/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
diff --git a/cpp/src/qpid/broker/SelectorExpression.h b/qpid/cpp/src/qpid/broker/SelectorExpression.h
index 158f086287..158f086287 100644
--- a/cpp/src/qpid/broker/SelectorExpression.h
+++ b/qpid/cpp/src/qpid/broker/SelectorExpression.h
diff --git a/cpp/src/qpid/broker/SelectorToken.cpp b/qpid/cpp/src/qpid/broker/SelectorToken.cpp
index e745bc3889..e745bc3889 100644
--- a/cpp/src/qpid/broker/SelectorToken.cpp
+++ b/qpid/cpp/src/qpid/broker/SelectorToken.cpp
diff --git a/cpp/src/qpid/broker/SelectorToken.h b/qpid/cpp/src/qpid/broker/SelectorToken.h
index bd60b69dce..bd60b69dce 100644
--- a/cpp/src/qpid/broker/SelectorToken.h
+++ b/qpid/cpp/src/qpid/broker/SelectorToken.h
diff --git a/cpp/src/qpid/broker/SelectorValue.cpp b/qpid/cpp/src/qpid/broker/SelectorValue.cpp
index 0855fa91d0..0855fa91d0 100644
--- a/cpp/src/qpid/broker/SelectorValue.cpp
+++ b/qpid/cpp/src/qpid/broker/SelectorValue.cpp
diff --git a/cpp/src/qpid/broker/SelectorValue.h b/qpid/cpp/src/qpid/broker/SelectorValue.h
index 3a731fd000..3a731fd000 100644
--- a/cpp/src/qpid/broker/SelectorValue.h
+++ b/qpid/cpp/src/qpid/broker/SelectorValue.h
diff --git a/cpp/src/qpid/broker/SelfDestructQueue.cpp b/qpid/cpp/src/qpid/broker/SelfDestructQueue.cpp
index f8b26a62ad..f8b26a62ad 100644
--- a/cpp/src/qpid/broker/SelfDestructQueue.cpp
+++ b/qpid/cpp/src/qpid/broker/SelfDestructQueue.cpp
diff --git a/cpp/src/qpid/broker/SelfDestructQueue.h b/qpid/cpp/src/qpid/broker/SelfDestructQueue.h
index 110eb1dcf7..110eb1dcf7 100644
--- a/cpp/src/qpid/broker/SelfDestructQueue.h
+++ b/qpid/cpp/src/qpid/broker/SelfDestructQueue.h
diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/qpid/cpp/src/qpid/broker/SemanticState.cpp
index 8d7acda673..8d7acda673 100644
--- a/cpp/src/qpid/broker/SemanticState.cpp
+++ b/qpid/cpp/src/qpid/broker/SemanticState.cpp
diff --git a/cpp/src/qpid/broker/SemanticState.h b/qpid/cpp/src/qpid/broker/SemanticState.h
index 8fb796add7..8fb796add7 100644
--- a/cpp/src/qpid/broker/SemanticState.h
+++ b/qpid/cpp/src/qpid/broker/SemanticState.h
diff --git a/cpp/src/qpid/broker/SessionAdapter.cpp b/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
index 5b1a6aa267..5b1a6aa267 100644
--- a/cpp/src/qpid/broker/SessionAdapter.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
diff --git a/cpp/src/qpid/broker/SessionAdapter.h b/qpid/cpp/src/qpid/broker/SessionAdapter.h
index 6c09d68254..6c09d68254 100644
--- a/cpp/src/qpid/broker/SessionAdapter.h
+++ b/qpid/cpp/src/qpid/broker/SessionAdapter.h
diff --git a/cpp/src/qpid/broker/SessionContext.h b/qpid/cpp/src/qpid/broker/SessionContext.h
index 92a3dcecc2..92a3dcecc2 100644
--- a/cpp/src/qpid/broker/SessionContext.h
+++ b/qpid/cpp/src/qpid/broker/SessionContext.h
diff --git a/cpp/src/qpid/broker/SessionHandler.cpp b/qpid/cpp/src/qpid/broker/SessionHandler.cpp
index a8f5734af7..a8f5734af7 100644
--- a/cpp/src/qpid/broker/SessionHandler.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionHandler.cpp
diff --git a/cpp/src/qpid/broker/SessionHandler.h b/qpid/cpp/src/qpid/broker/SessionHandler.h
index cb81084014..cb81084014 100644
--- a/cpp/src/qpid/broker/SessionHandler.h
+++ b/qpid/cpp/src/qpid/broker/SessionHandler.h
diff --git a/cpp/src/qpid/broker/SessionManager.cpp b/qpid/cpp/src/qpid/broker/SessionManager.cpp
index 8cc58571af..8cc58571af 100644
--- a/cpp/src/qpid/broker/SessionManager.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionManager.cpp
diff --git a/cpp/src/qpid/broker/SessionManager.h b/qpid/cpp/src/qpid/broker/SessionManager.h
index db88e7ec10..db88e7ec10 100644
--- a/cpp/src/qpid/broker/SessionManager.h
+++ b/qpid/cpp/src/qpid/broker/SessionManager.h
diff --git a/cpp/src/qpid/broker/SessionOutputException.h b/qpid/cpp/src/qpid/broker/SessionOutputException.h
index 7c1c5de926..7c1c5de926 100644
--- a/cpp/src/qpid/broker/SessionOutputException.h
+++ b/qpid/cpp/src/qpid/broker/SessionOutputException.h
diff --git a/cpp/src/qpid/broker/SessionState.cpp b/qpid/cpp/src/qpid/broker/SessionState.cpp
index 0c343e5d90..0c343e5d90 100644
--- a/cpp/src/qpid/broker/SessionState.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionState.cpp
diff --git a/cpp/src/qpid/broker/SessionState.h b/qpid/cpp/src/qpid/broker/SessionState.h
index ca6d6bf530..ca6d6bf530 100644
--- a/cpp/src/qpid/broker/SessionState.h
+++ b/qpid/cpp/src/qpid/broker/SessionState.h
diff --git a/cpp/src/qpid/broker/SignalHandler.cpp b/qpid/cpp/src/qpid/broker/SignalHandler.cpp
index 16c141f21c..16c141f21c 100644
--- a/cpp/src/qpid/broker/SignalHandler.cpp
+++ b/qpid/cpp/src/qpid/broker/SignalHandler.cpp
diff --git a/cpp/src/qpid/broker/SignalHandler.h b/qpid/cpp/src/qpid/broker/SignalHandler.h
index 7bfa9ea630..7bfa9ea630 100644
--- a/cpp/src/qpid/broker/SignalHandler.h
+++ b/qpid/cpp/src/qpid/broker/SignalHandler.h
diff --git a/cpp/src/qpid/broker/System.cpp b/qpid/cpp/src/qpid/broker/System.cpp
index f3b6f96d0c..f3b6f96d0c 100644
--- a/cpp/src/qpid/broker/System.cpp
+++ b/qpid/cpp/src/qpid/broker/System.cpp
diff --git a/cpp/src/qpid/broker/System.h b/qpid/cpp/src/qpid/broker/System.h
index 4a4af275c4..4a4af275c4 100644
--- a/cpp/src/qpid/broker/System.h
+++ b/qpid/cpp/src/qpid/broker/System.h
diff --git a/cpp/src/qpid/broker/ThresholdAlerts.cpp b/qpid/cpp/src/qpid/broker/ThresholdAlerts.cpp
index afb9d9ff4e..afb9d9ff4e 100644
--- a/cpp/src/qpid/broker/ThresholdAlerts.cpp
+++ b/qpid/cpp/src/qpid/broker/ThresholdAlerts.cpp
diff --git a/cpp/src/qpid/broker/ThresholdAlerts.h b/qpid/cpp/src/qpid/broker/ThresholdAlerts.h
index a8ff5270f3..a8ff5270f3 100644
--- a/cpp/src/qpid/broker/ThresholdAlerts.h
+++ b/qpid/cpp/src/qpid/broker/ThresholdAlerts.h
diff --git a/cpp/src/qpid/broker/TopicExchange.cpp b/qpid/cpp/src/qpid/broker/TopicExchange.cpp
index 558c900a4f..558c900a4f 100644
--- a/cpp/src/qpid/broker/TopicExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/TopicExchange.cpp
diff --git a/cpp/src/qpid/broker/TopicExchange.h b/qpid/cpp/src/qpid/broker/TopicExchange.h
index d54f23a70d..d54f23a70d 100644
--- a/cpp/src/qpid/broker/TopicExchange.h
+++ b/qpid/cpp/src/qpid/broker/TopicExchange.h
diff --git a/cpp/src/qpid/broker/TopicKeyNode.h b/qpid/cpp/src/qpid/broker/TopicKeyNode.h
index 7671ed069d..7671ed069d 100644
--- a/cpp/src/qpid/broker/TopicKeyNode.h
+++ b/qpid/cpp/src/qpid/broker/TopicKeyNode.h
diff --git a/cpp/src/qpid/broker/TransactionObserver.h b/qpid/cpp/src/qpid/broker/TransactionObserver.h
index 5333d7b8d6..5333d7b8d6 100644
--- a/cpp/src/qpid/broker/TransactionObserver.h
+++ b/qpid/cpp/src/qpid/broker/TransactionObserver.h
diff --git a/cpp/src/qpid/broker/TransactionalStore.h b/qpid/cpp/src/qpid/broker/TransactionalStore.h
index 2a2bac0c51..2a2bac0c51 100644
--- a/cpp/src/qpid/broker/TransactionalStore.h
+++ b/qpid/cpp/src/qpid/broker/TransactionalStore.h
diff --git a/cpp/src/qpid/broker/TxAccept.cpp b/qpid/cpp/src/qpid/broker/TxAccept.cpp
index 496f8a2a42..496f8a2a42 100644
--- a/cpp/src/qpid/broker/TxAccept.cpp
+++ b/qpid/cpp/src/qpid/broker/TxAccept.cpp
diff --git a/cpp/src/qpid/broker/TxAccept.h b/qpid/cpp/src/qpid/broker/TxAccept.h
index 97e82ffa3f..97e82ffa3f 100644
--- a/cpp/src/qpid/broker/TxAccept.h
+++ b/qpid/cpp/src/qpid/broker/TxAccept.h
diff --git a/cpp/src/qpid/broker/TxBuffer.cpp b/qpid/cpp/src/qpid/broker/TxBuffer.cpp
index 6dc2f5c2f4..6dc2f5c2f4 100644
--- a/cpp/src/qpid/broker/TxBuffer.cpp
+++ b/qpid/cpp/src/qpid/broker/TxBuffer.cpp
diff --git a/cpp/src/qpid/broker/TxBuffer.h b/qpid/cpp/src/qpid/broker/TxBuffer.h
index 2478b78138..2478b78138 100644
--- a/cpp/src/qpid/broker/TxBuffer.h
+++ b/qpid/cpp/src/qpid/broker/TxBuffer.h
diff --git a/cpp/src/qpid/broker/TxOp.h b/qpid/cpp/src/qpid/broker/TxOp.h
index 00303eb27c..00303eb27c 100644
--- a/cpp/src/qpid/broker/TxOp.h
+++ b/qpid/cpp/src/qpid/broker/TxOp.h
diff --git a/cpp/src/qpid/broker/Vhost.cpp b/qpid/cpp/src/qpid/broker/Vhost.cpp
index 8fd88601f5..8fd88601f5 100644
--- a/cpp/src/qpid/broker/Vhost.cpp
+++ b/qpid/cpp/src/qpid/broker/Vhost.cpp
diff --git a/cpp/src/qpid/broker/Vhost.h b/qpid/cpp/src/qpid/broker/Vhost.h
index 06a11db8ea..06a11db8ea 100644
--- a/cpp/src/qpid/broker/Vhost.h
+++ b/qpid/cpp/src/qpid/broker/Vhost.h
diff --git a/cpp/src/qpid/broker/amqp/Authorise.cpp b/qpid/cpp/src/qpid/broker/amqp/Authorise.cpp
index 28dc3b25ac..28dc3b25ac 100644
--- a/cpp/src/qpid/broker/amqp/Authorise.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Authorise.cpp
diff --git a/cpp/src/qpid/broker/amqp/Authorise.h b/qpid/cpp/src/qpid/broker/amqp/Authorise.h
index 3714511177..3714511177 100644
--- a/cpp/src/qpid/broker/amqp/Authorise.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Authorise.h
diff --git a/cpp/src/qpid/broker/amqp/BrokerContext.cpp b/qpid/cpp/src/qpid/broker/amqp/BrokerContext.cpp
index 9f7ae17293..9f7ae17293 100644
--- a/cpp/src/qpid/broker/amqp/BrokerContext.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/BrokerContext.cpp
diff --git a/cpp/src/qpid/broker/amqp/BrokerContext.h b/qpid/cpp/src/qpid/broker/amqp/BrokerContext.h
index feb35e39c4..feb35e39c4 100644
--- a/cpp/src/qpid/broker/amqp/BrokerContext.h
+++ b/qpid/cpp/src/qpid/broker/amqp/BrokerContext.h
diff --git a/cpp/src/qpid/broker/amqp/Connection.cpp b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
index 514add7e44..514add7e44 100644
--- a/cpp/src/qpid/broker/amqp/Connection.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
diff --git a/cpp/src/qpid/broker/amqp/Connection.h b/qpid/cpp/src/qpid/broker/amqp/Connection.h
index 0a63045350..0a63045350 100644
--- a/cpp/src/qpid/broker/amqp/Connection.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Connection.h
diff --git a/cpp/src/qpid/broker/amqp/DataReader.cpp b/qpid/cpp/src/qpid/broker/amqp/DataReader.cpp
index ca3e6daabd..ca3e6daabd 100644
--- a/cpp/src/qpid/broker/amqp/DataReader.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/DataReader.cpp
diff --git a/cpp/src/qpid/broker/amqp/DataReader.h b/qpid/cpp/src/qpid/broker/amqp/DataReader.h
index 99ff77b3dd..99ff77b3dd 100644
--- a/cpp/src/qpid/broker/amqp/DataReader.h
+++ b/qpid/cpp/src/qpid/broker/amqp/DataReader.h
diff --git a/cpp/src/qpid/broker/amqp/Domain.cpp b/qpid/cpp/src/qpid/broker/amqp/Domain.cpp
index 500ec034f4..500ec034f4 100644
--- a/cpp/src/qpid/broker/amqp/Domain.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Domain.cpp
diff --git a/cpp/src/qpid/broker/amqp/Domain.h b/qpid/cpp/src/qpid/broker/amqp/Domain.h
index ce7c590cfb..ce7c590cfb 100644
--- a/cpp/src/qpid/broker/amqp/Domain.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Domain.h
diff --git a/cpp/src/qpid/broker/amqp/Exception.cpp b/qpid/cpp/src/qpid/broker/amqp/Exception.cpp
index 6b874aa272..6b874aa272 100644
--- a/cpp/src/qpid/broker/amqp/Exception.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Exception.cpp
diff --git a/cpp/src/qpid/broker/amqp/Exception.h b/qpid/cpp/src/qpid/broker/amqp/Exception.h
index c2fe470e55..c2fe470e55 100644
--- a/cpp/src/qpid/broker/amqp/Exception.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Exception.h
diff --git a/cpp/src/qpid/broker/amqp/Filter.cpp b/qpid/cpp/src/qpid/broker/amqp/Filter.cpp
index 7da0a88878..7da0a88878 100644
--- a/cpp/src/qpid/broker/amqp/Filter.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Filter.cpp
diff --git a/cpp/src/qpid/broker/amqp/Filter.h b/qpid/cpp/src/qpid/broker/amqp/Filter.h
index 3f395c9c19..3f395c9c19 100644
--- a/cpp/src/qpid/broker/amqp/Filter.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Filter.h
diff --git a/cpp/src/qpid/broker/amqp/Header.cpp b/qpid/cpp/src/qpid/broker/amqp/Header.cpp
index 038f0a90cc..038f0a90cc 100644
--- a/cpp/src/qpid/broker/amqp/Header.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Header.cpp
diff --git a/cpp/src/qpid/broker/amqp/Header.h b/qpid/cpp/src/qpid/broker/amqp/Header.h
index 6e4f763028..6e4f763028 100644
--- a/cpp/src/qpid/broker/amqp/Header.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Header.h
diff --git a/cpp/src/qpid/broker/amqp/Incoming.cpp b/qpid/cpp/src/qpid/broker/amqp/Incoming.cpp
index f54328bc2e..f54328bc2e 100644
--- a/cpp/src/qpid/broker/amqp/Incoming.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Incoming.cpp
diff --git a/cpp/src/qpid/broker/amqp/Incoming.h b/qpid/cpp/src/qpid/broker/amqp/Incoming.h
index 127f8cecf9..127f8cecf9 100644
--- a/cpp/src/qpid/broker/amqp/Incoming.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Incoming.h
diff --git a/cpp/src/qpid/broker/amqp/Interconnect.cpp b/qpid/cpp/src/qpid/broker/amqp/Interconnect.cpp
index c99166e481..c99166e481 100644
--- a/cpp/src/qpid/broker/amqp/Interconnect.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Interconnect.cpp
diff --git a/cpp/src/qpid/broker/amqp/Interconnect.h b/qpid/cpp/src/qpid/broker/amqp/Interconnect.h
index 86b80ad129..86b80ad129 100644
--- a/cpp/src/qpid/broker/amqp/Interconnect.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Interconnect.h
diff --git a/cpp/src/qpid/broker/amqp/Interconnects.cpp b/qpid/cpp/src/qpid/broker/amqp/Interconnects.cpp
index 8c1cb246ec..8c1cb246ec 100644
--- a/cpp/src/qpid/broker/amqp/Interconnects.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Interconnects.cpp
diff --git a/cpp/src/qpid/broker/amqp/Interconnects.h b/qpid/cpp/src/qpid/broker/amqp/Interconnects.h
index 030d6d6446..030d6d6446 100644
--- a/cpp/src/qpid/broker/amqp/Interconnects.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Interconnects.h
diff --git a/cpp/src/qpid/broker/amqp/ManagedConnection.cpp b/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.cpp
index de46165e1a..de46165e1a 100644
--- a/cpp/src/qpid/broker/amqp/ManagedConnection.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.cpp
diff --git a/cpp/src/qpid/broker/amqp/ManagedConnection.h b/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.h
index a9f90cefcf..a9f90cefcf 100644
--- a/cpp/src/qpid/broker/amqp/ManagedConnection.h
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.h
diff --git a/cpp/src/qpid/broker/amqp/ManagedIncomingLink.cpp b/qpid/cpp/src/qpid/broker/amqp/ManagedIncomingLink.cpp
index d6ba18077c..d6ba18077c 100644
--- a/cpp/src/qpid/broker/amqp/ManagedIncomingLink.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedIncomingLink.cpp
diff --git a/cpp/src/qpid/broker/amqp/ManagedIncomingLink.h b/qpid/cpp/src/qpid/broker/amqp/ManagedIncomingLink.h
index 5d4b1409d4..5d4b1409d4 100644
--- a/cpp/src/qpid/broker/amqp/ManagedIncomingLink.h
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedIncomingLink.h
diff --git a/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp b/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
index d60fbf4b59..d60fbf4b59 100644
--- a/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
diff --git a/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h b/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h
index f6415bff38..f6415bff38 100644
--- a/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h
diff --git a/cpp/src/qpid/broker/amqp/ManagedSession.cpp b/qpid/cpp/src/qpid/broker/amqp/ManagedSession.cpp
index dc003ebde7..dc003ebde7 100644
--- a/cpp/src/qpid/broker/amqp/ManagedSession.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedSession.cpp
diff --git a/cpp/src/qpid/broker/amqp/ManagedSession.h b/qpid/cpp/src/qpid/broker/amqp/ManagedSession.h
index 5264f3fd7e..5264f3fd7e 100644
--- a/cpp/src/qpid/broker/amqp/ManagedSession.h
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedSession.h
diff --git a/cpp/src/qpid/broker/amqp/Message.cpp b/qpid/cpp/src/qpid/broker/amqp/Message.cpp
index b1e6c58b00..b1e6c58b00 100644
--- a/cpp/src/qpid/broker/amqp/Message.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Message.cpp
diff --git a/cpp/src/qpid/broker/amqp/Message.h b/qpid/cpp/src/qpid/broker/amqp/Message.h
index 161b1dc6f1..161b1dc6f1 100644
--- a/cpp/src/qpid/broker/amqp/Message.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Message.h
diff --git a/cpp/src/qpid/broker/amqp/NodePolicy.cpp b/qpid/cpp/src/qpid/broker/amqp/NodePolicy.cpp
index 6cefe36f67..6cefe36f67 100644
--- a/cpp/src/qpid/broker/amqp/NodePolicy.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/NodePolicy.cpp
diff --git a/cpp/src/qpid/broker/amqp/NodePolicy.h b/qpid/cpp/src/qpid/broker/amqp/NodePolicy.h
index d6e987d85f..d6e987d85f 100644
--- a/cpp/src/qpid/broker/amqp/NodePolicy.h
+++ b/qpid/cpp/src/qpid/broker/amqp/NodePolicy.h
diff --git a/cpp/src/qpid/broker/amqp/NodeProperties.cpp b/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp
index 586ff6d439..586ff6d439 100644
--- a/cpp/src/qpid/broker/amqp/NodeProperties.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp
diff --git a/cpp/src/qpid/broker/amqp/NodeProperties.h b/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h
index e1f0d3e792..e1f0d3e792 100644
--- a/cpp/src/qpid/broker/amqp/NodeProperties.h
+++ b/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h
diff --git a/cpp/src/qpid/broker/amqp/Outgoing.cpp b/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp
index 7a0bc6c0d8..7a0bc6c0d8 100644
--- a/cpp/src/qpid/broker/amqp/Outgoing.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp
diff --git a/cpp/src/qpid/broker/amqp/Outgoing.h b/qpid/cpp/src/qpid/broker/amqp/Outgoing.h
index 48f041171c..48f041171c 100644
--- a/cpp/src/qpid/broker/amqp/Outgoing.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Outgoing.h
diff --git a/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp b/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp
index cd31ef7788..cd31ef7788 100644
--- a/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp
diff --git a/cpp/src/qpid/broker/amqp/Relay.cpp b/qpid/cpp/src/qpid/broker/amqp/Relay.cpp
index 83b3e64ee6..83b3e64ee6 100644
--- a/cpp/src/qpid/broker/amqp/Relay.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Relay.cpp
diff --git a/cpp/src/qpid/broker/amqp/Relay.h b/qpid/cpp/src/qpid/broker/amqp/Relay.h
index ef700690fd..ef700690fd 100644
--- a/cpp/src/qpid/broker/amqp/Relay.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Relay.h
diff --git a/cpp/src/qpid/broker/amqp/Sasl.cpp b/qpid/cpp/src/qpid/broker/amqp/Sasl.cpp
index 44ac33c896..44ac33c896 100644
--- a/cpp/src/qpid/broker/amqp/Sasl.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Sasl.cpp
diff --git a/cpp/src/qpid/broker/amqp/Sasl.h b/qpid/cpp/src/qpid/broker/amqp/Sasl.h
index 859cfb2d34..859cfb2d34 100644
--- a/cpp/src/qpid/broker/amqp/Sasl.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Sasl.h
diff --git a/cpp/src/qpid/broker/amqp/SaslClient.cpp b/qpid/cpp/src/qpid/broker/amqp/SaslClient.cpp
index 4317d18525..4317d18525 100644
--- a/cpp/src/qpid/broker/amqp/SaslClient.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/SaslClient.cpp
diff --git a/cpp/src/qpid/broker/amqp/SaslClient.h b/qpid/cpp/src/qpid/broker/amqp/SaslClient.h
index fca293879e..fca293879e 100644
--- a/cpp/src/qpid/broker/amqp/SaslClient.h
+++ b/qpid/cpp/src/qpid/broker/amqp/SaslClient.h
diff --git a/cpp/src/qpid/broker/amqp/Session.cpp b/qpid/cpp/src/qpid/broker/amqp/Session.cpp
index ab677faac3..ab677faac3 100644
--- a/cpp/src/qpid/broker/amqp/Session.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Session.cpp
diff --git a/cpp/src/qpid/broker/amqp/Session.h b/qpid/cpp/src/qpid/broker/amqp/Session.h
index a991ac9e3e..a991ac9e3e 100644
--- a/cpp/src/qpid/broker/amqp/Session.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Session.h
diff --git a/cpp/src/qpid/broker/amqp/Topic.cpp b/qpid/cpp/src/qpid/broker/amqp/Topic.cpp
index 4e3de21c74..4e3de21c74 100644
--- a/cpp/src/qpid/broker/amqp/Topic.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Topic.cpp
diff --git a/cpp/src/qpid/broker/amqp/Topic.h b/qpid/cpp/src/qpid/broker/amqp/Topic.h
index df16f4a738..df16f4a738 100644
--- a/cpp/src/qpid/broker/amqp/Topic.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Topic.h
diff --git a/cpp/src/qpid/broker/amqp/Translation.cpp b/qpid/cpp/src/qpid/broker/amqp/Translation.cpp
index 2196c8ff3d..2196c8ff3d 100644
--- a/cpp/src/qpid/broker/amqp/Translation.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Translation.cpp
diff --git a/cpp/src/qpid/broker/amqp/Translation.h b/qpid/cpp/src/qpid/broker/amqp/Translation.h
index 47cb69d0ba..47cb69d0ba 100644
--- a/cpp/src/qpid/broker/amqp/Translation.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Translation.h
diff --git a/cpp/src/qpid/broker/amqp_0_10/Connection.cpp b/qpid/cpp/src/qpid/broker/amqp_0_10/Connection.cpp
index b7bd8bc50d..b7bd8bc50d 100644
--- a/cpp/src/qpid/broker/amqp_0_10/Connection.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp_0_10/Connection.cpp
diff --git a/cpp/src/qpid/broker/amqp_0_10/Connection.h b/qpid/cpp/src/qpid/broker/amqp_0_10/Connection.h
index 39a24adc1b..39a24adc1b 100644
--- a/cpp/src/qpid/broker/amqp_0_10/Connection.h
+++ b/qpid/cpp/src/qpid/broker/amqp_0_10/Connection.h
diff --git a/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.cpp b/qpid/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.cpp
index 98dd70dceb..98dd70dceb 100644
--- a/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.cpp
diff --git a/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.h b/qpid/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.h
index b55f8577a4..b55f8577a4 100644
--- a/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.h
+++ b/qpid/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.h
diff --git a/cpp/src/qpid/broker/management-schema.xml b/qpid/cpp/src/qpid/broker/management-schema.xml
index bb15a244ba..bb15a244ba 100644
--- a/cpp/src/qpid/broker/management-schema.xml
+++ b/qpid/cpp/src/qpid/broker/management-schema.xml
diff --git a/cpp/src/qpid/broker/posix/BrokerDefaults.cpp b/qpid/cpp/src/qpid/broker/posix/BrokerDefaults.cpp
index 9e463fa32d..9e463fa32d 100644
--- a/cpp/src/qpid/broker/posix/BrokerDefaults.cpp
+++ b/qpid/cpp/src/qpid/broker/posix/BrokerDefaults.cpp
diff --git a/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp b/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
index f141e6ad1a..f141e6ad1a 100644
--- a/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
+++ b/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
diff --git a/cpp/src/qpid/broker/windows/BrokerDefaults.cpp b/qpid/cpp/src/qpid/broker/windows/BrokerDefaults.cpp
index b65440b5ad..b65440b5ad 100644
--- a/cpp/src/qpid/broker/windows/BrokerDefaults.cpp
+++ b/qpid/cpp/src/qpid/broker/windows/BrokerDefaults.cpp
diff --git a/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp b/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
index 814c236712..814c236712 100644
--- a/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
+++ b/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
diff --git a/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp b/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
index 1a34332138..1a34332138 100644
--- a/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
+++ b/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
diff --git a/cpp/src/qpid/client/AsyncSession.h b/qpid/cpp/src/qpid/client/AsyncSession.h
index d91efeb4f1..d91efeb4f1 100644
--- a/cpp/src/qpid/client/AsyncSession.h
+++ b/qpid/cpp/src/qpid/client/AsyncSession.h
diff --git a/cpp/src/qpid/client/Bounds.cpp b/qpid/cpp/src/qpid/client/Bounds.cpp
index cc2577d5fc..cc2577d5fc 100644
--- a/cpp/src/qpid/client/Bounds.cpp
+++ b/qpid/cpp/src/qpid/client/Bounds.cpp
diff --git a/cpp/src/qpid/client/Bounds.h b/qpid/cpp/src/qpid/client/Bounds.h
index 838fcb8368..838fcb8368 100644
--- a/cpp/src/qpid/client/Bounds.h
+++ b/qpid/cpp/src/qpid/client/Bounds.h
diff --git a/cpp/src/qpid/client/ChainableFrameHandler.h b/qpid/cpp/src/qpid/client/ChainableFrameHandler.h
index 29e16d53dc..29e16d53dc 100644
--- a/cpp/src/qpid/client/ChainableFrameHandler.h
+++ b/qpid/cpp/src/qpid/client/ChainableFrameHandler.h
diff --git a/cpp/src/qpid/client/ClientImportExport.h b/qpid/cpp/src/qpid/client/ClientImportExport.h
index 2a3a5a52e9..2a3a5a52e9 100644
--- a/cpp/src/qpid/client/ClientImportExport.h
+++ b/qpid/cpp/src/qpid/client/ClientImportExport.h
diff --git a/cpp/src/qpid/client/Completion.cpp b/qpid/cpp/src/qpid/client/Completion.cpp
index a97c8c3534..a97c8c3534 100644
--- a/cpp/src/qpid/client/Completion.cpp
+++ b/qpid/cpp/src/qpid/client/Completion.cpp
diff --git a/cpp/src/qpid/client/Completion.h b/qpid/cpp/src/qpid/client/Completion.h
index 9546db9258..9546db9258 100644
--- a/cpp/src/qpid/client/Completion.h
+++ b/qpid/cpp/src/qpid/client/Completion.h
diff --git a/cpp/src/qpid/client/CompletionImpl.h b/qpid/cpp/src/qpid/client/CompletionImpl.h
index f180708316..f180708316 100644
--- a/cpp/src/qpid/client/CompletionImpl.h
+++ b/qpid/cpp/src/qpid/client/CompletionImpl.h
diff --git a/cpp/src/qpid/client/Connection.cpp b/qpid/cpp/src/qpid/client/Connection.cpp
index 26e69233af..26e69233af 100644
--- a/cpp/src/qpid/client/Connection.cpp
+++ b/qpid/cpp/src/qpid/client/Connection.cpp
diff --git a/cpp/src/qpid/client/Connection.h b/qpid/cpp/src/qpid/client/Connection.h
index fb502cb40a..fb502cb40a 100644
--- a/cpp/src/qpid/client/Connection.h
+++ b/qpid/cpp/src/qpid/client/Connection.h
diff --git a/cpp/src/qpid/client/ConnectionAccess.h b/qpid/cpp/src/qpid/client/ConnectionAccess.h
index 3a763f692f..3a763f692f 100644
--- a/cpp/src/qpid/client/ConnectionAccess.h
+++ b/qpid/cpp/src/qpid/client/ConnectionAccess.h
diff --git a/cpp/src/qpid/client/ConnectionHandler.cpp b/qpid/cpp/src/qpid/client/ConnectionHandler.cpp
index 3ee3f1cd40..3ee3f1cd40 100644
--- a/cpp/src/qpid/client/ConnectionHandler.cpp
+++ b/qpid/cpp/src/qpid/client/ConnectionHandler.cpp
diff --git a/cpp/src/qpid/client/ConnectionHandler.h b/qpid/cpp/src/qpid/client/ConnectionHandler.h
index 6af2e987fb..6af2e987fb 100644
--- a/cpp/src/qpid/client/ConnectionHandler.h
+++ b/qpid/cpp/src/qpid/client/ConnectionHandler.h
diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
index ad8f21e7cd..ad8f21e7cd 100644
--- a/cpp/src/qpid/client/ConnectionImpl.cpp
+++ b/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
diff --git a/cpp/src/qpid/client/ConnectionImpl.h b/qpid/cpp/src/qpid/client/ConnectionImpl.h
index b07ce142fb..b07ce142fb 100644
--- a/cpp/src/qpid/client/ConnectionImpl.h
+++ b/qpid/cpp/src/qpid/client/ConnectionImpl.h
diff --git a/cpp/src/qpid/client/ConnectionSettings.cpp b/qpid/cpp/src/qpid/client/ConnectionSettings.cpp
index 20804572a4..20804572a4 100644
--- a/cpp/src/qpid/client/ConnectionSettings.cpp
+++ b/qpid/cpp/src/qpid/client/ConnectionSettings.cpp
diff --git a/cpp/src/qpid/client/ConnectionSettings.h b/qpid/cpp/src/qpid/client/ConnectionSettings.h
index a0c209badf..a0c209badf 100644
--- a/cpp/src/qpid/client/ConnectionSettings.h
+++ b/qpid/cpp/src/qpid/client/ConnectionSettings.h
diff --git a/cpp/src/qpid/client/Connector.cpp b/qpid/cpp/src/qpid/client/Connector.cpp
index c71dd9ecb6..c71dd9ecb6 100644
--- a/cpp/src/qpid/client/Connector.cpp
+++ b/qpid/cpp/src/qpid/client/Connector.cpp
diff --git a/cpp/src/qpid/client/Connector.h b/qpid/cpp/src/qpid/client/Connector.h
index 1b5e59e06d..1b5e59e06d 100644
--- a/cpp/src/qpid/client/Connector.h
+++ b/qpid/cpp/src/qpid/client/Connector.h
diff --git a/cpp/src/qpid/client/Demux.cpp b/qpid/cpp/src/qpid/client/Demux.cpp
index abc23c75df..abc23c75df 100644
--- a/cpp/src/qpid/client/Demux.cpp
+++ b/qpid/cpp/src/qpid/client/Demux.cpp
diff --git a/cpp/src/qpid/client/Demux.h b/qpid/cpp/src/qpid/client/Demux.h
index 31dc3f9c06..31dc3f9c06 100644
--- a/cpp/src/qpid/client/Demux.h
+++ b/qpid/cpp/src/qpid/client/Demux.h
diff --git a/cpp/src/qpid/client/Dispatcher.cpp b/qpid/cpp/src/qpid/client/Dispatcher.cpp
index a715c623bf..a715c623bf 100644
--- a/cpp/src/qpid/client/Dispatcher.cpp
+++ b/qpid/cpp/src/qpid/client/Dispatcher.cpp
diff --git a/cpp/src/qpid/client/Dispatcher.h b/qpid/cpp/src/qpid/client/Dispatcher.h
index 74fdb90103..74fdb90103 100644
--- a/cpp/src/qpid/client/Dispatcher.h
+++ b/qpid/cpp/src/qpid/client/Dispatcher.h
diff --git a/cpp/src/qpid/client/Execution.h b/qpid/cpp/src/qpid/client/Execution.h
index ad622af9c1..ad622af9c1 100644
--- a/cpp/src/qpid/client/Execution.h
+++ b/qpid/cpp/src/qpid/client/Execution.h
diff --git a/cpp/src/qpid/client/FailoverListener.cpp b/qpid/cpp/src/qpid/client/FailoverListener.cpp
index 1a69182c90..1a69182c90 100644
--- a/cpp/src/qpid/client/FailoverListener.cpp
+++ b/qpid/cpp/src/qpid/client/FailoverListener.cpp
diff --git a/cpp/src/qpid/client/FailoverListener.h b/qpid/cpp/src/qpid/client/FailoverListener.h
index 53c7c26211..53c7c26211 100644
--- a/cpp/src/qpid/client/FailoverListener.h
+++ b/qpid/cpp/src/qpid/client/FailoverListener.h
diff --git a/cpp/src/qpid/client/FailoverManager.cpp b/qpid/cpp/src/qpid/client/FailoverManager.cpp
index f27aeb5b52..f27aeb5b52 100644
--- a/cpp/src/qpid/client/FailoverManager.cpp
+++ b/qpid/cpp/src/qpid/client/FailoverManager.cpp
diff --git a/cpp/src/qpid/client/FailoverManager.h b/qpid/cpp/src/qpid/client/FailoverManager.h
index bc739fd0f5..bc739fd0f5 100644
--- a/cpp/src/qpid/client/FailoverManager.h
+++ b/qpid/cpp/src/qpid/client/FailoverManager.h
diff --git a/cpp/src/qpid/client/FlowControl.h b/qpid/cpp/src/qpid/client/FlowControl.h
index bff7071b3b..bff7071b3b 100644
--- a/cpp/src/qpid/client/FlowControl.h
+++ b/qpid/cpp/src/qpid/client/FlowControl.h
diff --git a/cpp/src/qpid/client/Future.cpp b/qpid/cpp/src/qpid/client/Future.cpp
index 740cd3df59..740cd3df59 100644
--- a/cpp/src/qpid/client/Future.cpp
+++ b/qpid/cpp/src/qpid/client/Future.cpp
diff --git a/cpp/src/qpid/client/Future.h b/qpid/cpp/src/qpid/client/Future.h
index 630a7e03c0..630a7e03c0 100644
--- a/cpp/src/qpid/client/Future.h
+++ b/qpid/cpp/src/qpid/client/Future.h
diff --git a/cpp/src/qpid/client/FutureCompletion.cpp b/qpid/cpp/src/qpid/client/FutureCompletion.cpp
index ccfb073855..ccfb073855 100644
--- a/cpp/src/qpid/client/FutureCompletion.cpp
+++ b/qpid/cpp/src/qpid/client/FutureCompletion.cpp
diff --git a/cpp/src/qpid/client/FutureCompletion.h b/qpid/cpp/src/qpid/client/FutureCompletion.h
index 0970f494b7..0970f494b7 100644
--- a/cpp/src/qpid/client/FutureCompletion.h
+++ b/qpid/cpp/src/qpid/client/FutureCompletion.h
diff --git a/cpp/src/qpid/client/FutureResult.cpp b/qpid/cpp/src/qpid/client/FutureResult.cpp
index 0237eb1464..0237eb1464 100644
--- a/cpp/src/qpid/client/FutureResult.cpp
+++ b/qpid/cpp/src/qpid/client/FutureResult.cpp
diff --git a/cpp/src/qpid/client/FutureResult.h b/qpid/cpp/src/qpid/client/FutureResult.h
index ead4929571..ead4929571 100644
--- a/cpp/src/qpid/client/FutureResult.h
+++ b/qpid/cpp/src/qpid/client/FutureResult.h
diff --git a/cpp/src/qpid/client/Handle.h b/qpid/cpp/src/qpid/client/Handle.h
index b8315481a9..b8315481a9 100644
--- a/cpp/src/qpid/client/Handle.h
+++ b/qpid/cpp/src/qpid/client/Handle.h
diff --git a/cpp/src/qpid/client/LoadPlugins.cpp b/qpid/cpp/src/qpid/client/LoadPlugins.cpp
index 65a43c4012..65a43c4012 100644
--- a/cpp/src/qpid/client/LoadPlugins.cpp
+++ b/qpid/cpp/src/qpid/client/LoadPlugins.cpp
diff --git a/cpp/src/qpid/client/LoadPlugins.h b/qpid/cpp/src/qpid/client/LoadPlugins.h
index 0b398f6831..0b398f6831 100644
--- a/cpp/src/qpid/client/LoadPlugins.h
+++ b/qpid/cpp/src/qpid/client/LoadPlugins.h
diff --git a/cpp/src/qpid/client/LocalQueue.cpp b/qpid/cpp/src/qpid/client/LocalQueue.cpp
index 0019adabaf..0019adabaf 100644
--- a/cpp/src/qpid/client/LocalQueue.cpp
+++ b/qpid/cpp/src/qpid/client/LocalQueue.cpp
diff --git a/cpp/src/qpid/client/LocalQueue.h b/qpid/cpp/src/qpid/client/LocalQueue.h
index 1a19a8499d..1a19a8499d 100644
--- a/cpp/src/qpid/client/LocalQueue.h
+++ b/qpid/cpp/src/qpid/client/LocalQueue.h
diff --git a/cpp/src/qpid/client/LocalQueueImpl.cpp b/qpid/cpp/src/qpid/client/LocalQueueImpl.cpp
index 8b191728f4..8b191728f4 100644
--- a/cpp/src/qpid/client/LocalQueueImpl.cpp
+++ b/qpid/cpp/src/qpid/client/LocalQueueImpl.cpp
diff --git a/cpp/src/qpid/client/LocalQueueImpl.h b/qpid/cpp/src/qpid/client/LocalQueueImpl.h
index 75b62cf203..75b62cf203 100644
--- a/cpp/src/qpid/client/LocalQueueImpl.h
+++ b/qpid/cpp/src/qpid/client/LocalQueueImpl.h
diff --git a/cpp/src/qpid/client/Message.cpp b/qpid/cpp/src/qpid/client/Message.cpp
index 00f911c57e..00f911c57e 100644
--- a/cpp/src/qpid/client/Message.cpp
+++ b/qpid/cpp/src/qpid/client/Message.cpp
diff --git a/cpp/src/qpid/client/Message.h b/qpid/cpp/src/qpid/client/Message.h
index ba50dda9ba..ba50dda9ba 100644
--- a/cpp/src/qpid/client/Message.h
+++ b/qpid/cpp/src/qpid/client/Message.h
diff --git a/cpp/src/qpid/client/MessageImpl.cpp b/qpid/cpp/src/qpid/client/MessageImpl.cpp
index 865c462b15..865c462b15 100644
--- a/cpp/src/qpid/client/MessageImpl.cpp
+++ b/qpid/cpp/src/qpid/client/MessageImpl.cpp
diff --git a/cpp/src/qpid/client/MessageImpl.h b/qpid/cpp/src/qpid/client/MessageImpl.h
index a64ddd20d8..a64ddd20d8 100644
--- a/cpp/src/qpid/client/MessageImpl.h
+++ b/qpid/cpp/src/qpid/client/MessageImpl.h
diff --git a/cpp/src/qpid/client/MessageListener.cpp b/qpid/cpp/src/qpid/client/MessageListener.cpp
index 0f2a71287c..0f2a71287c 100644
--- a/cpp/src/qpid/client/MessageListener.cpp
+++ b/qpid/cpp/src/qpid/client/MessageListener.cpp
diff --git a/cpp/src/qpid/client/MessageListener.h b/qpid/cpp/src/qpid/client/MessageListener.h
index 3ca2fa964a..3ca2fa964a 100644
--- a/cpp/src/qpid/client/MessageListener.h
+++ b/qpid/cpp/src/qpid/client/MessageListener.h
diff --git a/cpp/src/qpid/client/MessageReplayTracker.cpp b/qpid/cpp/src/qpid/client/MessageReplayTracker.cpp
index 3afaae74e8..3afaae74e8 100644
--- a/cpp/src/qpid/client/MessageReplayTracker.cpp
+++ b/qpid/cpp/src/qpid/client/MessageReplayTracker.cpp
diff --git a/cpp/src/qpid/client/MessageReplayTracker.h b/qpid/cpp/src/qpid/client/MessageReplayTracker.h
index 06a3f29c7d..06a3f29c7d 100644
--- a/cpp/src/qpid/client/MessageReplayTracker.h
+++ b/qpid/cpp/src/qpid/client/MessageReplayTracker.h
diff --git a/cpp/src/qpid/client/PrivateImplRef.h b/qpid/cpp/src/qpid/client/PrivateImplRef.h
index fa89b1bfa0..fa89b1bfa0 100644
--- a/cpp/src/qpid/client/PrivateImplRef.h
+++ b/qpid/cpp/src/qpid/client/PrivateImplRef.h
diff --git a/cpp/src/qpid/client/QueueOptions.cpp b/qpid/cpp/src/qpid/client/QueueOptions.cpp
index e589bd76cd..e589bd76cd 100644
--- a/cpp/src/qpid/client/QueueOptions.cpp
+++ b/qpid/cpp/src/qpid/client/QueueOptions.cpp
diff --git a/cpp/src/qpid/client/QueueOptions.h b/qpid/cpp/src/qpid/client/QueueOptions.h
index a2f30a50b5..a2f30a50b5 100644
--- a/cpp/src/qpid/client/QueueOptions.h
+++ b/qpid/cpp/src/qpid/client/QueueOptions.h
diff --git a/cpp/src/qpid/client/RdmaConnector.cpp b/qpid/cpp/src/qpid/client/RdmaConnector.cpp
index 1689b7aee2..1689b7aee2 100644
--- a/cpp/src/qpid/client/RdmaConnector.cpp
+++ b/qpid/cpp/src/qpid/client/RdmaConnector.cpp
diff --git a/cpp/src/qpid/client/Results.cpp b/qpid/cpp/src/qpid/client/Results.cpp
index 0de3e8bd04..0de3e8bd04 100644
--- a/cpp/src/qpid/client/Results.cpp
+++ b/qpid/cpp/src/qpid/client/Results.cpp
diff --git a/cpp/src/qpid/client/Results.h b/qpid/cpp/src/qpid/client/Results.h
index 4c49f6b05b..4c49f6b05b 100644
--- a/cpp/src/qpid/client/Results.h
+++ b/qpid/cpp/src/qpid/client/Results.h
diff --git a/cpp/src/qpid/client/Session.h b/qpid/cpp/src/qpid/client/Session.h
index c40549bbc5..c40549bbc5 100644
--- a/cpp/src/qpid/client/Session.h
+++ b/qpid/cpp/src/qpid/client/Session.h
diff --git a/cpp/src/qpid/client/SessionBase_0_10.cpp b/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp
index e114b7aacc..e114b7aacc 100644
--- a/cpp/src/qpid/client/SessionBase_0_10.cpp
+++ b/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp
diff --git a/cpp/src/qpid/client/SessionBase_0_10.h b/qpid/cpp/src/qpid/client/SessionBase_0_10.h
index 630987c11d..630987c11d 100644
--- a/cpp/src/qpid/client/SessionBase_0_10.h
+++ b/qpid/cpp/src/qpid/client/SessionBase_0_10.h
diff --git a/cpp/src/qpid/client/SessionBase_0_10Access.h b/qpid/cpp/src/qpid/client/SessionBase_0_10Access.h
index 4d08a7ceaf..4d08a7ceaf 100644
--- a/cpp/src/qpid/client/SessionBase_0_10Access.h
+++ b/qpid/cpp/src/qpid/client/SessionBase_0_10Access.h
diff --git a/cpp/src/qpid/client/SessionImpl.cpp b/qpid/cpp/src/qpid/client/SessionImpl.cpp
index 01e614e041..01e614e041 100644
--- a/cpp/src/qpid/client/SessionImpl.cpp
+++ b/qpid/cpp/src/qpid/client/SessionImpl.cpp
diff --git a/cpp/src/qpid/client/SessionImpl.h b/qpid/cpp/src/qpid/client/SessionImpl.h
index e6ea8e6b90..e6ea8e6b90 100644
--- a/cpp/src/qpid/client/SessionImpl.h
+++ b/qpid/cpp/src/qpid/client/SessionImpl.h
diff --git a/cpp/src/qpid/client/SslConnector.cpp b/qpid/cpp/src/qpid/client/SslConnector.cpp
index 2e8842f24b..2e8842f24b 100644
--- a/cpp/src/qpid/client/SslConnector.cpp
+++ b/qpid/cpp/src/qpid/client/SslConnector.cpp
diff --git a/cpp/src/qpid/client/StateManager.cpp b/qpid/cpp/src/qpid/client/StateManager.cpp
index 839d92abdc..839d92abdc 100644
--- a/cpp/src/qpid/client/StateManager.cpp
+++ b/qpid/cpp/src/qpid/client/StateManager.cpp
diff --git a/cpp/src/qpid/client/StateManager.h b/qpid/cpp/src/qpid/client/StateManager.h
index f06dbc493c..f06dbc493c 100644
--- a/cpp/src/qpid/client/StateManager.h
+++ b/qpid/cpp/src/qpid/client/StateManager.h
diff --git a/cpp/src/qpid/client/Subscription.cpp b/qpid/cpp/src/qpid/client/Subscription.cpp
index 988f372604..988f372604 100644
--- a/cpp/src/qpid/client/Subscription.cpp
+++ b/qpid/cpp/src/qpid/client/Subscription.cpp
diff --git a/cpp/src/qpid/client/Subscription.h b/qpid/cpp/src/qpid/client/Subscription.h
index bb9b98e8ff..bb9b98e8ff 100644
--- a/cpp/src/qpid/client/Subscription.h
+++ b/qpid/cpp/src/qpid/client/Subscription.h
diff --git a/cpp/src/qpid/client/SubscriptionImpl.cpp b/qpid/cpp/src/qpid/client/SubscriptionImpl.cpp
index a8a0b47d94..a8a0b47d94 100644
--- a/cpp/src/qpid/client/SubscriptionImpl.cpp
+++ b/qpid/cpp/src/qpid/client/SubscriptionImpl.cpp
diff --git a/cpp/src/qpid/client/SubscriptionImpl.h b/qpid/cpp/src/qpid/client/SubscriptionImpl.h
index da77213423..da77213423 100644
--- a/cpp/src/qpid/client/SubscriptionImpl.h
+++ b/qpid/cpp/src/qpid/client/SubscriptionImpl.h
diff --git a/cpp/src/qpid/client/SubscriptionManager.cpp b/qpid/cpp/src/qpid/client/SubscriptionManager.cpp
index 485361d577..485361d577 100644
--- a/cpp/src/qpid/client/SubscriptionManager.cpp
+++ b/qpid/cpp/src/qpid/client/SubscriptionManager.cpp
diff --git a/cpp/src/qpid/client/SubscriptionManager.h b/qpid/cpp/src/qpid/client/SubscriptionManager.h
index 404a9c6eb9..404a9c6eb9 100644
--- a/cpp/src/qpid/client/SubscriptionManager.h
+++ b/qpid/cpp/src/qpid/client/SubscriptionManager.h
diff --git a/cpp/src/qpid/client/SubscriptionManagerImpl.cpp b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp
index 44f81776c0..44f81776c0 100644
--- a/cpp/src/qpid/client/SubscriptionManagerImpl.cpp
+++ b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp
diff --git a/cpp/src/qpid/client/SubscriptionManagerImpl.h b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.h
index 64d922e387..64d922e387 100644
--- a/cpp/src/qpid/client/SubscriptionManagerImpl.h
+++ b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.h
diff --git a/cpp/src/qpid/client/SubscriptionSettings.h b/qpid/cpp/src/qpid/client/SubscriptionSettings.h
index bee39f6816..bee39f6816 100644
--- a/cpp/src/qpid/client/SubscriptionSettings.h
+++ b/qpid/cpp/src/qpid/client/SubscriptionSettings.h
diff --git a/cpp/src/qpid/client/TCPConnector.cpp b/qpid/cpp/src/qpid/client/TCPConnector.cpp
index 2bdeec5b47..2bdeec5b47 100644
--- a/cpp/src/qpid/client/TCPConnector.cpp
+++ b/qpid/cpp/src/qpid/client/TCPConnector.cpp
diff --git a/cpp/src/qpid/client/TCPConnector.h b/qpid/cpp/src/qpid/client/TCPConnector.h
index 20bd2fa5b8..20bd2fa5b8 100644
--- a/cpp/src/qpid/client/TCPConnector.h
+++ b/qpid/cpp/src/qpid/client/TCPConnector.h
diff --git a/cpp/src/qpid/client/TypedResult.h b/qpid/cpp/src/qpid/client/TypedResult.h
index 8e1a16580c..8e1a16580c 100644
--- a/cpp/src/qpid/client/TypedResult.h
+++ b/qpid/cpp/src/qpid/client/TypedResult.h
diff --git a/cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp b/qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp
index d2accddcd0..d2accddcd0 100644
--- a/cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/AcceptTracker.h b/qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.h
index 85209c3b87..85209c3b87 100644
--- a/cpp/src/qpid/client/amqp0_10/AcceptTracker.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.h
diff --git a/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
index 2effe4a115..2effe4a115 100644
--- a/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/AddressResolution.h b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.h
index fc8f1a1d18..fc8f1a1d18 100644
--- a/cpp/src/qpid/client/amqp0_10/AddressResolution.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.h
diff --git a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
index 9406c992fe..9406c992fe 100644
--- a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
index ae839dc690..ae839dc690 100644
--- a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
diff --git a/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp b/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
index abf88c89c5..abf88c89c5 100644
--- a/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/IncomingMessages.h b/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.h
index ff1fb37f3d..ff1fb37f3d 100644
--- a/cpp/src/qpid/client/amqp0_10/IncomingMessages.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.h
diff --git a/cpp/src/qpid/client/amqp0_10/MessageSink.h b/qpid/cpp/src/qpid/client/amqp0_10/MessageSink.h
index 8d87a3c7bb..8d87a3c7bb 100644
--- a/cpp/src/qpid/client/amqp0_10/MessageSink.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/MessageSink.h
diff --git a/cpp/src/qpid/client/amqp0_10/MessageSource.h b/qpid/cpp/src/qpid/client/amqp0_10/MessageSource.h
index 74f2732f59..74f2732f59 100644
--- a/cpp/src/qpid/client/amqp0_10/MessageSource.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/MessageSource.h
diff --git a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp b/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
index 834ba1fe9f..834ba1fe9f 100644
--- a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.h b/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.h
index 2191f45546..2191f45546 100644
--- a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.h
diff --git a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp b/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
index c356bc298b..c356bc298b 100644
--- a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h b/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
index 0d3366907b..0d3366907b 100644
--- a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
diff --git a/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp b/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
index 7001acaf99..7001acaf99 100644
--- a/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/SenderImpl.h b/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h
index ee250af2d4..ee250af2d4 100644
--- a/cpp/src/qpid/client/amqp0_10/SenderImpl.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h
diff --git a/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp b/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
index e43abb1a56..e43abb1a56 100644
--- a/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/SessionImpl.h b/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h
index c7dea77d18..c7dea77d18 100644
--- a/cpp/src/qpid/client/amqp0_10/SessionImpl.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h
diff --git a/cpp/src/qpid/client/windows/ClientDllMain.cpp b/qpid/cpp/src/qpid/client/windows/ClientDllMain.cpp
index d636489908..d636489908 100644
--- a/cpp/src/qpid/client/windows/ClientDllMain.cpp
+++ b/qpid/cpp/src/qpid/client/windows/ClientDllMain.cpp
diff --git a/cpp/src/qpid/client/windows/SaslFactory.cpp b/qpid/cpp/src/qpid/client/windows/SaslFactory.cpp
index 25cae05543..25cae05543 100644
--- a/cpp/src/qpid/client/windows/SaslFactory.cpp
+++ b/qpid/cpp/src/qpid/client/windows/SaslFactory.cpp
diff --git a/cpp/src/qpid/client/windows/SslConnector.cpp b/qpid/cpp/src/qpid/client/windows/SslConnector.cpp
index 4f4ef4f559..4f4ef4f559 100644
--- a/cpp/src/qpid/client/windows/SslConnector.cpp
+++ b/qpid/cpp/src/qpid/client/windows/SslConnector.cpp
diff --git a/cpp/src/qpid/framing/AMQBody.cpp b/qpid/cpp/src/qpid/framing/AMQBody.cpp
index b3eeae0615..b3eeae0615 100644
--- a/cpp/src/qpid/framing/AMQBody.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQBody.cpp
diff --git a/cpp/src/qpid/framing/AMQBody.h b/qpid/cpp/src/qpid/framing/AMQBody.h
index 56d1d250c1..56d1d250c1 100644
--- a/cpp/src/qpid/framing/AMQBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQBody.h
diff --git a/cpp/src/qpid/framing/AMQContentBody.cpp b/qpid/cpp/src/qpid/framing/AMQContentBody.cpp
index 18f6994f8f..18f6994f8f 100644
--- a/cpp/src/qpid/framing/AMQContentBody.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQContentBody.cpp
diff --git a/cpp/src/qpid/framing/AMQContentBody.h b/qpid/cpp/src/qpid/framing/AMQContentBody.h
index 148b293a2f..148b293a2f 100644
--- a/cpp/src/qpid/framing/AMQContentBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQContentBody.h
diff --git a/cpp/src/qpid/framing/AMQDataBlock.h b/qpid/cpp/src/qpid/framing/AMQDataBlock.h
index 7f0d0dc2b5..7f0d0dc2b5 100644
--- a/cpp/src/qpid/framing/AMQDataBlock.h
+++ b/qpid/cpp/src/qpid/framing/AMQDataBlock.h
diff --git a/cpp/src/qpid/framing/AMQFrame.cpp b/qpid/cpp/src/qpid/framing/AMQFrame.cpp
index 5e065d598c..5e065d598c 100644
--- a/cpp/src/qpid/framing/AMQFrame.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQFrame.cpp
diff --git a/cpp/src/qpid/framing/AMQFrame.h b/qpid/cpp/src/qpid/framing/AMQFrame.h
index 19675ce6ff..19675ce6ff 100644
--- a/cpp/src/qpid/framing/AMQFrame.h
+++ b/qpid/cpp/src/qpid/framing/AMQFrame.h
diff --git a/cpp/src/qpid/framing/AMQHeaderBody.cpp b/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp
index 14218f1b45..14218f1b45 100644
--- a/cpp/src/qpid/framing/AMQHeaderBody.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp
diff --git a/cpp/src/qpid/framing/AMQHeaderBody.h b/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
index 452154eb5c..452154eb5c 100644
--- a/cpp/src/qpid/framing/AMQHeaderBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
diff --git a/cpp/src/qpid/framing/AMQHeartbeatBody.cpp b/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
index 477616221c..477616221c 100644
--- a/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
diff --git a/cpp/src/qpid/framing/AMQHeartbeatBody.h b/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h
index 19ac2be013..19ac2be013 100644
--- a/cpp/src/qpid/framing/AMQHeartbeatBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h
diff --git a/cpp/src/qpid/framing/AMQMethodBody.cpp b/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp
index 594af4c6dc..594af4c6dc 100644
--- a/cpp/src/qpid/framing/AMQMethodBody.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp
diff --git a/cpp/src/qpid/framing/AMQMethodBody.h b/qpid/cpp/src/qpid/framing/AMQMethodBody.h
index c634180712..c634180712 100644
--- a/cpp/src/qpid/framing/AMQMethodBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQMethodBody.h
diff --git a/cpp/src/qpid/framing/AMQP_HighestVersion.h b/qpid/cpp/src/qpid/framing/AMQP_HighestVersion.h
index 42139c7937..42139c7937 100644
--- a/cpp/src/qpid/framing/AMQP_HighestVersion.h
+++ b/qpid/cpp/src/qpid/framing/AMQP_HighestVersion.h
diff --git a/cpp/src/qpid/framing/AccumulatedAck.cpp b/qpid/cpp/src/qpid/framing/AccumulatedAck.cpp
index 2e6433a82f..2e6433a82f 100644
--- a/cpp/src/qpid/framing/AccumulatedAck.cpp
+++ b/qpid/cpp/src/qpid/framing/AccumulatedAck.cpp
diff --git a/cpp/src/qpid/framing/AccumulatedAck.h b/qpid/cpp/src/qpid/framing/AccumulatedAck.h
index 8e241b4ba1..8e241b4ba1 100644
--- a/cpp/src/qpid/framing/AccumulatedAck.h
+++ b/qpid/cpp/src/qpid/framing/AccumulatedAck.h
diff --git a/cpp/src/qpid/framing/Array.cpp b/qpid/cpp/src/qpid/framing/Array.cpp
index 4b4338f931..4b4338f931 100644
--- a/cpp/src/qpid/framing/Array.cpp
+++ b/qpid/cpp/src/qpid/framing/Array.cpp
diff --git a/cpp/src/qpid/framing/Array.h b/qpid/cpp/src/qpid/framing/Array.h
index 6254f6271a..6254f6271a 100644
--- a/cpp/src/qpid/framing/Array.h
+++ b/qpid/cpp/src/qpid/framing/Array.h
diff --git a/cpp/src/qpid/framing/Blob.cpp b/qpid/cpp/src/qpid/framing/Blob.cpp
index 0c8316f3d2..0c8316f3d2 100644
--- a/cpp/src/qpid/framing/Blob.cpp
+++ b/qpid/cpp/src/qpid/framing/Blob.cpp
diff --git a/cpp/src/qpid/framing/Blob.h b/qpid/cpp/src/qpid/framing/Blob.h
index 9878d92fe4..9878d92fe4 100644
--- a/cpp/src/qpid/framing/Blob.h
+++ b/qpid/cpp/src/qpid/framing/Blob.h
diff --git a/cpp/src/qpid/framing/BodyFactory.h b/qpid/cpp/src/qpid/framing/BodyFactory.h
index 6a8d9b1988..6a8d9b1988 100644
--- a/cpp/src/qpid/framing/BodyFactory.h
+++ b/qpid/cpp/src/qpid/framing/BodyFactory.h
diff --git a/cpp/src/qpid/framing/Buffer.cpp b/qpid/cpp/src/qpid/framing/Buffer.cpp
index 1c4caef046..1c4caef046 100644
--- a/cpp/src/qpid/framing/Buffer.cpp
+++ b/qpid/cpp/src/qpid/framing/Buffer.cpp
diff --git a/cpp/src/qpid/framing/Buffer.h b/qpid/cpp/src/qpid/framing/Buffer.h
index 166b524e3c..166b524e3c 100644
--- a/cpp/src/qpid/framing/Buffer.h
+++ b/qpid/cpp/src/qpid/framing/Buffer.h
diff --git a/cpp/src/qpid/framing/BufferTypes.h b/qpid/cpp/src/qpid/framing/BufferTypes.h
index 4199755852..4199755852 100644
--- a/cpp/src/qpid/framing/BufferTypes.h
+++ b/qpid/cpp/src/qpid/framing/BufferTypes.h
diff --git a/cpp/src/qpid/framing/ChannelHandler.h b/qpid/cpp/src/qpid/framing/ChannelHandler.h
index ddab204578..ddab204578 100644
--- a/cpp/src/qpid/framing/ChannelHandler.h
+++ b/qpid/cpp/src/qpid/framing/ChannelHandler.h
diff --git a/cpp/src/qpid/framing/Endian.cpp b/qpid/cpp/src/qpid/framing/Endian.cpp
index 5acc3c459f..5acc3c459f 100644
--- a/cpp/src/qpid/framing/Endian.cpp
+++ b/qpid/cpp/src/qpid/framing/Endian.cpp
diff --git a/cpp/src/qpid/framing/Endian.h b/qpid/cpp/src/qpid/framing/Endian.h
index 077d5a3e9b..077d5a3e9b 100644
--- a/cpp/src/qpid/framing/Endian.h
+++ b/qpid/cpp/src/qpid/framing/Endian.h
diff --git a/cpp/src/qpid/framing/FieldTable.cpp b/qpid/cpp/src/qpid/framing/FieldTable.cpp
index cd38db1ee8..cd38db1ee8 100644
--- a/cpp/src/qpid/framing/FieldTable.cpp
+++ b/qpid/cpp/src/qpid/framing/FieldTable.cpp
diff --git a/cpp/src/qpid/framing/FieldTable.h b/qpid/cpp/src/qpid/framing/FieldTable.h
index 1986a72d10..1986a72d10 100644
--- a/cpp/src/qpid/framing/FieldTable.h
+++ b/qpid/cpp/src/qpid/framing/FieldTable.h
diff --git a/cpp/src/qpid/framing/FieldValue.cpp b/qpid/cpp/src/qpid/framing/FieldValue.cpp
index 4abed0f77f..4abed0f77f 100644
--- a/cpp/src/qpid/framing/FieldValue.cpp
+++ b/qpid/cpp/src/qpid/framing/FieldValue.cpp
diff --git a/cpp/src/qpid/framing/FieldValue.h b/qpid/cpp/src/qpid/framing/FieldValue.h
index 1adcb2fa07..1adcb2fa07 100644
--- a/cpp/src/qpid/framing/FieldValue.h
+++ b/qpid/cpp/src/qpid/framing/FieldValue.h
diff --git a/cpp/src/qpid/framing/FrameDecoder.cpp b/qpid/cpp/src/qpid/framing/FrameDecoder.cpp
index 90cbbd84a1..90cbbd84a1 100644
--- a/cpp/src/qpid/framing/FrameDecoder.cpp
+++ b/qpid/cpp/src/qpid/framing/FrameDecoder.cpp
diff --git a/cpp/src/qpid/framing/FrameDecoder.h b/qpid/cpp/src/qpid/framing/FrameDecoder.h
index 26bed6c447..26bed6c447 100644
--- a/cpp/src/qpid/framing/FrameDecoder.h
+++ b/qpid/cpp/src/qpid/framing/FrameDecoder.h
diff --git a/cpp/src/qpid/framing/FrameDefaultVisitor.h b/qpid/cpp/src/qpid/framing/FrameDefaultVisitor.h
index bd676960bf..bd676960bf 100644
--- a/cpp/src/qpid/framing/FrameDefaultVisitor.h
+++ b/qpid/cpp/src/qpid/framing/FrameDefaultVisitor.h
diff --git a/cpp/src/qpid/framing/FrameHandler.h b/qpid/cpp/src/qpid/framing/FrameHandler.h
index fa1fb535ef..fa1fb535ef 100644
--- a/cpp/src/qpid/framing/FrameHandler.h
+++ b/qpid/cpp/src/qpid/framing/FrameHandler.h
diff --git a/cpp/src/qpid/framing/FrameSet.cpp b/qpid/cpp/src/qpid/framing/FrameSet.cpp
index 9aee7b98b9..9aee7b98b9 100644
--- a/cpp/src/qpid/framing/FrameSet.cpp
+++ b/qpid/cpp/src/qpid/framing/FrameSet.cpp
diff --git a/cpp/src/qpid/framing/FrameSet.h b/qpid/cpp/src/qpid/framing/FrameSet.h
index 4188fd9b8c..4188fd9b8c 100644
--- a/cpp/src/qpid/framing/FrameSet.h
+++ b/qpid/cpp/src/qpid/framing/FrameSet.h
diff --git a/cpp/src/qpid/framing/Handler.h b/qpid/cpp/src/qpid/framing/Handler.h
index e0c0e59d09..e0c0e59d09 100644
--- a/cpp/src/qpid/framing/Handler.h
+++ b/qpid/cpp/src/qpid/framing/Handler.h
diff --git a/cpp/src/qpid/framing/HeaderProperties.h b/qpid/cpp/src/qpid/framing/HeaderProperties.h
index 8b1828daec..8b1828daec 100644
--- a/cpp/src/qpid/framing/HeaderProperties.h
+++ b/qpid/cpp/src/qpid/framing/HeaderProperties.h
diff --git a/cpp/src/qpid/framing/InitiationHandler.cpp b/qpid/cpp/src/qpid/framing/InitiationHandler.cpp
index 7ded505a47..7ded505a47 100644
--- a/cpp/src/qpid/framing/InitiationHandler.cpp
+++ b/qpid/cpp/src/qpid/framing/InitiationHandler.cpp
diff --git a/cpp/src/qpid/framing/InitiationHandler.h b/qpid/cpp/src/qpid/framing/InitiationHandler.h
index 5dfcc6b468..5dfcc6b468 100644
--- a/cpp/src/qpid/framing/InitiationHandler.h
+++ b/qpid/cpp/src/qpid/framing/InitiationHandler.h
diff --git a/cpp/src/qpid/framing/InputHandler.h b/qpid/cpp/src/qpid/framing/InputHandler.h
index 3efb23632a..3efb23632a 100644
--- a/cpp/src/qpid/framing/InputHandler.h
+++ b/qpid/cpp/src/qpid/framing/InputHandler.h
diff --git a/cpp/src/qpid/framing/Invoker.h b/qpid/cpp/src/qpid/framing/Invoker.h
index 4f1cf7c331..4f1cf7c331 100644
--- a/cpp/src/qpid/framing/Invoker.h
+++ b/qpid/cpp/src/qpid/framing/Invoker.h
diff --git a/cpp/src/qpid/framing/IsInSequenceSet.h b/qpid/cpp/src/qpid/framing/IsInSequenceSet.h
index fe10c1b9fa..fe10c1b9fa 100644
--- a/cpp/src/qpid/framing/IsInSequenceSet.h
+++ b/qpid/cpp/src/qpid/framing/IsInSequenceSet.h
diff --git a/cpp/src/qpid/framing/List.cpp b/qpid/cpp/src/qpid/framing/List.cpp
index d7ea172bac..d7ea172bac 100644
--- a/cpp/src/qpid/framing/List.cpp
+++ b/qpid/cpp/src/qpid/framing/List.cpp
diff --git a/cpp/src/qpid/framing/List.h b/qpid/cpp/src/qpid/framing/List.h
index 681445947c..681445947c 100644
--- a/cpp/src/qpid/framing/List.h
+++ b/qpid/cpp/src/qpid/framing/List.h
diff --git a/cpp/src/qpid/framing/MethodBodyFactory.h b/qpid/cpp/src/qpid/framing/MethodBodyFactory.h
index 88bc444795..88bc444795 100644
--- a/cpp/src/qpid/framing/MethodBodyFactory.h
+++ b/qpid/cpp/src/qpid/framing/MethodBodyFactory.h
diff --git a/cpp/src/qpid/framing/MethodContent.h b/qpid/cpp/src/qpid/framing/MethodContent.h
index 58c9143cfa..58c9143cfa 100644
--- a/cpp/src/qpid/framing/MethodContent.h
+++ b/qpid/cpp/src/qpid/framing/MethodContent.h
diff --git a/cpp/src/qpid/framing/ModelMethod.h b/qpid/cpp/src/qpid/framing/ModelMethod.h
index d99bd06cfa..d99bd06cfa 100644
--- a/cpp/src/qpid/framing/ModelMethod.h
+++ b/qpid/cpp/src/qpid/framing/ModelMethod.h
diff --git a/cpp/src/qpid/framing/ProtocolInitiation.cpp b/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
index 19cb3f0e3d..19cb3f0e3d 100644
--- a/cpp/src/qpid/framing/ProtocolInitiation.cpp
+++ b/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
diff --git a/cpp/src/qpid/framing/ProtocolInitiation.h b/qpid/cpp/src/qpid/framing/ProtocolInitiation.h
index c519bc2442..c519bc2442 100644
--- a/cpp/src/qpid/framing/ProtocolInitiation.h
+++ b/qpid/cpp/src/qpid/framing/ProtocolInitiation.h
diff --git a/cpp/src/qpid/framing/ProtocolVersion.cpp b/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp
index 174fc3e65b..174fc3e65b 100644
--- a/cpp/src/qpid/framing/ProtocolVersion.cpp
+++ b/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp
diff --git a/cpp/src/qpid/framing/ProtocolVersion.h b/qpid/cpp/src/qpid/framing/ProtocolVersion.h
index 309e543516..309e543516 100644
--- a/cpp/src/qpid/framing/ProtocolVersion.h
+++ b/qpid/cpp/src/qpid/framing/ProtocolVersion.h
diff --git a/cpp/src/qpid/framing/Proxy.cpp b/qpid/cpp/src/qpid/framing/Proxy.cpp
index 452fb13b01..452fb13b01 100644
--- a/cpp/src/qpid/framing/Proxy.cpp
+++ b/qpid/cpp/src/qpid/framing/Proxy.cpp
diff --git a/cpp/src/qpid/framing/Proxy.h b/qpid/cpp/src/qpid/framing/Proxy.h
index 0884e9cbd2..0884e9cbd2 100644
--- a/cpp/src/qpid/framing/Proxy.h
+++ b/qpid/cpp/src/qpid/framing/Proxy.h
diff --git a/cpp/src/qpid/framing/ResizableBuffer.h b/qpid/cpp/src/qpid/framing/ResizableBuffer.h
index 0abc5ba7f4..0abc5ba7f4 100644
--- a/cpp/src/qpid/framing/ResizableBuffer.h
+++ b/qpid/cpp/src/qpid/framing/ResizableBuffer.h
diff --git a/cpp/src/qpid/framing/SendContent.cpp b/qpid/cpp/src/qpid/framing/SendContent.cpp
index 04b60396da..04b60396da 100644
--- a/cpp/src/qpid/framing/SendContent.cpp
+++ b/qpid/cpp/src/qpid/framing/SendContent.cpp
diff --git a/cpp/src/qpid/framing/SendContent.h b/qpid/cpp/src/qpid/framing/SendContent.h
index 1c464b9c8b..1c464b9c8b 100644
--- a/cpp/src/qpid/framing/SendContent.h
+++ b/qpid/cpp/src/qpid/framing/SendContent.h
diff --git a/cpp/src/qpid/framing/SequenceNumber.cpp b/qpid/cpp/src/qpid/framing/SequenceNumber.cpp
index 41cb236629..41cb236629 100644
--- a/cpp/src/qpid/framing/SequenceNumber.cpp
+++ b/qpid/cpp/src/qpid/framing/SequenceNumber.cpp
diff --git a/cpp/src/qpid/framing/SequenceNumber.h b/qpid/cpp/src/qpid/framing/SequenceNumber.h
index 00fa2469c8..00fa2469c8 100644
--- a/cpp/src/qpid/framing/SequenceNumber.h
+++ b/qpid/cpp/src/qpid/framing/SequenceNumber.h
diff --git a/cpp/src/qpid/framing/SequenceNumberSet.cpp b/qpid/cpp/src/qpid/framing/SequenceNumberSet.cpp
index e9d78f3c17..e9d78f3c17 100644
--- a/cpp/src/qpid/framing/SequenceNumberSet.cpp
+++ b/qpid/cpp/src/qpid/framing/SequenceNumberSet.cpp
diff --git a/cpp/src/qpid/framing/SequenceNumberSet.h b/qpid/cpp/src/qpid/framing/SequenceNumberSet.h
index c8356c8163..c8356c8163 100644
--- a/cpp/src/qpid/framing/SequenceNumberSet.h
+++ b/qpid/cpp/src/qpid/framing/SequenceNumberSet.h
diff --git a/cpp/src/qpid/framing/SequenceSet.cpp b/qpid/cpp/src/qpid/framing/SequenceSet.cpp
index 72fcd8a9e2..72fcd8a9e2 100644
--- a/cpp/src/qpid/framing/SequenceSet.cpp
+++ b/qpid/cpp/src/qpid/framing/SequenceSet.cpp
diff --git a/cpp/src/qpid/framing/SequenceSet.h b/qpid/cpp/src/qpid/framing/SequenceSet.h
index 827c8999b3..827c8999b3 100644
--- a/cpp/src/qpid/framing/SequenceSet.h
+++ b/qpid/cpp/src/qpid/framing/SequenceSet.h
diff --git a/cpp/src/qpid/framing/StructHelper.h b/qpid/cpp/src/qpid/framing/StructHelper.h
index fe2fa64ce7..fe2fa64ce7 100644
--- a/cpp/src/qpid/framing/StructHelper.h
+++ b/qpid/cpp/src/qpid/framing/StructHelper.h
diff --git a/cpp/src/qpid/framing/TemplateVisitor.h b/qpid/cpp/src/qpid/framing/TemplateVisitor.h
index d6d59603f7..d6d59603f7 100644
--- a/cpp/src/qpid/framing/TemplateVisitor.h
+++ b/qpid/cpp/src/qpid/framing/TemplateVisitor.h
diff --git a/cpp/src/qpid/framing/TransferContent.cpp b/qpid/cpp/src/qpid/framing/TransferContent.cpp
index d997b24304..d997b24304 100644
--- a/cpp/src/qpid/framing/TransferContent.cpp
+++ b/qpid/cpp/src/qpid/framing/TransferContent.cpp
diff --git a/cpp/src/qpid/framing/TransferContent.h b/qpid/cpp/src/qpid/framing/TransferContent.h
index 32663d7020..32663d7020 100644
--- a/cpp/src/qpid/framing/TransferContent.h
+++ b/qpid/cpp/src/qpid/framing/TransferContent.h
diff --git a/cpp/src/qpid/framing/TypeFilter.h b/qpid/cpp/src/qpid/framing/TypeFilter.h
index d1c42de583..d1c42de583 100644
--- a/cpp/src/qpid/framing/TypeFilter.h
+++ b/qpid/cpp/src/qpid/framing/TypeFilter.h
diff --git a/cpp/src/qpid/framing/Uuid.cpp b/qpid/cpp/src/qpid/framing/Uuid.cpp
index e377c1172d..e377c1172d 100644
--- a/cpp/src/qpid/framing/Uuid.cpp
+++ b/qpid/cpp/src/qpid/framing/Uuid.cpp
diff --git a/cpp/src/qpid/framing/Uuid.h b/qpid/cpp/src/qpid/framing/Uuid.h
index e9e56ed7c9..e9e56ed7c9 100644
--- a/cpp/src/qpid/framing/Uuid.h
+++ b/qpid/cpp/src/qpid/framing/Uuid.h
diff --git a/cpp/src/qpid/framing/Visitor.h b/qpid/cpp/src/qpid/framing/Visitor.h
index 759ee65914..759ee65914 100644
--- a/cpp/src/qpid/framing/Visitor.h
+++ b/qpid/cpp/src/qpid/framing/Visitor.h
diff --git a/cpp/src/qpid/framing/amqp_framing.h b/qpid/cpp/src/qpid/framing/amqp_framing.h
index bad1c08a46..bad1c08a46 100644
--- a/cpp/src/qpid/framing/amqp_framing.h
+++ b/qpid/cpp/src/qpid/framing/amqp_framing.h
diff --git a/cpp/src/qpid/framing/amqp_types.h b/qpid/cpp/src/qpid/framing/amqp_types.h
index 2072a83904..2072a83904 100644
--- a/cpp/src/qpid/framing/amqp_types.h
+++ b/qpid/cpp/src/qpid/framing/amqp_types.h
diff --git a/cpp/src/qpid/framing/amqp_types_full.h b/qpid/cpp/src/qpid/framing/amqp_types_full.h
index c5d84dedea..c5d84dedea 100644
--- a/cpp/src/qpid/framing/amqp_types_full.h
+++ b/qpid/cpp/src/qpid/framing/amqp_types_full.h
diff --git a/cpp/src/qpid/framing/frame_functors.h b/qpid/cpp/src/qpid/framing/frame_functors.h
index d2064d6a57..d2064d6a57 100644
--- a/cpp/src/qpid/framing/frame_functors.h
+++ b/qpid/cpp/src/qpid/framing/frame_functors.h
diff --git a/cpp/src/qpid/framing/variant.h b/qpid/cpp/src/qpid/framing/variant.h
index 8e13063385..8e13063385 100644
--- a/cpp/src/qpid/framing/variant.h
+++ b/qpid/cpp/src/qpid/framing/variant.h
diff --git a/cpp/src/qpid/ha/AlternateExchangeSetter.h b/qpid/cpp/src/qpid/ha/AlternateExchangeSetter.h
index fbf4755e7d..fbf4755e7d 100644
--- a/cpp/src/qpid/ha/AlternateExchangeSetter.h
+++ b/qpid/cpp/src/qpid/ha/AlternateExchangeSetter.h
diff --git a/cpp/src/qpid/ha/Backup.cpp b/qpid/cpp/src/qpid/ha/Backup.cpp
index 503de3e351..93ad5ec381 100644
--- a/cpp/src/qpid/ha/Backup.cpp
+++ b/qpid/cpp/src/qpid/ha/Backup.cpp
@@ -100,8 +100,8 @@ Role* Backup::recover(Mutex::ScopedLock&) {
         // Reset membership before allowing backups to connect.
         backups = membership.otherBackups();
         membership.clear();
-        return new Primary(haBroker, backups);
     }
+    return new Primary(haBroker, backups);
 }
 
 Role* Backup::promote() {
diff --git a/cpp/src/qpid/ha/Backup.h b/qpid/cpp/src/qpid/ha/Backup.h
index 88194158ce..88194158ce 100644
--- a/cpp/src/qpid/ha/Backup.h
+++ b/qpid/cpp/src/qpid/ha/Backup.h
diff --git a/cpp/src/qpid/ha/BackupConnectionExcluder.h b/qpid/cpp/src/qpid/ha/BackupConnectionExcluder.h
index 5a67cde922..5a67cde922 100644
--- a/cpp/src/qpid/ha/BackupConnectionExcluder.h
+++ b/qpid/cpp/src/qpid/ha/BackupConnectionExcluder.h
diff --git a/cpp/src/qpid/ha/BrokerInfo.cpp b/qpid/cpp/src/qpid/ha/BrokerInfo.cpp
index a13451e179..a13451e179 100644
--- a/cpp/src/qpid/ha/BrokerInfo.cpp
+++ b/qpid/cpp/src/qpid/ha/BrokerInfo.cpp
diff --git a/cpp/src/qpid/ha/BrokerInfo.h b/qpid/cpp/src/qpid/ha/BrokerInfo.h
index 87d51f5113..87d51f5113 100644
--- a/cpp/src/qpid/ha/BrokerInfo.h
+++ b/qpid/cpp/src/qpid/ha/BrokerInfo.h
diff --git a/cpp/src/qpid/ha/BrokerReplicator.cpp b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
index 5e8da17a1b..1587b5b33f 100644
--- a/cpp/src/qpid/ha/BrokerReplicator.cpp
+++ b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
@@ -865,27 +865,14 @@ bool BrokerReplicator::hasBindings() { return false; }
 
 string BrokerReplicator::getType() const { return QPID_CONFIGURATION_REPLICATOR; }
 
-void BrokerReplicator::disconnectedExchange(boost::shared_ptr<Exchange> ex) {
+void BrokerReplicator::disconnectedQueueReplicator(boost::shared_ptr<Exchange> ex) {
     boost::shared_ptr<QueueReplicator> qr(boost::dynamic_pointer_cast<QueueReplicator>(ex));
-    // FIXME aconway 2013-11-01: move logic with releaseFromUse to QueueReplicator
     if (qr) {
         qr->disconnect();
         if (TxReplicator::isTxQueue(qr->getQueue()->getName())) {
             // Transactions are aborted on failover so clean up tx-queues
             deleteQueue(qr->getQueue()->getName());
         }
-        else if (qr->getQueue()->isAutoDelete() && qr->isSubscribed()) {
-            if (qr->getQueue()->getSettings().autoDeleteDelay) {
-                // Start the auto-delete timer
-                qr->getQueue()->releaseFromUse();
-                qr->getQueue()->scheduleAutoDelete();
-            }
-            else {
-                // Delete immediately. Don't purge, the primary is gone so we need
-                // to reroute the deleted messages.
-                deleteQueue(qr->getQueue()->getName(), false);
-            }
-        }
     }
 }
 
@@ -893,9 +880,9 @@ typedef vector<boost::shared_ptr<Exchange> > ExchangeVector;
 
 // Callback function for accumulating exchange candidates
 namespace {
-	void exchangeAccumulatorCallback(ExchangeVector& ev, const Exchange::shared_ptr& i) {
-		ev.push_back(i);
-	}
+void exchangeAccumulatorCallback(ExchangeVector& ev, const Exchange::shared_ptr& i) {
+    ev.push_back(i);
+}
 }
 
 // Called by ConnectionObserver::disconnected, disconnected from the network side.
@@ -907,7 +894,7 @@ void BrokerReplicator::disconnected() {
     ExchangeVector exs;
     exchanges.eachExchange(boost::bind(&exchangeAccumulatorCallback, boost::ref(exs), _1));
     for_each(exs.begin(), exs.end(),
-             boost::bind(&BrokerReplicator::disconnectedExchange, this, _1));
+             boost::bind(&BrokerReplicator::disconnectedQueueReplicator, this, _1));
 }
 
 void BrokerReplicator::setMembership(const Variant::List& brokers) {
diff --git a/cpp/src/qpid/ha/BrokerReplicator.h b/qpid/cpp/src/qpid/ha/BrokerReplicator.h
index e319ab1219..b3e3fe3223 100644
--- a/cpp/src/qpid/ha/BrokerReplicator.h
+++ b/qpid/cpp/src/qpid/ha/BrokerReplicator.h
@@ -148,7 +148,7 @@ class BrokerReplicator : public broker::Exchange,
     void deleteQueue(const std::string& name, bool purge=true);
     void deleteExchange(const std::string& name);
 
-    void disconnectedExchange(boost::shared_ptr<broker::Exchange>);
+    void disconnectedQueueReplicator(boost::shared_ptr<broker::Exchange>);
     void disconnected();
 
     void setMembership(const types::Variant::List&); // Set membership from list.
diff --git a/cpp/src/qpid/ha/ConnectionObserver.cpp b/qpid/cpp/src/qpid/ha/ConnectionObserver.cpp
index c9c5c2e576..c9c5c2e576 100644
--- a/cpp/src/qpid/ha/ConnectionObserver.cpp
+++ b/qpid/cpp/src/qpid/ha/ConnectionObserver.cpp
diff --git a/cpp/src/qpid/ha/ConnectionObserver.h b/qpid/cpp/src/qpid/ha/ConnectionObserver.h
index 079dc43be6..079dc43be6 100644
--- a/cpp/src/qpid/ha/ConnectionObserver.h
+++ b/qpid/cpp/src/qpid/ha/ConnectionObserver.h
diff --git a/cpp/src/qpid/ha/Event.cpp b/qpid/cpp/src/qpid/ha/Event.cpp
index ff336d0b2b..ff336d0b2b 100644
--- a/cpp/src/qpid/ha/Event.cpp
+++ b/qpid/cpp/src/qpid/ha/Event.cpp
diff --git a/cpp/src/qpid/ha/Event.h b/qpid/cpp/src/qpid/ha/Event.h
index 7b96e36f64..7b96e36f64 100644
--- a/cpp/src/qpid/ha/Event.h
+++ b/qpid/cpp/src/qpid/ha/Event.h
diff --git a/cpp/src/qpid/ha/FailoverExchange.cpp b/qpid/cpp/src/qpid/ha/FailoverExchange.cpp
index f1b87c63c8..f1b87c63c8 100644
--- a/cpp/src/qpid/ha/FailoverExchange.cpp
+++ b/qpid/cpp/src/qpid/ha/FailoverExchange.cpp
diff --git a/cpp/src/qpid/ha/FailoverExchange.h b/qpid/cpp/src/qpid/ha/FailoverExchange.h
index 5263bdfb03..5263bdfb03 100644
--- a/cpp/src/qpid/ha/FailoverExchange.h
+++ b/qpid/cpp/src/qpid/ha/FailoverExchange.h
diff --git a/cpp/src/qpid/ha/HaBroker.cpp b/qpid/cpp/src/qpid/ha/HaBroker.cpp
index 61561b3af6..61561b3af6 100644
--- a/cpp/src/qpid/ha/HaBroker.cpp
+++ b/qpid/cpp/src/qpid/ha/HaBroker.cpp
diff --git a/cpp/src/qpid/ha/HaBroker.h b/qpid/cpp/src/qpid/ha/HaBroker.h
index d10014846c..d10014846c 100644
--- a/cpp/src/qpid/ha/HaBroker.h
+++ b/qpid/cpp/src/qpid/ha/HaBroker.h
diff --git a/cpp/src/qpid/ha/HaPlugin.cpp b/qpid/cpp/src/qpid/ha/HaPlugin.cpp
index d26b466847..d26b466847 100644
--- a/cpp/src/qpid/ha/HaPlugin.cpp
+++ b/qpid/cpp/src/qpid/ha/HaPlugin.cpp
diff --git a/cpp/src/qpid/ha/IdSetter.h b/qpid/cpp/src/qpid/ha/IdSetter.h
index dc9fa90af9..dc9fa90af9 100644
--- a/cpp/src/qpid/ha/IdSetter.h
+++ b/qpid/cpp/src/qpid/ha/IdSetter.h
diff --git a/cpp/src/qpid/ha/Membership.cpp b/qpid/cpp/src/qpid/ha/Membership.cpp
index 2f8ef1da97..2f8ef1da97 100644
--- a/cpp/src/qpid/ha/Membership.cpp
+++ b/qpid/cpp/src/qpid/ha/Membership.cpp
diff --git a/cpp/src/qpid/ha/Membership.h b/qpid/cpp/src/qpid/ha/Membership.h
index 5b2b72e2fc..5b2b72e2fc 100644
--- a/cpp/src/qpid/ha/Membership.h
+++ b/qpid/cpp/src/qpid/ha/Membership.h
diff --git a/cpp/src/qpid/ha/Primary.cpp b/qpid/cpp/src/qpid/ha/Primary.cpp
index 0c1858ceb1..0c0fe983bb 100644
--- a/cpp/src/qpid/ha/Primary.cpp
+++ b/qpid/cpp/src/qpid/ha/Primary.cpp
@@ -94,7 +94,16 @@ Primary::Primary(HaBroker& hb, const BrokerInfo::Set& expect) :
     logPrefix("Primary: "), active(false),
     replicationTest(hb.getSettings().replicateDefault.get())
 {
+    // Note that at this point, we are still rejecting client connections.
+    // So we are safe from client interference while we set up the primary.
+
     hb.getMembership().setStatus(RECOVERING);
+
+    // Process all QueueReplicators, handles auto-delete queues.
+    QueueReplicator::Vector qrs;
+    QueueReplicator::copy(hb.getBroker().getExchanges(), qrs);
+    std::for_each(qrs.begin(), qrs.end(), boost::bind(&QueueReplicator::promoted, _1));
+
     broker::QueueRegistry& queues = hb.getBroker().getQueues();
     queues.eachQueue(boost::bind(&Primary::initializeQueue, this, _1));
     if (expect.empty()) {
diff --git a/cpp/src/qpid/ha/Primary.h b/qpid/cpp/src/qpid/ha/Primary.h
index 7f98f06fec..7f98f06fec 100644
--- a/cpp/src/qpid/ha/Primary.h
+++ b/qpid/cpp/src/qpid/ha/Primary.h
diff --git a/cpp/src/qpid/ha/PrimaryTxObserver.cpp b/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp
index a32334bcf9..eeb3312aec 100644
--- a/cpp/src/qpid/ha/PrimaryTxObserver.cpp
+++ b/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp
@@ -26,7 +26,6 @@
 #include "QueueGuard.h"
 #include "RemoteBackup.h"
 #include "ReplicatingSubscription.h"
-#include "QueueReplicator.h"
 
 #include "qpid/broker/Broker.h"
 #include "qpid/broker/Queue.h"
@@ -121,7 +120,7 @@ void PrimaryTxObserver::initialize() {
         throw InvalidArgumentException(
             QPID_MSG(logPrefix << "TX replication queue already exists."));
     txQueue = result.first;
-    txQueue->markInUse(true); // Prevent auto-delete till we are done.
+    txQueue->markInUse(); // Prevent auto-delete till we are done.
     txQueue->deliver(TxBackupsEvent(backups).message());
 
 }
@@ -228,7 +227,8 @@ void PrimaryTxObserver::end(Mutex::ScopedLock&) {
     // If there are no outstanding completions, break pointer cycle here.
     // Otherwise break it in cancel() when the remaining completions are done.
     if (incomplete.empty()) txBuffer = 0;
-    txQueue->releaseFromUse(true); // txQueue will auto-delete
+    txQueue->releaseFromUse();  // txQueue will auto-delete
+    txQueue->scheduleAutoDelete();
     txQueue.reset();
     try {
         broker.getExchanges().destroy(getExchangeName());
diff --git a/cpp/src/qpid/ha/PrimaryTxObserver.h b/qpid/cpp/src/qpid/ha/PrimaryTxObserver.h
index 31b2b84b0a..31b2b84b0a 100644
--- a/cpp/src/qpid/ha/PrimaryTxObserver.h
+++ b/qpid/cpp/src/qpid/ha/PrimaryTxObserver.h
diff --git a/cpp/src/qpid/ha/QueueGuard.cpp b/qpid/cpp/src/qpid/ha/QueueGuard.cpp
index d2792e5e17..d2792e5e17 100644
--- a/cpp/src/qpid/ha/QueueGuard.cpp
+++ b/qpid/cpp/src/qpid/ha/QueueGuard.cpp
diff --git a/cpp/src/qpid/ha/QueueGuard.h b/qpid/cpp/src/qpid/ha/QueueGuard.h
index 33967970eb..33967970eb 100644
--- a/cpp/src/qpid/ha/QueueGuard.h
+++ b/qpid/cpp/src/qpid/ha/QueueGuard.h
diff --git a/cpp/src/qpid/ha/QueueReplicator.cpp b/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
index cc6c8a3f30..50f2ececdb 100644
--- a/cpp/src/qpid/ha/QueueReplicator.cpp
+++ b/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
@@ -50,6 +50,7 @@ using namespace framing::execution;
 using namespace std;
 using std::exception;
 using sys::Mutex;
+using boost::shared_ptr;
 
 const std::string QueueReplicator::QPID_SYNC_FREQUENCY("qpid.sync_frequency");
 
@@ -61,6 +62,17 @@ bool QueueReplicator::isReplicatorName(const std::string& name) {
     return startsWith(name, QUEUE_REPLICATOR_PREFIX);
 }
 
+namespace {
+void pushIfQr(QueueReplicator::Vector& v, const shared_ptr<Exchange>& ex) {
+    shared_ptr<QueueReplicator> qr = boost::dynamic_pointer_cast<QueueReplicator>(ex);
+    if (qr) v.push_back(qr);
+}
+}
+
+void QueueReplicator::copy(ExchangeRegistry& registry, Vector& result) {
+    registry.eachExchange(boost::bind(&pushIfQr, boost::ref(result), _1));
+}
+
 class QueueReplicator::ErrorListener : public SessionHandler::ErrorListener {
   public:
     ErrorListener(const boost::shared_ptr<QueueReplicator>& qr)
@@ -116,6 +128,7 @@ QueueReplicator::QueueReplicator(HaBroker& hb,
     framing::FieldTable args = getArgs();
     args.setString(QPID_REPLICATE, printable(NONE).str());
     setArgs(args);
+    // Don't allow backup queues to auto-delete, primary decides when to delete.
     if (q->isAutoDelete()) q->markInUse();
 
     dispatch[DequeueEvent::KEY] =
@@ -306,5 +319,16 @@ bool QueueReplicator::isBound(boost::shared_ptr<Queue>, const std::string* const
 bool QueueReplicator::hasBindings() { return false; }
 std::string QueueReplicator::getType() const { return ReplicatingSubscription::QPID_QUEUE_REPLICATOR; }
 
+void QueueReplicator::promoted() {
+    // Promoted to primary, deal with auto-delete now.
+    if (queue && queue->isAutoDelete() && subscribed) {
+        // Make a temporary shared_ptr to prevent premature deletion of queue.
+        // Otherwise scheduleAutoDelete can call this->destroy, which resets this->queue
+        // which could delete the queue while it's still running it's destroyed logic.
+        boost::shared_ptr<Queue> q(queue);
+        q->releaseFromUse();
+        q->scheduleAutoDelete();
+    }
+}
 
 }} // namespace qpid::broker
diff --git a/cpp/src/qpid/ha/QueueReplicator.h b/qpid/cpp/src/qpid/ha/QueueReplicator.h
index 6fd140fde3..8938285fe3 100644
--- a/cpp/src/qpid/ha/QueueReplicator.h
+++ b/qpid/cpp/src/qpid/ha/QueueReplicator.h
@@ -38,6 +38,7 @@ class Queue;
 class QueueRegistry;
 class SessionHandler;
 class Deliverable;
+class ExchangeRegistry;
 }
 
 namespace ha {
@@ -59,9 +60,12 @@ class QueueReplicator : public broker::Exchange,
   public:
     static const std::string QPID_SYNC_FREQUENCY;
     static const std::string REPLICATOR_PREFIX;
+    typedef std::vector<boost::shared_ptr<QueueReplicator> > Vector;
 
     static std::string replicatorName(const std::string& queueName);
     static bool isReplicatorName(const std::string&);
+    /*** Copy QueueReplicators from the registry */
+    static void copy(broker::ExchangeRegistry&, Vector& result);
 
     QueueReplicator(HaBroker&,
                     boost::shared_ptr<broker::Queue> q,
@@ -78,7 +82,6 @@ class QueueReplicator : public broker::Exchange,
 
     // Set if the queue has ever been subscribed to, used for auto-delete cleanup.
     void setSubscribed() { subscribed = true; }
-    bool isSubscribed() { return subscribed; }
 
     boost::shared_ptr<broker::Queue> getQueue() const { return queue; }
 
@@ -90,6 +93,8 @@ class QueueReplicator : public broker::Exchange,
     bool isBound(boost::shared_ptr<broker::Queue>, const std::string* const, const framing::FieldTable* const);
     bool hasBindings();
 
+    void promoted();
+
   protected:
     typedef boost::function<void(const std::string&, sys::Mutex::ScopedLock&)> DispatchFn;
     typedef qpid::sys::unordered_map<std::string, DispatchFn> DispatchMap;
diff --git a/cpp/src/qpid/ha/QueueSnapshot.h b/qpid/cpp/src/qpid/ha/QueueSnapshot.h
index 5b1054d934..5b1054d934 100644
--- a/cpp/src/qpid/ha/QueueSnapshot.h
+++ b/qpid/cpp/src/qpid/ha/QueueSnapshot.h
diff --git a/cpp/src/qpid/ha/QueueSnapshots.h b/qpid/cpp/src/qpid/ha/QueueSnapshots.h
index 8711f9234c..8711f9234c 100644
--- a/cpp/src/qpid/ha/QueueSnapshots.h
+++ b/qpid/cpp/src/qpid/ha/QueueSnapshots.h
diff --git a/cpp/src/qpid/ha/README.md b/qpid/cpp/src/qpid/ha/README.md
index 0ec4d30750..0ec4d30750 100644
--- a/cpp/src/qpid/ha/README.md
+++ b/qpid/cpp/src/qpid/ha/README.md
diff --git a/cpp/src/qpid/ha/RemoteBackup.cpp b/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
index 0993c6ea39..0993c6ea39 100644
--- a/cpp/src/qpid/ha/RemoteBackup.cpp
+++ b/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
diff --git a/cpp/src/qpid/ha/RemoteBackup.h b/qpid/cpp/src/qpid/ha/RemoteBackup.h
index b9e2e1a496..b9e2e1a496 100644
--- a/cpp/src/qpid/ha/RemoteBackup.h
+++ b/qpid/cpp/src/qpid/ha/RemoteBackup.h
diff --git a/cpp/src/qpid/ha/ReplicatingSubscription.cpp b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
index d0b93da85f..95215e1e59 100644
--- a/cpp/src/qpid/ha/ReplicatingSubscription.cpp
+++ b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
@@ -22,7 +22,6 @@
 #include "Event.h"
 #include "IdSetter.h"
 #include "QueueGuard.h"
-#include "QueueReplicator.h"
 #include "QueueSnapshots.h"
 #include "ReplicatingSubscription.h"
 #include "TxReplicatingSubscription.h"
diff --git a/cpp/src/qpid/ha/ReplicatingSubscription.h b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h
index 0df6f0b411..0df6f0b411 100644
--- a/cpp/src/qpid/ha/ReplicatingSubscription.h
+++ b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h
diff --git a/cpp/src/qpid/ha/ReplicationTest.cpp b/qpid/cpp/src/qpid/ha/ReplicationTest.cpp
index 647523ef2c..647523ef2c 100644
--- a/cpp/src/qpid/ha/ReplicationTest.cpp
+++ b/qpid/cpp/src/qpid/ha/ReplicationTest.cpp
diff --git a/cpp/src/qpid/ha/ReplicationTest.h b/qpid/cpp/src/qpid/ha/ReplicationTest.h
index c157385ce6..c157385ce6 100644
--- a/cpp/src/qpid/ha/ReplicationTest.h
+++ b/qpid/cpp/src/qpid/ha/ReplicationTest.h
diff --git a/cpp/src/qpid/ha/Role.h b/qpid/cpp/src/qpid/ha/Role.h
index 9986fde7e1..9986fde7e1 100644
--- a/cpp/src/qpid/ha/Role.h
+++ b/qpid/cpp/src/qpid/ha/Role.h
diff --git a/cpp/src/qpid/ha/Settings.h b/qpid/cpp/src/qpid/ha/Settings.h
index 9d5a5e6ae0..9d5a5e6ae0 100644
--- a/cpp/src/qpid/ha/Settings.h
+++ b/qpid/cpp/src/qpid/ha/Settings.h
diff --git a/cpp/src/qpid/ha/StandAlone.h b/qpid/cpp/src/qpid/ha/StandAlone.h
index d052996d40..d052996d40 100644
--- a/cpp/src/qpid/ha/StandAlone.h
+++ b/qpid/cpp/src/qpid/ha/StandAlone.h
diff --git a/cpp/src/qpid/ha/StatusCheck.cpp b/qpid/cpp/src/qpid/ha/StatusCheck.cpp
index fdc256d5a2..fdc256d5a2 100644
--- a/cpp/src/qpid/ha/StatusCheck.cpp
+++ b/qpid/cpp/src/qpid/ha/StatusCheck.cpp
diff --git a/cpp/src/qpid/ha/StatusCheck.h b/qpid/cpp/src/qpid/ha/StatusCheck.h
index 8896969f55..8896969f55 100644
--- a/cpp/src/qpid/ha/StatusCheck.h
+++ b/qpid/cpp/src/qpid/ha/StatusCheck.h
diff --git a/cpp/src/qpid/ha/TxReplicatingSubscription.cpp b/qpid/cpp/src/qpid/ha/TxReplicatingSubscription.cpp
index 15b33fe89d..15b33fe89d 100644
--- a/cpp/src/qpid/ha/TxReplicatingSubscription.cpp
+++ b/qpid/cpp/src/qpid/ha/TxReplicatingSubscription.cpp
diff --git a/cpp/src/qpid/ha/TxReplicatingSubscription.h b/qpid/cpp/src/qpid/ha/TxReplicatingSubscription.h
index a363d262a0..a363d262a0 100644
--- a/cpp/src/qpid/ha/TxReplicatingSubscription.h
+++ b/qpid/cpp/src/qpid/ha/TxReplicatingSubscription.h
diff --git a/cpp/src/qpid/ha/TxReplicator.cpp b/qpid/cpp/src/qpid/ha/TxReplicator.cpp
index 9ae9dcce36..9ae9dcce36 100644
--- a/cpp/src/qpid/ha/TxReplicator.cpp
+++ b/qpid/cpp/src/qpid/ha/TxReplicator.cpp
diff --git a/cpp/src/qpid/ha/TxReplicator.h b/qpid/cpp/src/qpid/ha/TxReplicator.h
index 9d80ecb8d3..9d80ecb8d3 100644
--- a/cpp/src/qpid/ha/TxReplicator.h
+++ b/qpid/cpp/src/qpid/ha/TxReplicator.h
diff --git a/cpp/src/qpid/ha/hash.h b/qpid/cpp/src/qpid/ha/hash.h
index 8a7f3c00fe..8a7f3c00fe 100644
--- a/cpp/src/qpid/ha/hash.h
+++ b/qpid/cpp/src/qpid/ha/hash.h
diff --git a/cpp/src/qpid/ha/management-schema.xml b/qpid/cpp/src/qpid/ha/management-schema.xml
index 3da482e732..3da482e732 100644
--- a/cpp/src/qpid/ha/management-schema.xml
+++ b/qpid/cpp/src/qpid/ha/management-schema.xml
diff --git a/cpp/src/qpid/ha/types.cpp b/qpid/cpp/src/qpid/ha/types.cpp
index c02ae33470..c02ae33470 100644
--- a/cpp/src/qpid/ha/types.cpp
+++ b/qpid/cpp/src/qpid/ha/types.cpp
diff --git a/cpp/src/qpid/ha/types.h b/qpid/cpp/src/qpid/ha/types.h
index 92157d411b..92157d411b 100644
--- a/cpp/src/qpid/ha/types.h
+++ b/qpid/cpp/src/qpid/ha/types.h
diff --git a/cpp/src/qpid/legacystore/BindingDbt.cpp b/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp
index a48c156e71..a48c156e71 100644
--- a/cpp/src/qpid/legacystore/BindingDbt.cpp
+++ b/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp
diff --git a/cpp/src/qpid/legacystore/BindingDbt.h b/qpid/cpp/src/qpid/legacystore/BindingDbt.h
index 63c7cd144e..63c7cd144e 100644
--- a/cpp/src/qpid/legacystore/BindingDbt.h
+++ b/qpid/cpp/src/qpid/legacystore/BindingDbt.h
diff --git a/cpp/src/qpid/legacystore/BufferValue.cpp b/qpid/cpp/src/qpid/legacystore/BufferValue.cpp
index fb2c471cd7..fb2c471cd7 100644
--- a/cpp/src/qpid/legacystore/BufferValue.cpp
+++ b/qpid/cpp/src/qpid/legacystore/BufferValue.cpp
diff --git a/cpp/src/qpid/legacystore/BufferValue.h b/qpid/cpp/src/qpid/legacystore/BufferValue.h
index 527fbcf577..527fbcf577 100644
--- a/cpp/src/qpid/legacystore/BufferValue.h
+++ b/qpid/cpp/src/qpid/legacystore/BufferValue.h
diff --git a/cpp/src/qpid/legacystore/Cursor.h b/qpid/cpp/src/qpid/legacystore/Cursor.h
index 0c869c29a0..0c869c29a0 100644
--- a/cpp/src/qpid/legacystore/Cursor.h
+++ b/qpid/cpp/src/qpid/legacystore/Cursor.h
diff --git a/cpp/src/qpid/legacystore/DataTokenImpl.cpp b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp
index 796d4c02f0..796d4c02f0 100644
--- a/cpp/src/qpid/legacystore/DataTokenImpl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp
diff --git a/cpp/src/qpid/legacystore/DataTokenImpl.h b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h
index e01d471e1b..e01d471e1b 100644
--- a/cpp/src/qpid/legacystore/DataTokenImpl.h
+++ b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h
diff --git a/cpp/src/qpid/legacystore/IdDbt.cpp b/qpid/cpp/src/qpid/legacystore/IdDbt.cpp
index d9edaf80e6..d9edaf80e6 100644
--- a/cpp/src/qpid/legacystore/IdDbt.cpp
+++ b/qpid/cpp/src/qpid/legacystore/IdDbt.cpp
diff --git a/cpp/src/qpid/legacystore/IdDbt.h b/qpid/cpp/src/qpid/legacystore/IdDbt.h
index ecf5922963..ecf5922963 100644
--- a/cpp/src/qpid/legacystore/IdDbt.h
+++ b/qpid/cpp/src/qpid/legacystore/IdDbt.h
diff --git a/cpp/src/qpid/legacystore/IdSequence.cpp b/qpid/cpp/src/qpid/legacystore/IdSequence.cpp
index 975b1107e7..975b1107e7 100644
--- a/cpp/src/qpid/legacystore/IdSequence.cpp
+++ b/qpid/cpp/src/qpid/legacystore/IdSequence.cpp
diff --git a/cpp/src/qpid/legacystore/IdSequence.h b/qpid/cpp/src/qpid/legacystore/IdSequence.h
index 11d7ff61ca..11d7ff61ca 100644
--- a/cpp/src/qpid/legacystore/IdSequence.h
+++ b/qpid/cpp/src/qpid/legacystore/IdSequence.h
diff --git a/cpp/src/qpid/legacystore/JournalImpl.cpp b/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp
index ba3f2aecae..ba3f2aecae 100644
--- a/cpp/src/qpid/legacystore/JournalImpl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp
diff --git a/cpp/src/qpid/legacystore/JournalImpl.h b/qpid/cpp/src/qpid/legacystore/JournalImpl.h
index 7227b2ffd4..7227b2ffd4 100644
--- a/cpp/src/qpid/legacystore/JournalImpl.h
+++ b/qpid/cpp/src/qpid/legacystore/JournalImpl.h
diff --git a/cpp/src/qpid/legacystore/MessageStoreImpl.cpp b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
index 7863940534..7863940534 100644
--- a/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
diff --git a/cpp/src/qpid/legacystore/MessageStoreImpl.h b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
index 68aceedfbb..68aceedfbb 100644
--- a/cpp/src/qpid/legacystore/MessageStoreImpl.h
+++ b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
diff --git a/cpp/src/qpid/legacystore/PreparedTransaction.cpp b/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp
index 50b81e2824..50b81e2824 100644
--- a/cpp/src/qpid/legacystore/PreparedTransaction.cpp
+++ b/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp
diff --git a/cpp/src/qpid/legacystore/PreparedTransaction.h b/qpid/cpp/src/qpid/legacystore/PreparedTransaction.h
index c5f7b9458a..c5f7b9458a 100644
--- a/cpp/src/qpid/legacystore/PreparedTransaction.h
+++ b/qpid/cpp/src/qpid/legacystore/PreparedTransaction.h
diff --git a/cpp/src/qpid/legacystore/StoreException.h b/qpid/cpp/src/qpid/legacystore/StoreException.h
index 6624aafd5a..6624aafd5a 100644
--- a/cpp/src/qpid/legacystore/StoreException.h
+++ b/qpid/cpp/src/qpid/legacystore/StoreException.h
diff --git a/cpp/src/qpid/legacystore/StorePlugin.cpp b/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp
index f9b77ce02c..f9b77ce02c 100644
--- a/cpp/src/qpid/legacystore/StorePlugin.cpp
+++ b/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp
diff --git a/cpp/src/qpid/legacystore/TxnCtxt.cpp b/qpid/cpp/src/qpid/legacystore/TxnCtxt.cpp
index 1db41f4c70..1db41f4c70 100644
--- a/cpp/src/qpid/legacystore/TxnCtxt.cpp
+++ b/qpid/cpp/src/qpid/legacystore/TxnCtxt.cpp
diff --git a/cpp/src/qpid/legacystore/TxnCtxt.h b/qpid/cpp/src/qpid/legacystore/TxnCtxt.h
index 77eaa27cd7..77eaa27cd7 100644
--- a/cpp/src/qpid/legacystore/TxnCtxt.h
+++ b/qpid/cpp/src/qpid/legacystore/TxnCtxt.h
diff --git a/cpp/src/qpid/legacystore/jrnl/aio.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp
index ffbddd887e..ffbddd887e 100644
--- a/cpp/src/qpid/legacystore/jrnl/aio.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/aio.h b/qpid/cpp/src/qpid/legacystore/jrnl/aio.h
index b1de5f79f7..b1de5f79f7 100644
--- a/cpp/src/qpid/legacystore/jrnl/aio.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/aio.h
diff --git a/cpp/src/qpid/legacystore/jrnl/aio_callback.h b/qpid/cpp/src/qpid/legacystore/jrnl/aio_callback.h
index 90249278a5..90249278a5 100644
--- a/cpp/src/qpid/legacystore/jrnl/aio_callback.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/aio_callback.h
diff --git a/cpp/src/qpid/legacystore/jrnl/cvar.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp
index e4010bf91f..e4010bf91f 100644
--- a/cpp/src/qpid/legacystore/jrnl/cvar.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/cvar.h b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.h
index 0498e743a2..0498e743a2 100644
--- a/cpp/src/qpid/legacystore/jrnl/cvar.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.h
diff --git a/cpp/src/qpid/legacystore/jrnl/data_tok.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
index ce7206d80d..ce7206d80d 100644
--- a/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/data_tok.h b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.h
index e35f069399..e35f069399 100644
--- a/cpp/src/qpid/legacystore/jrnl/data_tok.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.h
diff --git a/cpp/src/qpid/legacystore/jrnl/deq_hdr.h b/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.h
index ae7081eac1..ae7081eac1 100644
--- a/cpp/src/qpid/legacystore/jrnl/deq_hdr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
index 270ebdd69e..270ebdd69e 100644
--- a/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/deq_rec.h b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.h
index d870b658da..d870b658da 100644
--- a/cpp/src/qpid/legacystore/jrnl/deq_rec.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.h
diff --git a/cpp/src/qpid/legacystore/jrnl/enq_hdr.h b/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.h
index 0d1e6116be..0d1e6116be 100644
--- a/cpp/src/qpid/legacystore/jrnl/enq_hdr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/enq_map.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
index d024b704a7..d024b704a7 100644
--- a/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/enq_map.h b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.h
index 75404afebe..75404afebe 100644
--- a/cpp/src/qpid/legacystore/jrnl/enq_map.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.h
diff --git a/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
index 94f42066a0..94f42066a0 100644
--- a/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/enq_rec.h b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.h
index 805a96a1aa..805a96a1aa 100644
--- a/cpp/src/qpid/legacystore/jrnl/enq_rec.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.h
diff --git a/cpp/src/qpid/legacystore/jrnl/enums.h b/qpid/cpp/src/qpid/legacystore/jrnl/enums.h
index 169a13fa4d..169a13fa4d 100644
--- a/cpp/src/qpid/legacystore/jrnl/enums.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enums.h
diff --git a/cpp/src/qpid/legacystore/jrnl/fcntl.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
index fbb176667e..fbb176667e 100644
--- a/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/fcntl.h b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.h
index a75e3bc84d..a75e3bc84d 100644
--- a/cpp/src/qpid/legacystore/jrnl/fcntl.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.h
diff --git a/cpp/src/qpid/legacystore/jrnl/file_hdr.h b/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.h
index db20834cbb..db20834cbb 100644
--- a/cpp/src/qpid/legacystore/jrnl/file_hdr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/jcfg.h b/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.h
index 01d92ee985..01d92ee985 100644
--- a/cpp/src/qpid/legacystore/jrnl/jcfg.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.h
diff --git a/cpp/src/qpid/legacystore/jrnl/jcntl.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
index 21fcf099b4..21fcf099b4 100644
--- a/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/jcntl.h b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.h
index 294e9ced05..294e9ced05 100644
--- a/cpp/src/qpid/legacystore/jrnl/jcntl.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.h
diff --git a/cpp/src/qpid/legacystore/jrnl/jdir.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp
index a874c6c945..a874c6c945 100644
--- a/cpp/src/qpid/legacystore/jrnl/jdir.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/jdir.h b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.h
index e129b794d6..e129b794d6 100644
--- a/cpp/src/qpid/legacystore/jrnl/jdir.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.h
diff --git a/cpp/src/qpid/legacystore/jrnl/jerrno.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
index 4962ce63ab..4962ce63ab 100644
--- a/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/jerrno.h b/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.h
index 4c8b71c423..4c8b71c423 100644
--- a/cpp/src/qpid/legacystore/jrnl/jerrno.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.h
diff --git a/cpp/src/qpid/legacystore/jrnl/jexception.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp
index 5c571020e4..5c571020e4 100644
--- a/cpp/src/qpid/legacystore/jrnl/jexception.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/jexception.h b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.h
index 34d8373235..34d8373235 100644
--- a/cpp/src/qpid/legacystore/jrnl/jexception.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.h
diff --git a/cpp/src/qpid/legacystore/jrnl/jinf.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp
index 3326005d9b..3326005d9b 100644
--- a/cpp/src/qpid/legacystore/jrnl/jinf.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/jinf.h b/qpid/cpp/src/qpid/legacystore/jrnl/jinf.h
index 73f5386a19..73f5386a19 100644
--- a/cpp/src/qpid/legacystore/jrnl/jinf.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jinf.h
diff --git a/cpp/src/qpid/legacystore/jrnl/jrec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp
index 61b9b6cc9b..61b9b6cc9b 100644
--- a/cpp/src/qpid/legacystore/jrnl/jrec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/jrec.h b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.h
index 9d0771cabd..9d0771cabd 100644
--- a/cpp/src/qpid/legacystore/jrnl/jrec.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.h
diff --git a/cpp/src/qpid/legacystore/jrnl/lp_map.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
index 8024ddadd2..8024ddadd2 100644
--- a/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/lp_map.h b/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.h
index c43cbc0173..c43cbc0173 100644
--- a/cpp/src/qpid/legacystore/jrnl/lp_map.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.h
diff --git a/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
index d7b0c9f516..d7b0c9f516 100644
--- a/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/lpmgr.h b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.h
index be5c4494cc..be5c4494cc 100644
--- a/cpp/src/qpid/legacystore/jrnl/lpmgr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/pmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
index 3dc61e2661..3dc61e2661 100644
--- a/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/pmgr.h b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.h
index 64115e225e..64115e225e 100644
--- a/cpp/src/qpid/legacystore/jrnl/pmgr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/rcvdat.h b/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.h
index a7ef2341f0..a7ef2341f0 100644
--- a/cpp/src/qpid/legacystore/jrnl/rcvdat.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.h
diff --git a/cpp/src/qpid/legacystore/jrnl/rec_hdr.h b/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.h
index ff6325a760..ff6325a760 100644
--- a/cpp/src/qpid/legacystore/jrnl/rec_hdr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/rec_tail.h b/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.h
index 0c36151927..0c36151927 100644
--- a/cpp/src/qpid/legacystore/jrnl/rec_tail.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.h
diff --git a/cpp/src/qpid/legacystore/jrnl/rfc.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp
index 9b5ed95e81..9b5ed95e81 100644
--- a/cpp/src/qpid/legacystore/jrnl/rfc.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/rfc.h b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.h
index faa5d566ba..faa5d566ba 100644
--- a/cpp/src/qpid/legacystore/jrnl/rfc.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.h
diff --git a/cpp/src/qpid/legacystore/jrnl/rmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
index 204affd1d1..204affd1d1 100644
--- a/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/rmgr.h b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.h
index 47a36ef35c..47a36ef35c 100644
--- a/cpp/src/qpid/legacystore/jrnl/rmgr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/rrfc.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
index fc6f5d427f..fc6f5d427f 100644
--- a/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/rrfc.h b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.h
index 5066d6048a..5066d6048a 100644
--- a/cpp/src/qpid/legacystore/jrnl/rrfc.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.h
diff --git a/cpp/src/qpid/legacystore/jrnl/slock.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp
index 8f26d349ef..8f26d349ef 100644
--- a/cpp/src/qpid/legacystore/jrnl/slock.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/slock.h b/qpid/cpp/src/qpid/legacystore/jrnl/slock.h
index c05b5cf336..c05b5cf336 100644
--- a/cpp/src/qpid/legacystore/jrnl/slock.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/slock.h
diff --git a/cpp/src/qpid/legacystore/jrnl/smutex.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp
index 6f8991ca5b..6f8991ca5b 100644
--- a/cpp/src/qpid/legacystore/jrnl/smutex.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/smutex.h b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.h
index def0fb70f6..def0fb70f6 100644
--- a/cpp/src/qpid/legacystore/jrnl/smutex.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.h
diff --git a/cpp/src/qpid/legacystore/jrnl/time_ns.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
index 976068ef68..976068ef68 100644
--- a/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/time_ns.h b/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.h
index a9f69e2631..a9f69e2631 100644
--- a/cpp/src/qpid/legacystore/jrnl/time_ns.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.h
diff --git a/cpp/src/qpid/legacystore/jrnl/txn_hdr.h b/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.h
index 94b812ccec..94b812ccec 100644
--- a/cpp/src/qpid/legacystore/jrnl/txn_hdr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/txn_map.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
index c514670601..c514670601 100644
--- a/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/txn_map.h b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.h
index 6b38564e53..6b38564e53 100644
--- a/cpp/src/qpid/legacystore/jrnl/txn_map.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.h
diff --git a/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
index 1008e7700e..1008e7700e 100644
--- a/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/txn_rec.h b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.h
index 1a49df1c96..1a49df1c96 100644
--- a/cpp/src/qpid/legacystore/jrnl/txn_rec.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.h
diff --git a/cpp/src/qpid/legacystore/jrnl/wmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
index 4353fcfbca..4353fcfbca 100644
--- a/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/wmgr.h b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.h
index 8347221b1d..8347221b1d 100644
--- a/cpp/src/qpid/legacystore/jrnl/wmgr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/wrfc.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
index 43461b66a3..43461b66a3 100644
--- a/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/wrfc.h b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.h
index f0e4e73151..f0e4e73151 100644
--- a/cpp/src/qpid/legacystore/jrnl/wrfc.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.h
diff --git a/cpp/src/qpid/legacystore/management-schema.xml b/qpid/cpp/src/qpid/legacystore/management-schema.xml
index 65969f0fb2..65969f0fb2 100644
--- a/cpp/src/qpid/legacystore/management-schema.xml
+++ b/qpid/cpp/src/qpid/legacystore/management-schema.xml
diff --git a/cpp/src/qpid/linearstore/BindingDbt.cpp b/qpid/cpp/src/qpid/linearstore/BindingDbt.cpp
index 47738cce39..47738cce39 100644
--- a/cpp/src/qpid/linearstore/BindingDbt.cpp
+++ b/qpid/cpp/src/qpid/linearstore/BindingDbt.cpp
diff --git a/cpp/src/qpid/linearstore/BindingDbt.h b/qpid/cpp/src/qpid/linearstore/BindingDbt.h
index e5d61de248..e5d61de248 100644
--- a/cpp/src/qpid/linearstore/BindingDbt.h
+++ b/qpid/cpp/src/qpid/linearstore/BindingDbt.h
diff --git a/cpp/src/qpid/linearstore/BufferValue.cpp b/qpid/cpp/src/qpid/linearstore/BufferValue.cpp
index 5115055375..5115055375 100644
--- a/cpp/src/qpid/linearstore/BufferValue.cpp
+++ b/qpid/cpp/src/qpid/linearstore/BufferValue.cpp
diff --git a/cpp/src/qpid/linearstore/BufferValue.h b/qpid/cpp/src/qpid/linearstore/BufferValue.h
index daeb81306a..daeb81306a 100644
--- a/cpp/src/qpid/linearstore/BufferValue.h
+++ b/qpid/cpp/src/qpid/linearstore/BufferValue.h
diff --git a/cpp/src/qpid/linearstore/Cursor.h b/qpid/cpp/src/qpid/linearstore/Cursor.h
index 0287803b21..0287803b21 100644
--- a/cpp/src/qpid/linearstore/Cursor.h
+++ b/qpid/cpp/src/qpid/linearstore/Cursor.h
diff --git a/cpp/src/qpid/linearstore/DataTokenImpl.cpp b/qpid/cpp/src/qpid/linearstore/DataTokenImpl.cpp
index 0b1f3d7941..0b1f3d7941 100644
--- a/cpp/src/qpid/linearstore/DataTokenImpl.cpp
+++ b/qpid/cpp/src/qpid/linearstore/DataTokenImpl.cpp
diff --git a/cpp/src/qpid/linearstore/DataTokenImpl.h b/qpid/cpp/src/qpid/linearstore/DataTokenImpl.h
index 7152cef6a0..7152cef6a0 100644
--- a/cpp/src/qpid/linearstore/DataTokenImpl.h
+++ b/qpid/cpp/src/qpid/linearstore/DataTokenImpl.h
diff --git a/cpp/src/qpid/linearstore/ISSUES b/qpid/cpp/src/qpid/linearstore/ISSUES
index 3e1216f8a7..3e1216f8a7 100644
--- a/cpp/src/qpid/linearstore/ISSUES
+++ b/qpid/cpp/src/qpid/linearstore/ISSUES
diff --git a/cpp/src/qpid/linearstore/IdDbt.cpp b/qpid/cpp/src/qpid/linearstore/IdDbt.cpp
index d427085bbe..d427085bbe 100644
--- a/cpp/src/qpid/linearstore/IdDbt.cpp
+++ b/qpid/cpp/src/qpid/linearstore/IdDbt.cpp
diff --git a/cpp/src/qpid/linearstore/IdDbt.h b/qpid/cpp/src/qpid/linearstore/IdDbt.h
index c7264491ab..c7264491ab 100644
--- a/cpp/src/qpid/linearstore/IdDbt.h
+++ b/qpid/cpp/src/qpid/linearstore/IdDbt.h
diff --git a/cpp/src/qpid/linearstore/IdSequence.cpp b/qpid/cpp/src/qpid/linearstore/IdSequence.cpp
index 4d3172ffe9..4d3172ffe9 100644
--- a/cpp/src/qpid/linearstore/IdSequence.cpp
+++ b/qpid/cpp/src/qpid/linearstore/IdSequence.cpp
diff --git a/cpp/src/qpid/linearstore/IdSequence.h b/qpid/cpp/src/qpid/linearstore/IdSequence.h
index 17996eec52..17996eec52 100644
--- a/cpp/src/qpid/linearstore/IdSequence.h
+++ b/qpid/cpp/src/qpid/linearstore/IdSequence.h
diff --git a/cpp/src/qpid/linearstore/JournalImpl.cpp b/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
index 081fab190d..081fab190d 100644
--- a/cpp/src/qpid/linearstore/JournalImpl.cpp
+++ b/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
diff --git a/cpp/src/qpid/linearstore/JournalImpl.h b/qpid/cpp/src/qpid/linearstore/JournalImpl.h
index 763089f3d0..763089f3d0 100644
--- a/cpp/src/qpid/linearstore/JournalImpl.h
+++ b/qpid/cpp/src/qpid/linearstore/JournalImpl.h
diff --git a/cpp/src/qpid/linearstore/JournalLogImpl.cpp b/qpid/cpp/src/qpid/linearstore/JournalLogImpl.cpp
index c3e631a6ca..c3e631a6ca 100644
--- a/cpp/src/qpid/linearstore/JournalLogImpl.cpp
+++ b/qpid/cpp/src/qpid/linearstore/JournalLogImpl.cpp
diff --git a/cpp/src/qpid/linearstore/JournalLogImpl.h b/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h
index 846eaac124..846eaac124 100644
--- a/cpp/src/qpid/linearstore/JournalLogImpl.h
+++ b/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h
diff --git a/cpp/src/qpid/linearstore/MessageStoreImpl.cpp b/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp
index 593d2bd4b7..593d2bd4b7 100644
--- a/cpp/src/qpid/linearstore/MessageStoreImpl.cpp
+++ b/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp
diff --git a/cpp/src/qpid/linearstore/MessageStoreImpl.h b/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
index e995237d99..e995237d99 100644
--- a/cpp/src/qpid/linearstore/MessageStoreImpl.h
+++ b/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
diff --git a/cpp/src/qpid/linearstore/PreparedTransaction.cpp b/qpid/cpp/src/qpid/linearstore/PreparedTransaction.cpp
index 1b92ca8c23..1b92ca8c23 100644
--- a/cpp/src/qpid/linearstore/PreparedTransaction.cpp
+++ b/qpid/cpp/src/qpid/linearstore/PreparedTransaction.cpp
diff --git a/cpp/src/qpid/linearstore/PreparedTransaction.h b/qpid/cpp/src/qpid/linearstore/PreparedTransaction.h
index 7b381ba3b9..7b381ba3b9 100644
--- a/cpp/src/qpid/linearstore/PreparedTransaction.h
+++ b/qpid/cpp/src/qpid/linearstore/PreparedTransaction.h
diff --git a/cpp/src/qpid/linearstore/StoreException.h b/qpid/cpp/src/qpid/linearstore/StoreException.h
index 7a598a524f..7a598a524f 100644
--- a/cpp/src/qpid/linearstore/StoreException.h
+++ b/qpid/cpp/src/qpid/linearstore/StoreException.h
diff --git a/cpp/src/qpid/linearstore/StorePlugin.cpp b/qpid/cpp/src/qpid/linearstore/StorePlugin.cpp
index 6dfb2056bf..6dfb2056bf 100644
--- a/cpp/src/qpid/linearstore/StorePlugin.cpp
+++ b/qpid/cpp/src/qpid/linearstore/StorePlugin.cpp
diff --git a/cpp/src/qpid/linearstore/TxnCtxt.cpp b/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp
index 50ef58aafa..50ef58aafa 100644
--- a/cpp/src/qpid/linearstore/TxnCtxt.cpp
+++ b/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp
diff --git a/cpp/src/qpid/linearstore/TxnCtxt.h b/qpid/cpp/src/qpid/linearstore/TxnCtxt.h
index 4f95da5950..4f95da5950 100644
--- a/cpp/src/qpid/linearstore/TxnCtxt.h
+++ b/qpid/cpp/src/qpid/linearstore/TxnCtxt.h
diff --git a/cpp/src/qpid/linearstore/journal/AtomicCounter.h b/qpid/cpp/src/qpid/linearstore/journal/AtomicCounter.h
index 73e5fecf93..73e5fecf93 100644
--- a/cpp/src/qpid/linearstore/journal/AtomicCounter.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/AtomicCounter.h
diff --git a/cpp/src/qpid/linearstore/journal/Checksum.cpp b/qpid/cpp/src/qpid/linearstore/journal/Checksum.cpp
index 89d654ce76..89d654ce76 100644
--- a/cpp/src/qpid/linearstore/journal/Checksum.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/Checksum.cpp
diff --git a/cpp/src/qpid/linearstore/journal/Checksum.h b/qpid/cpp/src/qpid/linearstore/journal/Checksum.h
index d96aac2991..d96aac2991 100644
--- a/cpp/src/qpid/linearstore/journal/Checksum.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/Checksum.h
diff --git a/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp
index 83db81dce8..83db81dce8 100644
--- a/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp
diff --git a/cpp/src/qpid/linearstore/journal/EmptyFilePool.h b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h
index 5751c9d180..5751c9d180 100644
--- a/cpp/src/qpid/linearstore/journal/EmptyFilePool.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h
diff --git a/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp
index ab70e3825e..ab70e3825e 100644
--- a/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp
diff --git a/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h
index fa667f3326..fa667f3326 100644
--- a/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h
diff --git a/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp
index bef8d4e788..bef8d4e788 100644
--- a/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp
diff --git a/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h
index bd338461cb..bd338461cb 100644
--- a/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h
diff --git a/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h
index 14213f7955..14213f7955 100644
--- a/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h
diff --git a/cpp/src/qpid/linearstore/journal/JournalFile.cpp b/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp
index 8f6a311a84..8f6a311a84 100644
--- a/cpp/src/qpid/linearstore/journal/JournalFile.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp
diff --git a/cpp/src/qpid/linearstore/journal/JournalFile.h b/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h
index f0ad432fd8..f0ad432fd8 100644
--- a/cpp/src/qpid/linearstore/journal/JournalFile.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h
diff --git a/cpp/src/qpid/linearstore/journal/JournalLog.cpp b/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp
index c35ec97e91..c35ec97e91 100644
--- a/cpp/src/qpid/linearstore/journal/JournalLog.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp
diff --git a/cpp/src/qpid/linearstore/journal/JournalLog.h b/qpid/cpp/src/qpid/linearstore/journal/JournalLog.h
index cf503cb9d2..cf503cb9d2 100644
--- a/cpp/src/qpid/linearstore/journal/JournalLog.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/JournalLog.h
diff --git a/cpp/src/qpid/linearstore/journal/LinearFileController.cpp b/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp
index f962976daf..f962976daf 100644
--- a/cpp/src/qpid/linearstore/journal/LinearFileController.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp
diff --git a/cpp/src/qpid/linearstore/journal/LinearFileController.h b/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h
index 933b9792a4..933b9792a4 100644
--- a/cpp/src/qpid/linearstore/journal/LinearFileController.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h
diff --git a/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp b/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp
index 66ac7c3a2d..66ac7c3a2d 100644
--- a/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp
diff --git a/cpp/src/qpid/linearstore/journal/RecoveryManager.h b/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.h
index a32fdc1853..a32fdc1853 100644
--- a/cpp/src/qpid/linearstore/journal/RecoveryManager.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.h
diff --git a/cpp/src/qpid/linearstore/journal/aio.h b/qpid/cpp/src/qpid/linearstore/journal/aio.h
index 54e3401748..54e3401748 100644
--- a/cpp/src/qpid/linearstore/journal/aio.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/aio.h
diff --git a/cpp/src/qpid/linearstore/journal/aio_callback.h b/qpid/cpp/src/qpid/linearstore/journal/aio_callback.h
index f21b62617b..f21b62617b 100644
--- a/cpp/src/qpid/linearstore/journal/aio_callback.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/aio_callback.h
diff --git a/cpp/src/qpid/linearstore/journal/data_tok.cpp b/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp
index 3952c403a1..3952c403a1 100644
--- a/cpp/src/qpid/linearstore/journal/data_tok.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp
diff --git a/cpp/src/qpid/linearstore/journal/data_tok.h b/qpid/cpp/src/qpid/linearstore/journal/data_tok.h
index 67e0ec9683..67e0ec9683 100644
--- a/cpp/src/qpid/linearstore/journal/data_tok.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/data_tok.h
diff --git a/cpp/src/qpid/linearstore/journal/deq_rec.cpp b/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp
index 8b9e9d7f64..8b9e9d7f64 100644
--- a/cpp/src/qpid/linearstore/journal/deq_rec.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp
diff --git a/cpp/src/qpid/linearstore/journal/deq_rec.h b/qpid/cpp/src/qpid/linearstore/journal/deq_rec.h
index c7f78e1215..c7f78e1215 100644
--- a/cpp/src/qpid/linearstore/journal/deq_rec.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/deq_rec.h
diff --git a/cpp/src/qpid/linearstore/journal/enq_map.cpp b/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp
index 4eaaa64992..4eaaa64992 100644
--- a/cpp/src/qpid/linearstore/journal/enq_map.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp
diff --git a/cpp/src/qpid/linearstore/journal/enq_map.h b/qpid/cpp/src/qpid/linearstore/journal/enq_map.h
index 912a583ab9..912a583ab9 100644
--- a/cpp/src/qpid/linearstore/journal/enq_map.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/enq_map.h
diff --git a/cpp/src/qpid/linearstore/journal/enq_rec.cpp b/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp
index a4f19b3a7b..a4f19b3a7b 100644
--- a/cpp/src/qpid/linearstore/journal/enq_rec.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp
diff --git a/cpp/src/qpid/linearstore/journal/enq_rec.h b/qpid/cpp/src/qpid/linearstore/journal/enq_rec.h
index 439203c052..439203c052 100644
--- a/cpp/src/qpid/linearstore/journal/enq_rec.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/enq_rec.h
diff --git a/cpp/src/qpid/linearstore/journal/enums.h b/qpid/cpp/src/qpid/linearstore/journal/enums.h
index 90ec355955..90ec355955 100644
--- a/cpp/src/qpid/linearstore/journal/enums.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/enums.h
diff --git a/cpp/src/qpid/linearstore/journal/jcfg.h b/qpid/cpp/src/qpid/linearstore/journal/jcfg.h
index 83c61bcb5f..83c61bcb5f 100644
--- a/cpp/src/qpid/linearstore/journal/jcfg.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jcfg.h
diff --git a/cpp/src/qpid/linearstore/journal/jcntl.cpp b/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp
index 8226741e4a..8226741e4a 100644
--- a/cpp/src/qpid/linearstore/journal/jcntl.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp
diff --git a/cpp/src/qpid/linearstore/journal/jcntl.h b/qpid/cpp/src/qpid/linearstore/journal/jcntl.h
index c12c8afbc9..c12c8afbc9 100644
--- a/cpp/src/qpid/linearstore/journal/jcntl.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jcntl.h
diff --git a/cpp/src/qpid/linearstore/journal/jdir.cpp b/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp
index 896f44ceff..896f44ceff 100644
--- a/cpp/src/qpid/linearstore/journal/jdir.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp
diff --git a/cpp/src/qpid/linearstore/journal/jdir.h b/qpid/cpp/src/qpid/linearstore/journal/jdir.h
index 86b16f8545..86b16f8545 100644
--- a/cpp/src/qpid/linearstore/journal/jdir.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jdir.h
diff --git a/cpp/src/qpid/linearstore/journal/jerrno.cpp b/qpid/cpp/src/qpid/linearstore/journal/jerrno.cpp
index 51e90c6bb8..51e90c6bb8 100644
--- a/cpp/src/qpid/linearstore/journal/jerrno.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/jerrno.cpp
diff --git a/cpp/src/qpid/linearstore/journal/jerrno.h b/qpid/cpp/src/qpid/linearstore/journal/jerrno.h
index 5af0a7ada0..5af0a7ada0 100644
--- a/cpp/src/qpid/linearstore/journal/jerrno.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jerrno.h
diff --git a/cpp/src/qpid/linearstore/journal/jexception.cpp b/qpid/cpp/src/qpid/linearstore/journal/jexception.cpp
index 49f486746a..49f486746a 100644
--- a/cpp/src/qpid/linearstore/journal/jexception.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/jexception.cpp
diff --git a/cpp/src/qpid/linearstore/journal/jexception.h b/qpid/cpp/src/qpid/linearstore/journal/jexception.h
index d03ee32e3f..d03ee32e3f 100644
--- a/cpp/src/qpid/linearstore/journal/jexception.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jexception.h
diff --git a/cpp/src/qpid/linearstore/journal/jrec.h b/qpid/cpp/src/qpid/linearstore/journal/jrec.h
index 7645e646f6..7645e646f6 100644
--- a/cpp/src/qpid/linearstore/journal/jrec.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jrec.h
diff --git a/cpp/src/qpid/linearstore/journal/pmgr.cpp b/qpid/cpp/src/qpid/linearstore/journal/pmgr.cpp
index 54755dd4ed..54755dd4ed 100644
--- a/cpp/src/qpid/linearstore/journal/pmgr.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/pmgr.cpp
diff --git a/cpp/src/qpid/linearstore/journal/pmgr.h b/qpid/cpp/src/qpid/linearstore/journal/pmgr.h
index 157a6f0566..157a6f0566 100644
--- a/cpp/src/qpid/linearstore/journal/pmgr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/pmgr.h
diff --git a/cpp/src/qpid/linearstore/journal/slock.h b/qpid/cpp/src/qpid/linearstore/journal/slock.h
index 12e9e2d08c..12e9e2d08c 100644
--- a/cpp/src/qpid/linearstore/journal/slock.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/slock.h
diff --git a/cpp/src/qpid/linearstore/journal/smutex.h b/qpid/cpp/src/qpid/linearstore/journal/smutex.h
index b43f55944c..b43f55944c 100644
--- a/cpp/src/qpid/linearstore/journal/smutex.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/smutex.h
diff --git a/cpp/src/qpid/linearstore/journal/time_ns.cpp b/qpid/cpp/src/qpid/linearstore/journal/time_ns.cpp
index 39f2cd1d88..39f2cd1d88 100644
--- a/cpp/src/qpid/linearstore/journal/time_ns.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/time_ns.cpp
diff --git a/cpp/src/qpid/linearstore/journal/time_ns.h b/qpid/cpp/src/qpid/linearstore/journal/time_ns.h
index a228d47475..a228d47475 100644
--- a/cpp/src/qpid/linearstore/journal/time_ns.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/time_ns.h
diff --git a/cpp/src/qpid/linearstore/journal/txn_map.cpp b/qpid/cpp/src/qpid/linearstore/journal/txn_map.cpp
index 5e0a28814d..5e0a28814d 100644
--- a/cpp/src/qpid/linearstore/journal/txn_map.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/txn_map.cpp
diff --git a/cpp/src/qpid/linearstore/journal/txn_map.h b/qpid/cpp/src/qpid/linearstore/journal/txn_map.h
index 0f8cd5f3d7..0f8cd5f3d7 100644
--- a/cpp/src/qpid/linearstore/journal/txn_map.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/txn_map.h
diff --git a/cpp/src/qpid/linearstore/journal/txn_rec.cpp b/qpid/cpp/src/qpid/linearstore/journal/txn_rec.cpp
index b5d2e51ec0..b5d2e51ec0 100644
--- a/cpp/src/qpid/linearstore/journal/txn_rec.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/txn_rec.cpp
diff --git a/cpp/src/qpid/linearstore/journal/txn_rec.h b/qpid/cpp/src/qpid/linearstore/journal/txn_rec.h
index a9224a4a01..a9224a4a01 100644
--- a/cpp/src/qpid/linearstore/journal/txn_rec.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/txn_rec.h
diff --git a/cpp/src/qpid/linearstore/journal/utils/deq_hdr.c b/qpid/cpp/src/qpid/linearstore/journal/utils/deq_hdr.c
index 144ce4125a..144ce4125a 100644
--- a/cpp/src/qpid/linearstore/journal/utils/deq_hdr.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/deq_hdr.c
diff --git a/cpp/src/qpid/linearstore/journal/utils/deq_hdr.h b/qpid/cpp/src/qpid/linearstore/journal/utils/deq_hdr.h
index 3392867153..3392867153 100644
--- a/cpp/src/qpid/linearstore/journal/utils/deq_hdr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/deq_hdr.h
diff --git a/cpp/src/qpid/linearstore/journal/utils/enq_hdr.c b/qpid/cpp/src/qpid/linearstore/journal/utils/enq_hdr.c
index b4e8b62ff1..b4e8b62ff1 100644
--- a/cpp/src/qpid/linearstore/journal/utils/enq_hdr.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/enq_hdr.c
diff --git a/cpp/src/qpid/linearstore/journal/utils/enq_hdr.h b/qpid/cpp/src/qpid/linearstore/journal/utils/enq_hdr.h
index 00108792bc..00108792bc 100644
--- a/cpp/src/qpid/linearstore/journal/utils/enq_hdr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/enq_hdr.h
diff --git a/cpp/src/qpid/linearstore/journal/utils/file_hdr.c b/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.c
index 07f4719a8e..07f4719a8e 100644
--- a/cpp/src/qpid/linearstore/journal/utils/file_hdr.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.c
diff --git a/cpp/src/qpid/linearstore/journal/utils/file_hdr.h b/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.h
index 53ca686fb8..53ca686fb8 100644
--- a/cpp/src/qpid/linearstore/journal/utils/file_hdr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.h
diff --git a/cpp/src/qpid/linearstore/journal/utils/rec_hdr.c b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_hdr.c
index ad5262f9a3..ad5262f9a3 100644
--- a/cpp/src/qpid/linearstore/journal/utils/rec_hdr.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_hdr.c
diff --git a/cpp/src/qpid/linearstore/journal/utils/rec_hdr.h b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_hdr.h
index 64349b5ab8..64349b5ab8 100644
--- a/cpp/src/qpid/linearstore/journal/utils/rec_hdr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_hdr.h
diff --git a/cpp/src/qpid/linearstore/journal/utils/rec_tail.c b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.c
index 88c68e2b78..88c68e2b78 100644
--- a/cpp/src/qpid/linearstore/journal/utils/rec_tail.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.c
diff --git a/cpp/src/qpid/linearstore/journal/utils/rec_tail.h b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.h
index 5163580ead..5163580ead 100644
--- a/cpp/src/qpid/linearstore/journal/utils/rec_tail.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.h
diff --git a/cpp/src/qpid/linearstore/journal/utils/txn_hdr.c b/qpid/cpp/src/qpid/linearstore/journal/utils/txn_hdr.c
index 58d4cdebe4..58d4cdebe4 100644
--- a/cpp/src/qpid/linearstore/journal/utils/txn_hdr.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/txn_hdr.c
diff --git a/cpp/src/qpid/linearstore/journal/utils/txn_hdr.h b/qpid/cpp/src/qpid/linearstore/journal/utils/txn_hdr.h
index 442a1d373d..442a1d373d 100644
--- a/cpp/src/qpid/linearstore/journal/utils/txn_hdr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/txn_hdr.h
diff --git a/cpp/src/qpid/linearstore/journal/wmgr.cpp b/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp
index 6eaa8835be..6eaa8835be 100644
--- a/cpp/src/qpid/linearstore/journal/wmgr.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp
diff --git a/cpp/src/qpid/linearstore/journal/wmgr.h b/qpid/cpp/src/qpid/linearstore/journal/wmgr.h
index 0aa21ca545..0aa21ca545 100644
--- a/cpp/src/qpid/linearstore/journal/wmgr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/wmgr.h
diff --git a/cpp/src/qpid/linearstore/management-schema.xml b/qpid/cpp/src/qpid/linearstore/management-schema.xml
index dce8f7988a..dce8f7988a 100644
--- a/cpp/src/qpid/linearstore/management-schema.xml
+++ b/qpid/cpp/src/qpid/linearstore/management-schema.xml
diff --git a/cpp/src/qpid/log/Helpers.h b/qpid/cpp/src/qpid/log/Helpers.h
index 82ef8244be..82ef8244be 100644
--- a/cpp/src/qpid/log/Helpers.h
+++ b/qpid/cpp/src/qpid/log/Helpers.h
diff --git a/cpp/src/qpid/log/Logger.cpp b/qpid/cpp/src/qpid/log/Logger.cpp
index 8242acc87e..8242acc87e 100644
--- a/cpp/src/qpid/log/Logger.cpp
+++ b/qpid/cpp/src/qpid/log/Logger.cpp
diff --git a/cpp/src/qpid/log/Logger.h b/qpid/cpp/src/qpid/log/Logger.h
index 8c4beb0785..8c4beb0785 100644
--- a/cpp/src/qpid/log/Logger.h
+++ b/qpid/cpp/src/qpid/log/Logger.h
diff --git a/cpp/src/qpid/log/Options.cpp b/qpid/cpp/src/qpid/log/Options.cpp
index b310b7cfac..b310b7cfac 100644
--- a/cpp/src/qpid/log/Options.cpp
+++ b/qpid/cpp/src/qpid/log/Options.cpp
diff --git a/cpp/src/qpid/log/Options.h b/qpid/cpp/src/qpid/log/Options.h
index 42a8fb40fe..42a8fb40fe 100644
--- a/cpp/src/qpid/log/Options.h
+++ b/qpid/cpp/src/qpid/log/Options.h
diff --git a/cpp/src/qpid/log/OstreamOutput.cpp b/qpid/cpp/src/qpid/log/OstreamOutput.cpp
index 9b6ec1f8aa..9b6ec1f8aa 100644
--- a/cpp/src/qpid/log/OstreamOutput.cpp
+++ b/qpid/cpp/src/qpid/log/OstreamOutput.cpp
diff --git a/cpp/src/qpid/log/OstreamOutput.h b/qpid/cpp/src/qpid/log/OstreamOutput.h
index 12fd4ce425..12fd4ce425 100644
--- a/cpp/src/qpid/log/OstreamOutput.h
+++ b/qpid/cpp/src/qpid/log/OstreamOutput.h
diff --git a/cpp/src/qpid/log/Selector.cpp b/qpid/cpp/src/qpid/log/Selector.cpp
index 9f52242694..9f52242694 100644
--- a/cpp/src/qpid/log/Selector.cpp
+++ b/qpid/cpp/src/qpid/log/Selector.cpp
diff --git a/cpp/src/qpid/log/Selector.h b/qpid/cpp/src/qpid/log/Selector.h
index 1d025e9646..1d025e9646 100644
--- a/cpp/src/qpid/log/Selector.h
+++ b/qpid/cpp/src/qpid/log/Selector.h
diff --git a/cpp/src/qpid/log/SinkOptions.h b/qpid/cpp/src/qpid/log/SinkOptions.h
index 7ec2cfbc17..7ec2cfbc17 100644
--- a/cpp/src/qpid/log/SinkOptions.h
+++ b/qpid/cpp/src/qpid/log/SinkOptions.h
diff --git a/cpp/src/qpid/log/Statement.cpp b/qpid/cpp/src/qpid/log/Statement.cpp
index e70069fe7b..e70069fe7b 100644
--- a/cpp/src/qpid/log/Statement.cpp
+++ b/qpid/cpp/src/qpid/log/Statement.cpp
diff --git a/cpp/src/qpid/log/Statement.h b/qpid/cpp/src/qpid/log/Statement.h
index e928e19f22..e928e19f22 100644
--- a/cpp/src/qpid/log/Statement.h
+++ b/qpid/cpp/src/qpid/log/Statement.h
diff --git a/cpp/src/qpid/log/posix/SinkOptions.cpp b/qpid/cpp/src/qpid/log/posix/SinkOptions.cpp
index d3db5f3cdf..d3db5f3cdf 100644
--- a/cpp/src/qpid/log/posix/SinkOptions.cpp
+++ b/qpid/cpp/src/qpid/log/posix/SinkOptions.cpp
diff --git a/cpp/src/qpid/log/posix/SinkOptions.h b/qpid/cpp/src/qpid/log/posix/SinkOptions.h
index d929c29025..d929c29025 100644
--- a/cpp/src/qpid/log/posix/SinkOptions.h
+++ b/qpid/cpp/src/qpid/log/posix/SinkOptions.h
diff --git a/cpp/src/qpid/log/windows/SinkOptions.cpp b/qpid/cpp/src/qpid/log/windows/SinkOptions.cpp
index 0c74bea64e..0c74bea64e 100644
--- a/cpp/src/qpid/log/windows/SinkOptions.cpp
+++ b/qpid/cpp/src/qpid/log/windows/SinkOptions.cpp
diff --git a/cpp/src/qpid/log/windows/SinkOptions.h b/qpid/cpp/src/qpid/log/windows/SinkOptions.h
index f270c504a2..f270c504a2 100644
--- a/cpp/src/qpid/log/windows/SinkOptions.h
+++ b/qpid/cpp/src/qpid/log/windows/SinkOptions.h
diff --git a/cpp/src/qpid/management/Args.h b/qpid/cpp/src/qpid/management/Args.h
index 5d1cb7e01d..5d1cb7e01d 100644
--- a/cpp/src/qpid/management/Args.h
+++ b/qpid/cpp/src/qpid/management/Args.h
diff --git a/cpp/src/qpid/management/Buffer.cpp b/qpid/cpp/src/qpid/management/Buffer.cpp
index 0ad6e9a851..0ad6e9a851 100644
--- a/cpp/src/qpid/management/Buffer.cpp
+++ b/qpid/cpp/src/qpid/management/Buffer.cpp
diff --git a/cpp/src/qpid/management/Buffer.h b/qpid/cpp/src/qpid/management/Buffer.h
index 1ac52bf276..1ac52bf276 100644
--- a/cpp/src/qpid/management/Buffer.h
+++ b/qpid/cpp/src/qpid/management/Buffer.h
diff --git a/cpp/src/qpid/management/ConnectionSettings.cpp b/qpid/cpp/src/qpid/management/ConnectionSettings.cpp
index 1421a26867..1421a26867 100644
--- a/cpp/src/qpid/management/ConnectionSettings.cpp
+++ b/qpid/cpp/src/qpid/management/ConnectionSettings.cpp
diff --git a/cpp/src/qpid/management/ConnectionSettings.h b/qpid/cpp/src/qpid/management/ConnectionSettings.h
index b631ffa658..b631ffa658 100644
--- a/cpp/src/qpid/management/ConnectionSettings.h
+++ b/qpid/cpp/src/qpid/management/ConnectionSettings.h
diff --git a/cpp/src/qpid/management/Manageable.cpp b/qpid/cpp/src/qpid/management/Manageable.cpp
index 651215ffb5..651215ffb5 100644
--- a/cpp/src/qpid/management/Manageable.cpp
+++ b/qpid/cpp/src/qpid/management/Manageable.cpp
diff --git a/cpp/src/qpid/management/Manageable.h b/qpid/cpp/src/qpid/management/Manageable.h
index ede5c29e43..ede5c29e43 100644
--- a/cpp/src/qpid/management/Manageable.h
+++ b/qpid/cpp/src/qpid/management/Manageable.h
diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
index d4a07f407c..d4a07f407c 100644
--- a/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
diff --git a/cpp/src/qpid/management/ManagementAgent.h b/qpid/cpp/src/qpid/management/ManagementAgent.h
index c2eb5d4a31..c2eb5d4a31 100644
--- a/cpp/src/qpid/management/ManagementAgent.h
+++ b/qpid/cpp/src/qpid/management/ManagementAgent.h
diff --git a/cpp/src/qpid/management/ManagementDirectExchange.cpp b/qpid/cpp/src/qpid/management/ManagementDirectExchange.cpp
index 8ede6940b0..8ede6940b0 100644
--- a/cpp/src/qpid/management/ManagementDirectExchange.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementDirectExchange.cpp
diff --git a/cpp/src/qpid/management/ManagementDirectExchange.h b/qpid/cpp/src/qpid/management/ManagementDirectExchange.h
index 582354d723..582354d723 100644
--- a/cpp/src/qpid/management/ManagementDirectExchange.h
+++ b/qpid/cpp/src/qpid/management/ManagementDirectExchange.h
diff --git a/cpp/src/qpid/management/ManagementEvent.h b/qpid/cpp/src/qpid/management/ManagementEvent.h
index e80175096f..e80175096f 100644
--- a/cpp/src/qpid/management/ManagementEvent.h
+++ b/qpid/cpp/src/qpid/management/ManagementEvent.h
diff --git a/cpp/src/qpid/management/ManagementObject.cpp b/qpid/cpp/src/qpid/management/ManagementObject.cpp
index b4d469afbe..b4d469afbe 100644
--- a/cpp/src/qpid/management/ManagementObject.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementObject.cpp
diff --git a/cpp/src/qpid/management/ManagementObject.h b/qpid/cpp/src/qpid/management/ManagementObject.h
index 93fbec7bc7..93fbec7bc7 100644
--- a/cpp/src/qpid/management/ManagementObject.h
+++ b/qpid/cpp/src/qpid/management/ManagementObject.h
diff --git a/cpp/src/qpid/management/ManagementTopicExchange.cpp b/qpid/cpp/src/qpid/management/ManagementTopicExchange.cpp
index 0241d5a404..0241d5a404 100644
--- a/cpp/src/qpid/management/ManagementTopicExchange.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementTopicExchange.cpp
diff --git a/cpp/src/qpid/management/ManagementTopicExchange.h b/qpid/cpp/src/qpid/management/ManagementTopicExchange.h
index f5192a0936..f5192a0936 100644
--- a/cpp/src/qpid/management/ManagementTopicExchange.h
+++ b/qpid/cpp/src/qpid/management/ManagementTopicExchange.h
diff --git a/cpp/src/qpid/management/Mutex.cpp b/qpid/cpp/src/qpid/management/Mutex.cpp
index f05abb01dc..f05abb01dc 100644
--- a/cpp/src/qpid/management/Mutex.cpp
+++ b/qpid/cpp/src/qpid/management/Mutex.cpp
diff --git a/cpp/src/qpid/management/Mutex.h b/qpid/cpp/src/qpid/management/Mutex.h
index 67ae04bae9..67ae04bae9 100644
--- a/cpp/src/qpid/management/Mutex.h
+++ b/qpid/cpp/src/qpid/management/Mutex.h
diff --git a/cpp/src/qpid/memory.h b/qpid/cpp/src/qpid/memory.h
index 99d7a71e7b..99d7a71e7b 100644
--- a/cpp/src/qpid/memory.h
+++ b/qpid/cpp/src/qpid/memory.h
diff --git a/cpp/src/qpid/messaging/Address.cpp b/qpid/cpp/src/qpid/messaging/Address.cpp
index 6fbaeef661..6fbaeef661 100644
--- a/cpp/src/qpid/messaging/Address.cpp
+++ b/qpid/cpp/src/qpid/messaging/Address.cpp
diff --git a/cpp/src/qpid/messaging/AddressImpl.h b/qpid/cpp/src/qpid/messaging/AddressImpl.h
index 8d34bd73c4..8d34bd73c4 100644
--- a/cpp/src/qpid/messaging/AddressImpl.h
+++ b/qpid/cpp/src/qpid/messaging/AddressImpl.h
diff --git a/cpp/src/qpid/messaging/AddressParser.cpp b/qpid/cpp/src/qpid/messaging/AddressParser.cpp
index 882deba463..882deba463 100644
--- a/cpp/src/qpid/messaging/AddressParser.cpp
+++ b/qpid/cpp/src/qpid/messaging/AddressParser.cpp
diff --git a/cpp/src/qpid/messaging/AddressParser.h b/qpid/cpp/src/qpid/messaging/AddressParser.h
index 5e429e1ca9..5e429e1ca9 100644
--- a/cpp/src/qpid/messaging/AddressParser.h
+++ b/qpid/cpp/src/qpid/messaging/AddressParser.h
diff --git a/cpp/src/qpid/messaging/Connection.cpp b/qpid/cpp/src/qpid/messaging/Connection.cpp
index c8a60fc56b..c8a60fc56b 100644
--- a/cpp/src/qpid/messaging/Connection.cpp
+++ b/qpid/cpp/src/qpid/messaging/Connection.cpp
diff --git a/cpp/src/qpid/messaging/ConnectionImpl.h b/qpid/cpp/src/qpid/messaging/ConnectionImpl.h
index 92c6d91b10..92c6d91b10 100644
--- a/cpp/src/qpid/messaging/ConnectionImpl.h
+++ b/qpid/cpp/src/qpid/messaging/ConnectionImpl.h
diff --git a/cpp/src/qpid/messaging/ConnectionOptions.cpp b/qpid/cpp/src/qpid/messaging/ConnectionOptions.cpp
index 26bb699565..26bb699565 100644
--- a/cpp/src/qpid/messaging/ConnectionOptions.cpp
+++ b/qpid/cpp/src/qpid/messaging/ConnectionOptions.cpp
diff --git a/cpp/src/qpid/messaging/ConnectionOptions.h b/qpid/cpp/src/qpid/messaging/ConnectionOptions.h
index 877e541636..877e541636 100644
--- a/cpp/src/qpid/messaging/ConnectionOptions.h
+++ b/qpid/cpp/src/qpid/messaging/ConnectionOptions.h
diff --git a/cpp/src/qpid/messaging/Duration.cpp b/qpid/cpp/src/qpid/messaging/Duration.cpp
index a23e9f5bcb..a23e9f5bcb 100644
--- a/cpp/src/qpid/messaging/Duration.cpp
+++ b/qpid/cpp/src/qpid/messaging/Duration.cpp
diff --git a/cpp/src/qpid/messaging/FailoverUpdates.cpp b/qpid/cpp/src/qpid/messaging/FailoverUpdates.cpp
index 4f2fcf2e82..4f2fcf2e82 100644
--- a/cpp/src/qpid/messaging/FailoverUpdates.cpp
+++ b/qpid/cpp/src/qpid/messaging/FailoverUpdates.cpp
diff --git a/cpp/src/qpid/messaging/Message.cpp b/qpid/cpp/src/qpid/messaging/Message.cpp
index 62ee93b6c2..62ee93b6c2 100644
--- a/cpp/src/qpid/messaging/Message.cpp
+++ b/qpid/cpp/src/qpid/messaging/Message.cpp
diff --git a/cpp/src/qpid/messaging/MessageImpl.cpp b/qpid/cpp/src/qpid/messaging/MessageImpl.cpp
index 620e48ec2e..620e48ec2e 100644
--- a/cpp/src/qpid/messaging/MessageImpl.cpp
+++ b/qpid/cpp/src/qpid/messaging/MessageImpl.cpp
diff --git a/cpp/src/qpid/messaging/MessageImpl.h b/qpid/cpp/src/qpid/messaging/MessageImpl.h
index 647972de16..647972de16 100644
--- a/cpp/src/qpid/messaging/MessageImpl.h
+++ b/qpid/cpp/src/qpid/messaging/MessageImpl.h
diff --git a/cpp/src/qpid/messaging/PrivateImplRef.h b/qpid/cpp/src/qpid/messaging/PrivateImplRef.h
index a60f4eeadf..a60f4eeadf 100644
--- a/cpp/src/qpid/messaging/PrivateImplRef.h
+++ b/qpid/cpp/src/qpid/messaging/PrivateImplRef.h
diff --git a/cpp/src/qpid/messaging/ProtocolRegistry.cpp b/qpid/cpp/src/qpid/messaging/ProtocolRegistry.cpp
index 9e1e5f23fe..9e1e5f23fe 100644
--- a/cpp/src/qpid/messaging/ProtocolRegistry.cpp
+++ b/qpid/cpp/src/qpid/messaging/ProtocolRegistry.cpp
diff --git a/cpp/src/qpid/messaging/ProtocolRegistry.h b/qpid/cpp/src/qpid/messaging/ProtocolRegistry.h
index 25e8bd4ec8..25e8bd4ec8 100644
--- a/cpp/src/qpid/messaging/ProtocolRegistry.h
+++ b/qpid/cpp/src/qpid/messaging/ProtocolRegistry.h
diff --git a/cpp/src/qpid/messaging/Receiver.cpp b/qpid/cpp/src/qpid/messaging/Receiver.cpp
index a2c6b4cade..a2c6b4cade 100644
--- a/cpp/src/qpid/messaging/Receiver.cpp
+++ b/qpid/cpp/src/qpid/messaging/Receiver.cpp
diff --git a/cpp/src/qpid/messaging/ReceiverImpl.h b/qpid/cpp/src/qpid/messaging/ReceiverImpl.h
index 59ccc3214e..59ccc3214e 100644
--- a/cpp/src/qpid/messaging/ReceiverImpl.h
+++ b/qpid/cpp/src/qpid/messaging/ReceiverImpl.h
diff --git a/cpp/src/qpid/messaging/Sender.cpp b/qpid/cpp/src/qpid/messaging/Sender.cpp
index a26f2544c8..a26f2544c8 100644
--- a/cpp/src/qpid/messaging/Sender.cpp
+++ b/qpid/cpp/src/qpid/messaging/Sender.cpp
diff --git a/cpp/src/qpid/messaging/SenderImpl.h b/qpid/cpp/src/qpid/messaging/SenderImpl.h
index 91fd9b1536..91fd9b1536 100644
--- a/cpp/src/qpid/messaging/SenderImpl.h
+++ b/qpid/cpp/src/qpid/messaging/SenderImpl.h
diff --git a/cpp/src/qpid/messaging/Session.cpp b/qpid/cpp/src/qpid/messaging/Session.cpp
index fd0519705d..fd0519705d 100644
--- a/cpp/src/qpid/messaging/Session.cpp
+++ b/qpid/cpp/src/qpid/messaging/Session.cpp
diff --git a/cpp/src/qpid/messaging/SessionImpl.h b/qpid/cpp/src/qpid/messaging/SessionImpl.h
index 60ae615253..60ae615253 100644
--- a/cpp/src/qpid/messaging/SessionImpl.h
+++ b/qpid/cpp/src/qpid/messaging/SessionImpl.h
diff --git a/cpp/src/qpid/messaging/amqp/AddressHelper.cpp b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
index 3dbacac11f..3dbacac11f 100644
--- a/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
diff --git a/cpp/src/qpid/messaging/amqp/AddressHelper.h b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.h
index 3ee58cad8d..3ee58cad8d 100644
--- a/cpp/src/qpid/messaging/amqp/AddressHelper.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.h
diff --git a/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp b/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
index 47f65328eb..47f65328eb 100644
--- a/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
diff --git a/cpp/src/qpid/messaging/amqp/ConnectionContext.h b/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.h
index e1e6957707..e1e6957707 100644
--- a/cpp/src/qpid/messaging/amqp/ConnectionContext.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.h
diff --git a/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp b/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp
index c1ab108a61..c1ab108a61 100644
--- a/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp
diff --git a/cpp/src/qpid/messaging/amqp/ConnectionHandle.h b/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.h
index 0238313f93..0238313f93 100644
--- a/cpp/src/qpid/messaging/amqp/ConnectionHandle.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.h
diff --git a/cpp/src/qpid/messaging/amqp/DriverImpl.cpp b/qpid/cpp/src/qpid/messaging/amqp/DriverImpl.cpp
index 16307b3c22..16307b3c22 100644
--- a/cpp/src/qpid/messaging/amqp/DriverImpl.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/DriverImpl.cpp
diff --git a/cpp/src/qpid/messaging/amqp/DriverImpl.h b/qpid/cpp/src/qpid/messaging/amqp/DriverImpl.h
index 354fa1ae35..354fa1ae35 100644
--- a/cpp/src/qpid/messaging/amqp/DriverImpl.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/DriverImpl.h
diff --git a/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp b/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
index 504c5030a8..504c5030a8 100644
--- a/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
diff --git a/cpp/src/qpid/messaging/amqp/EncodedMessage.h b/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.h
index 16a43aecea..16a43aecea 100644
--- a/cpp/src/qpid/messaging/amqp/EncodedMessage.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.h
diff --git a/cpp/src/qpid/messaging/amqp/ReceiverContext.cpp b/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.cpp
index 2a45ccee44..2a45ccee44 100644
--- a/cpp/src/qpid/messaging/amqp/ReceiverContext.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.cpp
diff --git a/cpp/src/qpid/messaging/amqp/ReceiverContext.h b/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.h
index 59c0533c9a..59c0533c9a 100644
--- a/cpp/src/qpid/messaging/amqp/ReceiverContext.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.h
diff --git a/cpp/src/qpid/messaging/amqp/ReceiverHandle.cpp b/qpid/cpp/src/qpid/messaging/amqp/ReceiverHandle.cpp
index bd7082079c..bd7082079c 100644
--- a/cpp/src/qpid/messaging/amqp/ReceiverHandle.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/ReceiverHandle.cpp
diff --git a/cpp/src/qpid/messaging/amqp/ReceiverHandle.h b/qpid/cpp/src/qpid/messaging/amqp/ReceiverHandle.h
index 08a95fb585..08a95fb585 100644
--- a/cpp/src/qpid/messaging/amqp/ReceiverHandle.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/ReceiverHandle.h
diff --git a/cpp/src/qpid/messaging/amqp/Sasl.cpp b/qpid/cpp/src/qpid/messaging/amqp/Sasl.cpp
index 9c198f81af..9c198f81af 100644
--- a/cpp/src/qpid/messaging/amqp/Sasl.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/Sasl.cpp
diff --git a/cpp/src/qpid/messaging/amqp/Sasl.h b/qpid/cpp/src/qpid/messaging/amqp/Sasl.h
index b306454f9a..b306454f9a 100644
--- a/cpp/src/qpid/messaging/amqp/Sasl.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/Sasl.h
diff --git a/cpp/src/qpid/messaging/amqp/SenderContext.cpp b/qpid/cpp/src/qpid/messaging/amqp/SenderContext.cpp
index 0bf8bef27f..0bf8bef27f 100644
--- a/cpp/src/qpid/messaging/amqp/SenderContext.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/SenderContext.cpp
diff --git a/cpp/src/qpid/messaging/amqp/SenderContext.h b/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h
index 66e45a85a6..66e45a85a6 100644
--- a/cpp/src/qpid/messaging/amqp/SenderContext.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h
diff --git a/cpp/src/qpid/messaging/amqp/SenderHandle.cpp b/qpid/cpp/src/qpid/messaging/amqp/SenderHandle.cpp
index 367db701cb..367db701cb 100644
--- a/cpp/src/qpid/messaging/amqp/SenderHandle.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/SenderHandle.cpp
diff --git a/cpp/src/qpid/messaging/amqp/SenderHandle.h b/qpid/cpp/src/qpid/messaging/amqp/SenderHandle.h
index fab158c1ef..fab158c1ef 100644
--- a/cpp/src/qpid/messaging/amqp/SenderHandle.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/SenderHandle.h
diff --git a/cpp/src/qpid/messaging/amqp/SessionContext.cpp b/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp
index 7673e744c7..7673e744c7 100644
--- a/cpp/src/qpid/messaging/amqp/SessionContext.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp
diff --git a/cpp/src/qpid/messaging/amqp/SessionContext.h b/qpid/cpp/src/qpid/messaging/amqp/SessionContext.h
index df69e92ed3..df69e92ed3 100644
--- a/cpp/src/qpid/messaging/amqp/SessionContext.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/SessionContext.h
diff --git a/cpp/src/qpid/messaging/amqp/SessionHandle.cpp b/qpid/cpp/src/qpid/messaging/amqp/SessionHandle.cpp
index 044f208564..044f208564 100644
--- a/cpp/src/qpid/messaging/amqp/SessionHandle.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/SessionHandle.cpp
diff --git a/cpp/src/qpid/messaging/amqp/SessionHandle.h b/qpid/cpp/src/qpid/messaging/amqp/SessionHandle.h
index 5e843aaacc..5e843aaacc 100644
--- a/cpp/src/qpid/messaging/amqp/SessionHandle.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/SessionHandle.h
diff --git a/cpp/src/qpid/messaging/amqp/SslTransport.cpp b/qpid/cpp/src/qpid/messaging/amqp/SslTransport.cpp
index a62a553d90..a62a553d90 100644
--- a/cpp/src/qpid/messaging/amqp/SslTransport.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/SslTransport.cpp
diff --git a/cpp/src/qpid/messaging/amqp/SslTransport.h b/qpid/cpp/src/qpid/messaging/amqp/SslTransport.h
index 2972be4fac..2972be4fac 100644
--- a/cpp/src/qpid/messaging/amqp/SslTransport.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/SslTransport.h
diff --git a/cpp/src/qpid/messaging/amqp/TcpTransport.cpp b/qpid/cpp/src/qpid/messaging/amqp/TcpTransport.cpp
index c66f64567a..c66f64567a 100644
--- a/cpp/src/qpid/messaging/amqp/TcpTransport.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/TcpTransport.cpp
diff --git a/cpp/src/qpid/messaging/amqp/TcpTransport.h b/qpid/cpp/src/qpid/messaging/amqp/TcpTransport.h
index cf5d4a0855..cf5d4a0855 100644
--- a/cpp/src/qpid/messaging/amqp/TcpTransport.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/TcpTransport.h
diff --git a/cpp/src/qpid/messaging/amqp/Transport.cpp b/qpid/cpp/src/qpid/messaging/amqp/Transport.cpp
index 21f51046b1..21f51046b1 100644
--- a/cpp/src/qpid/messaging/amqp/Transport.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/Transport.cpp
diff --git a/cpp/src/qpid/messaging/amqp/Transport.h b/qpid/cpp/src/qpid/messaging/amqp/Transport.h
index 159916f9ae..159916f9ae 100644
--- a/cpp/src/qpid/messaging/amqp/Transport.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/Transport.h
diff --git a/cpp/src/qpid/messaging/amqp/TransportContext.h b/qpid/cpp/src/qpid/messaging/amqp/TransportContext.h
index 57192b5976..57192b5976 100644
--- a/cpp/src/qpid/messaging/amqp/TransportContext.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/TransportContext.h
diff --git a/cpp/src/qpid/messaging/exceptions.cpp b/qpid/cpp/src/qpid/messaging/exceptions.cpp
index 5d2683fffe..5d2683fffe 100644
--- a/cpp/src/qpid/messaging/exceptions.cpp
+++ b/qpid/cpp/src/qpid/messaging/exceptions.cpp
diff --git a/cpp/src/qpid/pointer_to_other.h b/qpid/cpp/src/qpid/pointer_to_other.h
index a99dc89658..a99dc89658 100644
--- a/cpp/src/qpid/pointer_to_other.h
+++ b/qpid/cpp/src/qpid/pointer_to_other.h
diff --git a/cpp/src/qpid/ptr_map.h b/qpid/cpp/src/qpid/ptr_map.h
index 6ffcd48e89..6ffcd48e89 100644
--- a/cpp/src/qpid/ptr_map.h
+++ b/qpid/cpp/src/qpid/ptr_map.h
diff --git a/cpp/src/qpid/store/CMakeLists.txt b/qpid/cpp/src/qpid/store/CMakeLists.txt
index 094ae9d5d0..094ae9d5d0 100644
--- a/cpp/src/qpid/store/CMakeLists.txt
+++ b/qpid/cpp/src/qpid/store/CMakeLists.txt
diff --git a/cpp/src/qpid/store/MessageStorePlugin.cpp b/qpid/cpp/src/qpid/store/MessageStorePlugin.cpp
index b876bd6b6d..b876bd6b6d 100644
--- a/cpp/src/qpid/store/MessageStorePlugin.cpp
+++ b/qpid/cpp/src/qpid/store/MessageStorePlugin.cpp
diff --git a/cpp/src/qpid/store/MessageStorePlugin.h b/qpid/cpp/src/qpid/store/MessageStorePlugin.h
index 1fcde6683d..1fcde6683d 100644
--- a/cpp/src/qpid/store/MessageStorePlugin.h
+++ b/qpid/cpp/src/qpid/store/MessageStorePlugin.h
diff --git a/cpp/src/qpid/store/StorageProvider.h b/qpid/cpp/src/qpid/store/StorageProvider.h
index de12ffb869..de12ffb869 100644
--- a/cpp/src/qpid/store/StorageProvider.h
+++ b/qpid/cpp/src/qpid/store/StorageProvider.h
diff --git a/cpp/src/qpid/store/StoreException.h b/qpid/cpp/src/qpid/store/StoreException.h
index 1dc7f670ec..1dc7f670ec 100644
--- a/cpp/src/qpid/store/StoreException.h
+++ b/qpid/cpp/src/qpid/store/StoreException.h
diff --git a/cpp/src/qpid/store/ms-clfs/Log.cpp b/qpid/cpp/src/qpid/store/ms-clfs/Log.cpp
index e6cb10c133..e6cb10c133 100644
--- a/cpp/src/qpid/store/ms-clfs/Log.cpp
+++ b/qpid/cpp/src/qpid/store/ms-clfs/Log.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/Log.h b/qpid/cpp/src/qpid/store/ms-clfs/Log.h
index 2f7eb6cada..2f7eb6cada 100644
--- a/cpp/src/qpid/store/ms-clfs/Log.h
+++ b/qpid/cpp/src/qpid/store/ms-clfs/Log.h
diff --git a/cpp/src/qpid/store/ms-clfs/Lsn.h b/qpid/cpp/src/qpid/store/ms-clfs/Lsn.h
index 7f46c1f266..7f46c1f266 100644
--- a/cpp/src/qpid/store/ms-clfs/Lsn.h
+++ b/qpid/cpp/src/qpid/store/ms-clfs/Lsn.h
diff --git a/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp b/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
index 512e71230b..512e71230b 100644
--- a/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
+++ b/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/MessageLog.cpp b/qpid/cpp/src/qpid/store/ms-clfs/MessageLog.cpp
index 849a0a44e8..849a0a44e8 100644
--- a/cpp/src/qpid/store/ms-clfs/MessageLog.cpp
+++ b/qpid/cpp/src/qpid/store/ms-clfs/MessageLog.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/MessageLog.h b/qpid/cpp/src/qpid/store/ms-clfs/MessageLog.h
index b3705287a6..b3705287a6 100644
--- a/cpp/src/qpid/store/ms-clfs/MessageLog.h
+++ b/qpid/cpp/src/qpid/store/ms-clfs/MessageLog.h
diff --git a/cpp/src/qpid/store/ms-clfs/Messages.cpp b/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp
index db5d2ebf4c..db5d2ebf4c 100644
--- a/cpp/src/qpid/store/ms-clfs/Messages.cpp
+++ b/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/Messages.h b/qpid/cpp/src/qpid/store/ms-clfs/Messages.h
index 93cc8bfe62..93cc8bfe62 100644
--- a/cpp/src/qpid/store/ms-clfs/Messages.h
+++ b/qpid/cpp/src/qpid/store/ms-clfs/Messages.h
diff --git a/cpp/src/qpid/store/ms-clfs/Transaction.cpp b/qpid/cpp/src/qpid/store/ms-clfs/Transaction.cpp
index f94fef6f84..f94fef6f84 100644
--- a/cpp/src/qpid/store/ms-clfs/Transaction.cpp
+++ b/qpid/cpp/src/qpid/store/ms-clfs/Transaction.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/Transaction.h b/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h
index 499b01d503..499b01d503 100644
--- a/cpp/src/qpid/store/ms-clfs/Transaction.h
+++ b/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h
diff --git a/cpp/src/qpid/store/ms-clfs/TransactionLog.cpp b/qpid/cpp/src/qpid/store/ms-clfs/TransactionLog.cpp
index 0ef046d7c8..0ef046d7c8 100644
--- a/cpp/src/qpid/store/ms-clfs/TransactionLog.cpp
+++ b/qpid/cpp/src/qpid/store/ms-clfs/TransactionLog.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/TransactionLog.h b/qpid/cpp/src/qpid/store/ms-clfs/TransactionLog.h
index 7ca27c229e..7ca27c229e 100644
--- a/cpp/src/qpid/store/ms-clfs/TransactionLog.h
+++ b/qpid/cpp/src/qpid/store/ms-clfs/TransactionLog.h
diff --git a/cpp/src/qpid/store/ms-sql/AmqpTransaction.cpp b/qpid/cpp/src/qpid/store/ms-sql/AmqpTransaction.cpp
index 095d1bf331..095d1bf331 100644
--- a/cpp/src/qpid/store/ms-sql/AmqpTransaction.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/AmqpTransaction.cpp
diff --git a/cpp/src/qpid/store/ms-sql/AmqpTransaction.h b/qpid/cpp/src/qpid/store/ms-sql/AmqpTransaction.h
index 625fab5595..625fab5595 100644
--- a/cpp/src/qpid/store/ms-sql/AmqpTransaction.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/AmqpTransaction.h
diff --git a/cpp/src/qpid/store/ms-sql/BindingRecordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/BindingRecordset.cpp
index 1dc4370312..1dc4370312 100644
--- a/cpp/src/qpid/store/ms-sql/BindingRecordset.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/BindingRecordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/BindingRecordset.h b/qpid/cpp/src/qpid/store/ms-sql/BindingRecordset.h
index 3cb732de75..3cb732de75 100644
--- a/cpp/src/qpid/store/ms-sql/BindingRecordset.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/BindingRecordset.h
diff --git a/cpp/src/qpid/store/ms-sql/BlobAdapter.cpp b/qpid/cpp/src/qpid/store/ms-sql/BlobAdapter.cpp
index 1889f34e41..1889f34e41 100644
--- a/cpp/src/qpid/store/ms-sql/BlobAdapter.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/BlobAdapter.cpp
diff --git a/cpp/src/qpid/store/ms-sql/BlobAdapter.h b/qpid/cpp/src/qpid/store/ms-sql/BlobAdapter.h
index 1c666392bc..1c666392bc 100644
--- a/cpp/src/qpid/store/ms-sql/BlobAdapter.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/BlobAdapter.h
diff --git a/cpp/src/qpid/store/ms-sql/BlobEncoder.cpp b/qpid/cpp/src/qpid/store/ms-sql/BlobEncoder.cpp
index 75d3dc2d86..75d3dc2d86 100644
--- a/cpp/src/qpid/store/ms-sql/BlobEncoder.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/BlobEncoder.cpp
diff --git a/cpp/src/qpid/store/ms-sql/BlobEncoder.h b/qpid/cpp/src/qpid/store/ms-sql/BlobEncoder.h
index d2b56223c1..d2b56223c1 100644
--- a/cpp/src/qpid/store/ms-sql/BlobEncoder.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/BlobEncoder.h
diff --git a/cpp/src/qpid/store/ms-sql/BlobRecordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/BlobRecordset.cpp
index ef1757dbad..ef1757dbad 100644
--- a/cpp/src/qpid/store/ms-sql/BlobRecordset.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/BlobRecordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/BlobRecordset.h b/qpid/cpp/src/qpid/store/ms-sql/BlobRecordset.h
index 4d1c338746..4d1c338746 100644
--- a/cpp/src/qpid/store/ms-sql/BlobRecordset.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/BlobRecordset.h
diff --git a/cpp/src/qpid/store/ms-sql/DatabaseConnection.cpp b/qpid/cpp/src/qpid/store/ms-sql/DatabaseConnection.cpp
index 3219ea526a..3219ea526a 100644
--- a/cpp/src/qpid/store/ms-sql/DatabaseConnection.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/DatabaseConnection.cpp
diff --git a/cpp/src/qpid/store/ms-sql/DatabaseConnection.h b/qpid/cpp/src/qpid/store/ms-sql/DatabaseConnection.h
index 785d1587c5..785d1587c5 100644
--- a/cpp/src/qpid/store/ms-sql/DatabaseConnection.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/DatabaseConnection.h
diff --git a/cpp/src/qpid/store/ms-sql/Exception.h b/qpid/cpp/src/qpid/store/ms-sql/Exception.h
index 65ec3388ff..65ec3388ff 100644
--- a/cpp/src/qpid/store/ms-sql/Exception.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/Exception.h
diff --git a/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp b/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
index 1432cc8fca..1432cc8fca 100644
--- a/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
diff --git a/cpp/src/qpid/store/ms-sql/MessageMapRecordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/MessageMapRecordset.cpp
index ce9fa61010..ce9fa61010 100644
--- a/cpp/src/qpid/store/ms-sql/MessageMapRecordset.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/MessageMapRecordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/MessageMapRecordset.h b/qpid/cpp/src/qpid/store/ms-sql/MessageMapRecordset.h
index 1b0c2f073e..1b0c2f073e 100644
--- a/cpp/src/qpid/store/ms-sql/MessageMapRecordset.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/MessageMapRecordset.h
diff --git a/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp
index 495f1a08c2..495f1a08c2 100644
--- a/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/MessageRecordset.h b/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.h
index 698b2561fe..698b2561fe 100644
--- a/cpp/src/qpid/store/ms-sql/MessageRecordset.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.h
diff --git a/cpp/src/qpid/store/ms-sql/Recordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/Recordset.cpp
index e706799951..e706799951 100644
--- a/cpp/src/qpid/store/ms-sql/Recordset.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/Recordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/Recordset.h b/qpid/cpp/src/qpid/store/ms-sql/Recordset.h
index 032b2bd434..032b2bd434 100644
--- a/cpp/src/qpid/store/ms-sql/Recordset.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/Recordset.h
diff --git a/cpp/src/qpid/store/ms-sql/SqlTransaction.cpp b/qpid/cpp/src/qpid/store/ms-sql/SqlTransaction.cpp
index 6ad7725570..6ad7725570 100644
--- a/cpp/src/qpid/store/ms-sql/SqlTransaction.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/SqlTransaction.cpp
diff --git a/cpp/src/qpid/store/ms-sql/SqlTransaction.h b/qpid/cpp/src/qpid/store/ms-sql/SqlTransaction.h
index 8b5239b786..8b5239b786 100644
--- a/cpp/src/qpid/store/ms-sql/SqlTransaction.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/SqlTransaction.h
diff --git a/cpp/src/qpid/store/ms-sql/State.cpp b/qpid/cpp/src/qpid/store/ms-sql/State.cpp
index 720603dd11..720603dd11 100644
--- a/cpp/src/qpid/store/ms-sql/State.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/State.cpp
diff --git a/cpp/src/qpid/store/ms-sql/State.h b/qpid/cpp/src/qpid/store/ms-sql/State.h
index 6350bc5bd2..6350bc5bd2 100644
--- a/cpp/src/qpid/store/ms-sql/State.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/State.h
diff --git a/cpp/src/qpid/store/ms-sql/TplRecordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/TplRecordset.cpp
index 1309d921a9..1309d921a9 100644
--- a/cpp/src/qpid/store/ms-sql/TplRecordset.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/TplRecordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/TplRecordset.h b/qpid/cpp/src/qpid/store/ms-sql/TplRecordset.h
index fbde51738c..fbde51738c 100644
--- a/cpp/src/qpid/store/ms-sql/TplRecordset.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/TplRecordset.h
diff --git a/cpp/src/qpid/store/ms-sql/VariantHelper.cpp b/qpid/cpp/src/qpid/store/ms-sql/VariantHelper.cpp
index acec95c1f9..acec95c1f9 100644
--- a/cpp/src/qpid/store/ms-sql/VariantHelper.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/VariantHelper.cpp
diff --git a/cpp/src/qpid/store/ms-sql/VariantHelper.h b/qpid/cpp/src/qpid/store/ms-sql/VariantHelper.h
index 723dbc3b76..723dbc3b76 100644
--- a/cpp/src/qpid/store/ms-sql/VariantHelper.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/VariantHelper.h
diff --git a/cpp/src/qpid/sys/AggregateOutput.cpp b/qpid/cpp/src/qpid/sys/AggregateOutput.cpp
index 773ea68e55..773ea68e55 100644
--- a/cpp/src/qpid/sys/AggregateOutput.cpp
+++ b/qpid/cpp/src/qpid/sys/AggregateOutput.cpp
diff --git a/cpp/src/qpid/sys/AggregateOutput.h b/qpid/cpp/src/qpid/sys/AggregateOutput.h
index c8dd8d989a..c8dd8d989a 100644
--- a/cpp/src/qpid/sys/AggregateOutput.h
+++ b/qpid/cpp/src/qpid/sys/AggregateOutput.h
diff --git a/cpp/src/qpid/sys/AsynchIO.h b/qpid/cpp/src/qpid/sys/AsynchIO.h
index 2bab96c0c5..2bab96c0c5 100644
--- a/cpp/src/qpid/sys/AsynchIO.h
+++ b/qpid/cpp/src/qpid/sys/AsynchIO.h
diff --git a/cpp/src/qpid/sys/AsynchIOHandler.cpp b/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
index 243e3d4603..243e3d4603 100644
--- a/cpp/src/qpid/sys/AsynchIOHandler.cpp
+++ b/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
diff --git a/cpp/src/qpid/sys/AsynchIOHandler.h b/qpid/cpp/src/qpid/sys/AsynchIOHandler.h
index 2dc15c1a19..2dc15c1a19 100644
--- a/cpp/src/qpid/sys/AsynchIOHandler.h
+++ b/qpid/cpp/src/qpid/sys/AsynchIOHandler.h
diff --git a/cpp/src/qpid/sys/AtomicCount.h b/qpid/cpp/src/qpid/sys/AtomicCount.h
index 94580c61f3..94580c61f3 100644
--- a/cpp/src/qpid/sys/AtomicCount.h
+++ b/qpid/cpp/src/qpid/sys/AtomicCount.h
diff --git a/cpp/src/qpid/sys/AtomicValue.h b/qpid/cpp/src/qpid/sys/AtomicValue.h
index bf995f991e..bf995f991e 100644
--- a/cpp/src/qpid/sys/AtomicValue.h
+++ b/qpid/cpp/src/qpid/sys/AtomicValue.h
diff --git a/cpp/src/qpid/sys/AtomicValue_gcc.h b/qpid/cpp/src/qpid/sys/AtomicValue_gcc.h
index 724bae422e..724bae422e 100644
--- a/cpp/src/qpid/sys/AtomicValue_gcc.h
+++ b/qpid/cpp/src/qpid/sys/AtomicValue_gcc.h
diff --git a/cpp/src/qpid/sys/AtomicValue_mutex.h b/qpid/cpp/src/qpid/sys/AtomicValue_mutex.h
index e4d433e7f5..e4d433e7f5 100644
--- a/cpp/src/qpid/sys/AtomicValue_mutex.h
+++ b/qpid/cpp/src/qpid/sys/AtomicValue_mutex.h
diff --git a/cpp/src/qpid/sys/BlockingQueue.h b/qpid/cpp/src/qpid/sys/BlockingQueue.h
index ca6b529930..ca6b529930 100644
--- a/cpp/src/qpid/sys/BlockingQueue.h
+++ b/qpid/cpp/src/qpid/sys/BlockingQueue.h
diff --git a/cpp/src/qpid/sys/Codec.h b/qpid/cpp/src/qpid/sys/Codec.h
index e398403e47..e398403e47 100644
--- a/cpp/src/qpid/sys/Codec.h
+++ b/qpid/cpp/src/qpid/sys/Codec.h
diff --git a/cpp/src/qpid/sys/Condition.h b/qpid/cpp/src/qpid/sys/Condition.h
index 9be4b357fe..9be4b357fe 100644
--- a/cpp/src/qpid/sys/Condition.h
+++ b/qpid/cpp/src/qpid/sys/Condition.h
diff --git a/cpp/src/qpid/sys/ConnectionCodec.h b/qpid/cpp/src/qpid/sys/ConnectionCodec.h
index c2890f06dc..c2890f06dc 100644
--- a/cpp/src/qpid/sys/ConnectionCodec.h
+++ b/qpid/cpp/src/qpid/sys/ConnectionCodec.h
diff --git a/cpp/src/qpid/sys/ConnectionInputHandler.h b/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h
index f6fcdb7479..f6fcdb7479 100644
--- a/cpp/src/qpid/sys/ConnectionInputHandler.h
+++ b/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h
diff --git a/cpp/src/qpid/sys/ConnectionInputHandlerFactory.h b/qpid/cpp/src/qpid/sys/ConnectionInputHandlerFactory.h
index 9bb7e13686..9bb7e13686 100644
--- a/cpp/src/qpid/sys/ConnectionInputHandlerFactory.h
+++ b/qpid/cpp/src/qpid/sys/ConnectionInputHandlerFactory.h
diff --git a/cpp/src/qpid/sys/ConnectionOutputHandler.h b/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h
index 3b1440d613..3b1440d613 100644
--- a/cpp/src/qpid/sys/ConnectionOutputHandler.h
+++ b/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h
diff --git a/cpp/src/qpid/sys/CopyOnWriteArray.h b/qpid/cpp/src/qpid/sys/CopyOnWriteArray.h
index 41384fc5a4..41384fc5a4 100644
--- a/cpp/src/qpid/sys/CopyOnWriteArray.h
+++ b/qpid/cpp/src/qpid/sys/CopyOnWriteArray.h
diff --git a/cpp/src/qpid/sys/DeletionManager.h b/qpid/cpp/src/qpid/sys/DeletionManager.h
index c1fea19f30..c1fea19f30 100644
--- a/cpp/src/qpid/sys/DeletionManager.h
+++ b/qpid/cpp/src/qpid/sys/DeletionManager.h
diff --git a/cpp/src/qpid/sys/DispatchHandle.cpp b/qpid/cpp/src/qpid/sys/DispatchHandle.cpp
index 5d6fc4e72f..5d6fc4e72f 100644
--- a/cpp/src/qpid/sys/DispatchHandle.cpp
+++ b/qpid/cpp/src/qpid/sys/DispatchHandle.cpp
diff --git a/cpp/src/qpid/sys/DispatchHandle.h b/qpid/cpp/src/qpid/sys/DispatchHandle.h
index 115a3c44f7..115a3c44f7 100644
--- a/cpp/src/qpid/sys/DispatchHandle.h
+++ b/qpid/cpp/src/qpid/sys/DispatchHandle.h
diff --git a/cpp/src/qpid/sys/Dispatcher.cpp b/qpid/cpp/src/qpid/sys/Dispatcher.cpp
index 5f52dcd990..5f52dcd990 100644
--- a/cpp/src/qpid/sys/Dispatcher.cpp
+++ b/qpid/cpp/src/qpid/sys/Dispatcher.cpp
diff --git a/cpp/src/qpid/sys/Dispatcher.h b/qpid/cpp/src/qpid/sys/Dispatcher.h
index e8213d0579..e8213d0579 100644
--- a/cpp/src/qpid/sys/Dispatcher.h
+++ b/qpid/cpp/src/qpid/sys/Dispatcher.h
diff --git a/cpp/src/qpid/sys/ExceptionHolder.h b/qpid/cpp/src/qpid/sys/ExceptionHolder.h
index 4bc934cf75..4bc934cf75 100644
--- a/cpp/src/qpid/sys/ExceptionHolder.h
+++ b/qpid/cpp/src/qpid/sys/ExceptionHolder.h
diff --git a/cpp/src/qpid/sys/FileSysDir.h b/qpid/cpp/src/qpid/sys/FileSysDir.h
index 7432fe39c9..7432fe39c9 100755
--- a/cpp/src/qpid/sys/FileSysDir.h
+++ b/qpid/cpp/src/qpid/sys/FileSysDir.h
diff --git a/cpp/src/qpid/sys/Fork.h b/qpid/cpp/src/qpid/sys/Fork.h
index 4ec061f7bc..4ec061f7bc 100644
--- a/cpp/src/qpid/sys/Fork.h
+++ b/qpid/cpp/src/qpid/sys/Fork.h
diff --git a/cpp/src/qpid/sys/IOHandle.h b/qpid/cpp/src/qpid/sys/IOHandle.h
index 06ae65f879..06ae65f879 100644
--- a/cpp/src/qpid/sys/IOHandle.h
+++ b/qpid/cpp/src/qpid/sys/IOHandle.h
diff --git a/cpp/src/qpid/sys/LockFile.h b/qpid/cpp/src/qpid/sys/LockFile.h
index 14a76cbf3e..14a76cbf3e 100644
--- a/cpp/src/qpid/sys/LockFile.h
+++ b/qpid/cpp/src/qpid/sys/LockFile.h
diff --git a/cpp/src/qpid/sys/LockPtr.h b/qpid/cpp/src/qpid/sys/LockPtr.h
index 738a864317..738a864317 100644
--- a/cpp/src/qpid/sys/LockPtr.h
+++ b/qpid/cpp/src/qpid/sys/LockPtr.h
diff --git a/cpp/src/qpid/sys/MemStat.cpp b/qpid/cpp/src/qpid/sys/MemStat.cpp
index c71fba785c..c71fba785c 100644
--- a/cpp/src/qpid/sys/MemStat.cpp
+++ b/qpid/cpp/src/qpid/sys/MemStat.cpp
diff --git a/cpp/src/qpid/sys/MemStat.h b/qpid/cpp/src/qpid/sys/MemStat.h
index d855786cd5..d855786cd5 100644
--- a/cpp/src/qpid/sys/MemStat.h
+++ b/qpid/cpp/src/qpid/sys/MemStat.h
diff --git a/cpp/src/qpid/sys/MemoryMappedFile.h b/qpid/cpp/src/qpid/sys/MemoryMappedFile.h
index 84548a5f6f..84548a5f6f 100644
--- a/cpp/src/qpid/sys/MemoryMappedFile.h
+++ b/qpid/cpp/src/qpid/sys/MemoryMappedFile.h
diff --git a/cpp/src/qpid/sys/Monitor.h b/qpid/cpp/src/qpid/sys/Monitor.h
index 123bf92dcb..123bf92dcb 100644
--- a/cpp/src/qpid/sys/Monitor.h
+++ b/qpid/cpp/src/qpid/sys/Monitor.h
diff --git a/cpp/src/qpid/sys/Mutex.h b/qpid/cpp/src/qpid/sys/Mutex.h
index e718586a39..e718586a39 100644
--- a/cpp/src/qpid/sys/Mutex.h
+++ b/qpid/cpp/src/qpid/sys/Mutex.h
diff --git a/cpp/src/qpid/sys/OutputControl.h b/qpid/cpp/src/qpid/sys/OutputControl.h
index f990594637..f990594637 100644
--- a/cpp/src/qpid/sys/OutputControl.h
+++ b/qpid/cpp/src/qpid/sys/OutputControl.h
diff --git a/cpp/src/qpid/sys/OutputTask.h b/qpid/cpp/src/qpid/sys/OutputTask.h
index fb08a63cd0..fb08a63cd0 100644
--- a/cpp/src/qpid/sys/OutputTask.h
+++ b/qpid/cpp/src/qpid/sys/OutputTask.h
diff --git a/cpp/src/qpid/sys/Path.h b/qpid/cpp/src/qpid/sys/Path.h
index 9b440b3c00..9b440b3c00 100644
--- a/cpp/src/qpid/sys/Path.h
+++ b/qpid/cpp/src/qpid/sys/Path.h
diff --git a/cpp/src/qpid/sys/PipeHandle.h b/qpid/cpp/src/qpid/sys/PipeHandle.h
index 8aac76996b..8aac76996b 100755
--- a/cpp/src/qpid/sys/PipeHandle.h
+++ b/qpid/cpp/src/qpid/sys/PipeHandle.h
diff --git a/cpp/src/qpid/sys/PollableCondition.h b/qpid/cpp/src/qpid/sys/PollableCondition.h
index 2eb6f2d947..2eb6f2d947 100644
--- a/cpp/src/qpid/sys/PollableCondition.h
+++ b/qpid/cpp/src/qpid/sys/PollableCondition.h
diff --git a/cpp/src/qpid/sys/PollableQueue.h b/qpid/cpp/src/qpid/sys/PollableQueue.h
index 03b9d0084d..03b9d0084d 100644
--- a/cpp/src/qpid/sys/PollableQueue.h
+++ b/qpid/cpp/src/qpid/sys/PollableQueue.h
diff --git a/cpp/src/qpid/sys/Poller.h b/qpid/cpp/src/qpid/sys/Poller.h
index 01ee139ee6..01ee139ee6 100644
--- a/cpp/src/qpid/sys/Poller.h
+++ b/qpid/cpp/src/qpid/sys/Poller.h
diff --git a/cpp/src/qpid/sys/Probes.h b/qpid/cpp/src/qpid/sys/Probes.h
index d30181c357..d30181c357 100644
--- a/cpp/src/qpid/sys/Probes.h
+++ b/qpid/cpp/src/qpid/sys/Probes.h
diff --git a/cpp/src/qpid/sys/RdmaIOPlugin.cpp b/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
index 31efd6753f..31efd6753f 100644
--- a/cpp/src/qpid/sys/RdmaIOPlugin.cpp
+++ b/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
diff --git a/cpp/src/qpid/sys/Runnable.cpp b/qpid/cpp/src/qpid/sys/Runnable.cpp
index 325d87c91b..325d87c91b 100644
--- a/cpp/src/qpid/sys/Runnable.cpp
+++ b/qpid/cpp/src/qpid/sys/Runnable.cpp
diff --git a/cpp/src/qpid/sys/Runnable.h b/qpid/cpp/src/qpid/sys/Runnable.h
index fed7663cb6..fed7663cb6 100644
--- a/cpp/src/qpid/sys/Runnable.h
+++ b/qpid/cpp/src/qpid/sys/Runnable.h
diff --git a/cpp/src/qpid/sys/ScopedIncrement.h b/qpid/cpp/src/qpid/sys/ScopedIncrement.h
index 8645ab2484..8645ab2484 100644
--- a/cpp/src/qpid/sys/ScopedIncrement.h
+++ b/qpid/cpp/src/qpid/sys/ScopedIncrement.h
diff --git a/cpp/src/qpid/sys/SecurityLayer.h b/qpid/cpp/src/qpid/sys/SecurityLayer.h
index 317ada16de..317ada16de 100644
--- a/cpp/src/qpid/sys/SecurityLayer.h
+++ b/qpid/cpp/src/qpid/sys/SecurityLayer.h
diff --git a/cpp/src/qpid/sys/SecuritySettings.h b/qpid/cpp/src/qpid/sys/SecuritySettings.h
index d595cad660..d595cad660 100644
--- a/cpp/src/qpid/sys/SecuritySettings.h
+++ b/qpid/cpp/src/qpid/sys/SecuritySettings.h
diff --git a/cpp/src/qpid/sys/Semaphore.h b/qpid/cpp/src/qpid/sys/Semaphore.h
index 9d70f89aeb..9d70f89aeb 100644
--- a/cpp/src/qpid/sys/Semaphore.h
+++ b/qpid/cpp/src/qpid/sys/Semaphore.h
diff --git a/cpp/src/qpid/sys/Shlib.cpp b/qpid/cpp/src/qpid/sys/Shlib.cpp
index 342d726876..342d726876 100644
--- a/cpp/src/qpid/sys/Shlib.cpp
+++ b/qpid/cpp/src/qpid/sys/Shlib.cpp
diff --git a/cpp/src/qpid/sys/Shlib.h b/qpid/cpp/src/qpid/sys/Shlib.h
index 2ce5a49fcb..2ce5a49fcb 100644
--- a/cpp/src/qpid/sys/Shlib.h
+++ b/qpid/cpp/src/qpid/sys/Shlib.h
diff --git a/cpp/src/qpid/sys/ShutdownHandler.h b/qpid/cpp/src/qpid/sys/ShutdownHandler.h
index 88baecb5b6..88baecb5b6 100644
--- a/cpp/src/qpid/sys/ShutdownHandler.h
+++ b/qpid/cpp/src/qpid/sys/ShutdownHandler.h
diff --git a/cpp/src/qpid/sys/Socket.h b/qpid/cpp/src/qpid/sys/Socket.h
index 38183bd5fd..38183bd5fd 100644
--- a/cpp/src/qpid/sys/Socket.h
+++ b/qpid/cpp/src/qpid/sys/Socket.h
diff --git a/cpp/src/qpid/sys/SocketAddress.h b/qpid/cpp/src/qpid/sys/SocketAddress.h
index c54877ea0b..c54877ea0b 100644
--- a/cpp/src/qpid/sys/SocketAddress.h
+++ b/qpid/cpp/src/qpid/sys/SocketAddress.h
diff --git a/cpp/src/qpid/sys/SocketTransport.cpp b/qpid/cpp/src/qpid/sys/SocketTransport.cpp
index 502aaa3bab..502aaa3bab 100644
--- a/cpp/src/qpid/sys/SocketTransport.cpp
+++ b/qpid/cpp/src/qpid/sys/SocketTransport.cpp
diff --git a/cpp/src/qpid/sys/SocketTransport.h b/qpid/cpp/src/qpid/sys/SocketTransport.h
index 5aca52c372..5aca52c372 100644
--- a/cpp/src/qpid/sys/SocketTransport.h
+++ b/qpid/cpp/src/qpid/sys/SocketTransport.h
diff --git a/cpp/src/qpid/sys/SslPlugin.cpp b/qpid/cpp/src/qpid/sys/SslPlugin.cpp
index 4c3326622a..4c3326622a 100644
--- a/cpp/src/qpid/sys/SslPlugin.cpp
+++ b/qpid/cpp/src/qpid/sys/SslPlugin.cpp
diff --git a/cpp/src/qpid/sys/StateMonitor.h b/qpid/cpp/src/qpid/sys/StateMonitor.h
index eac37a8543..eac37a8543 100644
--- a/cpp/src/qpid/sys/StateMonitor.h
+++ b/qpid/cpp/src/qpid/sys/StateMonitor.h
diff --git a/cpp/src/qpid/sys/StrError.h b/qpid/cpp/src/qpid/sys/StrError.h
index 36489dd0fc..36489dd0fc 100644
--- a/cpp/src/qpid/sys/StrError.h
+++ b/qpid/cpp/src/qpid/sys/StrError.h
diff --git a/cpp/src/qpid/sys/SystemInfo.h b/qpid/cpp/src/qpid/sys/SystemInfo.h
index 1b5720a5f0..1b5720a5f0 100644
--- a/cpp/src/qpid/sys/SystemInfo.h
+++ b/qpid/cpp/src/qpid/sys/SystemInfo.h
diff --git a/cpp/src/qpid/sys/TCPIOPlugin.cpp b/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
index cd941eb2f6..cd941eb2f6 100644
--- a/cpp/src/qpid/sys/TCPIOPlugin.cpp
+++ b/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
diff --git a/cpp/src/qpid/sys/Thread.h b/qpid/cpp/src/qpid/sys/Thread.h
index f556612908..f556612908 100644
--- a/cpp/src/qpid/sys/Thread.h
+++ b/qpid/cpp/src/qpid/sys/Thread.h
diff --git a/cpp/src/qpid/sys/Time.h b/qpid/cpp/src/qpid/sys/Time.h
index 2ccff92e7c..2ccff92e7c 100644
--- a/cpp/src/qpid/sys/Time.h
+++ b/qpid/cpp/src/qpid/sys/Time.h
diff --git a/cpp/src/qpid/sys/Timer.cpp b/qpid/cpp/src/qpid/sys/Timer.cpp
index f8eef2c9ec..f8eef2c9ec 100644
--- a/cpp/src/qpid/sys/Timer.cpp
+++ b/qpid/cpp/src/qpid/sys/Timer.cpp
diff --git a/cpp/src/qpid/sys/Timer.h b/qpid/cpp/src/qpid/sys/Timer.h
index 5045009609..5045009609 100644
--- a/cpp/src/qpid/sys/Timer.h
+++ b/qpid/cpp/src/qpid/sys/Timer.h
diff --git a/cpp/src/qpid/sys/TimerWarnings.cpp b/qpid/cpp/src/qpid/sys/TimerWarnings.cpp
index 00fb0d9db6..00fb0d9db6 100644
--- a/cpp/src/qpid/sys/TimerWarnings.cpp
+++ b/qpid/cpp/src/qpid/sys/TimerWarnings.cpp
diff --git a/cpp/src/qpid/sys/TimerWarnings.h b/qpid/cpp/src/qpid/sys/TimerWarnings.h
index 337a434ab5..337a434ab5 100644
--- a/cpp/src/qpid/sys/TimerWarnings.h
+++ b/qpid/cpp/src/qpid/sys/TimerWarnings.h
diff --git a/cpp/src/qpid/sys/TransportFactory.h b/qpid/cpp/src/qpid/sys/TransportFactory.h
index 06aa168024..06aa168024 100644
--- a/cpp/src/qpid/sys/TransportFactory.h
+++ b/qpid/cpp/src/qpid/sys/TransportFactory.h
diff --git a/cpp/src/qpid/sys/Waitable.h b/qpid/cpp/src/qpid/sys/Waitable.h
index 8f6bd17049..8f6bd17049 100644
--- a/cpp/src/qpid/sys/Waitable.h
+++ b/qpid/cpp/src/qpid/sys/Waitable.h
diff --git a/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp b/qpid/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp
index 79d9d08a59..79d9d08a59 100644
--- a/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp
+++ b/qpid/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp
diff --git a/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.h b/qpid/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.h
index ae86ba5569..ae86ba5569 100644
--- a/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.h
+++ b/qpid/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.h
diff --git a/cpp/src/qpid/sys/epoll/EpollPoller.cpp b/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp
index 6fdf99637f..6fdf99637f 100644
--- a/cpp/src/qpid/sys/epoll/EpollPoller.cpp
+++ b/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp
diff --git a/cpp/src/qpid/sys/posix/AsynchIO.cpp b/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
index c609e1ed31..c609e1ed31 100644
--- a/cpp/src/qpid/sys/posix/AsynchIO.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
diff --git a/cpp/src/qpid/sys/posix/BSDSocket.cpp b/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp
index 7c31b13ae9..7c31b13ae9 100644
--- a/cpp/src/qpid/sys/posix/BSDSocket.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp
diff --git a/cpp/src/qpid/sys/posix/BSDSocket.h b/qpid/cpp/src/qpid/sys/posix/BSDSocket.h
index ae73718d55..ae73718d55 100644
--- a/cpp/src/qpid/sys/posix/BSDSocket.h
+++ b/qpid/cpp/src/qpid/sys/posix/BSDSocket.h
diff --git a/cpp/src/qpid/sys/posix/Condition.h b/qpid/cpp/src/qpid/sys/posix/Condition.h
index 36e7557ffd..36e7557ffd 100644
--- a/cpp/src/qpid/sys/posix/Condition.h
+++ b/qpid/cpp/src/qpid/sys/posix/Condition.h
diff --git a/cpp/src/qpid/sys/posix/FileSysDir.cpp b/qpid/cpp/src/qpid/sys/posix/FileSysDir.cpp
index cec580164d..cec580164d 100755
--- a/cpp/src/qpid/sys/posix/FileSysDir.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/FileSysDir.cpp
diff --git a/cpp/src/qpid/sys/posix/Fork.cpp b/qpid/cpp/src/qpid/sys/posix/Fork.cpp
index a0d404a16e..a0d404a16e 100644
--- a/cpp/src/qpid/sys/posix/Fork.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Fork.cpp
diff --git a/cpp/src/qpid/sys/posix/Fork.h b/qpid/cpp/src/qpid/sys/posix/Fork.h
index 698c61ed30..698c61ed30 100644
--- a/cpp/src/qpid/sys/posix/Fork.h
+++ b/qpid/cpp/src/qpid/sys/posix/Fork.h
diff --git a/cpp/src/qpid/sys/posix/IOHandle.cpp b/qpid/cpp/src/qpid/sys/posix/IOHandle.cpp
index d3f502a63c..d3f502a63c 100644
--- a/cpp/src/qpid/sys/posix/IOHandle.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/IOHandle.cpp
diff --git a/cpp/src/qpid/sys/posix/LockFile.cpp b/qpid/cpp/src/qpid/sys/posix/LockFile.cpp
index 9fdf83f1bd..9fdf83f1bd 100755
--- a/cpp/src/qpid/sys/posix/LockFile.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/LockFile.cpp
diff --git a/cpp/src/qpid/sys/posix/MemStat.cpp b/qpid/cpp/src/qpid/sys/posix/MemStat.cpp
index 2fbf119cab..2fbf119cab 100644
--- a/cpp/src/qpid/sys/posix/MemStat.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/MemStat.cpp
diff --git a/cpp/src/qpid/sys/posix/MemoryMappedFile.cpp b/qpid/cpp/src/qpid/sys/posix/MemoryMappedFile.cpp
index b60aaae2e1..b60aaae2e1 100644
--- a/cpp/src/qpid/sys/posix/MemoryMappedFile.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/MemoryMappedFile.cpp
diff --git a/cpp/src/qpid/sys/posix/Mutex.cpp b/qpid/cpp/src/qpid/sys/posix/Mutex.cpp
index 0e1f0d30c2..0e1f0d30c2 100644
--- a/cpp/src/qpid/sys/posix/Mutex.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Mutex.cpp
diff --git a/cpp/src/qpid/sys/posix/Mutex.h b/qpid/cpp/src/qpid/sys/posix/Mutex.h
index e2b21b5a56..e2b21b5a56 100644
--- a/cpp/src/qpid/sys/posix/Mutex.h
+++ b/qpid/cpp/src/qpid/sys/posix/Mutex.h
diff --git a/cpp/src/qpid/sys/posix/Path.cpp b/qpid/cpp/src/qpid/sys/posix/Path.cpp
index 063e3cfc51..063e3cfc51 100644
--- a/cpp/src/qpid/sys/posix/Path.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Path.cpp
diff --git a/cpp/src/qpid/sys/posix/PidFile.h b/qpid/cpp/src/qpid/sys/posix/PidFile.h
index fb19d407f4..fb19d407f4 100644
--- a/cpp/src/qpid/sys/posix/PidFile.h
+++ b/qpid/cpp/src/qpid/sys/posix/PidFile.h
diff --git a/cpp/src/qpid/sys/posix/PipeHandle.cpp b/qpid/cpp/src/qpid/sys/posix/PipeHandle.cpp
index 4b19783338..4b19783338 100755
--- a/cpp/src/qpid/sys/posix/PipeHandle.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/PipeHandle.cpp
diff --git a/cpp/src/qpid/sys/posix/PollableCondition.cpp b/qpid/cpp/src/qpid/sys/posix/PollableCondition.cpp
index aa129faf20..aa129faf20 100644
--- a/cpp/src/qpid/sys/posix/PollableCondition.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/PollableCondition.cpp
diff --git a/cpp/src/qpid/sys/posix/PosixPoller.cpp b/qpid/cpp/src/qpid/sys/posix/PosixPoller.cpp
index ae839b2e20..ae839b2e20 100644
--- a/cpp/src/qpid/sys/posix/PosixPoller.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/PosixPoller.cpp
diff --git a/cpp/src/qpid/sys/posix/PrivatePosix.h b/qpid/cpp/src/qpid/sys/posix/PrivatePosix.h
index 0f59fe3176..0f59fe3176 100644
--- a/cpp/src/qpid/sys/posix/PrivatePosix.h
+++ b/qpid/cpp/src/qpid/sys/posix/PrivatePosix.h
diff --git a/cpp/src/qpid/sys/posix/Shlib.cpp b/qpid/cpp/src/qpid/sys/posix/Shlib.cpp
index 3fb685d5b8..3fb685d5b8 100644
--- a/cpp/src/qpid/sys/posix/Shlib.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Shlib.cpp
diff --git a/cpp/src/qpid/sys/posix/SocketAddress.cpp b/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
index b88b3a2806..b88b3a2806 100644
--- a/cpp/src/qpid/sys/posix/SocketAddress.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
diff --git a/cpp/src/qpid/sys/posix/StrError.cpp b/qpid/cpp/src/qpid/sys/posix/StrError.cpp
index 633e20213c..633e20213c 100644
--- a/cpp/src/qpid/sys/posix/StrError.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/StrError.cpp
diff --git a/cpp/src/qpid/sys/posix/SystemInfo.cpp b/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp
index 2a42a5b2a7..2a42a5b2a7 100755
--- a/cpp/src/qpid/sys/posix/SystemInfo.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp
diff --git a/cpp/src/qpid/sys/posix/Thread.cpp b/qpid/cpp/src/qpid/sys/posix/Thread.cpp
index a1d6396763..a1d6396763 100644
--- a/cpp/src/qpid/sys/posix/Thread.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Thread.cpp
diff --git a/cpp/src/qpid/sys/posix/Time.cpp b/qpid/cpp/src/qpid/sys/posix/Time.cpp
index b78a7e254a..b78a7e254a 100644
--- a/cpp/src/qpid/sys/posix/Time.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Time.cpp
diff --git a/cpp/src/qpid/sys/posix/Time.h b/qpid/cpp/src/qpid/sys/posix/Time.h
index 62d734c816..62d734c816 100755
--- a/cpp/src/qpid/sys/posix/Time.h
+++ b/qpid/cpp/src/qpid/sys/posix/Time.h
diff --git a/cpp/src/qpid/sys/posix/check.h b/qpid/cpp/src/qpid/sys/posix/check.h
index 1bfe5d6d78..1bfe5d6d78 100644
--- a/cpp/src/qpid/sys/posix/check.h
+++ b/qpid/cpp/src/qpid/sys/posix/check.h
diff --git a/cpp/src/qpid/sys/rdma/RdmaClient.cpp b/qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp
index 38e9b59541..38e9b59541 100644
--- a/cpp/src/qpid/sys/rdma/RdmaClient.cpp
+++ b/qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp
diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.cpp b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp
index 78bcdec68e..78bcdec68e 100644
--- a/cpp/src/qpid/sys/rdma/RdmaIO.cpp
+++ b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp
diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.h b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h
index ec9caaf08d..ec9caaf08d 100644
--- a/cpp/src/qpid/sys/rdma/RdmaIO.h
+++ b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h
diff --git a/cpp/src/qpid/sys/rdma/RdmaServer.cpp b/qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp
index 9b0710fd8f..9b0710fd8f 100644
--- a/cpp/src/qpid/sys/rdma/RdmaServer.cpp
+++ b/qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp
diff --git a/cpp/src/qpid/sys/rdma/rdma_exception.h b/qpid/cpp/src/qpid/sys/rdma/rdma_exception.h
index a3a289e38a..a3a289e38a 100644
--- a/cpp/src/qpid/sys/rdma/rdma_exception.h
+++ b/qpid/cpp/src/qpid/sys/rdma/rdma_exception.h
diff --git a/cpp/src/qpid/sys/rdma/rdma_factories.cpp b/qpid/cpp/src/qpid/sys/rdma/rdma_factories.cpp
index a66f5b4035..a66f5b4035 100644
--- a/cpp/src/qpid/sys/rdma/rdma_factories.cpp
+++ b/qpid/cpp/src/qpid/sys/rdma/rdma_factories.cpp
diff --git a/cpp/src/qpid/sys/rdma/rdma_factories.h b/qpid/cpp/src/qpid/sys/rdma/rdma_factories.h
index bfca71fc7e..bfca71fc7e 100644
--- a/cpp/src/qpid/sys/rdma/rdma_factories.h
+++ b/qpid/cpp/src/qpid/sys/rdma/rdma_factories.h
diff --git a/cpp/src/qpid/sys/rdma/rdma_wrap.cpp b/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
index 889ee9ff75..889ee9ff75 100644
--- a/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
+++ b/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
diff --git a/cpp/src/qpid/sys/rdma/rdma_wrap.h b/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.h
index 5f84793a5b..5f84793a5b 100644
--- a/cpp/src/qpid/sys/rdma/rdma_wrap.h
+++ b/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.h
diff --git a/cpp/src/qpid/sys/regex.h b/qpid/cpp/src/qpid/sys/regex.h
index 77de6a7f5c..77de6a7f5c 100644
--- a/cpp/src/qpid/sys/regex.h
+++ b/qpid/cpp/src/qpid/sys/regex.h
diff --git a/cpp/src/qpid/sys/solaris/ECFPoller.cpp b/qpid/cpp/src/qpid/sys/solaris/ECFPoller.cpp
index 06d542c938..06d542c938 100644
--- a/cpp/src/qpid/sys/solaris/ECFPoller.cpp
+++ b/qpid/cpp/src/qpid/sys/solaris/ECFPoller.cpp
diff --git a/cpp/src/qpid/sys/solaris/SystemInfo.cpp b/qpid/cpp/src/qpid/sys/solaris/SystemInfo.cpp
index 0e754e048b..0e754e048b 100755
--- a/cpp/src/qpid/sys/solaris/SystemInfo.cpp
+++ b/qpid/cpp/src/qpid/sys/solaris/SystemInfo.cpp
diff --git a/cpp/src/qpid/sys/ssl/SslSocket.cpp b/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
index a721918f57..a721918f57 100644
--- a/cpp/src/qpid/sys/ssl/SslSocket.cpp
+++ b/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
diff --git a/cpp/src/qpid/sys/ssl/SslSocket.h b/qpid/cpp/src/qpid/sys/ssl/SslSocket.h
index fc97059cfd..fc97059cfd 100644
--- a/cpp/src/qpid/sys/ssl/SslSocket.h
+++ b/qpid/cpp/src/qpid/sys/ssl/SslSocket.h
diff --git a/cpp/src/qpid/sys/ssl/check.cpp b/qpid/cpp/src/qpid/sys/ssl/check.cpp
index 72a2e265bd..72a2e265bd 100644
--- a/cpp/src/qpid/sys/ssl/check.cpp
+++ b/qpid/cpp/src/qpid/sys/ssl/check.cpp
diff --git a/cpp/src/qpid/sys/ssl/check.h b/qpid/cpp/src/qpid/sys/ssl/check.h
index 28d3c74ad0..28d3c74ad0 100644
--- a/cpp/src/qpid/sys/ssl/check.h
+++ b/qpid/cpp/src/qpid/sys/ssl/check.h
diff --git a/cpp/src/qpid/sys/ssl/util.cpp b/qpid/cpp/src/qpid/sys/ssl/util.cpp
index de5d638b09..de5d638b09 100644
--- a/cpp/src/qpid/sys/ssl/util.cpp
+++ b/qpid/cpp/src/qpid/sys/ssl/util.cpp
diff --git a/cpp/src/qpid/sys/ssl/util.h b/qpid/cpp/src/qpid/sys/ssl/util.h
index f34adab7be..f34adab7be 100644
--- a/cpp/src/qpid/sys/ssl/util.h
+++ b/qpid/cpp/src/qpid/sys/ssl/util.h
diff --git a/cpp/src/qpid/sys/unordered_map.h b/qpid/cpp/src/qpid/sys/unordered_map.h
index 7ae71c3daa..7ae71c3daa 100644
--- a/cpp/src/qpid/sys/unordered_map.h
+++ b/qpid/cpp/src/qpid/sys/unordered_map.h
diff --git a/cpp/src/qpid/sys/uuid.h b/qpid/cpp/src/qpid/sys/uuid.h
index 804ab34463..804ab34463 100644
--- a/cpp/src/qpid/sys/uuid.h
+++ b/qpid/cpp/src/qpid/sys/uuid.h
diff --git a/cpp/src/qpid/sys/windows/AsynchIO.cpp b/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
index 31e47cb3da..31e47cb3da 100644
--- a/cpp/src/qpid/sys/windows/AsynchIO.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
diff --git a/cpp/src/qpid/sys/windows/AsynchIoResult.h b/qpid/cpp/src/qpid/sys/windows/AsynchIoResult.h
index 27e4c22138..27e4c22138 100755
--- a/cpp/src/qpid/sys/windows/AsynchIoResult.h
+++ b/qpid/cpp/src/qpid/sys/windows/AsynchIoResult.h
diff --git a/cpp/src/qpid/sys/windows/Condition.h b/qpid/cpp/src/qpid/sys/windows/Condition.h
index cd5aebbf09..cd5aebbf09 100755
--- a/cpp/src/qpid/sys/windows/Condition.h
+++ b/qpid/cpp/src/qpid/sys/windows/Condition.h
diff --git a/cpp/src/qpid/sys/windows/FileSysDir.cpp b/qpid/cpp/src/qpid/sys/windows/FileSysDir.cpp
index e090747715..e090747715 100644
--- a/cpp/src/qpid/sys/windows/FileSysDir.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/FileSysDir.cpp
diff --git a/cpp/src/qpid/sys/windows/IOHandle.cpp b/qpid/cpp/src/qpid/sys/windows/IOHandle.cpp
index 19a1c44875..19a1c44875 100755
--- a/cpp/src/qpid/sys/windows/IOHandle.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/IOHandle.cpp
diff --git a/cpp/src/qpid/sys/windows/IoHandlePrivate.h b/qpid/cpp/src/qpid/sys/windows/IoHandlePrivate.h
index 4529ad93ec..4529ad93ec 100755
--- a/cpp/src/qpid/sys/windows/IoHandlePrivate.h
+++ b/qpid/cpp/src/qpid/sys/windows/IoHandlePrivate.h
diff --git a/cpp/src/qpid/sys/windows/IocpPoller.cpp b/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp
index ecb33c5517..ecb33c5517 100755
--- a/cpp/src/qpid/sys/windows/IocpPoller.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp
diff --git a/cpp/src/qpid/sys/windows/LockFile.cpp b/qpid/cpp/src/qpid/sys/windows/LockFile.cpp
index 048c2d5b18..048c2d5b18 100755
--- a/cpp/src/qpid/sys/windows/LockFile.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/LockFile.cpp
diff --git a/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp b/qpid/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp
index ba3358ae23..ba3358ae23 100644
--- a/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp
diff --git a/cpp/src/qpid/sys/windows/Mutex.h b/qpid/cpp/src/qpid/sys/windows/Mutex.h
index 5dcc69e836..5dcc69e836 100755
--- a/cpp/src/qpid/sys/windows/Mutex.h
+++ b/qpid/cpp/src/qpid/sys/windows/Mutex.h
diff --git a/cpp/src/qpid/sys/windows/Path.cpp b/qpid/cpp/src/qpid/sys/windows/Path.cpp
index 1cb4521fde..1cb4521fde 100644
--- a/cpp/src/qpid/sys/windows/Path.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/Path.cpp
diff --git a/cpp/src/qpid/sys/windows/PipeHandle.cpp b/qpid/cpp/src/qpid/sys/windows/PipeHandle.cpp
index 062458ae5f..062458ae5f 100755
--- a/cpp/src/qpid/sys/windows/PipeHandle.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/PipeHandle.cpp
diff --git a/cpp/src/qpid/sys/windows/PollableCondition.cpp b/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
index 3e2a5fb36c..3e2a5fb36c 100644
--- a/cpp/src/qpid/sys/windows/PollableCondition.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
diff --git a/cpp/src/qpid/sys/windows/QpidDllMain.h b/qpid/cpp/src/qpid/sys/windows/QpidDllMain.h
index 74eaf0256a..74eaf0256a 100644
--- a/cpp/src/qpid/sys/windows/QpidDllMain.h
+++ b/qpid/cpp/src/qpid/sys/windows/QpidDllMain.h
diff --git a/cpp/src/qpid/sys/windows/Shlib.cpp b/qpid/cpp/src/qpid/sys/windows/Shlib.cpp
index ba18747eb4..ba18747eb4 100644
--- a/cpp/src/qpid/sys/windows/Shlib.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/Shlib.cpp
diff --git a/cpp/src/qpid/sys/windows/SocketAddress.cpp b/qpid/cpp/src/qpid/sys/windows/SocketAddress.cpp
index b5146678af..b5146678af 100644
--- a/cpp/src/qpid/sys/windows/SocketAddress.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/SocketAddress.cpp
diff --git a/cpp/src/qpid/sys/windows/SslAsynchIO.cpp b/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.cpp
index a733ece74c..a733ece74c 100644
--- a/cpp/src/qpid/sys/windows/SslAsynchIO.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.cpp
diff --git a/cpp/src/qpid/sys/windows/SslAsynchIO.h b/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.h
index f80285c305..f80285c305 100644
--- a/cpp/src/qpid/sys/windows/SslAsynchIO.h
+++ b/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.h
diff --git a/cpp/src/qpid/sys/windows/StrError.cpp b/qpid/cpp/src/qpid/sys/windows/StrError.cpp
index 546d399d16..546d399d16 100755
--- a/cpp/src/qpid/sys/windows/StrError.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/StrError.cpp
diff --git a/cpp/src/qpid/sys/windows/SystemInfo.cpp b/qpid/cpp/src/qpid/sys/windows/SystemInfo.cpp
index fb58d53b81..fb58d53b81 100755
--- a/cpp/src/qpid/sys/windows/SystemInfo.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/SystemInfo.cpp
diff --git a/cpp/src/qpid/sys/windows/Thread.cpp b/qpid/cpp/src/qpid/sys/windows/Thread.cpp
index b342c9da1d..b342c9da1d 100755
--- a/cpp/src/qpid/sys/windows/Thread.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/Thread.cpp
diff --git a/cpp/src/qpid/sys/windows/Time.cpp b/qpid/cpp/src/qpid/sys/windows/Time.cpp
index a144a2dd5f..a144a2dd5f 100644
--- a/cpp/src/qpid/sys/windows/Time.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/Time.cpp
diff --git a/cpp/src/qpid/sys/windows/Time.h b/qpid/cpp/src/qpid/sys/windows/Time.h
index 2987b1c8b2..2987b1c8b2 100644
--- a/cpp/src/qpid/sys/windows/Time.h
+++ b/qpid/cpp/src/qpid/sys/windows/Time.h
diff --git a/cpp/src/qpid/sys/windows/WinSocket.cpp b/qpid/cpp/src/qpid/sys/windows/WinSocket.cpp
index 5637f6a9fb..5637f6a9fb 100644
--- a/cpp/src/qpid/sys/windows/WinSocket.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/WinSocket.cpp
diff --git a/cpp/src/qpid/sys/windows/WinSocket.h b/qpid/cpp/src/qpid/sys/windows/WinSocket.h
index bee6a58e7a..bee6a58e7a 100644
--- a/cpp/src/qpid/sys/windows/WinSocket.h
+++ b/qpid/cpp/src/qpid/sys/windows/WinSocket.h
diff --git a/cpp/src/qpid/sys/windows/check.h b/qpid/cpp/src/qpid/sys/windows/check.h
index 2a8e439bed..2a8e439bed 100755
--- a/cpp/src/qpid/sys/windows/check.h
+++ b/qpid/cpp/src/qpid/sys/windows/check.h
diff --git a/cpp/src/qpid/sys/windows/mingw32_compat.h b/qpid/cpp/src/qpid/sys/windows/mingw32_compat.h
index 51f613cc25..51f613cc25 100644
--- a/cpp/src/qpid/sys/windows/mingw32_compat.h
+++ b/qpid/cpp/src/qpid/sys/windows/mingw32_compat.h
diff --git a/cpp/src/qpid/sys/windows/util.cpp b/qpid/cpp/src/qpid/sys/windows/util.cpp
index 75aef26c35..75aef26c35 100644
--- a/cpp/src/qpid/sys/windows/util.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/util.cpp
diff --git a/cpp/src/qpid/sys/windows/util.h b/qpid/cpp/src/qpid/sys/windows/util.h
index 2855a90955..2855a90955 100644
--- a/cpp/src/qpid/sys/windows/util.h
+++ b/qpid/cpp/src/qpid/sys/windows/util.h
diff --git a/cpp/src/qpid/sys/windows/uuid.cpp b/qpid/cpp/src/qpid/sys/windows/uuid.cpp
index d4f57fcab6..d4f57fcab6 100644
--- a/cpp/src/qpid/sys/windows/uuid.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/uuid.cpp
diff --git a/cpp/src/qpid/sys/windows/uuid.h b/qpid/cpp/src/qpid/sys/windows/uuid.h
index 8ab132e9ce..8ab132e9ce 100644
--- a/cpp/src/qpid/sys/windows/uuid.h
+++ b/qpid/cpp/src/qpid/sys/windows/uuid.h
diff --git a/cpp/src/qpid/types/Exception.cpp b/qpid/cpp/src/qpid/types/Exception.cpp
index 71390e6abd..71390e6abd 100644
--- a/cpp/src/qpid/types/Exception.cpp
+++ b/qpid/cpp/src/qpid/types/Exception.cpp
diff --git a/cpp/src/qpid/types/Uuid.cpp b/qpid/cpp/src/qpid/types/Uuid.cpp
index 875e5925a9..875e5925a9 100644
--- a/cpp/src/qpid/types/Uuid.cpp
+++ b/qpid/cpp/src/qpid/types/Uuid.cpp
diff --git a/cpp/src/qpid/types/Variant.cpp b/qpid/cpp/src/qpid/types/Variant.cpp
index 292bb5ef09..292bb5ef09 100644
--- a/cpp/src/qpid/types/Variant.cpp
+++ b/qpid/cpp/src/qpid/types/Variant.cpp
diff --git a/cpp/src/qpid/types/encodings.h b/qpid/cpp/src/qpid/types/encodings.h
index 827b6964b9..827b6964b9 100644
--- a/cpp/src/qpid/types/encodings.h
+++ b/qpid/cpp/src/qpid/types/encodings.h
diff --git a/cpp/src/qpid/xml/XmlExchange.cpp b/qpid/cpp/src/qpid/xml/XmlExchange.cpp
index 837693f53f..837693f53f 100644
--- a/cpp/src/qpid/xml/XmlExchange.cpp
+++ b/qpid/cpp/src/qpid/xml/XmlExchange.cpp
diff --git a/cpp/src/qpid/xml/XmlExchange.h b/qpid/cpp/src/qpid/xml/XmlExchange.h
index f9e92d60f9..f9e92d60f9 100644
--- a/cpp/src/qpid/xml/XmlExchange.h
+++ b/qpid/cpp/src/qpid/xml/XmlExchange.h
diff --git a/cpp/src/qpid/xml/XmlExchangePlugin.cpp b/qpid/cpp/src/qpid/xml/XmlExchangePlugin.cpp
index 02f0110faf..02f0110faf 100644
--- a/cpp/src/qpid/xml/XmlExchangePlugin.cpp
+++ b/qpid/cpp/src/qpid/xml/XmlExchangePlugin.cpp
diff --git a/cpp/src/qpidd.cpp b/qpid/cpp/src/qpidd.cpp
index e17dea3164..e17dea3164 100644
--- a/cpp/src/qpidd.cpp
+++ b/qpid/cpp/src/qpidd.cpp
diff --git a/cpp/src/qpidd.h b/qpid/cpp/src/qpidd.h
index 08356ab29e..08356ab29e 100644
--- a/cpp/src/qpidd.h
+++ b/qpid/cpp/src/qpidd.h
diff --git a/cpp/src/rdma.cmake b/qpid/cpp/src/rdma.cmake
index 7c0ec66bf9..7c0ec66bf9 100644
--- a/cpp/src/rdma.cmake
+++ b/qpid/cpp/src/rdma.cmake
diff --git a/cpp/src/tests/.valgrind.supp b/qpid/cpp/src/tests/.valgrind.supp
index 1a24a9178e..1a24a9178e 100644
--- a/cpp/src/tests/.valgrind.supp
+++ b/qpid/cpp/src/tests/.valgrind.supp
diff --git a/cpp/src/tests/AccumulatedAckTest.cpp b/qpid/cpp/src/tests/AccumulatedAckTest.cpp
index c736a519d2..c736a519d2 100644
--- a/cpp/src/tests/AccumulatedAckTest.cpp
+++ b/qpid/cpp/src/tests/AccumulatedAckTest.cpp
diff --git a/cpp/src/tests/Address.cpp b/qpid/cpp/src/tests/Address.cpp
index 0fd3585958..0fd3585958 100644
--- a/cpp/src/tests/Address.cpp
+++ b/qpid/cpp/src/tests/Address.cpp
diff --git a/cpp/src/tests/Array.cpp b/qpid/cpp/src/tests/Array.cpp
index 8ce7615162..8ce7615162 100644
--- a/cpp/src/tests/Array.cpp
+++ b/qpid/cpp/src/tests/Array.cpp
diff --git a/cpp/src/tests/AsyncCompletion.cpp b/qpid/cpp/src/tests/AsyncCompletion.cpp
index e32097106f..e32097106f 100644
--- a/cpp/src/tests/AsyncCompletion.cpp
+++ b/qpid/cpp/src/tests/AsyncCompletion.cpp
diff --git a/cpp/src/tests/AtomicValue.cpp b/qpid/cpp/src/tests/AtomicValue.cpp
index d855d993a7..d855d993a7 100644
--- a/cpp/src/tests/AtomicValue.cpp
+++ b/qpid/cpp/src/tests/AtomicValue.cpp
diff --git a/cpp/src/tests/Blob.cpp b/qpid/cpp/src/tests/Blob.cpp
index 9878d92fe4..9878d92fe4 100644
--- a/cpp/src/tests/Blob.cpp
+++ b/qpid/cpp/src/tests/Blob.cpp
diff --git a/cpp/src/tests/BrokerFixture.h b/qpid/cpp/src/tests/BrokerFixture.h
index b7b0f9d34b..b7b0f9d34b 100644
--- a/cpp/src/tests/BrokerFixture.h
+++ b/qpid/cpp/src/tests/BrokerFixture.h
diff --git a/cpp/src/tests/BrokerMgmtAgent.cpp b/qpid/cpp/src/tests/BrokerMgmtAgent.cpp
index bad7e768a6..bad7e768a6 100644
--- a/cpp/src/tests/BrokerMgmtAgent.cpp
+++ b/qpid/cpp/src/tests/BrokerMgmtAgent.cpp
diff --git a/cpp/src/tests/BrokerMgmtAgent.xml b/qpid/cpp/src/tests/BrokerMgmtAgent.xml
index 202b8debf3..202b8debf3 100644
--- a/cpp/src/tests/BrokerMgmtAgent.xml
+++ b/qpid/cpp/src/tests/BrokerMgmtAgent.xml
diff --git a/cpp/src/tests/BrokerOptions.cpp b/qpid/cpp/src/tests/BrokerOptions.cpp
index b36d96916a..b36d96916a 100644
--- a/cpp/src/tests/BrokerOptions.cpp
+++ b/qpid/cpp/src/tests/BrokerOptions.cpp
diff --git a/cpp/src/tests/CMakeLists.txt b/qpid/cpp/src/tests/CMakeLists.txt
index c0a48d8dd3..c0a48d8dd3 100644
--- a/cpp/src/tests/CMakeLists.txt
+++ b/qpid/cpp/src/tests/CMakeLists.txt
diff --git a/cpp/src/tests/ClientMessage.cpp b/qpid/cpp/src/tests/ClientMessage.cpp
index 994c46552c..994c46552c 100644
--- a/cpp/src/tests/ClientMessage.cpp
+++ b/qpid/cpp/src/tests/ClientMessage.cpp
diff --git a/cpp/src/tests/ClientMessageTest.cpp b/qpid/cpp/src/tests/ClientMessageTest.cpp
index f925f1c234..f925f1c234 100644
--- a/cpp/src/tests/ClientMessageTest.cpp
+++ b/qpid/cpp/src/tests/ClientMessageTest.cpp
diff --git a/cpp/src/tests/ClientSessionTest.cpp b/qpid/cpp/src/tests/ClientSessionTest.cpp
index 2236882eed..2236882eed 100644
--- a/cpp/src/tests/ClientSessionTest.cpp
+++ b/qpid/cpp/src/tests/ClientSessionTest.cpp
diff --git a/cpp/src/tests/ConnectionOptions.h b/qpid/cpp/src/tests/ConnectionOptions.h
index fe945e9ddd..fe945e9ddd 100644
--- a/cpp/src/tests/ConnectionOptions.h
+++ b/qpid/cpp/src/tests/ConnectionOptions.h
diff --git a/cpp/src/tests/DeliveryRecordTest.cpp b/qpid/cpp/src/tests/DeliveryRecordTest.cpp
index 37b3095f81..37b3095f81 100644
--- a/cpp/src/tests/DeliveryRecordTest.cpp
+++ b/qpid/cpp/src/tests/DeliveryRecordTest.cpp
diff --git a/cpp/src/tests/DispatcherTest.cpp b/qpid/cpp/src/tests/DispatcherTest.cpp
index 7312fe8d2e..7312fe8d2e 100644
--- a/cpp/src/tests/DispatcherTest.cpp
+++ b/qpid/cpp/src/tests/DispatcherTest.cpp
diff --git a/cpp/src/tests/DtxWorkRecordTest.cpp b/qpid/cpp/src/tests/DtxWorkRecordTest.cpp
index bcb3fc14a1..bcb3fc14a1 100644
--- a/cpp/src/tests/DtxWorkRecordTest.cpp
+++ b/qpid/cpp/src/tests/DtxWorkRecordTest.cpp
diff --git a/cpp/src/tests/ExchangeTest.cpp b/qpid/cpp/src/tests/ExchangeTest.cpp
index df0684e832..df0684e832 100644
--- a/cpp/src/tests/ExchangeTest.cpp
+++ b/qpid/cpp/src/tests/ExchangeTest.cpp
diff --git a/cpp/src/tests/FieldTable.cpp b/qpid/cpp/src/tests/FieldTable.cpp
index 81372d87c5..81372d87c5 100644
--- a/cpp/src/tests/FieldTable.cpp
+++ b/qpid/cpp/src/tests/FieldTable.cpp
diff --git a/cpp/src/tests/FieldValue.cpp b/qpid/cpp/src/tests/FieldValue.cpp
index 0ebd0d7d44..0ebd0d7d44 100644
--- a/cpp/src/tests/FieldValue.cpp
+++ b/qpid/cpp/src/tests/FieldValue.cpp
diff --git a/cpp/src/tests/Frame.cpp b/qpid/cpp/src/tests/Frame.cpp
index cfcfde04a7..cfcfde04a7 100644
--- a/cpp/src/tests/Frame.cpp
+++ b/qpid/cpp/src/tests/Frame.cpp
diff --git a/cpp/src/tests/FrameDecoder.cpp b/qpid/cpp/src/tests/FrameDecoder.cpp
index 9eeff2a41e..9eeff2a41e 100644
--- a/cpp/src/tests/FrameDecoder.cpp
+++ b/qpid/cpp/src/tests/FrameDecoder.cpp
diff --git a/cpp/src/tests/FramingTest.cpp b/qpid/cpp/src/tests/FramingTest.cpp
index 2392b6fec4..2392b6fec4 100644
--- a/cpp/src/tests/FramingTest.cpp
+++ b/qpid/cpp/src/tests/FramingTest.cpp
diff --git a/cpp/src/tests/HeaderTest.cpp b/qpid/cpp/src/tests/HeaderTest.cpp
index 4b16f3c793..4b16f3c793 100644
--- a/cpp/src/tests/HeaderTest.cpp
+++ b/qpid/cpp/src/tests/HeaderTest.cpp
diff --git a/cpp/src/tests/HeadersExchangeTest.cpp b/qpid/cpp/src/tests/HeadersExchangeTest.cpp
index 3e68b84bc3..3e68b84bc3 100644
--- a/cpp/src/tests/HeadersExchangeTest.cpp
+++ b/qpid/cpp/src/tests/HeadersExchangeTest.cpp
diff --git a/cpp/src/tests/InlineAllocator.cpp b/qpid/cpp/src/tests/InlineAllocator.cpp
index a4c4d64cea..a4c4d64cea 100644
--- a/cpp/src/tests/InlineAllocator.cpp
+++ b/qpid/cpp/src/tests/InlineAllocator.cpp
diff --git a/cpp/src/tests/InlineVector.cpp b/qpid/cpp/src/tests/InlineVector.cpp
index ba5165886d..ba5165886d 100644
--- a/cpp/src/tests/InlineVector.cpp
+++ b/qpid/cpp/src/tests/InlineVector.cpp
diff --git a/cpp/src/tests/ManagementTest.cpp b/qpid/cpp/src/tests/ManagementTest.cpp
index 98ef591fae..98ef591fae 100644
--- a/cpp/src/tests/ManagementTest.cpp
+++ b/qpid/cpp/src/tests/ManagementTest.cpp
diff --git a/cpp/src/tests/MessageReplayTracker.cpp b/qpid/cpp/src/tests/MessageReplayTracker.cpp
index c0778247f0..c0778247f0 100644
--- a/cpp/src/tests/MessageReplayTracker.cpp
+++ b/qpid/cpp/src/tests/MessageReplayTracker.cpp
diff --git a/cpp/src/tests/MessageTest.cpp b/qpid/cpp/src/tests/MessageTest.cpp
index 28f8b0c2b8..28f8b0c2b8 100644
--- a/cpp/src/tests/MessageTest.cpp
+++ b/qpid/cpp/src/tests/MessageTest.cpp
diff --git a/cpp/src/tests/MessageUtils.h b/qpid/cpp/src/tests/MessageUtils.h
index a6a5aa65fd..a6a5aa65fd 100644
--- a/cpp/src/tests/MessageUtils.h
+++ b/qpid/cpp/src/tests/MessageUtils.h
diff --git a/cpp/src/tests/MessagingFixture.h b/qpid/cpp/src/tests/MessagingFixture.h
index 1d70d4cfa6..1d70d4cfa6 100644
--- a/cpp/src/tests/MessagingFixture.h
+++ b/qpid/cpp/src/tests/MessagingFixture.h
diff --git a/cpp/src/tests/MessagingSessionTests.cpp b/qpid/cpp/src/tests/MessagingSessionTests.cpp
index d23619e846..d23619e846 100644
--- a/cpp/src/tests/MessagingSessionTests.cpp
+++ b/qpid/cpp/src/tests/MessagingSessionTests.cpp
diff --git a/cpp/src/tests/MessagingThreadTests.cpp b/qpid/cpp/src/tests/MessagingThreadTests.cpp
index 48264735b1..48264735b1 100644
--- a/cpp/src/tests/MessagingThreadTests.cpp
+++ b/qpid/cpp/src/tests/MessagingThreadTests.cpp
diff --git a/cpp/src/tests/PollableCondition.cpp b/qpid/cpp/src/tests/PollableCondition.cpp
index f9b3c25c93..f9b3c25c93 100644
--- a/cpp/src/tests/PollableCondition.cpp
+++ b/qpid/cpp/src/tests/PollableCondition.cpp
diff --git a/cpp/src/tests/PollerTest.cpp b/qpid/cpp/src/tests/PollerTest.cpp
index 5a1d02964c..5a1d02964c 100644
--- a/cpp/src/tests/PollerTest.cpp
+++ b/qpid/cpp/src/tests/PollerTest.cpp
diff --git a/cpp/src/tests/ProxyTest.cpp b/qpid/cpp/src/tests/ProxyTest.cpp
index a926b28395..a926b28395 100644
--- a/cpp/src/tests/ProxyTest.cpp
+++ b/qpid/cpp/src/tests/ProxyTest.cpp
diff --git a/cpp/src/tests/Qmf2.cpp b/qpid/cpp/src/tests/Qmf2.cpp
index bc263d5c6d..bc263d5c6d 100644
--- a/cpp/src/tests/Qmf2.cpp
+++ b/qpid/cpp/src/tests/Qmf2.cpp
diff --git a/cpp/src/tests/QueueDepth.cpp b/qpid/cpp/src/tests/QueueDepth.cpp
index 09b221b3a8..09b221b3a8 100644
--- a/cpp/src/tests/QueueDepth.cpp
+++ b/qpid/cpp/src/tests/QueueDepth.cpp
diff --git a/cpp/src/tests/QueueFlowLimitTest.cpp b/qpid/cpp/src/tests/QueueFlowLimitTest.cpp
index b35294922d..b35294922d 100644
--- a/cpp/src/tests/QueueFlowLimitTest.cpp
+++ b/qpid/cpp/src/tests/QueueFlowLimitTest.cpp
diff --git a/cpp/src/tests/QueueOptionsTest.cpp b/qpid/cpp/src/tests/QueueOptionsTest.cpp
index bdb83d7d22..bdb83d7d22 100644
--- a/cpp/src/tests/QueueOptionsTest.cpp
+++ b/qpid/cpp/src/tests/QueueOptionsTest.cpp
diff --git a/cpp/src/tests/QueuePolicyTest.cpp b/qpid/cpp/src/tests/QueuePolicyTest.cpp
index f61c283fd4..f61c283fd4 100644
--- a/cpp/src/tests/QueuePolicyTest.cpp
+++ b/qpid/cpp/src/tests/QueuePolicyTest.cpp
diff --git a/cpp/src/tests/QueueRegistryTest.cpp b/qpid/cpp/src/tests/QueueRegistryTest.cpp
index 364d66c525..364d66c525 100644
--- a/cpp/src/tests/QueueRegistryTest.cpp
+++ b/qpid/cpp/src/tests/QueueRegistryTest.cpp
diff --git a/cpp/src/tests/QueueTest.cpp b/qpid/cpp/src/tests/QueueTest.cpp
index a9769740d6..a9769740d6 100644
--- a/cpp/src/tests/QueueTest.cpp
+++ b/qpid/cpp/src/tests/QueueTest.cpp
diff --git a/cpp/src/tests/README.txt b/qpid/cpp/src/tests/README.txt
index 8eaa5bbd25..8eaa5bbd25 100644
--- a/cpp/src/tests/README.txt
+++ b/qpid/cpp/src/tests/README.txt
diff --git a/cpp/src/tests/RangeSet.cpp b/qpid/cpp/src/tests/RangeSet.cpp
index 285f432bf7..285f432bf7 100644
--- a/cpp/src/tests/RangeSet.cpp
+++ b/qpid/cpp/src/tests/RangeSet.cpp
diff --git a/cpp/src/tests/RefCounted.cpp b/qpid/cpp/src/tests/RefCounted.cpp
index 3ac3895322..3ac3895322 100644
--- a/cpp/src/tests/RefCounted.cpp
+++ b/qpid/cpp/src/tests/RefCounted.cpp
diff --git a/cpp/src/tests/RetryList.cpp b/qpid/cpp/src/tests/RetryList.cpp
index 50cd5edfe8..50cd5edfe8 100644
--- a/cpp/src/tests/RetryList.cpp
+++ b/qpid/cpp/src/tests/RetryList.cpp
diff --git a/cpp/src/tests/Selector.cpp b/qpid/cpp/src/tests/Selector.cpp
index 59bdd36b77..59bdd36b77 100644
--- a/cpp/src/tests/Selector.cpp
+++ b/qpid/cpp/src/tests/Selector.cpp
diff --git a/cpp/src/tests/SequenceNumberTest.cpp b/qpid/cpp/src/tests/SequenceNumberTest.cpp
index f3c934e3ca..f3c934e3ca 100644
--- a/cpp/src/tests/SequenceNumberTest.cpp
+++ b/qpid/cpp/src/tests/SequenceNumberTest.cpp
diff --git a/cpp/src/tests/SequenceSet.cpp b/qpid/cpp/src/tests/SequenceSet.cpp
index bc0a8ea509..bc0a8ea509 100644
--- a/cpp/src/tests/SequenceSet.cpp
+++ b/qpid/cpp/src/tests/SequenceSet.cpp
diff --git a/cpp/src/tests/SessionState.cpp b/qpid/cpp/src/tests/SessionState.cpp
index 1cf3415484..1cf3415484 100644
--- a/cpp/src/tests/SessionState.cpp
+++ b/qpid/cpp/src/tests/SessionState.cpp
diff --git a/cpp/src/tests/Shlib.cpp b/qpid/cpp/src/tests/Shlib.cpp
index 7f01323e3c..7f01323e3c 100644
--- a/cpp/src/tests/Shlib.cpp
+++ b/qpid/cpp/src/tests/Shlib.cpp
diff --git a/cpp/src/tests/Statistics.cpp b/qpid/cpp/src/tests/Statistics.cpp
index 19531762b1..19531762b1 100644
--- a/cpp/src/tests/Statistics.cpp
+++ b/qpid/cpp/src/tests/Statistics.cpp
diff --git a/cpp/src/tests/Statistics.h b/qpid/cpp/src/tests/Statistics.h
index 091046a17f..091046a17f 100644
--- a/cpp/src/tests/Statistics.h
+++ b/qpid/cpp/src/tests/Statistics.h
diff --git a/cpp/src/tests/StringUtils.cpp b/qpid/cpp/src/tests/StringUtils.cpp
index c50287a4f4..c50287a4f4 100644
--- a/cpp/src/tests/StringUtils.cpp
+++ b/qpid/cpp/src/tests/StringUtils.cpp
diff --git a/cpp/src/tests/SystemInfo.cpp b/qpid/cpp/src/tests/SystemInfo.cpp
index 34f1ac408e..34f1ac408e 100644
--- a/cpp/src/tests/SystemInfo.cpp
+++ b/qpid/cpp/src/tests/SystemInfo.cpp
diff --git a/cpp/src/tests/TestMessageStore.h b/qpid/cpp/src/tests/TestMessageStore.h
index 0b63bc9c15..0b63bc9c15 100644
--- a/cpp/src/tests/TestMessageStore.h
+++ b/qpid/cpp/src/tests/TestMessageStore.h
diff --git a/cpp/src/tests/TestOptions.h b/qpid/cpp/src/tests/TestOptions.h
index f8da0f59cf..f8da0f59cf 100644
--- a/cpp/src/tests/TestOptions.h
+++ b/qpid/cpp/src/tests/TestOptions.h
diff --git a/cpp/src/tests/TimerTest.cpp b/qpid/cpp/src/tests/TimerTest.cpp
index e9ca3fcdf6..e9ca3fcdf6 100644
--- a/cpp/src/tests/TimerTest.cpp
+++ b/qpid/cpp/src/tests/TimerTest.cpp
diff --git a/cpp/src/tests/TopicExchangeTest.cpp b/qpid/cpp/src/tests/TopicExchangeTest.cpp
index d57951ea3f..d57951ea3f 100644
--- a/cpp/src/tests/TopicExchangeTest.cpp
+++ b/qpid/cpp/src/tests/TopicExchangeTest.cpp
diff --git a/cpp/src/tests/TransactionObserverTest.cpp b/qpid/cpp/src/tests/TransactionObserverTest.cpp
index 80ef494c21..80ef494c21 100644
--- a/cpp/src/tests/TransactionObserverTest.cpp
+++ b/qpid/cpp/src/tests/TransactionObserverTest.cpp
diff --git a/cpp/src/tests/TxBufferTest.cpp b/qpid/cpp/src/tests/TxBufferTest.cpp
index 3f052d213e..3f052d213e 100644
--- a/cpp/src/tests/TxBufferTest.cpp
+++ b/qpid/cpp/src/tests/TxBufferTest.cpp
diff --git a/cpp/src/tests/TxMocks.h b/qpid/cpp/src/tests/TxMocks.h
index 8b54e7484b..8b54e7484b 100644
--- a/cpp/src/tests/TxMocks.h
+++ b/qpid/cpp/src/tests/TxMocks.h
diff --git a/cpp/src/tests/Url.cpp b/qpid/cpp/src/tests/Url.cpp
index b30de682bc..b30de682bc 100644
--- a/cpp/src/tests/Url.cpp
+++ b/qpid/cpp/src/tests/Url.cpp
diff --git a/cpp/src/tests/Uuid.cpp b/qpid/cpp/src/tests/Uuid.cpp
index aa9580e25e..aa9580e25e 100644
--- a/cpp/src/tests/Uuid.cpp
+++ b/qpid/cpp/src/tests/Uuid.cpp
diff --git a/cpp/src/tests/Variant.cpp b/qpid/cpp/src/tests/Variant.cpp
index d2394bfbad..d2394bfbad 100644
--- a/cpp/src/tests/Variant.cpp
+++ b/qpid/cpp/src/tests/Variant.cpp
diff --git a/cpp/src/tests/XmlClientSessionTest.cpp b/qpid/cpp/src/tests/XmlClientSessionTest.cpp
index bfa6ed096b..bfa6ed096b 100644
--- a/cpp/src/tests/XmlClientSessionTest.cpp
+++ b/qpid/cpp/src/tests/XmlClientSessionTest.cpp
diff --git a/cpp/src/tests/acl.py b/qpid/cpp/src/tests/acl.py
index 66705e6d24..66705e6d24 100755
--- a/cpp/src/tests/acl.py
+++ b/qpid/cpp/src/tests/acl.py
diff --git a/cpp/src/tests/ais_test.cpp b/qpid/cpp/src/tests/ais_test.cpp
index 00c61242e4..00c61242e4 100644
--- a/cpp/src/tests/ais_test.cpp
+++ b/qpid/cpp/src/tests/ais_test.cpp
diff --git a/cpp/src/tests/allhosts b/qpid/cpp/src/tests/allhosts
index 07bc04fff5..07bc04fff5 100755
--- a/cpp/src/tests/allhosts
+++ b/qpid/cpp/src/tests/allhosts
diff --git a/cpp/src/tests/assertions.py b/qpid/cpp/src/tests/assertions.py
index f1db21b753..f1db21b753 100644
--- a/cpp/src/tests/assertions.py
+++ b/qpid/cpp/src/tests/assertions.py
diff --git a/cpp/src/tests/background.ps1 b/qpid/cpp/src/tests/background.ps1
index 36e9e4e6e9..36e9e4e6e9 100644
--- a/cpp/src/tests/background.ps1
+++ b/qpid/cpp/src/tests/background.ps1
diff --git a/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py
index 28e7f6b182..28e7f6b182 100644
--- a/cpp/src/tests/brokertest.py
+++ b/qpid/cpp/src/tests/brokertest.py
diff --git a/cpp/src/tests/cli_tests.py b/qpid/cpp/src/tests/cli_tests.py
index eee9bc648c..eee9bc648c 100755
--- a/cpp/src/tests/cli_tests.py
+++ b/qpid/cpp/src/tests/cli_tests.py
diff --git a/cpp/src/tests/config.null b/qpid/cpp/src/tests/config.null
index 565c7da435..565c7da435 100644
--- a/cpp/src/tests/config.null
+++ b/qpid/cpp/src/tests/config.null
diff --git a/cpp/src/tests/consume.cpp b/qpid/cpp/src/tests/consume.cpp
index 69110d151f..69110d151f 100644
--- a/cpp/src/tests/consume.cpp
+++ b/qpid/cpp/src/tests/consume.cpp
diff --git a/cpp/src/tests/datagen.cpp b/qpid/cpp/src/tests/datagen.cpp
index acbc07d63c..acbc07d63c 100644
--- a/cpp/src/tests/datagen.cpp
+++ b/qpid/cpp/src/tests/datagen.cpp
diff --git a/cpp/src/tests/declare_queues.cpp b/qpid/cpp/src/tests/declare_queues.cpp
index bf85b9c04b..bf85b9c04b 100644
--- a/cpp/src/tests/declare_queues.cpp
+++ b/qpid/cpp/src/tests/declare_queues.cpp
diff --git a/cpp/src/tests/dlclose_noop.c b/qpid/cpp/src/tests/dlclose_noop.c
index b78cf486d8..b78cf486d8 100644
--- a/cpp/src/tests/dlclose_noop.c
+++ b/qpid/cpp/src/tests/dlclose_noop.c
diff --git a/cpp/src/tests/dynamic_log_hires_timestamp b/qpid/cpp/src/tests/dynamic_log_hires_timestamp
index 75034f9902..75034f9902 100755
--- a/cpp/src/tests/dynamic_log_hires_timestamp
+++ b/qpid/cpp/src/tests/dynamic_log_hires_timestamp
diff --git a/cpp/src/tests/dynamic_log_level_test b/qpid/cpp/src/tests/dynamic_log_level_test
index f8fd7a8dd8..f8fd7a8dd8 100755
--- a/cpp/src/tests/dynamic_log_level_test
+++ b/qpid/cpp/src/tests/dynamic_log_level_test
diff --git a/cpp/src/tests/echotest.cpp b/qpid/cpp/src/tests/echotest.cpp
index 5114ab883d..5114ab883d 100644
--- a/cpp/src/tests/echotest.cpp
+++ b/qpid/cpp/src/tests/echotest.cpp
diff --git a/cpp/src/tests/exception_test.cpp b/qpid/cpp/src/tests/exception_test.cpp
index 3e844b4e58..3e844b4e58 100644
--- a/cpp/src/tests/exception_test.cpp
+++ b/qpid/cpp/src/tests/exception_test.cpp
diff --git a/cpp/src/tests/failing-amqp0-10-python-tests b/qpid/cpp/src/tests/failing-amqp0-10-python-tests
index cb742a25e5..cb742a25e5 100644
--- a/cpp/src/tests/failing-amqp0-10-python-tests
+++ b/qpid/cpp/src/tests/failing-amqp0-10-python-tests
diff --git a/cpp/src/tests/failing-amqp1.0-python-tests b/qpid/cpp/src/tests/failing-amqp1.0-python-tests
index 2cae7b6306..2cae7b6306 100644
--- a/cpp/src/tests/failing-amqp1.0-python-tests
+++ b/qpid/cpp/src/tests/failing-amqp1.0-python-tests
diff --git a/cpp/src/tests/fanout_perftest b/qpid/cpp/src/tests/fanout_perftest
index 168994d372..168994d372 100755
--- a/cpp/src/tests/fanout_perftest
+++ b/qpid/cpp/src/tests/fanout_perftest
diff --git a/cpp/src/tests/federated_topic_test b/qpid/cpp/src/tests/federated_topic_test
index 2d31f9af5a..2d31f9af5a 100755
--- a/cpp/src/tests/federated_topic_test
+++ b/qpid/cpp/src/tests/federated_topic_test
diff --git a/cpp/src/tests/federation.py b/qpid/cpp/src/tests/federation.py
index f5b62019e5..f5b62019e5 100755
--- a/cpp/src/tests/federation.py
+++ b/qpid/cpp/src/tests/federation.py
diff --git a/cpp/src/tests/federation_sys.py b/qpid/cpp/src/tests/federation_sys.py
index be9613bb9f..be9613bb9f 100755
--- a/cpp/src/tests/federation_sys.py
+++ b/qpid/cpp/src/tests/federation_sys.py
diff --git a/cpp/src/tests/find_prog.ps1 b/qpid/cpp/src/tests/find_prog.ps1
index 5c482debbf..5c482debbf 100644
--- a/cpp/src/tests/find_prog.ps1
+++ b/qpid/cpp/src/tests/find_prog.ps1
diff --git a/cpp/src/tests/ha_test.py b/qpid/cpp/src/tests/ha_test.py
index 8dd1347144..8dd1347144 100755
--- a/cpp/src/tests/ha_test.py
+++ b/qpid/cpp/src/tests/ha_test.py
diff --git a/cpp/src/tests/ha_tests.py b/qpid/cpp/src/tests/ha_tests.py
index 138868f64e..1a5d6ddff8 100755
--- a/cpp/src/tests/ha_tests.py
+++ b/qpid/cpp/src/tests/ha_tests.py
@@ -34,6 +34,14 @@ log = getLogger(__name__)
 class HaBrokerTest(BrokerTest):
     """Base class for HA broker tests"""
 
+def alt_setup(session, suffix):
+    # Create exchange to use as alternate and a queue bound to it.
+    # altex exchange: acts as alternate exchange
+    session.sender("altex%s;{create:always,node:{type:topic,x-declare:{type:'fanout'}}}"%(suffix))
+    # altq queue bound to altex, collect re-routed messages.
+    session.sender("altq%s;{create:always,node:{x-bindings:[{exchange:'altex%s',queue:altq%s}]}}"%(suffix,suffix,suffix))
+
+
 class ReplicationTests(HaBrokerTest):
     """Correctness tests for  HA replication."""
 
@@ -718,19 +726,44 @@ acl deny all all
         except NotFound: pass
         assert not cluster[1].agent().getQueue("q") # Should not be in QMF
 
-    def alt_setup(self, session, suffix):
-        # Create exchange to use as alternate and a queue bound to it.
-        # altex exchange: acts as alternate exchange
-        session.sender("altex%s;{create:always,node:{type:topic,x-declare:{type:'fanout'}}}"%(suffix))
-        # altq queue bound to altex, collect re-routed messages.
-        session.sender("altq%s;{create:always,node:{x-bindings:[{exchange:'altex%s',queue:altq%s}]}}"%(suffix,suffix,suffix))
+    def test_auto_delete_failover(self):
+        """Test auto-delete queues. Verify that:
+        - queues auto-deleted on the primary are deleted on the backup.
+        - auto-delete queues with/without timeout are deleted after a failover.
+        - messages are correctly routed to the alternate exchange.
+        """
+        cluster = HaCluster(self, 3)
+        s = cluster[0].connect().session()
+        def setup(q, timeout=""):
+            if timeout: timeout = ",arguments:{'qpid.auto_delete_timeout':%s}"%timeout
+            # Create alternate exchange, auto-delete queue and queue bound to alt. ex.
+            s.sender("%s-altex;{create:always,node:{type:topic,x-declare:{type:fanout}}}"%q)
+            qs = s.sender("%s;{create:always,node:{x-declare:{auto-delete:True,alternate-exchange:%s-altex%s}}}"%(q,q,timeout))
+            s.sender("%s-altq;{create:always,node:{x-bindings:[{exchange:%s-altex,queue:%s-altq}]}}"%(q,q,q))
+            qs.send(q) # Send a message to the auto-delete queue
+            return s
+
+        for args in [("q1",""),("q2","0"),("q3","1"),("q4",""),("q5","")]: setup(*args)
+        receivers = [s.receiver("q%s"%i) for i in [1,2,3,4]] # Subscribe to queues
+        # Note q5 is never subscribed to, so should not be auto-deleted.
+        receivers[3].close()    # Trigger auto-delete for q4
+        cluster[0].kill(final=False)
+        cluster[2].promote()
+        cluster.restart(0)
+        cluster[2].assert_browse("q3",["q3"]) # Not yet auto-deleted, 1 sec timeout.
+        for i in [2,1,0]:
+            for q in ["q1", "q2", "q3","q4"]:
+                cluster[i].wait_no_queue(q,timeout=2)      # auto-deleted
+                cluster[i].assert_browse_backup("%s-altq"%q, [q]) # Routed to alternate
+            cluster[i].assert_browse_backup("q5", ["q5"]) # Never subscribed, not deleted.
+            cluster[i].assert_browse_backup("q5-altq", [])
 
     def test_auto_delete_close(self):
         """Verify auto-delete queues are deleted on backup if auto-deleted
         on primary"""
         cluster=HaCluster(self, 2)
         p = cluster[0].connect().session()
-        self.alt_setup(p, "1")
+        alt_setup(p, "1")
         r = p.receiver("adq1;{create:always,node:{x-declare:{auto-delete:True,alternate-exchange:'altex1'}}}", capacity=1)
         s = p.sender("adq1")
         for m in ["aa","bb","cc"]: s.send(m)
@@ -742,71 +775,6 @@ acl deny all all
         cluster[1].assert_browse_backup("altq1", ["aa","bb","cc"])
         cluster[1].wait_queue("adq2")
 
-    def test_auto_delete_crash(self):
-        """Verify auto-delete queues are deleted on backup if the primary crashes"""
-        cluster=HaCluster(self, 2)
-        p = cluster[0].connect().session()
-        self.alt_setup(p,"1")
-
-        # adq1 is subscribed so will be auto-deleted.
-        r = p.receiver("adq1;{create:always,node:{x-declare:{auto-delete:True,alternate-exchange:'altex1'}}}", capacity=1)
-        s = p.sender("adq1")
-        for m in ["aa","bb","cc"]: s.send(m)
-        # adq2 is subscribed after cluster[2] starts.
-        p.sender("adq2;{create:always,node:{x-declare:{auto-delete:True}}}")
-        # adq3 is never subscribed.
-        p.sender("adq3;{create:always,node:{x-declare:{auto-delete:True}}}")
-
-        cluster.start()
-        cluster[2].wait_status("ready")
-
-        p.receiver("adq2")      # Subscribed after cluster[2] joined
-
-        for q in ["adq1","adq2","adq3","altq1"]: cluster[1].wait_queue(q)
-        for q in ["adq1","adq2","adq3","altq1"]: cluster[2].wait_queue(q)
-        cluster[0].kill()
-
-        cluster[1].wait_no_queue("adq1")
-        cluster[1].wait_no_queue("adq2")
-        cluster[1].wait_queue("adq3")
-
-        cluster[2].wait_no_queue("adq1")
-        cluster[2].wait_no_queue("adq2")
-        cluster[2].wait_queue("adq3")
-
-        cluster[1].assert_browse_backup("altq1", ["aa","bb","cc"])
-        cluster[2].assert_browse_backup("altq1", ["aa","bb","cc"])
-
-    def test_auto_delete_timeout(self):
-        cluster = HaCluster(self, 2)
-        # Test timeout
-        r1 = cluster[0].connect().session().receiver("q1;{create:always,node:{x-declare:{auto-delete:True,arguments:{'qpid.auto_delete_timeout':1}}}}")
-        # Test special case of timeout = 0
-        r0 = cluster[0].connect().session().receiver("q0;{create:always,node:{x-declare:{auto-delete:True,arguments:{'qpid.auto_delete_timeout':0}}}}")
-        cluster[1].wait_queue("q0")
-        cluster[1].wait_queue("q1")
-        cluster[0].kill()
-        cluster[1].wait_queue("q1")    # Not timed out yet
-        cluster[1].wait_no_queue("q1", timeout=5) # Wait for timeout
-        cluster[1].wait_no_queue("q0", timeout=5) # Wait for timeout
-
-    def test_alt_exchange_dup(self):
-        """QPID-4349: if a queue has an alterante exchange and is deleted the
-        messages appear twice on the alternate, they are rerouted once by the
-        primary and again by the backup."""
-        cluster = HaCluster(self,2)
-
-        # Set up q with alternate exchange altex bound to altq.
-        s = cluster[0].connect().session()
-        s.sender("altex;{create:always,node:{type:topic,x-declare:{type:'fanout'}}}")
-        s.sender("altq;{create:always,node:{x-bindings:[{exchange:'altex',queue:altq}]}}")
-        snd = s.sender("q;{create:always,node:{x-declare:{alternate-exchange:'altex'}}}")
-        messages = [ str(n) for n in xrange(10) ]
-        for m in messages: snd.send(m)
-        cluster[1].assert_browse_backup("q", messages)
-        s.sender("q;{delete:always}").close()
-        cluster[1].assert_browse_backup("altq", messages)
-
     def test_expired(self):
         """Regression test for QPID-4379: HA does not properly handle expired messages"""
         # Race between messages expiring and HA replicating consumer.
diff --git a/cpp/src/tests/header_test.cpp b/qpid/cpp/src/tests/header_test.cpp
index c36b4f3bc3..c36b4f3bc3 100644
--- a/cpp/src/tests/header_test.cpp
+++ b/qpid/cpp/src/tests/header_test.cpp
diff --git a/cpp/src/tests/header_test.py b/qpid/cpp/src/tests/header_test.py
index d5a2c16c01..d5a2c16c01 100755
--- a/cpp/src/tests/header_test.py
+++ b/qpid/cpp/src/tests/header_test.py
diff --git a/cpp/src/tests/headers_federation.py b/qpid/cpp/src/tests/headers_federation.py
index 60cff1da54..60cff1da54 100644
--- a/cpp/src/tests/headers_federation.py
+++ b/qpid/cpp/src/tests/headers_federation.py
diff --git a/cpp/src/tests/install_env.sh.in b/qpid/cpp/src/tests/install_env.sh.in
index d29a23930d..d29a23930d 100644
--- a/cpp/src/tests/install_env.sh.in
+++ b/qpid/cpp/src/tests/install_env.sh.in
diff --git a/cpp/src/tests/interlink_tests.py b/qpid/cpp/src/tests/interlink_tests.py
index c7269ac5e9..c7269ac5e9 100755
--- a/cpp/src/tests/interlink_tests.py
+++ b/qpid/cpp/src/tests/interlink_tests.py
diff --git a/cpp/src/tests/ipv6_test b/qpid/cpp/src/tests/ipv6_test
index 4ac5f95fba..4ac5f95fba 100755
--- a/cpp/src/tests/ipv6_test
+++ b/qpid/cpp/src/tests/ipv6_test
diff --git a/cpp/src/tests/legacystore/.valgrind.supp b/qpid/cpp/src/tests/legacystore/.valgrind.supp
index 5c1c5377bf..5c1c5377bf 100644
--- a/cpp/src/tests/legacystore/.valgrind.supp
+++ b/qpid/cpp/src/tests/legacystore/.valgrind.supp
diff --git a/cpp/src/tests/legacystore/.valgrindrc b/qpid/cpp/src/tests/legacystore/.valgrindrc
index 4aba7661de..4aba7661de 100644
--- a/cpp/src/tests/legacystore/.valgrindrc
+++ b/qpid/cpp/src/tests/legacystore/.valgrindrc
diff --git a/cpp/src/tests/legacystore/CMakeLists.txt b/qpid/cpp/src/tests/legacystore/CMakeLists.txt
index 85cc4be5c7..85cc4be5c7 100644
--- a/cpp/src/tests/legacystore/CMakeLists.txt
+++ b/qpid/cpp/src/tests/legacystore/CMakeLists.txt
diff --git a/cpp/src/tests/legacystore/MessageUtils.h b/qpid/cpp/src/tests/legacystore/MessageUtils.h
index cd23244293..cd23244293 100644
--- a/cpp/src/tests/legacystore/MessageUtils.h
+++ b/qpid/cpp/src/tests/legacystore/MessageUtils.h
diff --git a/cpp/src/tests/legacystore/OrderingTest.cpp b/qpid/cpp/src/tests/legacystore/OrderingTest.cpp
index 74a9db1c73..74a9db1c73 100644
--- a/cpp/src/tests/legacystore/OrderingTest.cpp
+++ b/qpid/cpp/src/tests/legacystore/OrderingTest.cpp
diff --git a/cpp/src/tests/legacystore/SimpleTest.cpp b/qpid/cpp/src/tests/legacystore/SimpleTest.cpp
index d3f040817f..d3f040817f 100644
--- a/cpp/src/tests/legacystore/SimpleTest.cpp
+++ b/qpid/cpp/src/tests/legacystore/SimpleTest.cpp
diff --git a/cpp/src/tests/legacystore/TestFramework.cpp b/qpid/cpp/src/tests/legacystore/TestFramework.cpp
index 2f7faf7682..2f7faf7682 100644
--- a/cpp/src/tests/legacystore/TestFramework.cpp
+++ b/qpid/cpp/src/tests/legacystore/TestFramework.cpp
diff --git a/cpp/src/tests/legacystore/TestFramework.h b/qpid/cpp/src/tests/legacystore/TestFramework.h
index f3066db602..f3066db602 100644
--- a/cpp/src/tests/legacystore/TestFramework.h
+++ b/qpid/cpp/src/tests/legacystore/TestFramework.h
diff --git a/cpp/src/tests/legacystore/TransactionalTest.cpp b/qpid/cpp/src/tests/legacystore/TransactionalTest.cpp
index d1bc34d5a7..d1bc34d5a7 100644
--- a/cpp/src/tests/legacystore/TransactionalTest.cpp
+++ b/qpid/cpp/src/tests/legacystore/TransactionalTest.cpp
diff --git a/cpp/src/tests/legacystore/TwoPhaseCommitTest.cpp b/qpid/cpp/src/tests/legacystore/TwoPhaseCommitTest.cpp
index 25bb9dc607..25bb9dc607 100644
--- a/cpp/src/tests/legacystore/TwoPhaseCommitTest.cpp
+++ b/qpid/cpp/src/tests/legacystore/TwoPhaseCommitTest.cpp
diff --git a/cpp/src/tests/legacystore/clean.sh b/qpid/cpp/src/tests/legacystore/clean.sh
index 838f246232..838f246232 100644
--- a/cpp/src/tests/legacystore/clean.sh
+++ b/qpid/cpp/src/tests/legacystore/clean.sh
diff --git a/cpp/src/tests/legacystore/federation/Makefile.am b/qpid/cpp/src/tests/legacystore/federation/Makefile.am
index c48e861a65..c48e861a65 100644
--- a/cpp/src/tests/legacystore/federation/Makefile.am
+++ b/qpid/cpp/src/tests/legacystore/federation/Makefile.am
diff --git a/cpp/src/tests/legacystore/federation/federation_tests_env.sh b/qpid/cpp/src/tests/legacystore/federation/federation_tests_env.sh
index bf75056444..bf75056444 100755
--- a/cpp/src/tests/legacystore/federation/federation_tests_env.sh
+++ b/qpid/cpp/src/tests/legacystore/federation/federation_tests_env.sh
diff --git a/cpp/src/tests/legacystore/federation/run_federation_sys_tests b/qpid/cpp/src/tests/legacystore/federation/run_federation_sys_tests
index 776f009c05..776f009c05 100755
--- a/cpp/src/tests/legacystore/federation/run_federation_sys_tests
+++ b/qpid/cpp/src/tests/legacystore/federation/run_federation_sys_tests
diff --git a/cpp/src/tests/legacystore/federation/run_long_federation_sys_tests b/qpid/cpp/src/tests/legacystore/federation/run_long_federation_sys_tests
index 012c8d8f18..012c8d8f18 100755
--- a/cpp/src/tests/legacystore/federation/run_long_federation_sys_tests
+++ b/qpid/cpp/src/tests/legacystore/federation/run_long_federation_sys_tests
diff --git a/cpp/src/tests/legacystore/jrnl/_st_auto_expand.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_st_auto_expand.cpp
index fb5c1f1742..fb5c1f1742 100644
--- a/cpp/src/tests/legacystore/jrnl/_st_auto_expand.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_st_auto_expand.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_st_basic.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_st_basic.cpp
index 4aa6d2e29f..4aa6d2e29f 100644
--- a/cpp/src/tests/legacystore/jrnl/_st_basic.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_st_basic.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_st_basic_txn.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_st_basic_txn.cpp
index aa2d31c2ae..aa2d31c2ae 100644
--- a/cpp/src/tests/legacystore/jrnl/_st_basic_txn.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_st_basic_txn.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_st_helper_fns.h b/qpid/cpp/src/tests/legacystore/jrnl/_st_helper_fns.h
index 923065dd11..923065dd11 100644
--- a/cpp/src/tests/legacystore/jrnl/_st_helper_fns.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_st_helper_fns.h
diff --git a/cpp/src/tests/legacystore/jrnl/_st_read.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_st_read.cpp
index ff2c39e14c..ff2c39e14c 100644
--- a/cpp/src/tests/legacystore/jrnl/_st_read.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_st_read.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_st_read_txn.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_st_read_txn.cpp
index 621777d8d3..621777d8d3 100644
--- a/cpp/src/tests/legacystore/jrnl/_st_read_txn.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_st_read_txn.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_enq_map.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_enq_map.cpp
index f05dcb824c..f05dcb824c 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_enq_map.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_enq_map.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_jdir.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jdir.cpp
index 842ea5c9ef..842ea5c9ef 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_jdir.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jdir.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_jerrno.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jerrno.cpp
index 1ae1138355..1ae1138355 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_jerrno.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jerrno.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_jexception.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jexception.cpp
index 8b9e876aa6..8b9e876aa6 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_jexception.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jexception.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_jinf.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jinf.cpp
index c6377c2287..c6377c2287 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_jinf.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jinf.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_lpmgr.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_lpmgr.cpp
index 2dc20ffa7c..2dc20ffa7c 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_lpmgr.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_lpmgr.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_rec_hdr.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_rec_hdr.cpp
index 099e576bbd..099e576bbd 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_rec_hdr.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_rec_hdr.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_time_ns.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_time_ns.cpp
index f1b53bb97b..f1b53bb97b 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_time_ns.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_time_ns.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_txn_map.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_txn_map.cpp
index 595ce0f6c6..595ce0f6c6 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_txn_map.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_txn_map.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/chk_jdata b/qpid/cpp/src/tests/legacystore/jrnl/chk_jdata
index 2ac87d91b9..2ac87d91b9 100755
--- a/cpp/src/tests/legacystore/jrnl/chk_jdata
+++ b/qpid/cpp/src/tests/legacystore/jrnl/chk_jdata
diff --git a/cpp/src/tests/legacystore/jrnl/cp_rtest_jrnl b/qpid/cpp/src/tests/legacystore/jrnl/cp_rtest_jrnl
index e21f991788..e21f991788 100755
--- a/cpp/src/tests/legacystore/jrnl/cp_rtest_jrnl
+++ b/qpid/cpp/src/tests/legacystore/jrnl/cp_rtest_jrnl
diff --git a/cpp/src/tests/legacystore/jrnl/jhexdump b/qpid/cpp/src/tests/legacystore/jrnl/jhexdump
index b013914441..b013914441 100755
--- a/cpp/src/tests/legacystore/jrnl/jhexdump
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jhexdump
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_data_src.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_data_src.cpp
index e4656ef83f..e4656ef83f 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_data_src.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_data_src.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_init_params.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_init_params.cpp
index 9fefe25105..9fefe25105 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_init_params.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_init_params.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_instance.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_instance.cpp
index 12f1c542d6..12f1c542d6 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_instance.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_instance.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_read_arg.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_read_arg.cpp
index 0d2025270d..0d2025270d 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_read_arg.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_read_arg.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case.cpp
index 3a7d0f951c..3a7d0f951c 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result.cpp
index dd83dbee69..dd83dbee69 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result_agregation.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result_agregation.cpp
index aa01bf833d..aa01bf833d 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result_agregation.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result_agregation.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.cpp
index adbdf6884b..adbdf6884b 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.csv b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.csv
index f886186275..f886186275 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.csv
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.csv
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/args.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/args.cpp
index 0f041c380e..0f041c380e 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/args.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/args.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/args.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/args.h
index b6f7fb4a79..b6f7fb4a79 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/args.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/args.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/data_src.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/data_src.cpp
index 3530e0b223..3530e0b223 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/data_src.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/data_src.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/data_src.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/data_src.h
index 66dc613787..66dc613787 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/data_src.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/data_src.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/jfile_chk.py b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jfile_chk.py
index 36ef511f5c..36ef511f5c 100755
--- a/cpp/src/tests/legacystore/jrnl/jtt/jfile_chk.py
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jfile_chk.py
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.cpp
index 1bc04110af..1bc04110af 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.h
index ece87f8e03..ece87f8e03 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.cpp
index 339dc1b52c..339dc1b52c 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.h
index 5003f39b24..5003f39b24 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/jtt.csv b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jtt.csv
index df523e3f97..df523e3f97 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/jtt.csv
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jtt.csv
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/main.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/main.cpp
index c8a4642b1c..c8a4642b1c 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/main.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/main.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/read_arg.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/read_arg.cpp
index 94a07c7005..94a07c7005 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/read_arg.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/read_arg.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/read_arg.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/read_arg.h
index a8fd6f198e..a8fd6f198e 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/read_arg.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/read_arg.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case.cpp
index e06e053504..e06e053504 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case.h
index f72dd05f0c..f72dd05f0c 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.cpp
index 2f88f265a5..2f88f265a5 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.h
index d15f9d021d..d15f9d021d 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.cpp
index da439e71e8..da439e71e8 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.h
index 0b3998176c..0b3998176c 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.cpp
index b818d6c7ae..b818d6c7ae 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.h
index 94a1ee3172..94a1ee3172 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.cpp
index de0b5dbfb9..de0b5dbfb9 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.h
index e608ac6280..e608ac6280 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.h
diff --git a/cpp/src/tests/legacystore/jrnl/prof b/qpid/cpp/src/tests/legacystore/jrnl/prof
index 2abe7baa4a..2abe7baa4a 100755
--- a/cpp/src/tests/legacystore/jrnl/prof
+++ b/qpid/cpp/src/tests/legacystore/jrnl/prof
diff --git a/cpp/src/tests/legacystore/jrnl/run-journal-tests b/qpid/cpp/src/tests/legacystore/jrnl/run-journal-tests
index e169e39c60..e169e39c60 100755
--- a/cpp/src/tests/legacystore/jrnl/run-journal-tests
+++ b/qpid/cpp/src/tests/legacystore/jrnl/run-journal-tests
diff --git a/cpp/src/tests/legacystore/jrnl/tests.ods b/qpid/cpp/src/tests/legacystore/jrnl/tests.ods
index d900374321..d900374321 100644
--- a/cpp/src/tests/legacystore/jrnl/tests.ods
+++ b/qpid/cpp/src/tests/legacystore/jrnl/tests.ods
diff --git a/cpp/src/tests/legacystore/persistence.py b/qpid/cpp/src/tests/legacystore/persistence.py
index c4ab712f14..c4ab712f14 100644
--- a/cpp/src/tests/legacystore/persistence.py
+++ b/qpid/cpp/src/tests/legacystore/persistence.py
diff --git a/cpp/src/tests/legacystore/python_tests/__init__.py b/qpid/cpp/src/tests/legacystore/python_tests/__init__.py
index ebb9da8670..ebb9da8670 100644
--- a/cpp/src/tests/legacystore/python_tests/__init__.py
+++ b/qpid/cpp/src/tests/legacystore/python_tests/__init__.py
diff --git a/cpp/src/tests/legacystore/python_tests/client_persistence.py b/qpid/cpp/src/tests/legacystore/python_tests/client_persistence.py
index 3c62740a62..3c62740a62 100644
--- a/cpp/src/tests/legacystore/python_tests/client_persistence.py
+++ b/qpid/cpp/src/tests/legacystore/python_tests/client_persistence.py
diff --git a/cpp/src/tests/legacystore/python_tests/resize.py b/qpid/cpp/src/tests/legacystore/python_tests/resize.py
index 469e0f6730..469e0f6730 100644
--- a/cpp/src/tests/legacystore/python_tests/resize.py
+++ b/qpid/cpp/src/tests/legacystore/python_tests/resize.py
diff --git a/cpp/src/tests/legacystore/python_tests/store_test.py b/qpid/cpp/src/tests/legacystore/python_tests/store_test.py
index 2fcab4e38e..2fcab4e38e 100644
--- a/cpp/src/tests/legacystore/python_tests/store_test.py
+++ b/qpid/cpp/src/tests/legacystore/python_tests/store_test.py
diff --git a/cpp/src/tests/legacystore/run_long_python_tests b/qpid/cpp/src/tests/legacystore/run_long_python_tests
index be6380302c..be6380302c 100644
--- a/cpp/src/tests/legacystore/run_long_python_tests
+++ b/qpid/cpp/src/tests/legacystore/run_long_python_tests
diff --git a/cpp/src/tests/legacystore/run_python_tests b/qpid/cpp/src/tests/legacystore/run_python_tests
index c1d04a28a1..c1d04a28a1 100755
--- a/cpp/src/tests/legacystore/run_python_tests
+++ b/qpid/cpp/src/tests/legacystore/run_python_tests
diff --git a/cpp/src/tests/legacystore/run_short_python_tests b/qpid/cpp/src/tests/legacystore/run_short_python_tests
index 9b9e7c59be..9b9e7c59be 100644
--- a/cpp/src/tests/legacystore/run_short_python_tests
+++ b/qpid/cpp/src/tests/legacystore/run_short_python_tests
diff --git a/cpp/src/tests/legacystore/system_test.sh b/qpid/cpp/src/tests/legacystore/system_test.sh
index 52cecbce8a..52cecbce8a 100644
--- a/cpp/src/tests/legacystore/system_test.sh
+++ b/qpid/cpp/src/tests/legacystore/system_test.sh
diff --git a/cpp/src/tests/legacystore/unit_test.cpp b/qpid/cpp/src/tests/legacystore/unit_test.cpp
index add80a6f91..add80a6f91 100644
--- a/cpp/src/tests/legacystore/unit_test.cpp
+++ b/qpid/cpp/src/tests/legacystore/unit_test.cpp
diff --git a/cpp/src/tests/legacystore/unit_test.h b/qpid/cpp/src/tests/legacystore/unit_test.h
index 16b6ae2ffb..16b6ae2ffb 100644
--- a/cpp/src/tests/legacystore/unit_test.h
+++ b/qpid/cpp/src/tests/legacystore/unit_test.h
diff --git a/cpp/src/tests/linearstore/linearstoredirsetup.sh b/qpid/cpp/src/tests/linearstore/linearstoredirsetup.sh
index 5e2ca235a1..5e2ca235a1 100755
--- a/cpp/src/tests/linearstore/linearstoredirsetup.sh
+++ b/qpid/cpp/src/tests/linearstore/linearstoredirsetup.sh
diff --git a/cpp/src/tests/logging.cpp b/qpid/cpp/src/tests/logging.cpp
index 32cd09d73d..32cd09d73d 100644
--- a/cpp/src/tests/logging.cpp
+++ b/qpid/cpp/src/tests/logging.cpp
diff --git a/cpp/src/tests/misc.py b/qpid/cpp/src/tests/misc.py
index 257fb9e754..257fb9e754 100644
--- a/cpp/src/tests/misc.py
+++ b/qpid/cpp/src/tests/misc.py
diff --git a/cpp/src/tests/msg_group_test.cpp b/qpid/cpp/src/tests/msg_group_test.cpp
index 4f54e3ee53..4f54e3ee53 100644
--- a/cpp/src/tests/msg_group_test.cpp
+++ b/qpid/cpp/src/tests/msg_group_test.cpp
diff --git a/cpp/src/tests/multiq_perftest b/qpid/cpp/src/tests/multiq_perftest
index 9673dd2e6d..9673dd2e6d 100755
--- a/cpp/src/tests/multiq_perftest
+++ b/qpid/cpp/src/tests/multiq_perftest
diff --git a/cpp/src/tests/perfdist b/qpid/cpp/src/tests/perfdist
index 4049b410ff..4049b410ff 100755
--- a/cpp/src/tests/perfdist
+++ b/qpid/cpp/src/tests/perfdist
diff --git a/cpp/src/tests/ping_broker b/qpid/cpp/src/tests/ping_broker
index bdf48f3358..bdf48f3358 100755
--- a/cpp/src/tests/ping_broker
+++ b/qpid/cpp/src/tests/ping_broker
diff --git a/cpp/src/tests/policies.py b/qpid/cpp/src/tests/policies.py
index ec0191f91e..ec0191f91e 100644
--- a/cpp/src/tests/policies.py
+++ b/qpid/cpp/src/tests/policies.py
diff --git a/cpp/src/tests/policy.acl b/qpid/cpp/src/tests/policy.acl
index ef46026555..ef46026555 100644
--- a/cpp/src/tests/policy.acl
+++ b/qpid/cpp/src/tests/policy.acl
diff --git a/cpp/src/tests/publish.cpp b/qpid/cpp/src/tests/publish.cpp
index 3f456e7588..3f456e7588 100644
--- a/cpp/src/tests/publish.cpp
+++ b/qpid/cpp/src/tests/publish.cpp
diff --git a/cpp/src/tests/python_tests b/qpid/cpp/src/tests/python_tests
index babe93c163..babe93c163 100755
--- a/cpp/src/tests/python_tests
+++ b/qpid/cpp/src/tests/python_tests
diff --git a/cpp/src/tests/python_tests.ps1 b/qpid/cpp/src/tests/python_tests.ps1
index f7caa8f75a..f7caa8f75a 100644
--- a/cpp/src/tests/python_tests.ps1
+++ b/qpid/cpp/src/tests/python_tests.ps1
diff --git a/cpp/src/tests/qpid-analyze-trace b/qpid/cpp/src/tests/qpid-analyze-trace
index 65c673e511..65c673e511 100755
--- a/cpp/src/tests/qpid-analyze-trace
+++ b/qpid/cpp/src/tests/qpid-analyze-trace
diff --git a/cpp/src/tests/qpid-build-rinstall b/qpid/cpp/src/tests/qpid-build-rinstall
index beff7dffba..beff7dffba 100755
--- a/cpp/src/tests/qpid-build-rinstall
+++ b/qpid/cpp/src/tests/qpid-build-rinstall
diff --git a/cpp/src/tests/qpid-client-test.cpp b/qpid/cpp/src/tests/qpid-client-test.cpp
index 9198324f93..9198324f93 100644
--- a/cpp/src/tests/qpid-client-test.cpp
+++ b/qpid/cpp/src/tests/qpid-client-test.cpp
diff --git a/cpp/src/tests/qpid-cluster-benchmark b/qpid/cpp/src/tests/qpid-cluster-benchmark
index f20ac6ac30..f20ac6ac30 100755
--- a/cpp/src/tests/qpid-cluster-benchmark
+++ b/qpid/cpp/src/tests/qpid-cluster-benchmark
diff --git a/cpp/src/tests/qpid-cpp-benchmark b/qpid/cpp/src/tests/qpid-cpp-benchmark
index 9ac6a10883..9ac6a10883 100755
--- a/cpp/src/tests/qpid-cpp-benchmark
+++ b/qpid/cpp/src/tests/qpid-cpp-benchmark
diff --git a/cpp/src/tests/qpid-ctrl b/qpid/cpp/src/tests/qpid-ctrl
index 4246c57898..4246c57898 100755
--- a/cpp/src/tests/qpid-ctrl
+++ b/qpid/cpp/src/tests/qpid-ctrl
diff --git a/cpp/src/tests/qpid-latency-test.cpp b/qpid/cpp/src/tests/qpid-latency-test.cpp
index ba53ba0459..ba53ba0459 100644
--- a/cpp/src/tests/qpid-latency-test.cpp
+++ b/qpid/cpp/src/tests/qpid-latency-test.cpp
diff --git a/cpp/src/tests/qpid-perftest.cpp b/qpid/cpp/src/tests/qpid-perftest.cpp
index c28bdfe5f8..c28bdfe5f8 100644
--- a/cpp/src/tests/qpid-perftest.cpp
+++ b/qpid/cpp/src/tests/qpid-perftest.cpp
diff --git a/cpp/src/tests/qpid-ping.cpp b/qpid/cpp/src/tests/qpid-ping.cpp
index 52331499e7..52331499e7 100644
--- a/cpp/src/tests/qpid-ping.cpp
+++ b/qpid/cpp/src/tests/qpid-ping.cpp
diff --git a/cpp/src/tests/qpid-receive.cpp b/qpid/cpp/src/tests/qpid-receive.cpp
index ab26d3d9b5..ab26d3d9b5 100644
--- a/cpp/src/tests/qpid-receive.cpp
+++ b/qpid/cpp/src/tests/qpid-receive.cpp
diff --git a/cpp/src/tests/qpid-send.cpp b/qpid/cpp/src/tests/qpid-send.cpp
index f912b84e8e..f912b84e8e 100644
--- a/cpp/src/tests/qpid-send.cpp
+++ b/qpid/cpp/src/tests/qpid-send.cpp
diff --git a/cpp/src/tests/qpid-src-rinstall b/qpid/cpp/src/tests/qpid-src-rinstall
index c7473e9197..c7473e9197 100755
--- a/cpp/src/tests/qpid-src-rinstall
+++ b/qpid/cpp/src/tests/qpid-src-rinstall
diff --git a/cpp/src/tests/qpid-stream.cpp b/qpid/cpp/src/tests/qpid-stream.cpp
index f02a484750..f02a484750 100644
--- a/cpp/src/tests/qpid-stream.cpp
+++ b/qpid/cpp/src/tests/qpid-stream.cpp
diff --git a/cpp/src/tests/qpid-topic-listener.cpp b/qpid/cpp/src/tests/qpid-topic-listener.cpp
index c42e76d760..c42e76d760 100644
--- a/cpp/src/tests/qpid-topic-listener.cpp
+++ b/qpid/cpp/src/tests/qpid-topic-listener.cpp
diff --git a/cpp/src/tests/qpid-topic-publisher.cpp b/qpid/cpp/src/tests/qpid-topic-publisher.cpp
index f9107b90d0..f9107b90d0 100644
--- a/cpp/src/tests/qpid-topic-publisher.cpp
+++ b/qpid/cpp/src/tests/qpid-topic-publisher.cpp
diff --git a/cpp/src/tests/qpid-txtest.cpp b/qpid/cpp/src/tests/qpid-txtest.cpp
index 6e7d46802c..6e7d46802c 100644
--- a/cpp/src/tests/qpid-txtest.cpp
+++ b/qpid/cpp/src/tests/qpid-txtest.cpp
diff --git a/cpp/src/tests/qpidd-empty.conf b/qpid/cpp/src/tests/qpidd-empty.conf
index bbf52bf446..bbf52bf446 100644
--- a/cpp/src/tests/qpidd-empty.conf
+++ b/qpid/cpp/src/tests/qpidd-empty.conf
diff --git a/cpp/src/tests/qpidd-p0 b/qpid/cpp/src/tests/qpidd-p0
index 1f7807afd2..1f7807afd2 100755
--- a/cpp/src/tests/qpidd-p0
+++ b/qpid/cpp/src/tests/qpidd-p0
diff --git a/cpp/src/tests/qpidd_qmfv2_tests.py b/qpid/cpp/src/tests/qpidd_qmfv2_tests.py
index 55497ccc03..55497ccc03 100755
--- a/cpp/src/tests/qpidd_qmfv2_tests.py
+++ b/qpid/cpp/src/tests/qpidd_qmfv2_tests.py
diff --git a/cpp/src/tests/queue_flow_limit_tests.py b/qpid/cpp/src/tests/queue_flow_limit_tests.py
index 83e31e979b..83e31e979b 100644
--- a/cpp/src/tests/queue_flow_limit_tests.py
+++ b/qpid/cpp/src/tests/queue_flow_limit_tests.py
diff --git a/cpp/src/tests/queue_redirect.py b/qpid/cpp/src/tests/queue_redirect.py
index 8a7b4c244b..8a7b4c244b 100644
--- a/cpp/src/tests/queue_redirect.py
+++ b/qpid/cpp/src/tests/queue_redirect.py
diff --git a/cpp/src/tests/quick_perftest b/qpid/cpp/src/tests/quick_perftest
index 698af60324..698af60324 100755
--- a/cpp/src/tests/quick_perftest
+++ b/qpid/cpp/src/tests/quick_perftest
diff --git a/cpp/src/tests/quick_topictest b/qpid/cpp/src/tests/quick_topictest
index e44ec0f477..e44ec0f477 100755
--- a/cpp/src/tests/quick_topictest
+++ b/qpid/cpp/src/tests/quick_topictest
diff --git a/cpp/src/tests/quick_topictest.ps1 b/qpid/cpp/src/tests/quick_topictest.ps1
index 8f5b2caff7..8f5b2caff7 100644
--- a/cpp/src/tests/quick_topictest.ps1
+++ b/qpid/cpp/src/tests/quick_topictest.ps1
diff --git a/cpp/src/tests/quick_txtest b/qpid/cpp/src/tests/quick_txtest
index 77e8556f1d..77e8556f1d 100755
--- a/cpp/src/tests/quick_txtest
+++ b/qpid/cpp/src/tests/quick_txtest
diff --git a/cpp/src/tests/receiver.cpp b/qpid/cpp/src/tests/receiver.cpp
index f1b462d6e4..f1b462d6e4 100644
--- a/cpp/src/tests/receiver.cpp
+++ b/qpid/cpp/src/tests/receiver.cpp
diff --git a/cpp/src/tests/reject_release.py b/qpid/cpp/src/tests/reject_release.py
index d072b8aa78..d072b8aa78 100644
--- a/cpp/src/tests/reject_release.py
+++ b/qpid/cpp/src/tests/reject_release.py
diff --git a/cpp/src/tests/replaying_sender.cpp b/qpid/cpp/src/tests/replaying_sender.cpp
index a5549bfdf2..a5549bfdf2 100644
--- a/cpp/src/tests/replaying_sender.cpp
+++ b/qpid/cpp/src/tests/replaying_sender.cpp
diff --git a/cpp/src/tests/resuming_receiver.cpp b/qpid/cpp/src/tests/resuming_receiver.cpp
index 2e22a7c572..2e22a7c572 100644
--- a/cpp/src/tests/resuming_receiver.cpp
+++ b/qpid/cpp/src/tests/resuming_receiver.cpp
diff --git a/cpp/src/tests/ring_queue_test b/qpid/cpp/src/tests/ring_queue_test
index 410ea30eb8..410ea30eb8 100755
--- a/cpp/src/tests/ring_queue_test
+++ b/qpid/cpp/src/tests/ring_queue_test
diff --git a/cpp/src/tests/rsynchosts b/qpid/cpp/src/tests/rsynchosts
index 10e1081f76..10e1081f76 100755
--- a/cpp/src/tests/rsynchosts
+++ b/qpid/cpp/src/tests/rsynchosts
diff --git a/cpp/src/tests/run_acl_tests b/qpid/cpp/src/tests/run_acl_tests
index a6f4fd8cbb..a6f4fd8cbb 100755
--- a/cpp/src/tests/run_acl_tests
+++ b/qpid/cpp/src/tests/run_acl_tests
diff --git a/cpp/src/tests/run_acl_tests.ps1 b/qpid/cpp/src/tests/run_acl_tests.ps1
index 8279d87e54..8279d87e54 100644
--- a/cpp/src/tests/run_acl_tests.ps1
+++ b/qpid/cpp/src/tests/run_acl_tests.ps1
diff --git a/cpp/src/tests/run_cli_tests b/qpid/cpp/src/tests/run_cli_tests
index 1db99001a4..1db99001a4 100755
--- a/cpp/src/tests/run_cli_tests
+++ b/qpid/cpp/src/tests/run_cli_tests
diff --git a/cpp/src/tests/run_federation_sys_tests b/qpid/cpp/src/tests/run_federation_sys_tests
index f5f1ae44d3..f5f1ae44d3 100755
--- a/cpp/src/tests/run_federation_sys_tests
+++ b/qpid/cpp/src/tests/run_federation_sys_tests
diff --git a/cpp/src/tests/run_federation_tests b/qpid/cpp/src/tests/run_federation_tests
index 8cadd3702f..8cadd3702f 100755
--- a/cpp/src/tests/run_federation_tests
+++ b/qpid/cpp/src/tests/run_federation_tests
diff --git a/cpp/src/tests/run_federation_tests.ps1 b/qpid/cpp/src/tests/run_federation_tests.ps1
index 803b3eef6f..803b3eef6f 100644
--- a/cpp/src/tests/run_federation_tests.ps1
+++ b/qpid/cpp/src/tests/run_federation_tests.ps1
diff --git a/cpp/src/tests/run_ha_tests b/qpid/cpp/src/tests/run_ha_tests
index bb60bea076..bb60bea076 100755
--- a/cpp/src/tests/run_ha_tests
+++ b/qpid/cpp/src/tests/run_ha_tests
diff --git a/cpp/src/tests/run_header_test b/qpid/cpp/src/tests/run_header_test
index d1edcf6831..d1edcf6831 100755
--- a/cpp/src/tests/run_header_test
+++ b/qpid/cpp/src/tests/run_header_test
diff --git a/cpp/src/tests/run_header_test.ps1 b/qpid/cpp/src/tests/run_header_test.ps1
index 344fac9cf9..344fac9cf9 100644
--- a/cpp/src/tests/run_header_test.ps1
+++ b/qpid/cpp/src/tests/run_header_test.ps1
diff --git a/cpp/src/tests/run_headers_federation_tests b/qpid/cpp/src/tests/run_headers_federation_tests
index afbbf144ee..afbbf144ee 100644
--- a/cpp/src/tests/run_headers_federation_tests
+++ b/qpid/cpp/src/tests/run_headers_federation_tests
diff --git a/cpp/src/tests/run_interlink_tests b/qpid/cpp/src/tests/run_interlink_tests
index 71482fa7fd..71482fa7fd 100755
--- a/cpp/src/tests/run_interlink_tests
+++ b/qpid/cpp/src/tests/run_interlink_tests
diff --git a/cpp/src/tests/run_long_federation_sys_tests b/qpid/cpp/src/tests/run_long_federation_sys_tests
index c2b4e02d81..c2b4e02d81 100644
--- a/cpp/src/tests/run_long_federation_sys_tests
+++ b/qpid/cpp/src/tests/run_long_federation_sys_tests
diff --git a/cpp/src/tests/run_msg_group_tests b/qpid/cpp/src/tests/run_msg_group_tests
index ee479c23c7..ee479c23c7 100755
--- a/cpp/src/tests/run_msg_group_tests
+++ b/qpid/cpp/src/tests/run_msg_group_tests
diff --git a/cpp/src/tests/run_msg_group_tests.ps1 b/qpid/cpp/src/tests/run_msg_group_tests.ps1
index e9cee0a5a0..e9cee0a5a0 100644
--- a/cpp/src/tests/run_msg_group_tests.ps1
+++ b/qpid/cpp/src/tests/run_msg_group_tests.ps1
diff --git a/cpp/src/tests/run_msg_group_tests_soak b/qpid/cpp/src/tests/run_msg_group_tests_soak
index d87ca16c88..d87ca16c88 100755
--- a/cpp/src/tests/run_msg_group_tests_soak
+++ b/qpid/cpp/src/tests/run_msg_group_tests_soak
diff --git a/cpp/src/tests/run_paged_queue_tests b/qpid/cpp/src/tests/run_paged_queue_tests
index 8f72ddd5b7..8f72ddd5b7 100755
--- a/cpp/src/tests/run_paged_queue_tests
+++ b/qpid/cpp/src/tests/run_paged_queue_tests
diff --git a/cpp/src/tests/run_perftest b/qpid/cpp/src/tests/run_perftest
index 2fadc6cc62..2fadc6cc62 100755
--- a/cpp/src/tests/run_perftest
+++ b/qpid/cpp/src/tests/run_perftest
diff --git a/cpp/src/tests/run_queue_flow_limit_tests b/qpid/cpp/src/tests/run_queue_flow_limit_tests
index 55b3e5d4c5..55b3e5d4c5 100755
--- a/cpp/src/tests/run_queue_flow_limit_tests
+++ b/qpid/cpp/src/tests/run_queue_flow_limit_tests
diff --git a/cpp/src/tests/run_queue_redirect b/qpid/cpp/src/tests/run_queue_redirect
index 3a0ae5118a..3a0ae5118a 100755
--- a/cpp/src/tests/run_queue_redirect
+++ b/qpid/cpp/src/tests/run_queue_redirect
diff --git a/cpp/src/tests/run_ring_queue_test b/qpid/cpp/src/tests/run_ring_queue_test
index 69497f9872..69497f9872 100755
--- a/cpp/src/tests/run_ring_queue_test
+++ b/qpid/cpp/src/tests/run_ring_queue_test
diff --git a/cpp/src/tests/run_store_tests.ps1 b/qpid/cpp/src/tests/run_store_tests.ps1
index 0683892393..0683892393 100644
--- a/cpp/src/tests/run_store_tests.ps1
+++ b/qpid/cpp/src/tests/run_store_tests.ps1
diff --git a/cpp/src/tests/run_test b/qpid/cpp/src/tests/run_test
index acb1714b0e..acb1714b0e 100755
--- a/cpp/src/tests/run_test
+++ b/qpid/cpp/src/tests/run_test
diff --git a/cpp/src/tests/run_test.ps1 b/qpid/cpp/src/tests/run_test.ps1
index 872e1dddb1..872e1dddb1 100644
--- a/cpp/src/tests/run_test.ps1
+++ b/qpid/cpp/src/tests/run_test.ps1
diff --git a/cpp/src/tests/sasl_fed b/qpid/cpp/src/tests/sasl_fed
index 38ef43f56f..38ef43f56f 100755
--- a/cpp/src/tests/sasl_fed
+++ b/qpid/cpp/src/tests/sasl_fed
diff --git a/cpp/src/tests/sasl_fed_ex b/qpid/cpp/src/tests/sasl_fed_ex
index febafb19de..febafb19de 100755
--- a/cpp/src/tests/sasl_fed_ex
+++ b/qpid/cpp/src/tests/sasl_fed_ex
diff --git a/cpp/src/tests/sasl_no_dir b/qpid/cpp/src/tests/sasl_no_dir
index b2f5d1668e..b2f5d1668e 100755
--- a/cpp/src/tests/sasl_no_dir
+++ b/qpid/cpp/src/tests/sasl_no_dir
diff --git a/cpp/src/tests/sasl_test_setup.sh b/qpid/cpp/src/tests/sasl_test_setup.sh
index d41efbe6e5..d41efbe6e5 100755
--- a/cpp/src/tests/sasl_test_setup.sh
+++ b/qpid/cpp/src/tests/sasl_test_setup.sh
diff --git a/cpp/src/tests/sasl_version.cpp b/qpid/cpp/src/tests/sasl_version.cpp
index db3efe4181..db3efe4181 100644
--- a/cpp/src/tests/sasl_version.cpp
+++ b/qpid/cpp/src/tests/sasl_version.cpp
diff --git a/cpp/src/tests/sender.cpp b/qpid/cpp/src/tests/sender.cpp
index 063b5e87dc..063b5e87dc 100644
--- a/cpp/src/tests/sender.cpp
+++ b/qpid/cpp/src/tests/sender.cpp
diff --git a/cpp/src/tests/shared_perftest b/qpid/cpp/src/tests/shared_perftest
index 709ffd56b5..709ffd56b5 100755
--- a/cpp/src/tests/shared_perftest
+++ b/qpid/cpp/src/tests/shared_perftest
diff --git a/cpp/src/tests/shlibtest.cpp b/qpid/cpp/src/tests/shlibtest.cpp
index 5655eb7e64..5655eb7e64 100644
--- a/cpp/src/tests/shlibtest.cpp
+++ b/qpid/cpp/src/tests/shlibtest.cpp
diff --git a/cpp/src/tests/ssl_test b/qpid/cpp/src/tests/ssl_test
index 36a8d01b32..36a8d01b32 100755
--- a/cpp/src/tests/ssl_test
+++ b/qpid/cpp/src/tests/ssl_test
diff --git a/cpp/src/tests/store.py b/qpid/cpp/src/tests/store.py
index 5c1934dded..5c1934dded 100755
--- a/cpp/src/tests/store.py
+++ b/qpid/cpp/src/tests/store.py
diff --git a/cpp/src/tests/swig_python_tests b/qpid/cpp/src/tests/swig_python_tests
index 6de10f5ae9..6de10f5ae9 100755
--- a/cpp/src/tests/swig_python_tests
+++ b/qpid/cpp/src/tests/swig_python_tests
diff --git a/cpp/src/tests/test.xquery b/qpid/cpp/src/tests/test.xquery
index 4cfe3af02d..4cfe3af02d 100644
--- a/cpp/src/tests/test.xquery
+++ b/qpid/cpp/src/tests/test.xquery
diff --git a/cpp/src/tests/test_env.ps1.in b/qpid/cpp/src/tests/test_env.ps1.in
index 12373b5b35..12373b5b35 100644
--- a/cpp/src/tests/test_env.ps1.in
+++ b/qpid/cpp/src/tests/test_env.ps1.in
diff --git a/cpp/src/tests/test_env.sh.in b/qpid/cpp/src/tests/test_env.sh.in
index df410ec188..df410ec188 100644
--- a/cpp/src/tests/test_env.sh.in
+++ b/qpid/cpp/src/tests/test_env.sh.in
diff --git a/cpp/src/tests/test_env_common.sh b/qpid/cpp/src/tests/test_env_common.sh
index 348664ca76..348664ca76 100644
--- a/cpp/src/tests/test_env_common.sh
+++ b/qpid/cpp/src/tests/test_env_common.sh
diff --git a/cpp/src/tests/test_store.cpp b/qpid/cpp/src/tests/test_store.cpp
index e299161c68..e299161c68 100644
--- a/cpp/src/tests/test_store.cpp
+++ b/qpid/cpp/src/tests/test_store.cpp
diff --git a/cpp/src/tests/test_tools.h b/qpid/cpp/src/tests/test_tools.h
index 7950a36913..7950a36913 100644
--- a/cpp/src/tests/test_tools.h
+++ b/qpid/cpp/src/tests/test_tools.h
diff --git a/cpp/src/tests/topic_perftest b/qpid/cpp/src/tests/topic_perftest
index 04e1cdcffb..04e1cdcffb 100755
--- a/cpp/src/tests/topic_perftest
+++ b/qpid/cpp/src/tests/topic_perftest
diff --git a/cpp/src/tests/topictest b/qpid/cpp/src/tests/topictest
index f4c6e7187d..f4c6e7187d 100755
--- a/cpp/src/tests/topictest
+++ b/qpid/cpp/src/tests/topictest
diff --git a/cpp/src/tests/topictest.ps1 b/qpid/cpp/src/tests/topictest.ps1
index f15b2d452c..f15b2d452c 100644
--- a/cpp/src/tests/topictest.ps1
+++ b/qpid/cpp/src/tests/topictest.ps1
diff --git a/cpp/src/tests/txjob.cpp b/qpid/cpp/src/tests/txjob.cpp
index 29394c3415..29394c3415 100644
--- a/cpp/src/tests/txjob.cpp
+++ b/qpid/cpp/src/tests/txjob.cpp
diff --git a/cpp/src/tests/txshift.cpp b/qpid/cpp/src/tests/txshift.cpp
index bf85bee986..bf85bee986 100644
--- a/cpp/src/tests/txshift.cpp
+++ b/qpid/cpp/src/tests/txshift.cpp
diff --git a/cpp/src/tests/unit_test.cpp b/qpid/cpp/src/tests/unit_test.cpp
index 00c61242e4..00c61242e4 100644
--- a/cpp/src/tests/unit_test.cpp
+++ b/qpid/cpp/src/tests/unit_test.cpp
diff --git a/cpp/src/tests/unit_test.h b/qpid/cpp/src/tests/unit_test.h
index a11df2ff04..a11df2ff04 100644
--- a/cpp/src/tests/unit_test.h
+++ b/qpid/cpp/src/tests/unit_test.h
diff --git a/cpp/src/tests/vg_check b/qpid/cpp/src/tests/vg_check
index 462f4cb5e4..462f4cb5e4 100644
--- a/cpp/src/tests/vg_check
+++ b/qpid/cpp/src/tests/vg_check
diff --git a/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp b/qpid/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp
index 14f1e46606..14f1e46606 100644
--- a/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp
+++ b/qpid/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp
diff --git a/cpp/src/versions.cmake b/qpid/cpp/src/versions.cmake
index ac20e9ed7f..ac20e9ed7f 100644
--- a/cpp/src/versions.cmake
+++ b/qpid/cpp/src/versions.cmake
diff --git a/cpp/src/windows/QpiddBroker.cpp b/qpid/cpp/src/windows/QpiddBroker.cpp
index b383b7d6c7..b383b7d6c7 100644
--- a/cpp/src/windows/QpiddBroker.cpp
+++ b/qpid/cpp/src/windows/QpiddBroker.cpp
diff --git a/cpp/src/windows/SCM.cpp b/qpid/cpp/src/windows/SCM.cpp
index 2eeb143427..2eeb143427 100644
--- a/cpp/src/windows/SCM.cpp
+++ b/qpid/cpp/src/windows/SCM.cpp
diff --git a/cpp/src/windows/SCM.h b/qpid/cpp/src/windows/SCM.h
index bdc73bc210..bdc73bc210 100644
--- a/cpp/src/windows/SCM.h
+++ b/qpid/cpp/src/windows/SCM.h
diff --git a/cpp/src/windows/resources/qpid-icon.ico b/qpid/cpp/src/windows/resources/qpid-icon.ico
index 112f5d8f1f..112f5d8f1f 100644
--- a/cpp/src/windows/resources/qpid-icon.ico
+++ b/qpid/cpp/src/windows/resources/qpid-icon.ico
diff --git a/cpp/src/windows/resources/template-resource.rc b/qpid/cpp/src/windows/resources/template-resource.rc
index 8ca0a90890..8ca0a90890 100644
--- a/cpp/src/windows/resources/template-resource.rc
+++ b/qpid/cpp/src/windows/resources/template-resource.rc
diff --git a/cpp/src/windows/resources/version-resource.h b/qpid/cpp/src/windows/resources/version-resource.h
index bf942abbaf..bf942abbaf 100644
--- a/cpp/src/windows/resources/version-resource.h
+++ b/qpid/cpp/src/windows/resources/version-resource.h
diff --git a/doc/book/.gitignore b/qpid/doc/book/.gitignore
index 21f1f20096..21f1f20096 100644
--- a/doc/book/.gitignore
+++ b/qpid/doc/book/.gitignore
diff --git a/doc/book/Makefile b/qpid/doc/book/Makefile
index 3ba8354602..3ba8354602 100644
--- a/doc/book/Makefile
+++ b/qpid/doc/book/Makefile
diff --git a/doc/book/src/Makefile.inc b/qpid/doc/book/src/Makefile.inc
index 65808a0566..65808a0566 100644
--- a/doc/book/src/Makefile.inc
+++ b/qpid/doc/book/src/Makefile.inc
diff --git a/doc/book/src/common/css/style.css b/qpid/doc/book/src/common/css/style.css
index c681596592..c681596592 100644
--- a/doc/book/src/common/css/style.css
+++ b/qpid/doc/book/src/common/css/style.css
diff --git a/doc/book/src/cpp-broker/.gitignore b/qpid/doc/book/src/cpp-broker/.gitignore
index 6d31bdba7f..6d31bdba7f 100644
--- a/doc/book/src/cpp-broker/.gitignore
+++ b/qpid/doc/book/src/cpp-broker/.gitignore
diff --git a/doc/book/src/cpp-broker/AMQP-Compatibility.xml b/qpid/doc/book/src/cpp-broker/AMQP-Compatibility.xml
index e5aa98cf96..e5aa98cf96 100644
--- a/doc/book/src/cpp-broker/AMQP-Compatibility.xml
+++ b/qpid/doc/book/src/cpp-broker/AMQP-Compatibility.xml
diff --git a/doc/book/src/cpp-broker/AMQP-Messaging-Broker-CPP-Book.xml b/qpid/doc/book/src/cpp-broker/AMQP-Messaging-Broker-CPP-Book.xml
index 6122b12e18..6122b12e18 100644
--- a/doc/book/src/cpp-broker/AMQP-Messaging-Broker-CPP-Book.xml
+++ b/qpid/doc/book/src/cpp-broker/AMQP-Messaging-Broker-CPP-Book.xml
diff --git a/doc/book/src/cpp-broker/Active-Passive-Cluster.xml b/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
index 7e1b905373..7e1b905373 100644
--- a/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
+++ b/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
diff --git a/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Exchange-Options.xml b/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Exchange-Options.xml
index fccdae1b9a..fccdae1b9a 100644
--- a/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Exchange-Options.xml
+++ b/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Exchange-Options.xml
diff --git a/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml b/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml
index e693ee463b..e693ee463b 100644
--- a/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml
+++ b/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml
diff --git a/doc/book/src/cpp-broker/HA-Queue-Replication.xml b/qpid/doc/book/src/cpp-broker/HA-Queue-Replication.xml
index 71ad1578fb..71ad1578fb 100644
--- a/doc/book/src/cpp-broker/HA-Queue-Replication.xml
+++ b/qpid/doc/book/src/cpp-broker/HA-Queue-Replication.xml
diff --git a/doc/book/src/cpp-broker/LVQ.xml b/qpid/doc/book/src/cpp-broker/LVQ.xml
index b57c6268be..b57c6268be 100644
--- a/doc/book/src/cpp-broker/LVQ.xml
+++ b/qpid/doc/book/src/cpp-broker/LVQ.xml
diff --git a/doc/book/src/cpp-broker/Makefile b/qpid/doc/book/src/cpp-broker/Makefile
index 0266a0f54d..0266a0f54d 100644
--- a/doc/book/src/cpp-broker/Makefile
+++ b/qpid/doc/book/src/cpp-broker/Makefile
diff --git a/doc/book/src/cpp-broker/Managing-CPP-Broker.xml b/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml
index d6e52c4fdf..d6e52c4fdf 100644
--- a/doc/book/src/cpp-broker/Managing-CPP-Broker.xml
+++ b/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml
diff --git a/doc/book/src/cpp-broker/QMF-Python-Console-Tutorial.xml b/qpid/doc/book/src/cpp-broker/QMF-Python-Console-Tutorial.xml
index 2cb802671b..2cb802671b 100644
--- a/doc/book/src/cpp-broker/QMF-Python-Console-Tutorial.xml
+++ b/qpid/doc/book/src/cpp-broker/QMF-Python-Console-Tutorial.xml
diff --git a/doc/book/src/cpp-broker/Qpid-Interoperability-Documentation.xml b/qpid/doc/book/src/cpp-broker/Qpid-Interoperability-Documentation.xml
index 74546693df..74546693df 100644
--- a/doc/book/src/cpp-broker/Qpid-Interoperability-Documentation.xml
+++ b/qpid/doc/book/src/cpp-broker/Qpid-Interoperability-Documentation.xml
diff --git a/doc/book/src/cpp-broker/Qpid-Management-Framework.xml b/qpid/doc/book/src/cpp-broker/Qpid-Management-Framework.xml
index 89bfe9d95e..89bfe9d95e 100644
--- a/doc/book/src/cpp-broker/Qpid-Management-Framework.xml
+++ b/qpid/doc/book/src/cpp-broker/Qpid-Management-Framework.xml
diff --git a/doc/book/src/cpp-broker/Running-CPP-Broker.xml b/qpid/doc/book/src/cpp-broker/Running-CPP-Broker.xml
index 7f76cbc354..7f76cbc354 100644
--- a/doc/book/src/cpp-broker/Running-CPP-Broker.xml
+++ b/qpid/doc/book/src/cpp-broker/Running-CPP-Broker.xml
diff --git a/doc/book/src/cpp-broker/Security.xml b/qpid/doc/book/src/cpp-broker/Security.xml
index 7bf7034996..7bf7034996 100644
--- a/doc/book/src/cpp-broker/Security.xml
+++ b/qpid/doc/book/src/cpp-broker/Security.xml
diff --git a/doc/book/src/cpp-broker/Using-Broker-Federation.xml b/qpid/doc/book/src/cpp-broker/Using-Broker-Federation.xml
index f5fedf814c..f5fedf814c 100644
--- a/doc/book/src/cpp-broker/Using-Broker-Federation.xml
+++ b/qpid/doc/book/src/cpp-broker/Using-Broker-Federation.xml
diff --git a/doc/book/src/cpp-broker/Using-message-groups.xml b/qpid/doc/book/src/cpp-broker/Using-message-groups.xml
index 9b904d9f18..9b904d9f18 100644
--- a/doc/book/src/cpp-broker/Using-message-groups.xml
+++ b/qpid/doc/book/src/cpp-broker/Using-message-groups.xml
diff --git a/doc/book/src/cpp-broker/producer-flow-control.xml b/qpid/doc/book/src/cpp-broker/producer-flow-control.xml
index fd44f51e81..fd44f51e81 100644
--- a/doc/book/src/cpp-broker/producer-flow-control.xml
+++ b/qpid/doc/book/src/cpp-broker/producer-flow-control.xml
diff --git a/doc/book/src/cpp-broker/queue-state-replication.xml b/qpid/doc/book/src/cpp-broker/queue-state-replication.xml
index 3ffac805eb..3ffac805eb 100644
--- a/doc/book/src/cpp-broker/queue-state-replication.xml
+++ b/qpid/doc/book/src/cpp-broker/queue-state-replication.xml
diff --git a/doc/book/src/images/qpid-logo.png b/qpid/doc/book/src/images/qpid-logo.png
index 5f4ccc3081..5f4ccc3081 100644
--- a/doc/book/src/images/qpid-logo.png
+++ b/qpid/doc/book/src/images/qpid-logo.png
diff --git a/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml b/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
index 2beb77d965..2beb77d965 100644
--- a/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
+++ b/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Close-On-No-Route.xml b/qpid/doc/book/src/java-broker/Java-Broker-Close-On-No-Route.xml
index d2d8fefbc8..d2d8fefbc8 100644
--- a/doc/book/src/java-broker/Java-Broker-Close-On-No-Route.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Close-On-No-Route.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Concepts-Authentication-Providers.xml b/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Authentication-Providers.xml
index dd7c291c77..dd7c291c77 100644
--- a/doc/book/src/java-broker/Java-Broker-Concepts-Authentication-Providers.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Authentication-Providers.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Concepts-Exchanges.xml b/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Exchanges.xml
index 1018f95b04..1018f95b04 100644
--- a/doc/book/src/java-broker/Java-Broker-Concepts-Exchanges.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Exchanges.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Concepts-Other-Services.xml b/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Other-Services.xml
index d0368329b6..d0368329b6 100644
--- a/doc/book/src/java-broker/Java-Broker-Concepts-Other-Services.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Other-Services.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Concepts-Ports.xml b/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Ports.xml
index 027e3a1697..027e3a1697 100644
--- a/doc/book/src/java-broker/Java-Broker-Concepts-Ports.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Ports.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Concepts-Queues.xml b/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Queues.xml
index ea9f7d8fae..ea9f7d8fae 100644
--- a/doc/book/src/java-broker/Java-Broker-Concepts-Queues.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Queues.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Concepts-Virtual-Hosts.xml b/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Virtual-Hosts.xml
index 6f5f1f38ba..6f5f1f38ba 100644
--- a/doc/book/src/java-broker/Java-Broker-Concepts-Virtual-Hosts.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Virtual-Hosts.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Concepts.xml b/qpid/doc/book/src/java-broker/Java-Broker-Concepts.xml
index 2981add7fb..2981add7fb 100644
--- a/doc/book/src/java-broker/Java-Broker-Concepts.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Concepts.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml b/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml
index 072effa798..072effa798 100644
--- a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-JMX.xml b/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-JMX.xml
index 5b4ea42d2b..5b4ea42d2b 100644
--- a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-JMX.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-JMX.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Other-Tooling.xml b/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Other-Tooling.xml
index cf9d9497dd..cf9d9497dd 100644
--- a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Other-Tooling.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Other-Tooling.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-REST-API.xml b/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-REST-API.xml
index 7ec2428414..7ec2428414 100644
--- a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-REST-API.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-REST-API.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Web-Console.xml b/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Web-Console.xml
index faf496d61d..faf496d61d 100644
--- a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Web-Console.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Web-Console.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Web-Management.xml b/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Web-Management.xml
index 76d29093ad..76d29093ad 100644
--- a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Web-Management.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Web-Management.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing.xml b/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing.xml
index 9a07c37861..9a07c37861 100644
--- a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Exchanges-Binding-Arguments.xml b/qpid/doc/book/src/java-broker/Java-Broker-Exchanges-Binding-Arguments.xml
index 06c5ee7336..06c5ee7336 100644
--- a/doc/book/src/java-broker/Java-Broker-Exchanges-Binding-Arguments.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Exchanges-Binding-Arguments.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Exchanges.xml b/qpid/doc/book/src/java-broker/Java-Broker-Exchanges.xml
index 7fe0df1410..7fe0df1410 100644
--- a/doc/book/src/java-broker/Java-Broker-Exchanges.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Exchanges.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Getting-Started.xml b/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
index d597cf1aeb..d597cf1aeb 100644
--- a/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
diff --git a/doc/book/src/java-broker/Java-Broker-High-Availability.xml b/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml
index ca205a865e..ca205a865e 100644
--- a/doc/book/src/java-broker/Java-Broker-High-Availability.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Installation.xml b/qpid/doc/book/src/java-broker/Java-Broker-Installation.xml
index 7e694372c8..7e694372c8 100644
--- a/doc/book/src/java-broker/Java-Broker-Installation.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Installation.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Introduction.xml b/qpid/doc/book/src/java-broker/Java-Broker-Introduction.xml
index 651389d0ac..651389d0ac 100644
--- a/doc/book/src/java-broker/Java-Broker-Introduction.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Introduction.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Miscellaneous.xml b/qpid/doc/book/src/java-broker/Java-Broker-Miscellaneous.xml
index 4b3bdeb15b..4b3bdeb15b 100644
--- a/doc/book/src/java-broker/Java-Broker-Miscellaneous.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Miscellaneous.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Ports.xml b/qpid/doc/book/src/java-broker/Java-Broker-Ports.xml
index c322045336..c322045336 100644
--- a/doc/book/src/java-broker/Java-Broker-Ports.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Ports.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml b/qpid/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml
index 9d94523c06..9d94523c06 100644
--- a/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Queues.xml b/qpid/doc/book/src/java-broker/Java-Broker-Queues.xml
index 9338ab8462..9338ab8462 100644
--- a/doc/book/src/java-broker/Java-Broker-Queues.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Queues.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Runtime-Alerts.xml b/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Alerts.xml
index 29ac68b937..29ac68b937 100644
--- a/doc/book/src/java-broker/Java-Broker-Runtime-Alerts.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Alerts.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml b/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml
index cf7660aed7..cf7660aed7 100644
--- a/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management.xml b/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management.xml
index 814b366d9d..814b366d9d 100644
--- a/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Runtime-Handling-Undeliverable-Messages.xml b/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Handling-Undeliverable-Messages.xml
index 29c42267e4..29c42267e4 100644
--- a/doc/book/src/java-broker/Java-Broker-Runtime-Handling-Undeliverable-Messages.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Handling-Undeliverable-Messages.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Runtime-Log-Files.xml b/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Log-Files.xml
index 84ee4db6d3..84ee4db6d3 100644
--- a/doc/book/src/java-broker/Java-Broker-Runtime-Log-Files.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Log-Files.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Runtime-Producer-Transaction-Timeout.xml b/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Producer-Transaction-Timeout.xml
index 8ef8528ee1..8ef8528ee1 100644
--- a/doc/book/src/java-broker/Java-Broker-Runtime-Producer-Transaction-Timeout.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Producer-Transaction-Timeout.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Runtime.xml b/qpid/doc/book/src/java-broker/Java-Broker-Runtime.xml
index 3c2b9b8dcc..3c2b9b8dcc 100644
--- a/doc/book/src/java-broker/Java-Broker-Runtime.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Runtime.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Security-ACLs.xml b/qpid/doc/book/src/java-broker/Java-Broker-Security-ACLs.xml
index 03537115a4..03537115a4 100644
--- a/doc/book/src/java-broker/Java-Broker-Security-ACLs.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Security-ACLs.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Security-Authentication-Providers.xml b/qpid/doc/book/src/java-broker/Java-Broker-Security-Authentication-Providers.xml
index 538d08d8e9..538d08d8e9 100644
--- a/doc/book/src/java-broker/Java-Broker-Security-Authentication-Providers.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Security-Authentication-Providers.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Security-Group-Providers.xml b/qpid/doc/book/src/java-broker/Java-Broker-Security-Group-Providers.xml
index 34ea443ef7..34ea443ef7 100644
--- a/doc/book/src/java-broker/Java-Broker-Security-Group-Providers.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Security-Group-Providers.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Security-SSL.xml b/qpid/doc/book/src/java-broker/Java-Broker-Security-SSL.xml
index 0a5ec0ec97..0a5ec0ec97 100644
--- a/doc/book/src/java-broker/Java-Broker-Security-SSL.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Security-SSL.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Security.xml b/qpid/doc/book/src/java-broker/Java-Broker-Security.xml
index 858a27abb0..858a27abb0 100644
--- a/doc/book/src/java-broker/Java-Broker-Security.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Security.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Stores-BDB-Store.xml b/qpid/doc/book/src/java-broker/Java-Broker-Stores-BDB-Store.xml
index d6c779f2f3..d6c779f2f3 100644
--- a/doc/book/src/java-broker/Java-Broker-Stores-BDB-Store.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Stores-BDB-Store.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Stores-Derby-Store.xml b/qpid/doc/book/src/java-broker/Java-Broker-Stores-Derby-Store.xml
index b8cd7a17d5..b8cd7a17d5 100644
--- a/doc/book/src/java-broker/Java-Broker-Stores-Derby-Store.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Stores-Derby-Store.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Stores-HA-BDB-Store.xml b/qpid/doc/book/src/java-broker/Java-Broker-Stores-HA-BDB-Store.xml
index ee9102f293..ee9102f293 100644
--- a/doc/book/src/java-broker/Java-Broker-Stores-HA-BDB-Store.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Stores-HA-BDB-Store.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Stores-Memory-Store.xml b/qpid/doc/book/src/java-broker/Java-Broker-Stores-Memory-Store.xml
index cb04929e0c..cb04929e0c 100644
--- a/doc/book/src/java-broker/Java-Broker-Stores-Memory-Store.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Stores-Memory-Store.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Stores-SQL-Store.xml b/qpid/doc/book/src/java-broker/Java-Broker-Stores-SQL-Store.xml
index f41b8af0e6..f41b8af0e6 100644
--- a/doc/book/src/java-broker/Java-Broker-Stores-SQL-Store.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Stores-SQL-Store.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Stores.xml b/qpid/doc/book/src/java-broker/Java-Broker-Stores.xml
index 2524c9855c..2524c9855c 100644
--- a/doc/book/src/java-broker/Java-Broker-Stores.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Stores.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml b/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml
index 6a4c8485e3..6a4c8485e3 100644
--- a/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml
diff --git a/doc/book/src/java-broker/Java-Broker-Virtual-Hosts.xml b/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts.xml
index b240d85d4f..b240d85d4f 100644
--- a/doc/book/src/java-broker/Java-Broker-Virtual-Hosts.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts.xml
diff --git a/doc/book/src/java-broker/Makefile b/qpid/doc/book/src/java-broker/Makefile
index 0266a0f54d..0266a0f54d 100644
--- a/doc/book/src/java-broker/Makefile
+++ b/qpid/doc/book/src/java-broker/Makefile
diff --git a/doc/book/src/java-broker/commonEntities.xml b/qpid/doc/book/src/java-broker/commonEntities.xml
index 868c469d1b..868c469d1b 100644
--- a/doc/book/src/java-broker/commonEntities.xml
+++ b/qpid/doc/book/src/java-broker/commonEntities.xml
diff --git a/doc/book/src/java-broker/images/Broker-Model.png b/qpid/doc/book/src/java-broker/images/Broker-Model.png
index e74f608bf1..e74f608bf1 100644
--- a/doc/book/src/java-broker/images/Broker-Model.png
+++ b/qpid/doc/book/src/java-broker/images/Broker-Model.png
diff --git a/doc/book/src/java-broker/images/Exchange-Direct.png b/qpid/doc/book/src/java-broker/images/Exchange-Direct.png
index 184fb80704..184fb80704 100644
--- a/doc/book/src/java-broker/images/Exchange-Direct.png
+++ b/qpid/doc/book/src/java-broker/images/Exchange-Direct.png
diff --git a/doc/book/src/java-broker/images/Exchange-Direct.svg b/qpid/doc/book/src/java-broker/images/Exchange-Direct.svg
index 76d25fa2ab..76d25fa2ab 100644
--- a/doc/book/src/java-broker/images/Exchange-Direct.svg
+++ b/qpid/doc/book/src/java-broker/images/Exchange-Direct.svg
diff --git a/doc/book/src/java-broker/images/Exchange-Fanout.png b/qpid/doc/book/src/java-broker/images/Exchange-Fanout.png
index 1e7f8ca397..1e7f8ca397 100644
--- a/doc/book/src/java-broker/images/Exchange-Fanout.png
+++ b/qpid/doc/book/src/java-broker/images/Exchange-Fanout.png
diff --git a/doc/book/src/java-broker/images/Exchange-Fanout.svg b/qpid/doc/book/src/java-broker/images/Exchange-Fanout.svg
index 2768886c48..2768886c48 100644
--- a/doc/book/src/java-broker/images/Exchange-Fanout.svg
+++ b/qpid/doc/book/src/java-broker/images/Exchange-Fanout.svg
diff --git a/doc/book/src/java-broker/images/Exchange-Topic-Hierarchical.png b/qpid/doc/book/src/java-broker/images/Exchange-Topic-Hierarchical.png
index faa7507dad..faa7507dad 100644
--- a/doc/book/src/java-broker/images/Exchange-Topic-Hierarchical.png
+++ b/qpid/doc/book/src/java-broker/images/Exchange-Topic-Hierarchical.png
diff --git a/doc/book/src/java-broker/images/Exchange-Topic-Hierarchical.svg b/qpid/doc/book/src/java-broker/images/Exchange-Topic-Hierarchical.svg
index 28ac5a072b..28ac5a072b 100644
--- a/doc/book/src/java-broker/images/Exchange-Topic-Hierarchical.svg
+++ b/qpid/doc/book/src/java-broker/images/Exchange-Topic-Hierarchical.svg
diff --git a/doc/book/src/java-broker/images/Exchange-Topic-JMSSelector.png b/qpid/doc/book/src/java-broker/images/Exchange-Topic-JMSSelector.png
index 7272949204..7272949204 100644
--- a/doc/book/src/java-broker/images/Exchange-Topic-JMSSelector.png
+++ b/qpid/doc/book/src/java-broker/images/Exchange-Topic-JMSSelector.png
diff --git a/doc/book/src/java-broker/images/Exchange-Topic-JMSSelector.svg b/qpid/doc/book/src/java-broker/images/Exchange-Topic-JMSSelector.svg
index 568761a18d..568761a18d 100644
--- a/doc/book/src/java-broker/images/Exchange-Topic-JMSSelector.svg
+++ b/qpid/doc/book/src/java-broker/images/Exchange-Topic-JMSSelector.svg
diff --git a/doc/book/src/java-broker/images/Exchange-Topic.png b/qpid/doc/book/src/java-broker/images/Exchange-Topic.png
index f631d73a12..f631d73a12 100644
--- a/doc/book/src/java-broker/images/Exchange-Topic.png
+++ b/qpid/doc/book/src/java-broker/images/Exchange-Topic.png
diff --git a/doc/book/src/java-broker/images/Exchange-Topic.svg b/qpid/doc/book/src/java-broker/images/Exchange-Topic.svg
index 4240be5594..4240be5594 100644
--- a/doc/book/src/java-broker/images/Exchange-Topic.svg
+++ b/qpid/doc/book/src/java-broker/images/Exchange-Topic.svg
diff --git a/doc/book/src/java-broker/images/HA-2N-Key.png b/qpid/doc/book/src/java-broker/images/HA-2N-Key.png
index 3c1856d496..3c1856d496 100644
--- a/doc/book/src/java-broker/images/HA-2N-Key.png
+++ b/qpid/doc/book/src/java-broker/images/HA-2N-Key.png
diff --git a/doc/book/src/java-broker/images/HA-2N-Key.svg b/qpid/doc/book/src/java-broker/images/HA-2N-Key.svg
index ed471192e2..ed471192e2 100644
--- a/doc/book/src/java-broker/images/HA-2N-Key.svg
+++ b/qpid/doc/book/src/java-broker/images/HA-2N-Key.svg
diff --git a/doc/book/src/java-broker/images/HA-2N-MasterFail.png b/qpid/doc/book/src/java-broker/images/HA-2N-MasterFail.png
index b839d291b9..b839d291b9 100644
--- a/doc/book/src/java-broker/images/HA-2N-MasterFail.png
+++ b/qpid/doc/book/src/java-broker/images/HA-2N-MasterFail.png
diff --git a/doc/book/src/java-broker/images/HA-2N-MasterFail.svg b/qpid/doc/book/src/java-broker/images/HA-2N-MasterFail.svg
index c3fc0c66f3..c3fc0c66f3 100644
--- a/doc/book/src/java-broker/images/HA-2N-MasterFail.svg
+++ b/qpid/doc/book/src/java-broker/images/HA-2N-MasterFail.svg
diff --git a/doc/book/src/java-broker/images/HA-2N-NetworkPartition.png b/qpid/doc/book/src/java-broker/images/HA-2N-NetworkPartition.png
index cd4a196924..cd4a196924 100644
--- a/doc/book/src/java-broker/images/HA-2N-NetworkPartition.png
+++ b/qpid/doc/book/src/java-broker/images/HA-2N-NetworkPartition.png
diff --git a/doc/book/src/java-broker/images/HA-2N-NetworkPartition.svg b/qpid/doc/book/src/java-broker/images/HA-2N-NetworkPartition.svg
index 392489c5c8..392489c5c8 100644
--- a/doc/book/src/java-broker/images/HA-2N-NetworkPartition.svg
+++ b/qpid/doc/book/src/java-broker/images/HA-2N-NetworkPartition.svg
diff --git a/doc/book/src/java-broker/images/HA-2N-Normal.png b/qpid/doc/book/src/java-broker/images/HA-2N-Normal.png
index eeaad4f230..eeaad4f230 100644
--- a/doc/book/src/java-broker/images/HA-2N-Normal.png
+++ b/qpid/doc/book/src/java-broker/images/HA-2N-Normal.png
diff --git a/doc/book/src/java-broker/images/HA-2N-Normal.svg b/qpid/doc/book/src/java-broker/images/HA-2N-Normal.svg
index 68ade6acd0..68ade6acd0 100644
--- a/doc/book/src/java-broker/images/HA-2N-Normal.svg
+++ b/qpid/doc/book/src/java-broker/images/HA-2N-Normal.svg
diff --git a/doc/book/src/java-broker/images/HA-2N-ReplicaFail.png b/qpid/doc/book/src/java-broker/images/HA-2N-ReplicaFail.png
index 769fc959fc..769fc959fc 100644
--- a/doc/book/src/java-broker/images/HA-2N-ReplicaFail.png
+++ b/qpid/doc/book/src/java-broker/images/HA-2N-ReplicaFail.png
diff --git a/doc/book/src/java-broker/images/HA-2N-ReplicaFail.svg b/qpid/doc/book/src/java-broker/images/HA-2N-ReplicaFail.svg
index 8caf055b98..8caf055b98 100644
--- a/doc/book/src/java-broker/images/HA-2N-ReplicaFail.svg
+++ b/qpid/doc/book/src/java-broker/images/HA-2N-ReplicaFail.svg
diff --git a/doc/book/src/java-broker/images/HA-2N-SplitBrain.png b/qpid/doc/book/src/java-broker/images/HA-2N-SplitBrain.png
index 74393648a5..74393648a5 100644
--- a/doc/book/src/java-broker/images/HA-2N-SplitBrain.png
+++ b/qpid/doc/book/src/java-broker/images/HA-2N-SplitBrain.png
diff --git a/doc/book/src/java-broker/images/HA-2N-SplitBrain.svg b/qpid/doc/book/src/java-broker/images/HA-2N-SplitBrain.svg
index 7fed44ea36..7fed44ea36 100644
--- a/doc/book/src/java-broker/images/HA-2N-SplitBrain.svg
+++ b/qpid/doc/book/src/java-broker/images/HA-2N-SplitBrain.svg
diff --git a/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png b/qpid/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png
index 29d5494746..29d5494746 100644
--- a/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png
+++ b/qpid/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png
diff --git a/doc/book/src/java-broker/images/HA-perftests-results.png b/qpid/doc/book/src/java-broker/images/HA-perftests-results.png
index e8dbb3c123..e8dbb3c123 100644
--- a/doc/book/src/java-broker/images/HA-perftests-results.png
+++ b/qpid/doc/book/src/java-broker/images/HA-perftests-results.png
diff --git a/doc/book/src/java-broker/images/Management-Web-Console.png b/qpid/doc/book/src/java-broker/images/Management-Web-Console.png
index de7344a08c..de7344a08c 100644
--- a/doc/book/src/java-broker/images/Management-Web-Console.png
+++ b/qpid/doc/book/src/java-broker/images/Management-Web-Console.png
diff --git a/doc/book/src/java-broker/images/VirtualHost-Model.png b/qpid/doc/book/src/java-broker/images/VirtualHost-Model.png
index 011026bcfb..011026bcfb 100644
--- a/doc/book/src/java-broker/images/VirtualHost-Model.png
+++ b/qpid/doc/book/src/java-broker/images/VirtualHost-Model.png
diff --git a/doc/book/src/java-perftests/JMS-Performance-Test-Framework.xml b/qpid/doc/book/src/java-perftests/JMS-Performance-Test-Framework.xml
index 51a777c94b..51a777c94b 100644
--- a/doc/book/src/java-perftests/JMS-Performance-Test-Framework.xml
+++ b/qpid/doc/book/src/java-perftests/JMS-Performance-Test-Framework.xml
diff --git a/doc/book/src/java-perftests/Makefile b/qpid/doc/book/src/java-perftests/Makefile
index 0266a0f54d..0266a0f54d 100644
--- a/doc/book/src/java-perftests/Makefile
+++ b/qpid/doc/book/src/java-perftests/Makefile
diff --git a/doc/book/src/old/ACL.xml b/qpid/doc/book/src/old/ACL.xml
index ceb7cecb23..ceb7cecb23 100644
--- a/doc/book/src/old/ACL.xml
+++ b/qpid/doc/book/src/old/ACL.xml
diff --git a/doc/book/src/old/AMQP-.NET-Messaging-Client.xml b/qpid/doc/book/src/old/AMQP-.NET-Messaging-Client.xml
index 1d4001942b..1d4001942b 100644
--- a/doc/book/src/old/AMQP-.NET-Messaging-Client.xml
+++ b/qpid/doc/book/src/old/AMQP-.NET-Messaging-Client.xml
diff --git a/doc/book/src/old/AMQP-C++-Messaging-Client.xml b/qpid/doc/book/src/old/AMQP-C++-Messaging-Client.xml
index 73a2cd6c0b..73a2cd6c0b 100644
--- a/doc/book/src/old/AMQP-C++-Messaging-Client.xml
+++ b/qpid/doc/book/src/old/AMQP-C++-Messaging-Client.xml
diff --git a/doc/book/src/old/AMQP-Java-JMS-Messaging-Client.xml b/qpid/doc/book/src/old/AMQP-Java-JMS-Messaging-Client.xml
index 8c14d67e14..8c14d67e14 100644
--- a/doc/book/src/old/AMQP-Java-JMS-Messaging-Client.xml
+++ b/qpid/doc/book/src/old/AMQP-Java-JMS-Messaging-Client.xml
diff --git a/doc/book/src/old/AMQP-Messaging-Broker-CPP.xml b/qpid/doc/book/src/old/AMQP-Messaging-Broker-CPP.xml
index b4e0deb13d..b4e0deb13d 100644
--- a/doc/book/src/old/AMQP-Messaging-Broker-CPP.xml
+++ b/qpid/doc/book/src/old/AMQP-Messaging-Broker-CPP.xml
diff --git a/doc/book/src/old/AMQP-Python-Messaging-Client.xml b/qpid/doc/book/src/old/AMQP-Python-Messaging-Client.xml
index 15baf214ec..15baf214ec 100644
--- a/doc/book/src/old/AMQP-Python-Messaging-Client.xml
+++ b/qpid/doc/book/src/old/AMQP-Python-Messaging-Client.xml
diff --git a/doc/book/src/old/AMQP-Ruby-Messaging-Client.xml b/qpid/doc/book/src/old/AMQP-Ruby-Messaging-Client.xml
index 45318c0beb..45318c0beb 100644
--- a/doc/book/src/old/AMQP-Ruby-Messaging-Client.xml
+++ b/qpid/doc/book/src/old/AMQP-Ruby-Messaging-Client.xml
diff --git a/doc/book/src/old/AMQP.xml b/qpid/doc/book/src/old/AMQP.xml
index 1a609649bb..1a609649bb 100644
--- a/doc/book/src/old/AMQP.xml
+++ b/qpid/doc/book/src/old/AMQP.xml
diff --git a/doc/book/src/old/Binding-URL-Format.xml b/qpid/doc/book/src/old/Binding-URL-Format.xml
index 3d938b740a..3d938b740a 100644
--- a/doc/book/src/old/Binding-URL-Format.xml
+++ b/qpid/doc/book/src/old/Binding-URL-Format.xml
diff --git a/doc/book/src/old/Book-Info.xml b/qpid/doc/book/src/old/Book-Info.xml
index 2e02fbe8ea..2e02fbe8ea 100644
--- a/doc/book/src/old/Book-Info.xml
+++ b/qpid/doc/book/src/old/Book-Info.xml
diff --git a/doc/book/src/old/Book.xml b/qpid/doc/book/src/old/Book.xml
index ee69532152..ee69532152 100644
--- a/doc/book/src/old/Book.xml
+++ b/qpid/doc/book/src/old/Book.xml
diff --git a/doc/book/src/old/Broker-CPP.xml b/qpid/doc/book/src/old/Broker-CPP.xml
index 99584be23d..99584be23d 100644
--- a/doc/book/src/old/Broker-CPP.xml
+++ b/qpid/doc/book/src/old/Broker-CPP.xml
diff --git a/doc/book/src/old/Broker-Java.xml b/qpid/doc/book/src/old/Broker-Java.xml
index f8ce89b185..f8ce89b185 100644
--- a/doc/book/src/old/Broker-Java.xml
+++ b/qpid/doc/book/src/old/Broker-Java.xml
diff --git a/doc/book/src/old/Clients.xml b/qpid/doc/book/src/old/Clients.xml
index 3dc2d38e86..3dc2d38e86 100644
--- a/doc/book/src/old/Clients.xml
+++ b/qpid/doc/book/src/old/Clients.xml
diff --git a/doc/book/src/old/Connection-URL-Format.xml b/qpid/doc/book/src/old/Connection-URL-Format.xml
index cb772487cd..cb772487cd 100644
--- a/doc/book/src/old/Connection-URL-Format.xml
+++ b/qpid/doc/book/src/old/Connection-URL-Format.xml
diff --git a/doc/book/src/old/Download.xml b/qpid/doc/book/src/old/Download.xml
index 7bc08143ac..7bc08143ac 100644
--- a/doc/book/src/old/Download.xml
+++ b/qpid/doc/book/src/old/Download.xml
diff --git a/doc/book/src/old/Excel-AddIn.xml b/qpid/doc/book/src/old/Excel-AddIn.xml
index e38f620bd8..e38f620bd8 100644
--- a/doc/book/src/old/Excel-AddIn.xml
+++ b/qpid/doc/book/src/old/Excel-AddIn.xml
diff --git a/doc/book/src/old/FAQ.xml b/qpid/doc/book/src/old/FAQ.xml
index 5647f18f69..5647f18f69 100644
--- a/doc/book/src/old/FAQ.xml
+++ b/qpid/doc/book/src/old/FAQ.xml
diff --git a/doc/book/src/old/Getting-Started.xml b/qpid/doc/book/src/old/Getting-Started.xml
index 216a52170e..216a52170e 100644
--- a/doc/book/src/old/Getting-Started.xml
+++ b/qpid/doc/book/src/old/Getting-Started.xml
diff --git a/doc/book/src/old/How-to-Use-JNDI.xml b/qpid/doc/book/src/old/How-to-Use-JNDI.xml
index 0d6315c2a3..0d6315c2a3 100644
--- a/doc/book/src/old/How-to-Use-JNDI.xml
+++ b/qpid/doc/book/src/old/How-to-Use-JNDI.xml
diff --git a/doc/book/src/old/InfoPlugin.xml b/qpid/doc/book/src/old/InfoPlugin.xml
index aebcd08c02..aebcd08c02 100644
--- a/doc/book/src/old/InfoPlugin.xml
+++ b/qpid/doc/book/src/old/InfoPlugin.xml
diff --git a/doc/book/src/old/Introduction.xml b/qpid/doc/book/src/old/Introduction.xml
index 8f92c207cf..8f92c207cf 100644
--- a/doc/book/src/old/Introduction.xml
+++ b/qpid/doc/book/src/old/Introduction.xml
diff --git a/doc/book/src/old/Java-Broker-StatusLogMessages.xml b/qpid/doc/book/src/old/Java-Broker-StatusLogMessages.xml
index 98f876e532..98f876e532 100644
--- a/doc/book/src/old/Java-Broker-StatusLogMessages.xml
+++ b/qpid/doc/book/src/old/Java-Broker-StatusLogMessages.xml
diff --git a/doc/book/src/old/Java-JMS-Selector-Syntax.xml b/qpid/doc/book/src/old/Java-JMS-Selector-Syntax.xml
index 870e277b66..870e277b66 100644
--- a/doc/book/src/old/Java-JMS-Selector-Syntax.xml
+++ b/qpid/doc/book/src/old/Java-JMS-Selector-Syntax.xml
diff --git a/doc/book/src/old/Management-Design-notes.xml b/qpid/doc/book/src/old/Management-Design-notes.xml
index 76f0dac926..76f0dac926 100644
--- a/doc/book/src/old/Management-Design-notes.xml
+++ b/qpid/doc/book/src/old/Management-Design-notes.xml
diff --git a/doc/book/src/old/NET-User-Guide.xml b/qpid/doc/book/src/old/NET-User-Guide.xml
index 7bfa20b8c8..7bfa20b8c8 100644
--- a/doc/book/src/old/NET-User-Guide.xml
+++ b/qpid/doc/book/src/old/NET-User-Guide.xml
diff --git a/doc/book/src/old/PythonBrokerTest.xml b/qpid/doc/book/src/old/PythonBrokerTest.xml
index ae7edade40..ae7edade40 100644
--- a/doc/book/src/old/PythonBrokerTest.xml
+++ b/qpid/doc/book/src/old/PythonBrokerTest.xml
diff --git a/doc/book/src/old/QMan-Qpid-Management-bridge.xml b/qpid/doc/book/src/old/QMan-Qpid-Management-bridge.xml
index f2c366dcbb..f2c366dcbb 100644
--- a/doc/book/src/old/QMan-Qpid-Management-bridge.xml
+++ b/qpid/doc/book/src/old/QMan-Qpid-Management-bridge.xml
diff --git a/doc/book/src/old/Qpid-ACLs.xml b/qpid/doc/book/src/old/Qpid-ACLs.xml
index a2b64061c3..a2b64061c3 100644
--- a/doc/book/src/old/Qpid-ACLs.xml
+++ b/qpid/doc/book/src/old/Qpid-ACLs.xml
diff --git a/doc/book/src/old/Qpid-Book.xml b/qpid/doc/book/src/old/Qpid-Book.xml
index ee69532152..ee69532152 100644
--- a/doc/book/src/old/Qpid-Book.xml
+++ b/qpid/doc/book/src/old/Qpid-Book.xml
diff --git a/doc/book/src/old/Qpid-Compatibility-And-Interoperability-Book.xml b/qpid/doc/book/src/old/Qpid-Compatibility-And-Interoperability-Book.xml
index f382f390c7..f382f390c7 100644
--- a/doc/book/src/old/Qpid-Compatibility-And-Interoperability-Book.xml
+++ b/qpid/doc/book/src/old/Qpid-Compatibility-And-Interoperability-Book.xml
diff --git a/doc/book/src/old/SASL-Compatibility.xml b/qpid/doc/book/src/old/SASL-Compatibility.xml
index ad223792b5..ad223792b5 100644
--- a/doc/book/src/old/SASL-Compatibility.xml
+++ b/qpid/doc/book/src/old/SASL-Compatibility.xml
diff --git a/doc/book/src/old/SSL.xml b/qpid/doc/book/src/old/SSL.xml
index a9a5cb953a..a9a5cb953a 100644
--- a/doc/book/src/old/SSL.xml
+++ b/qpid/doc/book/src/old/SSL.xml
diff --git a/doc/book/src/old/Security-Plugins.xml b/qpid/doc/book/src/old/Security-Plugins.xml
index bf5cb726b3..bf5cb726b3 100644
--- a/doc/book/src/old/Security-Plugins.xml
+++ b/qpid/doc/book/src/old/Security-Plugins.xml
diff --git a/doc/book/src/old/System-Properties.xml b/qpid/doc/book/src/old/System-Properties.xml
index 40b823185f..40b823185f 100644
--- a/doc/book/src/old/System-Properties.xml
+++ b/qpid/doc/book/src/old/System-Properties.xml
diff --git a/doc/book/src/old/Using-Qpid-with-other-JNDI-Providers.xml b/qpid/doc/book/src/old/Using-Qpid-with-other-JNDI-Providers.xml
index 2bd7d761ef..2bd7d761ef 100644
--- a/doc/book/src/old/Using-Qpid-with-other-JNDI-Providers.xml
+++ b/qpid/doc/book/src/old/Using-Qpid-with-other-JNDI-Providers.xml
diff --git a/doc/book/src/old/WCF.xml b/qpid/doc/book/src/old/WCF.xml
index aaf54463db..aaf54463db 100644
--- a/doc/book/src/old/WCF.xml
+++ b/qpid/doc/book/src/old/WCF.xml
diff --git a/doc/book/src/old/schemas.xml b/qpid/doc/book/src/old/schemas.xml
index 6102e65f07..6102e65f07 100644
--- a/doc/book/src/old/schemas.xml
+++ b/qpid/doc/book/src/old/schemas.xml
diff --git a/doc/book/src/programming/Makefile b/qpid/doc/book/src/programming/Makefile
index 0266a0f54d..0266a0f54d 100644
--- a/doc/book/src/programming/Makefile
+++ b/qpid/doc/book/src/programming/Makefile
diff --git a/doc/book/src/programming/Message-Groups-Guide.xml b/qpid/doc/book/src/programming/Message-Groups-Guide.xml
index 0ec6982bac..0ec6982bac 100644
--- a/doc/book/src/programming/Message-Groups-Guide.xml
+++ b/qpid/doc/book/src/programming/Message-Groups-Guide.xml
diff --git a/doc/book/src/programming/Programming-In-Apache-Qpid.xml b/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml
index d5527850c8..d5527850c8 100644
--- a/doc/book/src/programming/Programming-In-Apache-Qpid.xml
+++ b/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml
diff --git a/doc/book/src/qmf/QmfBook.xml b/qpid/doc/book/src/qmf/QmfBook.xml
index 64a6545fb5..64a6545fb5 100644
--- a/doc/book/src/qmf/QmfBook.xml
+++ b/qpid/doc/book/src/qmf/QmfBook.xml
diff --git a/doc/book/src/qmf/QmfIntroduction.xml b/qpid/doc/book/src/qmf/QmfIntroduction.xml
index db7b8949a5..db7b8949a5 100644
--- a/doc/book/src/qmf/QmfIntroduction.xml
+++ b/qpid/doc/book/src/qmf/QmfIntroduction.xml
diff --git a/doc/book/xsl/html-custom.xsl b/qpid/doc/book/xsl/html-custom.xsl
index dbfbcc44c7..dbfbcc44c7 100644
--- a/doc/book/xsl/html-custom.xsl
+++ b/qpid/doc/book/xsl/html-custom.xsl
diff --git a/doc/dev-readme/QPID-Component-README.odg b/qpid/doc/dev-readme/QPID-Component-README.odg
index 217a6d68d8..217a6d68d8 100644
--- a/doc/dev-readme/QPID-Component-README.odg
+++ b/qpid/doc/dev-readme/QPID-Component-README.odg
diff --git a/doc/dev-readme/QPID-Component-README.pdf b/qpid/doc/dev-readme/QPID-Component-README.pdf
index 3012372889..3012372889 100644
--- a/doc/dev-readme/QPID-Component-README.pdf
+++ b/qpid/doc/dev-readme/QPID-Component-README.pdf
diff --git a/doc/dev-readme/README.txt b/qpid/doc/dev-readme/README.txt
index 65a8626e53..65a8626e53 100644
--- a/doc/dev-readme/README.txt
+++ b/qpid/doc/dev-readme/README.txt
diff --git a/doc/website/README.txt b/qpid/doc/website/README.txt
index dcb3b423e5..dcb3b423e5 100644
--- a/doc/website/README.txt
+++ b/qpid/doc/website/README.txt
diff --git a/etc/LICENSE b/qpid/etc/LICENSE
index bc46b77047..bc46b77047 100644
--- a/etc/LICENSE
+++ b/qpid/etc/LICENSE
diff --git a/etc/NOTICE b/qpid/etc/NOTICE
index 05f39ba176..05f39ba176 100644
--- a/etc/NOTICE
+++ b/qpid/etc/NOTICE
diff --git a/etc/svn-auto-props b/qpid/etc/svn-auto-props
index 35f1d10998..35f1d10998 100644
--- a/etc/svn-auto-props
+++ b/qpid/etc/svn-auto-props
diff --git a/extras/dispatch/README b/qpid/extras/dispatch/README
index 24cba9ed6e..24cba9ed6e 100644
--- a/extras/dispatch/README
+++ b/qpid/extras/dispatch/README
diff --git a/extras/qmf/.gitignore b/qpid/extras/qmf/.gitignore
index 846f2ac5b0..846f2ac5b0 100644
--- a/extras/qmf/.gitignore
+++ b/qpid/extras/qmf/.gitignore
diff --git a/extras/qmf/LICENSE.txt b/qpid/extras/qmf/LICENSE.txt
index 6b0b1270ff..6b0b1270ff 100644
--- a/extras/qmf/LICENSE.txt
+++ b/qpid/extras/qmf/LICENSE.txt
diff --git a/extras/qmf/NOTICE.txt b/qpid/extras/qmf/NOTICE.txt
index 32ccdb70c4..32ccdb70c4 100644
--- a/extras/qmf/NOTICE.txt
+++ b/qpid/extras/qmf/NOTICE.txt
diff --git a/extras/qmf/setup.py b/qpid/extras/qmf/setup.py
index a181866cd1..a181866cd1 100755
--- a/extras/qmf/setup.py
+++ b/qpid/extras/qmf/setup.py
diff --git a/extras/qmf/src/py/qmf/__init__.py b/qpid/extras/qmf/src/py/qmf/__init__.py
index 31d5a2ef58..31d5a2ef58 100644
--- a/extras/qmf/src/py/qmf/__init__.py
+++ b/qpid/extras/qmf/src/py/qmf/__init__.py
diff --git a/extras/qmf/src/py/qmf/console.py b/qpid/extras/qmf/src/py/qmf/console.py
index 640195964e..640195964e 100644
--- a/extras/qmf/src/py/qmf/console.py
+++ b/qpid/extras/qmf/src/py/qmf/console.py
diff --git a/extras/sasl/LICENSE b/qpid/extras/sasl/LICENSE
index cff2a5e25d..cff2a5e25d 100644
--- a/extras/sasl/LICENSE
+++ b/qpid/extras/sasl/LICENSE
diff --git a/extras/sasl/Makefile.am b/qpid/extras/sasl/Makefile.am
index efa6d4f2d3..efa6d4f2d3 100644
--- a/extras/sasl/Makefile.am
+++ b/qpid/extras/sasl/Makefile.am
diff --git a/extras/sasl/bootstrap b/qpid/extras/sasl/bootstrap
index 906e5a71e4..906e5a71e4 100755
--- a/extras/sasl/bootstrap
+++ b/qpid/extras/sasl/bootstrap
diff --git a/extras/sasl/build-aux/compile b/qpid/extras/sasl/build-aux/compile
index 1b1d232169..1b1d232169 100755
--- a/extras/sasl/build-aux/compile
+++ b/qpid/extras/sasl/build-aux/compile
diff --git a/extras/sasl/build-aux/config.guess b/qpid/extras/sasl/build-aux/config.guess
index c93201a4d2..c93201a4d2 100755
--- a/extras/sasl/build-aux/config.guess
+++ b/qpid/extras/sasl/build-aux/config.guess
diff --git a/extras/sasl/build-aux/config.rpath b/qpid/extras/sasl/build-aux/config.rpath
index c492a93b66..c492a93b66 100755
--- a/extras/sasl/build-aux/config.rpath
+++ b/qpid/extras/sasl/build-aux/config.rpath
diff --git a/extras/sasl/build-aux/config.sub b/qpid/extras/sasl/build-aux/config.sub
index 7ccee73057..7ccee73057 100755
--- a/extras/sasl/build-aux/config.sub
+++ b/qpid/extras/sasl/build-aux/config.sub
diff --git a/extras/sasl/build-aux/depcomp b/qpid/extras/sasl/build-aux/depcomp
index ca5ea4e1ef..ca5ea4e1ef 100755
--- a/extras/sasl/build-aux/depcomp
+++ b/qpid/extras/sasl/build-aux/depcomp
diff --git a/extras/sasl/build-aux/install-sh b/qpid/extras/sasl/build-aux/install-sh
index 4fbbae7b7f..4fbbae7b7f 100755
--- a/extras/sasl/build-aux/install-sh
+++ b/qpid/extras/sasl/build-aux/install-sh
diff --git a/extras/sasl/build-aux/mdate-sh b/qpid/extras/sasl/build-aux/mdate-sh
index cd916c0a34..cd916c0a34 100755
--- a/extras/sasl/build-aux/mdate-sh
+++ b/qpid/extras/sasl/build-aux/mdate-sh
diff --git a/extras/sasl/build-aux/missing b/qpid/extras/sasl/build-aux/missing
index 1c8ff7049d..1c8ff7049d 100755
--- a/extras/sasl/build-aux/missing
+++ b/qpid/extras/sasl/build-aux/missing
diff --git a/extras/sasl/build-aux/py-compile b/qpid/extras/sasl/build-aux/py-compile
index 1fad0975ce..1fad0975ce 120000
--- a/extras/sasl/build-aux/py-compile
+++ b/qpid/extras/sasl/build-aux/py-compile
diff --git a/extras/sasl/configure.ac b/qpid/extras/sasl/configure.ac
index bc0fadbb31..bc0fadbb31 100644
--- a/extras/sasl/configure.ac
+++ b/qpid/extras/sasl/configure.ac
diff --git a/extras/sasl/include/saslwrapper.h b/qpid/extras/sasl/include/saslwrapper.h
index bb2a9af7ff..bb2a9af7ff 100644
--- a/extras/sasl/include/saslwrapper.h
+++ b/qpid/extras/sasl/include/saslwrapper.h
diff --git a/extras/sasl/m4/ac_pkg_swig.m4 b/qpid/extras/sasl/m4/ac_pkg_swig.m4
index 6e385c067c..6e385c067c 100644
--- a/extras/sasl/m4/ac_pkg_swig.m4
+++ b/qpid/extras/sasl/m4/ac_pkg_swig.m4
diff --git a/extras/sasl/m4/compiler-flags.m4 b/qpid/extras/sasl/m4/compiler-flags.m4
index 01cb728f02..01cb728f02 100644
--- a/extras/sasl/m4/compiler-flags.m4
+++ b/qpid/extras/sasl/m4/compiler-flags.m4
diff --git a/extras/sasl/python/Makefile.am b/qpid/extras/sasl/python/Makefile.am
index 7c61f37cee..7c61f37cee 100644
--- a/extras/sasl/python/Makefile.am
+++ b/qpid/extras/sasl/python/Makefile.am
diff --git a/extras/sasl/python/python.i b/qpid/extras/sasl/python/python.i
index 9f4e7ee8af..9f4e7ee8af 100644
--- a/extras/sasl/python/python.i
+++ b/qpid/extras/sasl/python/python.i
diff --git a/extras/sasl/ruby/Makefile.am b/qpid/extras/sasl/ruby/Makefile.am
index 85fde1085d..85fde1085d 100644
--- a/extras/sasl/ruby/Makefile.am
+++ b/qpid/extras/sasl/ruby/Makefile.am
diff --git a/extras/sasl/ruby/ruby.i b/qpid/extras/sasl/ruby/ruby.i
index 7c20f7f071..7c20f7f071 100644
--- a/extras/sasl/ruby/ruby.i
+++ b/qpid/extras/sasl/ruby/ruby.i
diff --git a/extras/sasl/src/Makefile.am b/qpid/extras/sasl/src/Makefile.am
index c2aa8dd188..c2aa8dd188 100644
--- a/extras/sasl/src/Makefile.am
+++ b/qpid/extras/sasl/src/Makefile.am
diff --git a/extras/sasl/src/cyrus/saslwrapper.cpp b/qpid/extras/sasl/src/cyrus/saslwrapper.cpp
index f8b08acfa6..f8b08acfa6 100644
--- a/extras/sasl/src/cyrus/saslwrapper.cpp
+++ b/qpid/extras/sasl/src/cyrus/saslwrapper.cpp
diff --git a/extras/sasl/src/saslwrapper.i b/qpid/extras/sasl/src/saslwrapper.i
index 533ac79ce5..533ac79ce5 100644
--- a/extras/sasl/src/saslwrapper.i
+++ b/qpid/extras/sasl/src/saslwrapper.i
diff --git a/java/.gitignore b/qpid/java/.gitignore
index d995501f21..d995501f21 100644
--- a/java/.gitignore
+++ b/qpid/java/.gitignore
diff --git a/java/amqp-1-0-client-jms/README.txt b/qpid/java/amqp-1-0-client-jms/README.txt
index eac8344aac..eac8344aac 100644
--- a/java/amqp-1-0-client-jms/README.txt
+++ b/qpid/java/amqp-1-0-client-jms/README.txt
diff --git a/java/amqp-1-0-client-jms/build.xml b/qpid/java/amqp-1-0-client-jms/build.xml
index d501be1d8d..d501be1d8d 100644
--- a/java/amqp-1-0-client-jms/build.xml
+++ b/qpid/java/amqp-1-0-client-jms/build.xml
diff --git a/java/amqp-1-0-client-jms/example/build.xml b/qpid/java/amqp-1-0-client-jms/example/build.xml
index cb9ab0994c..cb9ab0994c 100644
--- a/java/amqp-1-0-client-jms/example/build.xml
+++ b/qpid/java/amqp-1-0-client-jms/example/build.xml
diff --git a/java/amqp-1-0-client-jms/example/src/main/java/org/apache/qpid/amqp_1_0/jms/example/Hello.java b/qpid/java/amqp-1-0-client-jms/example/src/main/java/org/apache/qpid/amqp_1_0/jms/example/Hello.java
index 500be792ba..500be792ba 100644
--- a/java/amqp-1-0-client-jms/example/src/main/java/org/apache/qpid/amqp_1_0/jms/example/Hello.java
+++ b/qpid/java/amqp-1-0-client-jms/example/src/main/java/org/apache/qpid/amqp_1_0/jms/example/Hello.java
diff --git a/java/amqp-1-0-client-jms/example/src/main/java/org/apache/qpid/amqp_1_0/jms/example/hello.properties b/qpid/java/amqp-1-0-client-jms/example/src/main/java/org/apache/qpid/amqp_1_0/jms/example/hello.properties
index e83a887cc9..e83a887cc9 100644
--- a/java/amqp-1-0-client-jms/example/src/main/java/org/apache/qpid/amqp_1_0/jms/example/hello.properties
+++ b/qpid/java/amqp-1-0-client-jms/example/src/main/java/org/apache/qpid/amqp_1_0/jms/example/hello.properties
diff --git a/java/amqp-1-0-client-jms/pom.xml b/qpid/java/amqp-1-0-client-jms/pom.xml
index ffcfd223ae..ffcfd223ae 100644
--- a/java/amqp-1-0-client-jms/pom.xml
+++ b/qpid/java/amqp-1-0-client-jms/pom.xml
diff --git a/java/amqp-1-0-client-jms/resources/LICENSE b/qpid/java/amqp-1-0-client-jms/resources/LICENSE
index de4b130f35..de4b130f35 100644
--- a/java/amqp-1-0-client-jms/resources/LICENSE
+++ b/qpid/java/amqp-1-0-client-jms/resources/LICENSE
diff --git a/java/amqp-1-0-client-jms/resources/NOTICE b/qpid/java/amqp-1-0-client-jms/resources/NOTICE
index 8d1c3f3122..8d1c3f3122 100644
--- a/java/amqp-1-0-client-jms/resources/NOTICE
+++ b/qpid/java/amqp-1-0-client-jms/resources/NOTICE
diff --git a/java/amqp-1-0-client-jms/resources/README.txt b/qpid/java/amqp-1-0-client-jms/resources/README.txt
index 35d25050fe..35d25050fe 100644
--- a/java/amqp-1-0-client-jms/resources/README.txt
+++ b/qpid/java/amqp-1-0-client-jms/resources/README.txt
diff --git a/java/amqp-1-0-client-jms/src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml b/qpid/java/amqp-1-0-client-jms/src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml
index 96fd0704bb..96fd0704bb 100644
--- a/java/amqp-1-0-client-jms/src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml
+++ b/qpid/java/amqp-1-0-client-jms/src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/AmqpMessage.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/AmqpMessage.java
index 4c8ff9d998..4c8ff9d998 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/AmqpMessage.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/AmqpMessage.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/BytesMessage.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/BytesMessage.java
index 5ae4c2695a..5ae4c2695a 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/BytesMessage.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/BytesMessage.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Connection.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Connection.java
index 08e3c4673e..08e3c4673e 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Connection.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Connection.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ConnectionFactory.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ConnectionFactory.java
index 752993b229..752993b229 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ConnectionFactory.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ConnectionFactory.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ConnectionMetaData.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ConnectionMetaData.java
index 425d7f9795..425d7f9795 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ConnectionMetaData.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ConnectionMetaData.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Destination.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Destination.java
index a7f37eea14..a7f37eea14 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Destination.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Destination.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ErrorCodes.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ErrorCodes.java
index e362befc67..e362befc67 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ErrorCodes.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ErrorCodes.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/JavaSerializable.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/JavaSerializable.java
index 0202ac80a7..0202ac80a7 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/JavaSerializable.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/JavaSerializable.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MapMessage.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MapMessage.java
index a758d04237..a758d04237 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MapMessage.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MapMessage.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Message.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Message.java
index 1e774abbd6..1e774abbd6 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Message.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Message.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageConsumer.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageConsumer.java
index 7c28a7ef7e..7c28a7ef7e 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageConsumer.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageConsumer.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageConsumerException.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageConsumerException.java
index 3fad24f61c..3fad24f61c 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageConsumerException.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageConsumerException.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageProducer.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageProducer.java
index 19090e713c..19090e713c 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageProducer.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageProducer.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageProducerException.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageProducerException.java
index 45ea4662ac..45ea4662ac 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageProducerException.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageProducerException.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageRejectedException.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageRejectedException.java
index fa559e060f..fa559e060f 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageRejectedException.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/MessageRejectedException.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ObjectMessage.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ObjectMessage.java
index 4dcd96d1ec..4dcd96d1ec 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ObjectMessage.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ObjectMessage.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Queue.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Queue.java
index 880eadea9b..880eadea9b 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Queue.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Queue.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueBrowser.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueBrowser.java
index b6d20cbdd5..b6d20cbdd5 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueBrowser.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueBrowser.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueConnection.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueConnection.java
index 5404fbeb56..5404fbeb56 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueConnection.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueConnection.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueReceiver.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueReceiver.java
index 3b2fcb7b45..3b2fcb7b45 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueReceiver.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueReceiver.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueSender.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueSender.java
index 27116463d1..27116463d1 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueSender.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueSender.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueSession.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueSession.java
index 4ccd5d96a6..4ccd5d96a6 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueSession.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/QueueSession.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Session.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Session.java
index 387bfeddb1..387bfeddb1 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Session.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Session.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/SessionException.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/SessionException.java
index 73be5513c3..73be5513c3 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/SessionException.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/SessionException.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/StreamMessage.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/StreamMessage.java
index 6fc728f4bb..6fc728f4bb 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/StreamMessage.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/StreamMessage.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TemporaryDestination.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TemporaryDestination.java
index 025a1af806..025a1af806 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TemporaryDestination.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TemporaryDestination.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TemporaryQueue.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TemporaryQueue.java
index e08e4b5996..e08e4b5996 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TemporaryQueue.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TemporaryQueue.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TemporaryTopic.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TemporaryTopic.java
index a9ceabdc2a..a9ceabdc2a 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TemporaryTopic.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TemporaryTopic.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TextMessage.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TextMessage.java
index d6911e2357..d6911e2357 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TextMessage.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TextMessage.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Topic.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Topic.java
index c401081176..c401081176 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Topic.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/Topic.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicConnection.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicConnection.java
index 8334a186f5..8334a186f5 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicConnection.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicConnection.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicPublisher.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicPublisher.java
index 66aa69b518..66aa69b518 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicPublisher.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicPublisher.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicSession.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicSession.java
index 764d00380b..764d00380b 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicSession.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicSession.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicSubscriber.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicSubscriber.java
index c0546b8a75..c0546b8a75 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicSubscriber.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/TopicSubscriber.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/AmqpMessageImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/AmqpMessageImpl.java
index ed6f86a972..ed6f86a972 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/AmqpMessageImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/AmqpMessageImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/BytesMessageImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/BytesMessageImpl.java
index e45c5a73fe..e45c5a73fe 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/BytesMessageImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/BytesMessageImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
index f46840e9ae..f46840e9ae 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java
index 976ae10c56..976ae10c56 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionMetaDataImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionMetaDataImpl.java
index 64f7c065a7..64f7c065a7 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionMetaDataImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionMetaDataImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/DecodedDestination.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/DecodedDestination.java
index 74e98c2163..74e98c2163 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/DecodedDestination.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/DecodedDestination.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/DestinationImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/DestinationImpl.java
index 924c5b9857..924c5b9857 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/DestinationImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/DestinationImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MapMessageImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MapMessageImpl.java
index cb57936d3d..cb57936d3d 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MapMessageImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MapMessageImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java
index fd6f09d162..fd6f09d162 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java
index dcf531c6b5..dcf531c6b5 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java
index fed9b5904f..fed9b5904f 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java
index cee4f4f6f2..cee4f4f6f2 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ObjectMessageImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ObjectMessageImpl.java
index 5e180beb9e..5e180beb9e 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ObjectMessageImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ObjectMessageImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueBrowserImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueBrowserImpl.java
index 29de87875c..29de87875c 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueBrowserImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueBrowserImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueConnectionImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueConnectionImpl.java
index 3741702505..3741702505 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueConnectionImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueConnectionImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueImpl.java
index cb56843a72..cb56843a72 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueReceiverImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueReceiverImpl.java
index 4e9e9d6a39..4e9e9d6a39 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueReceiverImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueReceiverImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueSenderImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueSenderImpl.java
index 690febc100..690febc100 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueSenderImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueSenderImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueSessionImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueSessionImpl.java
index 0d89e9b495..0d89e9b495 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueSessionImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueSessionImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
index 3fa1032111..3fa1032111 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/StreamMessageImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/StreamMessageImpl.java
index 9aededca5e..9aededca5e 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/StreamMessageImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/StreamMessageImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TemporaryQueueImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TemporaryQueueImpl.java
index 45cd7525c0..45cd7525c0 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TemporaryQueueImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TemporaryQueueImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TemporaryTopicImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TemporaryTopicImpl.java
index b2587e41d4..b2587e41d4 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TemporaryTopicImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TemporaryTopicImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TextMessageImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TextMessageImpl.java
index de79defddb..de79defddb 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TextMessageImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TextMessageImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicConnectionImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicConnectionImpl.java
index 8fe92dd801..8fe92dd801 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicConnectionImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicConnectionImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicImpl.java
index 5292944075..5292944075 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicPublisherImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicPublisherImpl.java
index 62c3783682..62c3783682 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicPublisherImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicPublisherImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSessionImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSessionImpl.java
index 44d0c7f78f..44d0c7f78f 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSessionImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSessionImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSubscriberImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSubscriberImpl.java
index 69e07f30a1..69e07f30a1 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSubscriberImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSubscriberImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/NameParserImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/NameParserImpl.java
index 7c3857f6c9..7c3857f6c9 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/NameParserImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/NameParserImpl.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/PropertiesFileInitialContextFactory.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/PropertiesFileInitialContextFactory.java
index 091ab41304..091ab41304 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/PropertiesFileInitialContextFactory.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/PropertiesFileInitialContextFactory.java
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/ReadOnlyContext.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/ReadOnlyContext.java
index 4e0f994b94..4e0f994b94 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/ReadOnlyContext.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/ReadOnlyContext.java
diff --git a/java/amqp-1-0-client/build.xml b/qpid/java/amqp-1-0-client/build.xml
index cd7654ed15..cd7654ed15 100644
--- a/java/amqp-1-0-client/build.xml
+++ b/qpid/java/amqp-1-0-client/build.xml
diff --git a/java/amqp-1-0-client/example/build.xml b/qpid/java/amqp-1-0-client/example/build.xml
index 89bba729dd..89bba729dd 100644
--- a/java/amqp-1-0-client/example/build.xml
+++ b/qpid/java/amqp-1-0-client/example/build.xml
diff --git a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Command.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Command.java
index 3bb26744c4..3bb26744c4 100644
--- a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Command.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Command.java
diff --git a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java
index 09d19f4394..09d19f4394 100644
--- a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java
diff --git a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Dump.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Dump.java
index 06440b8f19..06440b8f19 100644
--- a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Dump.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Dump.java
diff --git a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filereceiver.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filereceiver.java
index e65d1324ef..e65d1324ef 100644
--- a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filereceiver.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filereceiver.java
diff --git a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filesender.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filesender.java
index c7bcd99312..c7bcd99312 100644
--- a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filesender.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filesender.java
diff --git a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Receive.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Receive.java
index 6f99bbc2ee..6f99bbc2ee 100644
--- a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Receive.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Receive.java
diff --git a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Request.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Request.java
index bce7bfcd9a..bce7bfcd9a 100644
--- a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Request.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Request.java
diff --git a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Respond.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Respond.java
index 1e4bcfc7d7..1e4bcfc7d7 100644
--- a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Respond.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Respond.java
diff --git a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Send.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Send.java
index 36aadc7851..36aadc7851 100644
--- a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Send.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Send.java
diff --git a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
index 4421c44a61..4421c44a61 100644
--- a/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
diff --git a/java/amqp-1-0-client/pom.xml b/qpid/java/amqp-1-0-client/pom.xml
index 13430c0c22..13430c0c22 100644
--- a/java/amqp-1-0-client/pom.xml
+++ b/qpid/java/amqp-1-0-client/pom.xml
diff --git a/java/amqp-1-0-client/resources/LICENSE b/qpid/java/amqp-1-0-client/resources/LICENSE
index de4b130f35..de4b130f35 100644
--- a/java/amqp-1-0-client/resources/LICENSE
+++ b/qpid/java/amqp-1-0-client/resources/LICENSE
diff --git a/java/amqp-1-0-client/resources/NOTICE b/qpid/java/amqp-1-0-client/resources/NOTICE
index 8d1c3f3122..8d1c3f3122 100644
--- a/java/amqp-1-0-client/resources/NOTICE
+++ b/qpid/java/amqp-1-0-client/resources/NOTICE
diff --git a/java/amqp-1-0-client/resources/README.txt b/qpid/java/amqp-1-0-client/resources/README.txt
index 35d25050fe..35d25050fe 100644
--- a/java/amqp-1-0-client/resources/README.txt
+++ b/qpid/java/amqp-1-0-client/resources/README.txt
diff --git a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/AcknowledgeMode.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/AcknowledgeMode.java
index 05d176bc35..05d176bc35 100644
--- a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/AcknowledgeMode.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/AcknowledgeMode.java
diff --git a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ChannelsExhaustedException.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ChannelsExhaustedException.java
index 1f23d02e02..1f23d02e02 100644
--- a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ChannelsExhaustedException.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ChannelsExhaustedException.java
diff --git a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java
index 6074f9b868..6074f9b868 100644
--- a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java
diff --git a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionClosedException.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionClosedException.java
index a434a4aaaf..a434a4aaaf 100644
--- a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionClosedException.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionClosedException.java
diff --git a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionErrorException.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionErrorException.java
index baf3de8991..baf3de8991 100644
--- a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionErrorException.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionErrorException.java
diff --git a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionException.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionException.java
index 569c1f129d..569c1f129d 100644
--- a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionException.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionException.java
diff --git a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/LinkDetachedException.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/LinkDetachedException.java
index 45b00255f2..45b00255f2 100644
--- a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/LinkDetachedException.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/LinkDetachedException.java
diff --git a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Message.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Message.java
index e8ac1de6c1..e8ac1de6c1 100644
--- a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Message.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Message.java
diff --git a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
index 5175d1d847..5175d1d847 100644
--- a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
diff --git a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java
index e891c5cbe7..e891c5cbe7 100644
--- a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java
diff --git a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java
index ce1ce512a2..ce1ce512a2 100644
--- a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java
diff --git a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Transaction.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Transaction.java
index a379463710..a379463710 100644
--- a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Transaction.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Transaction.java
diff --git a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TransactionController.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TransactionController.java
index 9f2c76bc72..9f2c76bc72 100644
--- a/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TransactionController.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TransactionController.java
diff --git a/java/amqp-1-0-common/build.xml b/qpid/java/amqp-1-0-common/build.xml
index 370769824f..370769824f 100644
--- a/java/amqp-1-0-common/build.xml
+++ b/qpid/java/amqp-1-0-common/build.xml
diff --git a/java/amqp-1-0-common/pom.xml b/qpid/java/amqp-1-0-common/pom.xml
index d771d58ab1..d771d58ab1 100644
--- a/java/amqp-1-0-common/pom.xml
+++ b/qpid/java/amqp-1-0-common/pom.xml
diff --git a/java/amqp-1-0-common/resources/LICENSE b/qpid/java/amqp-1-0-common/resources/LICENSE
index de4b130f35..de4b130f35 100644
--- a/java/amqp-1-0-common/resources/LICENSE
+++ b/qpid/java/amqp-1-0-common/resources/LICENSE
diff --git a/java/amqp-1-0-common/resources/NOTICE b/qpid/java/amqp-1-0-common/resources/NOTICE
index 8d1c3f3122..8d1c3f3122 100644
--- a/java/amqp-1-0-common/resources/NOTICE
+++ b/qpid/java/amqp-1-0-common/resources/NOTICE
diff --git a/java/amqp-1-0-common/resources/README.txt b/qpid/java/amqp-1-0-common/resources/README.txt
index 35d25050fe..35d25050fe 100644
--- a/java/amqp-1-0-common/resources/README.txt
+++ b/qpid/java/amqp-1-0-common/resources/README.txt
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/AbstractDescribedTypeWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/AbstractDescribedTypeWriter.java
index 08ab14f123..08ab14f123 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/AbstractDescribedTypeWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/AbstractDescribedTypeWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/AbstractListWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/AbstractListWriter.java
index 9e8acaaeeb..9e8acaaeeb 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/AbstractListWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/AbstractListWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/AbstractMapWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/AbstractMapWriter.java
index b4390c3ef3..b4390c3ef3 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/AbstractMapWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/AbstractMapWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ArrayTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ArrayTypeConstructor.java
index cc9cc27b56..cc9cc27b56 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ArrayTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ArrayTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ArrayWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ArrayWriter.java
index 4bf083456e..4bf083456e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ArrayWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ArrayWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryString.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryString.java
index c8af187a5f..c8af187a5f 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryString.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryString.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryTypeConstructor.java
index 4c5a9d9830..4c5a9d9830 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryWriter.java
index 835b2567c1..835b2567c1 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BooleanConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BooleanConstructor.java
index 5cad87cbd8..5cad87cbd8 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BooleanConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BooleanConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BooleanWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BooleanWriter.java
index 9c3d519972..9c3d519972 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BooleanWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/BooleanWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteArrayWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteArrayWriter.java
index 539e000050..539e000050 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteArrayWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteArrayWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteBufferWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteBufferWriter.java
index 81cd14b2d9..81cd14b2d9 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteBufferWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteBufferWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteTypeConstructor.java
index 02278597f6..02278597f6 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteWriter.java
index 275ae9239b..275ae9239b 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CharTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CharTypeConstructor.java
index d661838350..d661838350 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CharTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CharTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CharWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CharWriter.java
index c3fbdf76dd..c3fbdf76dd 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CharWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CharWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CompoundTypeAssembler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CompoundTypeAssembler.java
index abdcee65d7..abdcee65d7 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CompoundTypeAssembler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CompoundTypeAssembler.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CompoundTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CompoundTypeConstructor.java
index 28bf1a577c..28bf1a577c 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CompoundTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CompoundTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CompoundWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CompoundWriter.java
index 8e09e093e0..8e09e093e0 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CompoundWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/CompoundWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DecimalConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DecimalConstructor.java
index 6c3b64aa25..6c3b64aa25 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DecimalConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DecimalConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DefaultDescribedTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DefaultDescribedTypeConstructor.java
index 5da6bf7e58..5da6bf7e58 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DefaultDescribedTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DefaultDescribedTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DelegatingValueWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DelegatingValueWriter.java
index 87ef8456b3..87ef8456b3 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DelegatingValueWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DelegatingValueWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedType.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedType.java
index d0f8dfffcc..d0f8dfffcc 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedType.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedType.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedTypeConstructor.java
index e6746474bc..e6746474bc 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedTypeConstructorRegistry.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedTypeConstructorRegistry.java
index f7b611c3a1..f7b611c3a1 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedTypeConstructorRegistry.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedTypeConstructorRegistry.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DoubleTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DoubleTypeConstructor.java
index ab2550face..ab2550face 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DoubleTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DoubleTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DoubleWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DoubleWriter.java
index 6c17528cf8..6c17528cf8 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DoubleWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/DoubleWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/Encoder.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/Encoder.java
index 9b2a654f10..9b2a654f10 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/Encoder.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/Encoder.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedEightWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedEightWriter.java
index 2a68af9fae..2a68af9fae 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedEightWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedEightWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedFourWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedFourWriter.java
index eeacef7cd9..eeacef7cd9 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedFourWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedFourWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedOneWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedOneWriter.java
index 805b0743a4..805b0743a4 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedOneWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedOneWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedSixteenWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedSixteenWriter.java
index c71572ac45..c71572ac45 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedSixteenWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedSixteenWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedTwoWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedTwoWriter.java
index a45523c2b2..a45523c2b2 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedTwoWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedTwoWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FloatTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FloatTypeConstructor.java
index 58b0b114f1..58b0b114f1 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FloatTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FloatTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FloatWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FloatWriter.java
index 44d9fba737..44d9fba737 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FloatWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FloatWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FrameWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FrameWriter.java
index f1d33c9b38..f1d33c9b38 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FrameWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/FrameWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/IntTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/IntTypeConstructor.java
index 4eef4933d4..4eef4933d4 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/IntTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/IntTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/IntegerWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/IntegerWriter.java
index 271ea8a23b..271ea8a23b 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/IntegerWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/IntegerWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ListWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ListWriter.java
index a726c268fd..a726c268fd 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ListWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ListWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/LongTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/LongTypeConstructor.java
index edfa9f600f..edfa9f600f 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/LongTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/LongTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/LongWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/LongWriter.java
index 56b9ac70a5..56b9ac70a5 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/LongWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/LongWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/MapWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/MapWriter.java
index 5f4f6c2d2e..5f4f6c2d2e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/MapWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/MapWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/NullTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/NullTypeConstructor.java
index 6b46895708..6b46895708 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/NullTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/NullTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/NullWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/NullWriter.java
index cdc0ea3386..cdc0ea3386 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/NullWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/NullWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHandler.java
index e792cb45a8..e792cb45a8 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHandler.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHeaderHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHeaderHandler.java
index 504f3bdfa2..504f3bdfa2 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHeaderHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHeaderHandler.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/RestrictedTypeValueWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/RestrictedTypeValueWriter.java
index 89821984f8..89821984f8 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/RestrictedTypeValueWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/RestrictedTypeValueWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ShortTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ShortTypeConstructor.java
index de86dbaf64..de86dbaf64 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ShortTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ShortTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ShortWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ShortWriter.java
index 005cd17ae2..005cd17ae2 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ShortWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ShortWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SimpleVariableWidthWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SimpleVariableWidthWriter.java
index 415b5973a5..415b5973a5 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SimpleVariableWidthWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SimpleVariableWidthWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallIntConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallIntConstructor.java
index 652285c0da..652285c0da 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallIntConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallIntConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallLongConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallLongConstructor.java
index e7258b30e9..e7258b30e9 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallLongConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallLongConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallUIntConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallUIntConstructor.java
index fd2f41fa59..fd2f41fa59 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallUIntConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallUIntConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallULongConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallULongConstructor.java
index 2b49335e3e..2b49335e3e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallULongConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallULongConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/StringTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/StringTypeConstructor.java
index cc788f72c5..cc788f72c5 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/StringTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/StringTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/StringWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/StringWriter.java
index 872d12070b..872d12070b 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/StringWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/StringWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolArrayWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolArrayWriter.java
index 234a6afe24..234a6afe24 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolArrayWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolArrayWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolTypeConstructor.java
index b846b16722..b846b16722 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolWriter.java
index 0498e0ada6..0498e0ada6 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/TimestampTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/TimestampTypeConstructor.java
index 0dc8ab99ef..0dc8ab99ef 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/TimestampTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/TimestampTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/TimestampWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/TimestampWriter.java
index dd8eccbdfb..dd8eccbdfb 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/TimestampWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/TimestampWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/TypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/TypeConstructor.java
index bd29be78f6..bd29be78f6 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/TypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/TypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UByteTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UByteTypeConstructor.java
index 904c5c8d46..904c5c8d46 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UByteTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UByteTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UIntTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UIntTypeConstructor.java
index 1dbba651a2..1dbba651a2 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UIntTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UIntTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ULongTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ULongTypeConstructor.java
index 61f9922da6..61f9922da6 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ULongTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ULongTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UShortTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UShortTypeConstructor.java
index a43c886549..a43c886549 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UShortTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UShortTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UUIDTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UUIDTypeConstructor.java
index ed9eaeabcb..ed9eaeabcb 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UUIDTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UUIDTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UUIDWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UUIDWriter.java
index 7ca6a80633..7ca6a80633 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UUIDWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UUIDWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedByteWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedByteWriter.java
index afecc993b3..afecc993b3 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedByteWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedByteWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedIntegerWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedIntegerWriter.java
index 7e4e6be075..7e4e6be075 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedIntegerWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedIntegerWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedLongWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedLongWriter.java
index 6b77620e5e..6b77620e5e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedLongWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedLongWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedShortWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedShortWriter.java
index 56f1a37bd6..56f1a37bd6 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedShortWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedShortWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueHandler.java
index 2bac799c55..2bac799c55 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueHandler.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueProducingProtocolHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueProducingProtocolHandler.java
index a8563352e7..a8563352e7 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueProducingProtocolHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueProducingProtocolHandler.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueWriter.java
index 65f33aa4ad..65f33aa4ad 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthTypeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthTypeConstructor.java
index 6dbc27aa8d..6dbc27aa8d 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthTypeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthTypeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthWriter.java
index 33d87b79ac..33d87b79ac 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/WrapperTypeValueWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/WrapperTypeValueWriter.java
index c6edc51671..c6edc51671 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/WrapperTypeValueWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/WrapperTypeValueWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroListConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroListConstructor.java
index b9d6a50425..b9d6a50425 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroListConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroListConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroUIntConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroUIntConstructor.java
index b3c57ceaf7..b3c57ceaf7 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroUIntConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroUIntConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroULongConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroULongConstructor.java
index b2ab2a4158..b2ab2a4158 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroULongConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroULongConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQFrame.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQFrame.java
index 7950d9de7c..7950d9de7c 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQFrame.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQFrame.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQPProtocolHeaderHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQPProtocolHeaderHandler.java
index ec035bd60d..ec035bd60d 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQPProtocolHeaderHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQPProtocolHeaderHandler.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/ConnectionHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/ConnectionHandler.java
index 119dd6bf3a..119dd6bf3a 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/ConnectionHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/ConnectionHandler.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java
index 83cb36246a..83cb36246a 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameParsingError.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameParsingError.java
index 44c2e1d533..44c2e1d533 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameParsingError.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameParsingError.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameTypeHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameTypeHandler.java
index 902e5b0a51..902e5b0a51 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameTypeHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameTypeHandler.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/OversizeFrameException.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/OversizeFrameException.java
index 37897d9cb5..37897d9cb5 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/OversizeFrameException.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/OversizeFrameException.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrame.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrame.java
index eb45e4c2f5..eb45e4c2f5 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrame.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrame.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrameHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrameHandler.java
index 7a7a072f9d..7a7a072f9d 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrameHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrameHandler.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLProtocolHeaderHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLProtocolHeaderHandler.java
index 4ab90df92a..4ab90df92a 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLProtocolHeaderHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLProtocolHeaderHandler.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SocketExceptionHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SocketExceptionHandler.java
index 540aee0f8d..540aee0f8d 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SocketExceptionHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SocketExceptionHandler.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/TransportFrame.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/TransportFrame.java
index b66d36ebeb..b66d36ebeb 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/TransportFrame.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/TransportFrame.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/MessageAttributes.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/MessageAttributes.java
index 0adcb38a17..0adcb38a17 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/MessageAttributes.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/MessageAttributes.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoder.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoder.java
index 63a9fd3cee..63a9fd3cee 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoder.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoder.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoderImpl.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoderImpl.java
index 6730b148af..6730b148af 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoderImpl.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoderImpl.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionEncoder.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionEncoder.java
index dd8796293f..dd8796293f 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionEncoder.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionEncoder.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionEncoderImpl.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionEncoderImpl.java
index fd5c571236..fd5c571236 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionEncoderImpl.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionEncoderImpl.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/AMQPFrameTransport.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/AMQPFrameTransport.java
index 7cb10b923f..7cb10b923f 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/AMQPFrameTransport.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/AMQPFrameTransport.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/AMQPTransport.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/AMQPTransport.java
index 8327cf6f26..8327cf6f26 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/AMQPTransport.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/AMQPTransport.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/BytesProcessor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/BytesProcessor.java
index d26eda302f..d26eda302f 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/BytesProcessor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/BytesProcessor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/BytesTransport.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/BytesTransport.java
index 6932e7628b..6932e7628b 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/BytesTransport.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/BytesTransport.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/CircularBytesBuffer.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/CircularBytesBuffer.java
index e71eedd1e1..e71eedd1e1 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/CircularBytesBuffer.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/CircularBytesBuffer.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
index a3c4ad7b5a..a3c4ad7b5a 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEventListener.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEventListener.java
index 17163598d2..17163598d2 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEventListener.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEventListener.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionState.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionState.java
index c4fd038a61..c4fd038a61 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionState.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionState.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/Container.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/Container.java
index 1edb73554a..1edb73554a 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/Container.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/Container.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/Delivery.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/Delivery.java
index aca781afb9..aca781afb9 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/Delivery.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/Delivery.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/DeliveryStateHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/DeliveryStateHandler.java
index 95a16d375f..95a16d375f 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/DeliveryStateHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/DeliveryStateHandler.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ErrorHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ErrorHandler.java
index 185b866900..185b866900 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ErrorHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ErrorHandler.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/FrameOutputHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/FrameOutputHandler.java
index 2f3a49733a..2f3a49733a 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/FrameOutputHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/FrameOutputHandler.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/FrameTransport.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/FrameTransport.java
index 0f9cc8f5e8..0f9cc8f5e8 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/FrameTransport.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/FrameTransport.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/LinkEndpoint.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/LinkEndpoint.java
index 32fffd545a..32fffd545a 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/LinkEndpoint.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/LinkEndpoint.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/LinkEventListener.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/LinkEventListener.java
index c56a227e31..c56a227e31 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/LinkEventListener.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/LinkEventListener.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/Node.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/Node.java
index fe1b535d1c..fe1b535d1c 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/Node.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/Node.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ProtocolHeaderTransport.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ProtocolHeaderTransport.java
index f9abbeb832..f9abbeb832 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ProtocolHeaderTransport.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ProtocolHeaderTransport.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkEndpoint.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkEndpoint.java
index 8a5940658c..8a5940658c 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkEndpoint.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkEndpoint.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkListener.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkListener.java
index c0464fbff6..c0464fbff6 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkListener.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkListener.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingSessionHalfEndpoint.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingSessionHalfEndpoint.java
index 0fa15d4e51..0fa15d4e51 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingSessionHalfEndpoint.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingSessionHalfEndpoint.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLEndpoint.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLEndpoint.java
index 21c33d848d..21c33d848d 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLEndpoint.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLEndpoint.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLEndpointImpl.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLEndpointImpl.java
index 68884e21cf..68884e21cf 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLEndpointImpl.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLEndpointImpl.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLFrameTransport.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLFrameTransport.java
index 8299cddfbe..8299cddfbe 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLFrameTransport.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLFrameTransport.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLTransport.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLTransport.java
index e140e3acd7..e140e3acd7 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLTransport.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLTransport.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SaslServerProvider.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SaslServerProvider.java
index abc92e8acf..abc92e8acf 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SaslServerProvider.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SaslServerProvider.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SendingLinkEndpoint.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SendingLinkEndpoint.java
index fb525f0666..fb525f0666 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SendingLinkEndpoint.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SendingLinkEndpoint.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SendingLinkListener.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SendingLinkListener.java
index 09a99f1ba1..09a99f1ba1 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SendingLinkListener.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SendingLinkListener.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SendingSessionHalfEndpoint.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SendingSessionHalfEndpoint.java
index 995df132d7..995df132d7 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SendingSessionHalfEndpoint.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SendingSessionHalfEndpoint.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SequenceNumber.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SequenceNumber.java
index b67ff32f0e..b67ff32f0e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SequenceNumber.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SequenceNumber.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionAttachment.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionAttachment.java
index 63fd59c41a..63fd59c41a 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionAttachment.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionAttachment.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEndpoint.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEndpoint.java
index f7a3cd3800..f7a3cd3800 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEndpoint.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEndpoint.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEventListener.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEventListener.java
index 81d51b5908..81d51b5908 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEventListener.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEventListener.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionHalfEndpoint.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionHalfEndpoint.java
index d09f1e617d..d09f1e617d 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionHalfEndpoint.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionHalfEndpoint.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionState.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionState.java
index 76508a58f1..76508a58f1 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionState.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionState.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/StateChangeListener.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/StateChangeListener.java
index a02e110d8b..a02e110d8b 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/StateChangeListener.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/StateChangeListener.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/UnsettledTransfer.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/UnsettledTransfer.java
index 25b65ea50e..25b65ea50e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/UnsettledTransfer.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/UnsettledTransfer.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/AmqpErrorException.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/AmqpErrorException.java
index 0787cc2d83..0787cc2d83 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/AmqpErrorException.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/AmqpErrorException.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Binary.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Binary.java
index 8074354051..8074354051 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Binary.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Binary.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/DeliveryState.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/DeliveryState.java
index b82a3631ee..b82a3631ee 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/DeliveryState.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/DeliveryState.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/DistributionMode.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/DistributionMode.java
index 0be77b7841..0be77b7841 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/DistributionMode.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/DistributionMode.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/ErrorCondition.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/ErrorCondition.java
index 7c3e0ae285..7c3e0ae285 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/ErrorCondition.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/ErrorCondition.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/FrameBody.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/FrameBody.java
index f0036778c8..f0036778c8 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/FrameBody.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/FrameBody.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/GlobalTxId.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/GlobalTxId.java
index e3f2372c02..e3f2372c02 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/GlobalTxId.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/GlobalTxId.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/LifetimePolicy.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/LifetimePolicy.java
index 8ca7b7161e..8ca7b7161e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/LifetimePolicy.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/LifetimePolicy.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Outcome.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Outcome.java
index 949258a7f7..949258a7f7 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Outcome.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Outcome.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/RestrictedType.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/RestrictedType.java
index 7e324b6184..7e324b6184 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/RestrictedType.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/RestrictedType.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/SaslFrameBody.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/SaslFrameBody.java
index 8470a6f29b..8470a6f29b 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/SaslFrameBody.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/SaslFrameBody.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Section.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Section.java
index 34fb92b19c..34fb92b19c 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Section.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Section.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Source.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Source.java
index eadec0456f..eadec0456f 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Source.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Source.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Symbol.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Symbol.java
index de4e86f201..de4e86f201 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Symbol.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Symbol.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Target.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Target.java
index d01128a64c..d01128a64c 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Target.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Target.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/TxnCapability.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/TxnCapability.java
index 6249e8ab80..6249e8ab80 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/TxnCapability.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/TxnCapability.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/TxnId.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/TxnId.java
index eef6b3a32f..eef6b3a32f 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/TxnId.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/TxnId.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedByte.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedByte.java
index 7d608e2359..7d608e2359 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedByte.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedByte.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedInteger.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedInteger.java
index 515e1d08a1..515e1d08a1 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedInteger.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedInteger.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedLong.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedLong.java
index ebf8bc9c28..ebf8bc9c28 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedLong.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedLong.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedShort.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedShort.java
index a576db2a55..a576db2a55 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedShort.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedShort.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/WrapperType.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/WrapperType.java
index 2304559da9..2304559da9 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/WrapperType.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/WrapperType.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/codec/AMQPDescribedTypeRegistry.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/codec/AMQPDescribedTypeRegistry.java
index ff886090be..ff886090be 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/codec/AMQPDescribedTypeRegistry.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/codec/AMQPDescribedTypeRegistry.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Accepted.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Accepted.java
index aede9df82e..aede9df82e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Accepted.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Accepted.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/AmqpSequence.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/AmqpSequence.java
index 72531f3acc..72531f3acc 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/AmqpSequence.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/AmqpSequence.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/AmqpValue.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/AmqpValue.java
index 22723decca..22723decca 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/AmqpValue.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/AmqpValue.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/ApplicationProperties.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/ApplicationProperties.java
index fb9200ecb6..fb9200ecb6 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/ApplicationProperties.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/ApplicationProperties.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Data.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Data.java
index f4b8b78264..f4b8b78264 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Data.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Data.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnClose.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnClose.java
index aab5cf8a27..aab5cf8a27 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnClose.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnClose.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnNoLinks.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnNoLinks.java
index ab0043ea5b..ab0043ea5b 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnNoLinks.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnNoLinks.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnNoLinksOrMessages.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnNoLinksOrMessages.java
index 591597c655..591597c655 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnNoLinksOrMessages.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnNoLinksOrMessages.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnNoMessages.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnNoMessages.java
index 9e44061928..9e44061928 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnNoMessages.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnNoMessages.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeliveryAnnotations.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeliveryAnnotations.java
index bde1da090e..bde1da090e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeliveryAnnotations.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeliveryAnnotations.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/ExactSubjectFilter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/ExactSubjectFilter.java
index 3d01a26485..3d01a26485 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/ExactSubjectFilter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/ExactSubjectFilter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Filter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Filter.java
index 46f391bf4d..46f391bf4d 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Filter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Filter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Footer.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Footer.java
index 25cf04763e..25cf04763e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Footer.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Footer.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Header.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Header.java
index 02b4810196..02b4810196 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Header.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Header.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/JMSSelectorFilter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/JMSSelectorFilter.java
index a6317c42bf..a6317c42bf 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/JMSSelectorFilter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/JMSSelectorFilter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/MatchingSubjectFilter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/MatchingSubjectFilter.java
index 9504a658a9..9504a658a9 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/MatchingSubjectFilter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/MatchingSubjectFilter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/MessageAnnotations.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/MessageAnnotations.java
index 265beb7213..265beb7213 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/MessageAnnotations.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/MessageAnnotations.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Modified.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Modified.java
index d466cbf2b1..d466cbf2b1 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Modified.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Modified.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/NoLocalFilter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/NoLocalFilter.java
index 73f175e6fa..73f175e6fa 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/NoLocalFilter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/NoLocalFilter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Properties.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Properties.java
index bcab361a8e..bcab361a8e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Properties.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Properties.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Received.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Received.java
index 2e398063b8..2e398063b8 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Received.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Received.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Rejected.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Rejected.java
index c895074131..c895074131 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Rejected.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Rejected.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Released.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Released.java
index ad54b6ff04..ad54b6ff04 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Released.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Released.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Source.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Source.java
index e24fb1af7d..e24fb1af7d 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Source.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Source.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/StdDistMode.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/StdDistMode.java
index a3fba6fe46..a3fba6fe46 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/StdDistMode.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/StdDistMode.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Target.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Target.java
index ea9319d31d..ea9319d31d 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Target.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Target.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/TerminusDurability.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/TerminusDurability.java
index b08c416b4a..b08c416b4a 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/TerminusDurability.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/TerminusDurability.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/TerminusExpiryPolicy.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/TerminusExpiryPolicy.java
index 7ed2f84532..7ed2f84532 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/TerminusExpiryPolicy.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/TerminusExpiryPolicy.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AcceptedConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AcceptedConstructor.java
index 438378599e..438378599e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AcceptedConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AcceptedConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AcceptedWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AcceptedWriter.java
index 862b678b59..862b678b59 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AcceptedWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AcceptedWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpSequenceConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpSequenceConstructor.java
index 7304a50b18..7304a50b18 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpSequenceConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpSequenceConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpSequenceWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpSequenceWriter.java
index 14c10ca5e6..14c10ca5e6 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpSequenceWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpSequenceWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueConstructor.java
index 2000880361..2000880361 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueWriter.java
index f38d2edb00..f38d2edb00 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ApplicationPropertiesConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ApplicationPropertiesConstructor.java
index f2bf26b7b4..f2bf26b7b4 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ApplicationPropertiesConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ApplicationPropertiesConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ApplicationPropertiesWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ApplicationPropertiesWriter.java
index 6fff917058..6fff917058 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ApplicationPropertiesWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ApplicationPropertiesWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DataConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DataConstructor.java
index 75e921c1b8..75e921c1b8 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DataConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DataConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DataWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DataWriter.java
index 5ae6eecb43..5ae6eecb43 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DataWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DataWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnCloseConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnCloseConstructor.java
index 31236a00cc..31236a00cc 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnCloseConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnCloseConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnCloseWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnCloseWriter.java
index 3ea43f2565..3ea43f2565 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnCloseWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnCloseWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksConstructor.java
index e5ea6e923e..e5ea6e923e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.java
index c9bafe9550..c9bafe9550 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesWriter.java
index e77c6a3be4..e77c6a3be4 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksWriter.java
index cbd5048ba1..cbd5048ba1 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoMessagesConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoMessagesConstructor.java
index de8ce5b9a5..de8ce5b9a5 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoMessagesConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoMessagesConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoMessagesWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoMessagesWriter.java
index bd75ec9fa1..bd75ec9fa1 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoMessagesWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoMessagesWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeliveryAnnotationsConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeliveryAnnotationsConstructor.java
index 3596a1f722..3596a1f722 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeliveryAnnotationsConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeliveryAnnotationsConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeliveryAnnotationsWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeliveryAnnotationsWriter.java
index f3404d78aa..f3404d78aa 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeliveryAnnotationsWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeliveryAnnotationsWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterConstructor.java
index 90eff967b2..90eff967b2 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterWriter.java
index 2e95aba7a2..2e95aba7a2 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/FooterConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/FooterConstructor.java
index ed92c9f8f8..ed92c9f8f8 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/FooterConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/FooterConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/FooterWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/FooterWriter.java
index 3ffde7c663..3ffde7c663 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/FooterWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/FooterWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/HeaderConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/HeaderConstructor.java
index 5a1b4ceb1b..5a1b4ceb1b 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/HeaderConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/HeaderConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/HeaderWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/HeaderWriter.java
index 20605293e1..20605293e1 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/HeaderWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/HeaderWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
index ac377f8461..ac377f8461 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterWriter.java
index f363f0f1a4..f363f0f1a4 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java
index 13e365fb5a..13e365fb5a 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterWriter.java
index 3c260e66d4..3c260e66d4 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MessageAnnotationsConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MessageAnnotationsConstructor.java
index b2f2ec5739..b2f2ec5739 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MessageAnnotationsConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MessageAnnotationsConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MessageAnnotationsWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MessageAnnotationsWriter.java
index 400449c381..400449c381 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MessageAnnotationsWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MessageAnnotationsWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ModifiedConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ModifiedConstructor.java
index fb78708d7d..fb78708d7d 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ModifiedConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ModifiedConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ModifiedWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ModifiedWriter.java
index df3063ee52..df3063ee52 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ModifiedWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ModifiedWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterConstructor.java
index b1c5e1dcfe..b1c5e1dcfe 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterWriter.java
index 8308f63101..8308f63101 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/PropertiesConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/PropertiesConstructor.java
index 98b911f341..98b911f341 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/PropertiesConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/PropertiesConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/PropertiesWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/PropertiesWriter.java
index 021338bcfa..021338bcfa 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/PropertiesWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/PropertiesWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReceivedConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReceivedConstructor.java
index a515379d33..a515379d33 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReceivedConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReceivedConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReceivedWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReceivedWriter.java
index 76af939db5..76af939db5 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReceivedWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReceivedWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/RejectedConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/RejectedConstructor.java
index d7713bbb52..d7713bbb52 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/RejectedConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/RejectedConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/RejectedWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/RejectedWriter.java
index 6e24ac2972..6e24ac2972 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/RejectedWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/RejectedWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReleasedConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReleasedConstructor.java
index 534b81efd7..534b81efd7 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReleasedConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReleasedConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReleasedWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReleasedWriter.java
index cad602e0a6..cad602e0a6 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReleasedWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReleasedWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/SourceConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/SourceConstructor.java
index be9b271f72..be9b271f72 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/SourceConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/SourceConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/SourceWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/SourceWriter.java
index 7fc8cfb35e..7fc8cfb35e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/SourceWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/SourceWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/TargetConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/TargetConstructor.java
index 1c89574273..1c89574273 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/TargetConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/TargetConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/TargetWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/TargetWriter.java
index 970a9f4020..970a9f4020 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/TargetWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/TargetWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslChallenge.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslChallenge.java
index 081c00af29..081c00af29 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslChallenge.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslChallenge.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslCode.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslCode.java
index 59a24070ef..59a24070ef 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslCode.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslCode.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslInit.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslInit.java
index 9b789a4e17..9b789a4e17 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslInit.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslInit.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslMechanisms.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslMechanisms.java
index 9598035899..9598035899 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslMechanisms.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslMechanisms.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslOutcome.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslOutcome.java
index 02d707d311..02d707d311 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslOutcome.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslOutcome.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslResponse.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslResponse.java
index 7ffcaba7e9..7ffcaba7e9 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslResponse.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslResponse.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslChallengeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslChallengeConstructor.java
index 400e62db5a..400e62db5a 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslChallengeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslChallengeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslChallengeWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslChallengeWriter.java
index 2dd0e572e4..2dd0e572e4 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslChallengeWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslChallengeWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslInitConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslInitConstructor.java
index ff21c8e7d9..ff21c8e7d9 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslInitConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslInitConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslInitWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslInitWriter.java
index 50c724d9ed..50c724d9ed 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslInitWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslInitWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslMechanismsConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslMechanismsConstructor.java
index 0fcdbd2a1a..0fcdbd2a1a 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslMechanismsConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslMechanismsConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslMechanismsWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslMechanismsWriter.java
index e630cd0a2f..e630cd0a2f 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslMechanismsWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslMechanismsWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslOutcomeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslOutcomeConstructor.java
index b1c4760d3e..b1c4760d3e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslOutcomeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslOutcomeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslOutcomeWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslOutcomeWriter.java
index 7c35900ccc..7c35900ccc 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslOutcomeWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslOutcomeWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslResponseConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslResponseConstructor.java
index 364cf59a2f..364cf59a2f 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslResponseConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslResponseConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslResponseWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslResponseWriter.java
index a8d63085c2..a8d63085c2 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslResponseWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslResponseWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Coordinator.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Coordinator.java
index 0417cefd35..0417cefd35 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Coordinator.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Coordinator.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Declare.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Declare.java
index 5ec8993392..5ec8993392 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Declare.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Declare.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Declared.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Declared.java
index 4878cc3ccf..4878cc3ccf 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Declared.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Declared.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Discharge.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Discharge.java
index 356380608b..356380608b 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Discharge.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Discharge.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TransactionErrors.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TransactionErrors.java
index b87a7eea91..b87a7eea91 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TransactionErrors.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TransactionErrors.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TransactionalState.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TransactionalState.java
index b4fe564cf1..b4fe564cf1 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TransactionalState.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TransactionalState.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TxnCapabilities.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TxnCapabilities.java
index 840cc57d27..840cc57d27 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TxnCapabilities.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TxnCapabilities.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TxnCapability.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TxnCapability.java
index 19763f5b6b..19763f5b6b 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TxnCapability.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TxnCapability.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/CoordinatorConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/CoordinatorConstructor.java
index de1dbc625e..de1dbc625e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/CoordinatorConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/CoordinatorConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/CoordinatorWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/CoordinatorWriter.java
index 56e3993046..56e3993046 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/CoordinatorWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/CoordinatorWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclareConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclareConstructor.java
index 7eaf7dd9a8..7eaf7dd9a8 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclareConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclareConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclareWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclareWriter.java
index bf0687fe92..bf0687fe92 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclareWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclareWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclaredConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclaredConstructor.java
index 1e226ff994..1e226ff994 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclaredConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclaredConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclaredWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclaredWriter.java
index 798ffcc72b..798ffcc72b 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclaredWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclaredWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DischargeConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DischargeConstructor.java
index ab088cc74d..ab088cc74d 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DischargeConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DischargeConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DischargeWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DischargeWriter.java
index ddd8678418..ddd8678418 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DischargeWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DischargeWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/TransactionalStateConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/TransactionalStateConstructor.java
index 88cddba562..88cddba562 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/TransactionalStateConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/TransactionalStateConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/TransactionalStateWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/TransactionalStateWriter.java
index ea450fcf35..ea450fcf35 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/TransactionalStateWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/TransactionalStateWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/AmqpError.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/AmqpError.java
index 075a80ef90..075a80ef90 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/AmqpError.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/AmqpError.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Attach.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Attach.java
index d01dd0146c..d01dd0146c 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Attach.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Attach.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Begin.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Begin.java
index 558fcbf780..558fcbf780 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Begin.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Begin.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Close.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Close.java
index e86342d531..e86342d531 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Close.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Close.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/ConnectionError.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/ConnectionError.java
index 8a2120a252..8a2120a252 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/ConnectionError.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/ConnectionError.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Detach.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Detach.java
index f788201328..f788201328 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Detach.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Detach.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Disposition.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Disposition.java
index c7f04dedca..c7f04dedca 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Disposition.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Disposition.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/End.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/End.java
index 63fc331360..63fc331360 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/End.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/End.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Error.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Error.java
index 6e1af84cc9..6e1af84cc9 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Error.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Error.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Flow.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Flow.java
index 118d163841..118d163841 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Flow.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Flow.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/LinkError.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/LinkError.java
index 3c2d025619..3c2d025619 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/LinkError.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/LinkError.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Open.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Open.java
index cabee25c73..cabee25c73 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Open.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Open.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/ReceiverSettleMode.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/ReceiverSettleMode.java
index 53f0f2b931..53f0f2b931 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/ReceiverSettleMode.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/ReceiverSettleMode.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Role.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Role.java
index 55be00b3d7..55be00b3d7 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Role.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Role.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/SenderSettleMode.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/SenderSettleMode.java
index 528ec69dbc..528ec69dbc 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/SenderSettleMode.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/SenderSettleMode.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/SessionError.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/SessionError.java
index b7b233c879..b7b233c879 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/SessionError.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/SessionError.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Transfer.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Transfer.java
index a58db63a1f..a58db63a1f 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Transfer.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Transfer.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/AttachConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/AttachConstructor.java
index 0df84ac820..0df84ac820 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/AttachConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/AttachConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/AttachWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/AttachWriter.java
index 0b67635dc0..0b67635dc0 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/AttachWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/AttachWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/BeginConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/BeginConstructor.java
index 94470c5139..94470c5139 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/BeginConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/BeginConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/BeginWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/BeginWriter.java
index 84abf6698e..84abf6698e 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/BeginWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/BeginWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/CloseConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/CloseConstructor.java
index 69544dc96f..69544dc96f 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/CloseConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/CloseConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/CloseWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/CloseWriter.java
index 96313efcb9..96313efcb9 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/CloseWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/CloseWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DetachConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DetachConstructor.java
index 8d90d39769..8d90d39769 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DetachConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DetachConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DetachWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DetachWriter.java
index 620f087f98..620f087f98 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DetachWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DetachWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DispositionConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DispositionConstructor.java
index 928f54ea97..928f54ea97 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DispositionConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DispositionConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DispositionWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DispositionWriter.java
index 3bfdf840ab..3bfdf840ab 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DispositionWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DispositionWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/EndConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/EndConstructor.java
index 0f8fe63d55..0f8fe63d55 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/EndConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/EndConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/EndWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/EndWriter.java
index af6a11ae09..af6a11ae09 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/EndWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/EndWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/ErrorConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/ErrorConstructor.java
index 510170ae1f..510170ae1f 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/ErrorConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/ErrorConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/ErrorWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/ErrorWriter.java
index 6c5ebc5dc6..6c5ebc5dc6 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/ErrorWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/ErrorWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/FlowConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/FlowConstructor.java
index 406b5a327a..406b5a327a 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/FlowConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/FlowConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/FlowWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/FlowWriter.java
index a866491cea..a866491cea 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/FlowWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/FlowWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/OpenConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/OpenConstructor.java
index ba2df038e4..ba2df038e4 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/OpenConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/OpenConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/OpenWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/OpenWriter.java
index f512384a20..f512384a20 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/OpenWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/OpenWriter.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/TransferConstructor.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/TransferConstructor.java
index ad3812bbdc..ad3812bbdc 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/TransferConstructor.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/TransferConstructor.java
diff --git a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/TransferWriter.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/TransferWriter.java
index f2252cfc4a..f2252cfc4a 100644
--- a/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/TransferWriter.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/TransferWriter.java
diff --git a/java/bdbstore/bin/backup.sh b/qpid/java/bdbstore/bin/backup.sh
index ca2233cc8e..ca2233cc8e 100755
--- a/java/bdbstore/bin/backup.sh
+++ b/qpid/java/bdbstore/bin/backup.sh
diff --git a/java/bdbstore/build.xml b/qpid/java/bdbstore/build.xml
index 975176c834..975176c834 100644
--- a/java/bdbstore/build.xml
+++ b/qpid/java/bdbstore/build.xml
diff --git a/java/bdbstore/jmx/build.xml b/qpid/java/bdbstore/jmx/build.xml
index 544cdef2fc..544cdef2fc 100644
--- a/java/bdbstore/jmx/build.xml
+++ b/qpid/java/bdbstore/jmx/build.xml
diff --git a/java/bdbstore/jmx/pom.xml b/qpid/java/bdbstore/jmx/pom.xml
index 3480460972..3480460972 100644
--- a/java/bdbstore/jmx/pom.xml
+++ b/qpid/java/bdbstore/jmx/pom.xml
diff --git a/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java b/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java
index 28528ec83c..28528ec83c 100644
--- a/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java
+++ b/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java
diff --git a/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java b/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java
index 0492350a25..0492350a25 100644
--- a/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java
+++ b/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java
diff --git a/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/ManagedBDBHAMessageStore.java b/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/ManagedBDBHAMessageStore.java
index b85e44526b..b85e44526b 100644
--- a/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/ManagedBDBHAMessageStore.java
+++ b/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/ManagedBDBHAMessageStore.java
diff --git a/java/bdbstore/jmx/src/main/resources/META-INF/services/org.apache.qpid.server.jmx.MBeanProvider b/qpid/java/bdbstore/jmx/src/main/resources/META-INF/services/org.apache.qpid.server.jmx.MBeanProvider
index 8ece9627b0..8ece9627b0 100644
--- a/java/bdbstore/jmx/src/main/resources/META-INF/services/org.apache.qpid.server.jmx.MBeanProvider
+++ b/qpid/java/bdbstore/jmx/src/main/resources/META-INF/services/org.apache.qpid.server.jmx.MBeanProvider
diff --git a/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java b/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java
index 298d5bc045..298d5bc045 100644
--- a/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java
+++ b/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java
diff --git a/java/bdbstore/pom.xml b/qpid/java/bdbstore/pom.xml
index c90f904171..c90f904171 100644
--- a/java/bdbstore/pom.xml
+++ b/qpid/java/bdbstore/pom.xml
diff --git a/java/bdbstore/src/main/java/backup-log4j.xml b/qpid/java/bdbstore/src/main/java/backup-log4j.xml
index 6b0619f0b6..6b0619f0b6 100644
--- a/java/bdbstore/src/main/java/backup-log4j.xml
+++ b/qpid/java/bdbstore/src/main/java/backup-log4j.xml
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java
index 2186597380..2186597380 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
index e772498ee9..e772498ee9 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
index 9b97fec479..9b97fec479 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStore.java
index fb1dc1f1d3..fb1dc1f1d3 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStore.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStore.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHost.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHost.java
index bb3c7b108d..bb3c7b108d 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHost.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHost.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostFactory.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostFactory.java
index 3b564f33fd..3b564f33fd 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostFactory.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostFactory.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
index 4028de4b80..4028de4b80 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreFactory.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreFactory.java
index d7c8b23d39..d7c8b23d39 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreFactory.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreFactory.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java
index 598d20146c..598d20146c 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java
index a876a056fc..a876a056fc 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/entry/PreparedTransaction.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/entry/PreparedTransaction.java
index eb5c4677ff..eb5c4677ff 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/entry/PreparedTransaction.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/entry/PreparedTransaction.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/entry/QueueEntryKey.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/entry/QueueEntryKey.java
index e7cf93ff7a..e7cf93ff7a 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/entry/QueueEntryKey.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/entry/QueueEntryKey.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/entry/Xid.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/entry/Xid.java
index bed7575f9a..bed7575f9a 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/entry/Xid.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/entry/Xid.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBinding.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBinding.java
index 31cafbe74d..31cafbe74d 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBinding.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBinding.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ContentBinding.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ContentBinding.java
index 9154ca114a..9154ca114a 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ContentBinding.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ContentBinding.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/MessageMetaDataBinding.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/MessageMetaDataBinding.java
index 6925c9ee2b..6925c9ee2b 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/MessageMetaDataBinding.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/MessageMetaDataBinding.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java
index 09f2c50e2d..09f2c50e2d 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/QueueEntryBinding.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/QueueEntryBinding.java
index 22d0ede31f..22d0ede31f 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/QueueEntryBinding.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/QueueEntryBinding.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/StringMapBinding.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/StringMapBinding.java
index 15f31953f4..15f31953f4 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/StringMapBinding.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/StringMapBinding.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/UUIDTupleBinding.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/UUIDTupleBinding.java
index f8657cdd49..f8657cdd49 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/UUIDTupleBinding.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/UUIDTupleBinding.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/XidBinding.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/XidBinding.java
index 01a5b75fef..01a5b75fef 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/XidBinding.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/XidBinding.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java
index 43aa5aa2b4..43aa5aa2b4 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java
index 925e40ea93..925e40ea93 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorTemplate.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorTemplate.java
index dc68837d47..dc68837d47 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorTemplate.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorTemplate.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseCallable.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseCallable.java
index bf5462ef48..bf5462ef48 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseCallable.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseCallable.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseEntryCallback.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseEntryCallback.java
index 8ac22e5dfb..8ac22e5dfb 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseEntryCallback.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseEntryCallback.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseRunnable.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseRunnable.java
index 3e9e6a3497..3e9e6a3497 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseRunnable.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseRunnable.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java
index 135158afa4..135158afa4 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/StoreUpgrade.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/StoreUpgrade.java
index f73e2e5d78..f73e2e5d78 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/StoreUpgrade.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/StoreUpgrade.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
index 4c9eae6f3e..4c9eae6f3e 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
index a478872ad0..a478872ad0 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom6To7.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom6To7.java
index e318c3586e..e318c3586e 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom6To7.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom6To7.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeInteractionHandler.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeInteractionHandler.java
index 0cedbd15e0..0cedbd15e0 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeInteractionHandler.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeInteractionHandler.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeInteractionResponse.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeInteractionResponse.java
index eb5a049a9a..eb5a049a9a 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeInteractionResponse.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeInteractionResponse.java
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java
index e769bfae81..e769bfae81 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java
diff --git a/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/addVirtualHost.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/addVirtualHost.js
index 44ad5fa57a..44ad5fa57a 100644
--- a/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/addVirtualHost.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/addVirtualHost.js
diff --git a/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/add.js
index 81871b6034..81871b6034 100644
--- a/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/add.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/add.js
diff --git a/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html
index 17ffb1686f..17ffb1686f 100644
--- a/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html
diff --git a/java/bdbstore/src/main/java/resources/virtualhost/store/bdb/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhost/store/bdb/add.html
index 2ed5b35c10..2ed5b35c10 100644
--- a/java/bdbstore/src/main/java/resources/virtualhost/store/bdb/add.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhost/store/bdb/add.html
diff --git a/java/bdbstore/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory b/qpid/java/bdbstore/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
index a822405565..a822405565 100644
--- a/java/bdbstore/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
+++ b/qpid/java/bdbstore/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
diff --git a/java/bdbstore/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory b/qpid/java/bdbstore/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
index a822405565..a822405565 100644
--- a/java/bdbstore/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
+++ b/qpid/java/bdbstore/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
diff --git a/java/bdbstore/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.VirtualHostFactory b/qpid/java/bdbstore/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.VirtualHostFactory
index 0f8848cb74..0f8848cb74 100644
--- a/java/bdbstore/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.VirtualHostFactory
+++ b/qpid/java/bdbstore/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.VirtualHostFactory
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java
index 67804dc234..67804dc234 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java
index d7acf27f75..d7acf27f75 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java
index bfe41773eb..bfe41773eb 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreQuotaEventsTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreQuotaEventsTest.java
index 4684358190..4684358190 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreQuotaEventsTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreQuotaEventsTest.java
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
index ed6024feb1..ed6024feb1 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAMessageStoreSmokeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAMessageStoreSmokeTest.java
index 3f32df4b0c..3f32df4b0c 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAMessageStoreSmokeTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAMessageStoreSmokeTest.java
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreCreatorTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreCreatorTest.java
index 730001d849..730001d849 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreCreatorTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreCreatorTest.java
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBindingTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBindingTest.java
index 5a5d39081c..5a5d39081c 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBindingTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBindingTest.java
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
index b2b28b3c2d..b2b28b3c2d 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java
index 7ec442b73d..7ec442b73d 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java
index 500fb0a919..500fb0a919 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
index 44f0861275..44f0861275 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderFailOnNewerVersionTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderFailOnNewerVersionTest.java
index 75717120b3..75717120b3 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderFailOnNewerVersionTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderFailOnNewerVersionTest.java
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java
index 23fd9bc24f..23fd9bc24f 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java
diff --git a/java/bdbstore/src/test/resources/upgrade/bdbstore-v4/test-store/00000000.jdb b/qpid/java/bdbstore/src/test/resources/upgrade/bdbstore-v4/test-store/00000000.jdb
index cfc1f05d28..cfc1f05d28 100644
--- a/java/bdbstore/src/test/resources/upgrade/bdbstore-v4/test-store/00000000.jdb
+++ b/qpid/java/bdbstore/src/test/resources/upgrade/bdbstore-v4/test-store/00000000.jdb
diff --git a/java/bdbstore/src/test/resources/upgrade/bdbstore-v5/readme.txt b/qpid/java/bdbstore/src/test/resources/upgrade/bdbstore-v5/readme.txt
index a7e754f967..a7e754f967 100644
--- a/java/bdbstore/src/test/resources/upgrade/bdbstore-v5/readme.txt
+++ b/qpid/java/bdbstore/src/test/resources/upgrade/bdbstore-v5/readme.txt
diff --git a/java/bdbstore/src/test/resources/upgrade/bdbstore-v5/test-store/00000000.jdb b/qpid/java/bdbstore/src/test/resources/upgrade/bdbstore-v5/test-store/00000000.jdb
index cfc1f05d28..cfc1f05d28 100644
--- a/java/bdbstore/src/test/resources/upgrade/bdbstore-v5/test-store/00000000.jdb
+++ b/qpid/java/bdbstore/src/test/resources/upgrade/bdbstore-v5/test-store/00000000.jdb
diff --git a/java/bdbstore/src/test/resources/upgrade/bdbstore-v5/test-store/00000001.jdb b/qpid/java/bdbstore/src/test/resources/upgrade/bdbstore-v5/test-store/00000001.jdb
index 4b45ff61e6..4b45ff61e6 100644
--- a/java/bdbstore/src/test/resources/upgrade/bdbstore-v5/test-store/00000001.jdb
+++ b/qpid/java/bdbstore/src/test/resources/upgrade/bdbstore-v5/test-store/00000001.jdb
diff --git a/java/bdbstore/src/test/resources/upgrade/bdbstore-v999/test-store/00000000.jdb b/qpid/java/bdbstore/src/test/resources/upgrade/bdbstore-v999/test-store/00000000.jdb
index 991367019f..991367019f 100644
--- a/java/bdbstore/src/test/resources/upgrade/bdbstore-v999/test-store/00000000.jdb
+++ b/qpid/java/bdbstore/src/test/resources/upgrade/bdbstore-v999/test-store/00000000.jdb
diff --git a/java/bdbstore/systests/build.xml b/qpid/java/bdbstore/systests/build.xml
index ca809ad0cb..ca809ad0cb 100644
--- a/java/bdbstore/systests/build.xml
+++ b/qpid/java/bdbstore/systests/build.xml
diff --git a/java/bdbstore/systests/pom.xml b/qpid/java/bdbstore/systests/pom.xml
index 5660b47085..5660b47085 100644
--- a/java/bdbstore/systests/pom.xml
+++ b/qpid/java/bdbstore/systests/pom.xml
diff --git a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java
index 73eaf363ad..73eaf363ad 100644
--- a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java
+++ b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java
diff --git a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
index 76b990038d..76b990038d 100644
--- a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
+++ b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
diff --git a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
index 755168ca9c..755168ca9c 100644
--- a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
+++ b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
diff --git a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java
index 0464269efc..0464269efc 100644
--- a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java
+++ b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java
diff --git a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java
index 0e25c4e17a..0e25c4e17a 100644
--- a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java
+++ b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java
diff --git a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java
index 95626f7fa5..95626f7fa5 100644
--- a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java
+++ b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java
diff --git a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
index 408643b98a..408643b98a 100644
--- a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
+++ b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
diff --git a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java
index 353c3a0ec5..353c3a0ec5 100644
--- a/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java
+++ b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java
diff --git a/java/broker-core/build-generate-sources.xml b/qpid/java/broker-core/build-generate-sources.xml
index 56637c2bce..56637c2bce 100644
--- a/java/broker-core/build-generate-sources.xml
+++ b/qpid/java/broker-core/build-generate-sources.xml
diff --git a/java/broker-core/build.xml b/qpid/java/broker-core/build.xml
index c8c54a6f70..c8c54a6f70 100644
--- a/java/broker-core/build.xml
+++ b/qpid/java/broker-core/build.xml
diff --git a/java/broker-core/pom.xml b/qpid/java/broker-core/pom.xml
index a872bf565a..a872bf565a 100644
--- a/java/broker-core/pom.xml
+++ b/qpid/java/broker-core/pom.xml
diff --git a/java/broker-core/src/main/java/broker.bnd b/qpid/java/broker-core/src/main/java/broker.bnd
index 1a371a5efd..1a371a5efd 100755
--- a/java/broker-core/src/main/java/broker.bnd
+++ b/qpid/java/broker-core/src/main/java/broker.bnd
diff --git a/java/broker-core/src/main/java/fallback-log4j.properties b/qpid/java/broker-core/src/main/java/fallback-log4j.properties
index 7b95a89924..7b95a89924 100644
--- a/java/broker-core/src/main/java/fallback-log4j.properties
+++ b/qpid/java/broker-core/src/main/java/fallback-log4j.properties
diff --git a/java/broker-core/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java b/qpid/java/broker-core/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
index 54ca574871..54ca574871 100644
--- a/java/broker-core/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
index 7de0ebe1de..7de0ebe1de 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
index d5f344f4ed..d5f344f4ed 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/TransactionTimeoutHelper.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/TransactionTimeoutHelper.java
index b7007bf768..b7007bf768 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/TransactionTimeoutHelper.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/TransactionTimeoutHelper.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/binding/Binding.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/Binding.java
index 469a4bb9d0..469a4bb9d0 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/binding/Binding.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/Binding.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreator.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreator.java
index 2d42d60039..2d42d60039 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreator.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreator.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
index fb382a8ca9..fb382a8ca9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfigurationEntry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfigurationEntry.java
index 8afb1af24d..8afb1af24d 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfigurationEntry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfigurationEntry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfigurationEntryStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfigurationEntryStore.java
index 5f3589c7ef..5f3589c7ef 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfigurationEntryStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfigurationEntryStore.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfiguredObjectRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfiguredObjectRecoverer.java
index 65d97e6db1..65d97e6db1 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfiguredObjectRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfiguredObjectRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java
index c7cf0c0892..c7cf0c0892 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/IllegalConfigurationException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/IllegalConfigurationException.java
index bedd470ddf..bedd470ddf 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/IllegalConfigurationException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/IllegalConfigurationException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
index 25466d9c55..25466d9c55 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/RecovererProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/RecovererProvider.java
index 963d019ec3..963d019ec3 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/RecovererProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/RecovererProvider.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
index 189f5916e0..189f5916e0 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/XmlConfigurationUtilities.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/XmlConfigurationUtilities.java
index 84972c1e0a..84972c1e0a 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/XmlConfigurationUtilities.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/XmlConfigurationUtilities.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/plugins/AbstractConfiguration.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/plugins/AbstractConfiguration.java
index b87022868e..b87022868e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/plugins/AbstractConfiguration.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/plugins/AbstractConfiguration.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/AccessControlProviderRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/AccessControlProviderRecoverer.java
index df80b9fe5f..df80b9fe5f 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/AccessControlProviderRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/AccessControlProviderRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/AuthenticationProviderRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/AuthenticationProviderRecoverer.java
index 8eec88d556..8eec88d556 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/AuthenticationProviderRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/AuthenticationProviderRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
index f260b27259..f260b27259 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProvider.java
index 14b6d9f118..14b6d9f118 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProvider.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/GroupProviderRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/GroupProviderRecoverer.java
index 00f23b3c1c..00f23b3c1c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/GroupProviderRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/GroupProviderRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/KeyStoreRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/KeyStoreRecoverer.java
index 8efedd37b5..8efedd37b5 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/KeyStoreRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/KeyStoreRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/PluginRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/PluginRecoverer.java
index ddc4482953..ddc4482953 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/PluginRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/PluginRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/PortRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/PortRecoverer.java
index 147e835a8d..147e835a8d 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/PortRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/PortRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/PreferencesProviderRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/PreferencesProviderRecoverer.java
index db3f968435..db3f968435 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/PreferencesProviderRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/PreferencesProviderRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/RecovererHelper.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/RecovererHelper.java
index cc0426131f..cc0426131f 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/RecovererHelper.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/RecovererHelper.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/StoreUpgrader.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/StoreUpgrader.java
index 1a5ef9adca..1a5ef9adca 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/StoreUpgrader.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/StoreUpgrader.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/TrustStoreRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/TrustStoreRecoverer.java
index 7e9428a4d6..7e9428a4d6 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/TrustStoreRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/TrustStoreRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/VirtualHostRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/VirtualHostRecoverer.java
index 4f863adfb5..4f863adfb5 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/VirtualHostRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/VirtualHostRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreUtil.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreUtil.java
index 6d895892b3..6d895892b3 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreUtil.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreUtil.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java
index df82822a86..df82822a86 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
index 639f3cd5c4..639f3cd5c4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java
index 56b0aec7dd..56b0aec7dd 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java
index 3022898300..3022898300 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/factory/JsonConfigurationStoreFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/factory/JsonConfigurationStoreFactory.java
index de007e68d7..de007e68d7 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/factory/JsonConfigurationStoreFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/factory/JsonConfigurationStoreFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/factory/MemoryConfigurationStoreFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/factory/MemoryConfigurationStoreFactory.java
index f7a9157144..f7a9157144 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/factory/MemoryConfigurationStoreFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/factory/MemoryConfigurationStoreFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/ChangeAttributesTask.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/ChangeAttributesTask.java
index 4ba4057fee..4ba4057fee 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/ChangeAttributesTask.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/ChangeAttributesTask.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/ChangeStateTask.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/ChangeStateTask.java
index b6de1e136a..b6de1e136a 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/ChangeStateTask.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/ChangeStateTask.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/CreateChildTask.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/CreateChildTask.java
index d3a8f5b797..d3a8f5b797 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/CreateChildTask.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/CreateChildTask.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/SetAttributeTask.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/SetAttributeTask.java
index 94649434e6..94649434e6 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/SetAttributeTask.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/SetAttributeTask.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java
index 671104d413..671104d413 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
index b933d3f961..b933d3f961 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java
index 07d934027e..07d934027e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index c30ebe17be..c30ebe17be 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java
index aed2ddb8cf..aed2ddb8cf 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
index 612fa855a4..612fa855a4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
index b54f995b5e..b54f995b5e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
index 1e022c994e..1e022c994e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeType.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeType.java
index d61d10155e..d61d10155e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeType.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeType.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/Exchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/Exchange.java
index d05e731daa..d05e731daa 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/Exchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/Exchange.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
index f364691666..f364691666 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
index c77f114428..c77f114428 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInitialiser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInitialiser.java
index 6dbc1d54d1..6dbc1d54d1 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInitialiser.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInitialiser.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeReferrer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeReferrer.java
index e41d63d97d..e41d63d97d 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeReferrer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeReferrer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
index 53ee7de661..53ee7de661 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
index cd830d69a9..cd830d69a9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeType.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeType.java
index ac864df02c..ac864df02c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeType.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeType.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FilterSupport.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FilterSupport.java
index e78516cf69..e78516cf69 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FilterSupport.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FilterSupport.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
index eb4a84a5b9..eb4a84a5b9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
index 41dd7e010c..41dd7e010c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeType.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeType.java
index 42d04f5a97..42d04f5a97 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeType.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeType.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
index 6b8b84f5dd..6b8b84f5dd 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeType.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeType.java
index 3bbae700be..3bbae700be 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeType.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeType.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
index 44d5f7f1d0..44d5f7f1d0 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
index 85338c0760..85338c0760 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherResult.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherResult.java
index 6084b18b31..6084b18b31 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherResult.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherResult.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicNormalizer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicNormalizer.java
index e45d6a539d..e45d6a539d 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicNormalizer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicNormalizer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
index 214ca23b49..214ca23b49 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java
index c905299733..c905299733 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java
index 24c41ee7da..24c41ee7da 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManager.java
index b5e282038b..b5e282038b 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
index 07049a6c97..07049a6c97 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
index 3d0d9a0f31..3d0d9a0f31 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/filter/MessageFilter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
index f5416af09a..f5416af09a 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
index d3e097d22c..d3e097d22c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
index 6c158de8b5..6c158de8b5 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java
index 124fb0d1d9..124fb0d1d9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/flow/BytesOnlyCreditManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/flow/BytesOnlyCreditManager.java
index be3a13d2d3..be3a13d2d3 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/flow/BytesOnlyCreditManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/flow/BytesOnlyCreditManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/flow/FlowCreditManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/flow/FlowCreditManager.java
index 280f2851a4..280f2851a4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/flow/FlowCreditManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/flow/FlowCreditManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/flow/LimitlessCreditManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/flow/LimitlessCreditManager.java
index 89fc60666b..89fc60666b 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/flow/LimitlessCreditManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/flow/LimitlessCreditManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/flow/MessageAndBytesCreditManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/flow/MessageAndBytesCreditManager.java
index 31c1fda968..31c1fda968 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/flow/MessageAndBytesCreditManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/flow/MessageAndBytesCreditManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/flow/MessageOnlyCreditManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/flow/MessageOnlyCreditManager.java
index 1817e8ad31..1817e8ad31 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/flow/MessageOnlyCreditManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/flow/MessageOnlyCreditManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/flow/Pre0_10CreditManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/flow/Pre0_10CreditManager.java
index fc2d4bfb53..fc2d4bfb53 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/flow/Pre0_10CreditManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/flow/Pre0_10CreditManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractRootMessageLogger.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractRootMessageLogger.java
index 98da9074ef..98da9074ef 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractRootMessageLogger.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractRootMessageLogger.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/CompositeStartupMessageLogger.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/CompositeStartupMessageLogger.java
index e0a51b3a3e..e0a51b3a3e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/CompositeStartupMessageLogger.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/CompositeStartupMessageLogger.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java
index b4e9f2f333..b4e9f2f333 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogActor.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogActor.java
index 18f03c2716..18f03c2716 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogActor.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogActor.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogMessage.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogMessage.java
index fa18435fab..fa18435fab 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogMessage.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogMessage.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogRecorder.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogRecorder.java
index dfffbdbb5f..dfffbdbb5f 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogRecorder.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogRecorder.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogSubject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogSubject.java
index 09a277e520..09a277e520 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogSubject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/LogSubject.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java
index db8b24e90e..db8b24e90e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java
index 1431dd1da9..1431dd1da9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
index b384b3fde3..b384b3fde3 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
index d23122ac5d..d23122ac5d 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
index 99e11bf9ae..99e11bf9ae 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
index e8c6c9c323..e8c6c9c323 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AbstractManagementActor.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AbstractManagementActor.java
index 8cf121b3d9..8cf121b3d9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AbstractManagementActor.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AbstractManagementActor.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/BrokerActor.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/BrokerActor.java
index 9e77452228..9e77452228 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/BrokerActor.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/BrokerActor.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java
index 6251471139..6251471139 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/GenericActor.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/GenericActor.java
index 0e418a95e2..0e418a95e2 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/GenericActor.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/GenericActor.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/HttpManagementActor.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/HttpManagementActor.java
index 9b445c2bd9..9b445c2bd9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/HttpManagementActor.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/HttpManagementActor.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
index ba5ea47fc1..ba5ea47fc1 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java
index 4b17e8c0e6..4b17e8c0e6 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
index a2dbf2f6ee..a2dbf2f6ee 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/log4j/LoggingFacadeException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/log4j/LoggingFacadeException.java
index 468b06be34..468b06be34 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/log4j/LoggingFacadeException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/log4j/LoggingFacadeException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/log4j/LoggingManagementFacade.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/log4j/LoggingManagementFacade.java
index 6a961c8fa4..6a961c8fa4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/log4j/LoggingManagementFacade.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/log4j/LoggingManagementFacade.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
index 9894db5000..9894db5000 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties
index c953076165..c953076165 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
index f160235e43..f160235e43 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties
index 808ec7918f..808ec7918f 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
index d4ba32673f..d4ba32673f 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
index 76c1fa1b5b..76c1fa1b5b 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
index 66fdc93c6d..66fdc93c6d 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Channel_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Channel_logmessages.properties
index 397c12d73c..397c12d73c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Channel_logmessages.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Channel_logmessages.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
index a07e0e3fe4..a07e0e3fe4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStore_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStore_logmessages.properties
index 541f8b8c68..541f8b8c68 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStore_logmessages.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStore_logmessages.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
index 2766f0c1f1..2766f0c1f1 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties
index ad9896a659..ad9896a659 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
index f9e86ef8b3..f9e86ef8b3 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties
index b25a6a7301..b25a6a7301 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
index df700b2222..df700b2222 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
index 7924be28d3..7924be28d3 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
index 2c700df31c..2c700df31c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStore_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStore_logmessages.properties
index d3823a71a0..d3823a71a0 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStore_logmessages.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStore_logmessages.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
index 75fa5b533e..75fa5b533e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties
index 538bf994ea..538bf994ea 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
index b58b324ece..b58b324ece 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties
index ef5f885b50..ef5f885b50 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
index 22c54f0ec7..22c54f0ec7 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLog_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLog_logmessages.properties
index b9e87159a6..b9e87159a6 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLog_logmessages.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLog_logmessages.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
index 149d6d2e89..149d6d2e89 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties
index 5695026cbc..5695026cbc 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
index baccf240ff..baccf240ff 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
index a633162e85..a633162e85 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
index 5b0e34b73e..5b0e34b73e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
index 87c2377e0f..87c2377e0f 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
index 5affafad75..5affafad75 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
index 7611ee1a88..7611ee1a88 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
index ed989d764f..ed989d764f 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java
index 53a9ab75d9..53a9ab75d9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
index 9a23b733dc..9a23b733dc 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java
index 63bd1e45a0..63bd1e45a0 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
index 8311dbd5ff..8311dbd5ff 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/message/EnqueableMessage.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/EnqueableMessage.java
index 7be91ad0ca..7be91ad0ca 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/message/EnqueableMessage.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/EnqueableMessage.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/message/InboundMessage.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/InboundMessage.java
index 1b3fdb1870..1b3fdb1870 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/message/InboundMessage.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/InboundMessage.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageContentSource.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageContentSource.java
index 44741f57bd..44741f57bd 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageContentSource.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageContentSource.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageReference.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageReference.java
index 399f8f9327..399f8f9327 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageReference.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageReference.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java
index e1ad2fd0ca..e1ad2fd0ca 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
index d96bef0463..d96bef0463 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Attribute.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Attribute.java
index 4fccf47e0e..4fccf47e0e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Attribute.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Attribute.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationMethod.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationMethod.java
index 7a5927a365..7a5927a365 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationMethod.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationMethod.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
index f75d0211cb..f75d0211cb 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java
index fdb009386c..fdb009386c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
index 0c1a6de58b..0c1a6de58b 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfigurationChangeListener.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfigurationChangeListener.java
index d20c709e90..d20c709e90 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfigurationChangeListener.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfigurationChangeListener.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
index 45e743dbca..45e743dbca 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFinder.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFinder.java
index 6a7d6f8f7b..6a7d6f8f7b 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFinder.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFinder.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
index 3139850892..3139850892 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
index 958177e713..958177e713 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Event.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Event.java
index 91b684f06e..91b684f06e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Event.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Event.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/EventType.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/EventType.java
index edd5ce4250..edd5ce4250 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/EventType.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/EventType.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
index e63c71e955..e63c71e955 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
index aacd515107..aacd515107 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
index 6832cc6fa6..6832cc6fa6 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
index 9016f97927..9016f97927 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/IllegalStateTransitionException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/IllegalStateTransitionException.java
index 9cab5e2103..9cab5e2103 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/IllegalStateTransitionException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/IllegalStateTransitionException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/IntegrityViolationException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/IntegrityViolationException.java
index def450640a..def450640a 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/IntegrityViolationException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/IntegrityViolationException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
index ab909390bd..ab909390bd 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/LifetimePolicy.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/LifetimePolicy.java
index c9006f4e71..c9006f4e71 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/LifetimePolicy.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/LifetimePolicy.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Model.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Model.java
index 50538a5580..50538a5580 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Model.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Model.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/PasswordCredentialManagingAuthenticationProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PasswordCredentialManagingAuthenticationProvider.java
index 1027e5ce8c..1027e5ce8c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/PasswordCredentialManagingAuthenticationProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PasswordCredentialManagingAuthenticationProvider.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
index b9503a5841..b9503a5841 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
index 60d62e3f27..60d62e3f27 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
index fadd036a58..fadd036a58 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java
index e9d50fbc59..e9d50fbc59 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Publisher.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Publisher.java
index cdb85d8023..cdb85d8023 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Publisher.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Publisher.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
index ae2031bd71..ae2031bd71 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/QueueNotificationListener.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/QueueNotificationListener.java
index ab601f685c..ab601f685c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/QueueNotificationListener.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/QueueNotificationListener.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/QueueType.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/QueueType.java
index 96f2a7e2e5..96f2a7e2e5 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/QueueType.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/QueueType.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
index e813d0c129..e813d0c129 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/State.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/State.java
index a4287e09b1..a4287e09b1 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/State.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/State.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Statistics.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Statistics.java
index 92d6f47741..92d6f47741 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Statistics.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Statistics.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/Transport.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Transport.java
index ae6e5ac43a..ae6e5ac43a 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/Transport.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Transport.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
index d313e1832f..d313e1832f 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java
index 7def89025d..7def89025d 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
index cf1a688634..cf1a688634 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
index ae07005679..ae07005679 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAlias.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAlias.java
index 31403d78e5..31403d78e5 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAlias.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAlias.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractAdapter.java
index 9ac2cb00a3..9ac2cb00a3 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
index 707cf8076d..707cf8076d 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
index 2867a92410..2867a92410 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java
index a6fe191523..a6fe191523 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderFactory.java
index 6cdf2f2c1a..6cdf2f2c1a 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
index a4ce95e5aa..a4ce95e5aa 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
index 656bdc9acf..656bdc9acf 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java
index 322c8a0ea4..322c8a0ea4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java
index 92b8f55f23..92b8f55f23 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
index e7b5d65c65..e7b5d65c65 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
index e8bacb2712..e8bacb2712 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java
index 696c59783e..696c59783e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
index 0963f01522..0963f01522 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java
index 39f0017fc3..39f0017fc3 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactory.java
index 32ee910973..32ee910973 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java
index 9323606c83..9323606c83 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderFactory.java
index 1d3ccd81b3..1d3ccd81b3 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java
index 1101232c96..1101232c96 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/NoStatistics.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/NoStatistics.java
index 03fdbd1e85..03fdbd1e85 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/NoStatistics.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/NoStatistics.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
index 0547f961d0..0547f961d0 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java
index 8dc446e5b2..8dc446e5b2 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java
index 074f7c243b..074f7c243b 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
index 31ce7e56fd..31ce7e56fd 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/StatisticsAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/StatisticsAdapter.java
index 28c46a0339..28c46a0339 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/StatisticsAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/StatisticsAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java
index 2d703e2baf..2d703e2baf 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
index 16151dbb63..16151dbb63 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
index 91b705b004..91b705b004 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AccessControlFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AccessControlFactory.java
index 0298789672..0298789672 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AccessControlFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AccessControlFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AuthenticationManagerFactory.java
index 4805f06760..4805f06760 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AuthenticationManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AuthenticationManagerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ConfigurationStoreFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ConfigurationStoreFactory.java
index 382c742161..382c742161 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ConfigurationStoreFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ConfigurationStoreFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/DurableConfigurationStoreFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/DurableConfigurationStoreFactory.java
index 94a029ced3..94a029ced3 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/DurableConfigurationStoreFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/DurableConfigurationStoreFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ExchangeType.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ExchangeType.java
index ab19fa196e..ab19fa196e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ExchangeType.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ExchangeType.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/GroupManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/GroupManagerFactory.java
index 3d7a6323eb..3d7a6323eb 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/GroupManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/GroupManagerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
index 12fb9224bb..12fb9224bb 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageConverter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageConverter.java
index cf3860ba92..cf3860ba92 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageConverter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageConverter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageMetaDataType.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageMetaDataType.java
index ee89782307..ee89782307 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageMetaDataType.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageMetaDataType.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java
index 81404dcba8..81404dcba8 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/Pluggable.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/Pluggable.java
index cc18e83f8e..cc18e83f8e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/Pluggable.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/Pluggable.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PluggableFactoryLoader.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PluggableFactoryLoader.java
index 7a8b7c0c65..7a8b7c0c65 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PluggableFactoryLoader.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PluggableFactoryLoader.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PluginFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PluginFactory.java
index 7f804781a5..7f804781a5 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PluginFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PluginFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PreferencesProviderFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PreferencesProviderFactory.java
index 92135ab14a..92135ab14a 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PreferencesProviderFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PreferencesProviderFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ProtocolEngineCreator.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ProtocolEngineCreator.java
index 2fa9084b8b..2fa9084b8b 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ProtocolEngineCreator.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ProtocolEngineCreator.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
index 148a306b27..148a306b27 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java
index 9549b70c83..9549b70c83 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java
index 180653af0e..180653af0e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
index a3833eebb9..a3833eebb9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AmqpProtocolVersion.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AmqpProtocolVersion.java
index 0a71fe257a..0a71fe257a 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AmqpProtocolVersion.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AmqpProtocolVersion.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/LinkModel.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/LinkModel.java
index 16120a3523..16120a3523 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/LinkModel.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/LinkModel.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/LinkRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/LinkRegistry.java
index 67d6e9f8d1..67d6e9f8d1 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/LinkRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/LinkRegistry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageConverterRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageConverterRegistry.java
index 81e5af179d..81e5af179d 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageConverterRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageConverterRegistry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
index 47b578c4ef..47b578c4ef 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
index 3ce9383ee0..3ce9383ee0 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java
index 46c2a635b7..46c2a635b7 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
index ceebe4f965..ceebe4f965 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
index 029c7e4f86..029c7e4f86 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/BaseQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/BaseQueue.java
index 6145570b0c..6145570b0c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/BaseQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/BaseQueue.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java
index c2813bb7a5..c2813bb7a5 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
index 53420ded9b..53420ded9b 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
index 7d091dbf73..7d091dbf73 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/Filterable.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/Filterable.java
index 50d8f4166d..50d8f4166d 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/Filterable.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/Filterable.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
index 2a78ee430c..2a78ee430c 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
index 566cdd0ea5..566cdd0ea5 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java
index daa5db393a..daa5db393a 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
index 66315af9fb..66315af9fb 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
index 589f385d22..589f385d22 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueContext.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueContext.java
index 79279b44c7..79279b44c7 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueContext.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueContext.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
index c44961c457..c44961c457 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
index 36feb27d86..36feb27d86 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryIterator.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryIterator.java
index 73ebb0f300..73ebb0f300 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryIterator.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryIterator.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryList.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryList.java
index 641aaa0a08..641aaa0a08 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryList.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryList.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java
index 4dbce45f67..4dbce45f67 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryVisitor.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryVisitor.java
index 9ecaf6dafd..9ecaf6dafd 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryVisitor.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryVisitor.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueFactory.java
index 3e4e1df5a2..3e4e1df5a2 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
index bc1d5942bd..bc1d5942bd 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
index 22a2029494..22a2029494 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index fb36433799..fb36433799 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryImpl.java
index 4a10d31d37..4a10d31d37 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryImpl.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
index b8d8ec19f4..b8d8ec19f4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueue.java
index b3566df0c4..b3566df0c4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueue.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryImpl.java
index 1052adbe67..1052adbe67 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryImpl.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
index 7f742d455d..7f742d455d 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryListFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryListFactory.java
index 87c79178f0..87c79178f0 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryListFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryListFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
index 47a7d733dd..47a7d733dd 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
index 9d16f4b927..9d16f4b927 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
index 7341922bd0..7341922bd0 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/AccessControl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/AccessControl.java
index 61e928a38c..61e928a38c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/AccessControl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/AccessControl.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/AuthorizationHolder.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/AuthorizationHolder.java
index 8243fc3f75..8243fc3f75 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/AuthorizationHolder.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/AuthorizationHolder.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/Result.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/Result.java
index f79721799e..f79721799e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/Result.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/Result.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java
index ff45add206..ff45add206 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/SubjectCreator.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SubjectCreator.java
index 244ab0dd94..244ab0dd94 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/SubjectCreator.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SubjectCreator.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/access/FileAccessControlProviderConstants.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/FileAccessControlProviderConstants.java
index 3a98a947df..3a98a947df 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/access/FileAccessControlProviderConstants.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/FileAccessControlProviderConstants.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
index a379f85bbb..a379f85bbb 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectType.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
index 9016205d1c..9016205d1c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/access/Operation.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/Operation.java
index db5b8fba11..db5b8fba11 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/access/Operation.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/Operation.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/access/OperationLoggingDetails.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/OperationLoggingDetails.java
index a683199abc..a683199abc 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/access/OperationLoggingDetails.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/OperationLoggingDetails.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/access/Permission.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/Permission.java
index 49b3a331f9..49b3a331f9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/access/Permission.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/Permission.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipal.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipal.java
index fb31132514..fb31132514 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipal.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipal.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
index 09bf6cf3b1..09bf6cf3b1 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/SubjectAuthenticationResult.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/SubjectAuthenticationResult.java
index 3be96b87eb..3be96b87eb 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/SubjectAuthenticationResult.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/SubjectAuthenticationResult.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/UsernamePrincipal.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/UsernamePrincipal.java
index 5b3c1d59cf..5b3c1d59cf 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/UsernamePrincipal.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/UsernamePrincipal.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
index cb5bc54cd2..cb5bc54cd2 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
index 4f3892c2c6..4f3892c2c6 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
index b9de1587b5..b9de1587b5 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PasswordPrincipal.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PasswordPrincipal.java
index 8e12d5f0a3..8e12d5f0a3 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PasswordPrincipal.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PasswordPrincipal.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
index 34d2710472..34d2710472 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java
index bf9bfc6c99..bf9bfc6c99 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java
index 7e3e28e4f8..7e3e28e4f8 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticator.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticator.java
index bf8d489e61..bf8d489e61 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticator.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticator.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractPrincipalDatabaseAuthManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractPrincipalDatabaseAuthManagerFactory.java
index 86d012cc96..86d012cc96 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractPrincipalDatabaseAuthManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractPrincipalDatabaseAuthManagerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManager.java
index 30626ce98c..30626ce98c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerFactory.java
index 2160a082f4..2160a082f4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
index 67a4f348b1..67a4f348b1 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java
index 8b979c324d..8b979c324d 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
index c503549bf2..c503549bf2 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java
index 3f8449c529..3f8449c529 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationProviderAttributeDescriptions.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationProviderAttributeDescriptions.properties
index 263254e9fe..263254e9fe 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationProviderAttributeDescriptions.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationProviderAttributeDescriptions.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java
index 6bbf3ca6f5..6bbf3ca6f5 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java
index 8b86a783a9..8b86a783a9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PasswordFileAuthenticationProviderAttributeDescriptions.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PasswordFileAuthenticationProviderAttributeDescriptions.properties
index e847e90f57..e847e90f57 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PasswordFileAuthenticationProviderAttributeDescriptions.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PasswordFileAuthenticationProviderAttributeDescriptions.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java
index 5e077cfe79..5e077cfe79 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
index da6464a57e..da6464a57e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
index 903f54dd8e..903f54dd8e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
index 3ac185d78b..3ac185d78b 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java
index 767e675125..767e675125 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationProviderAttributeDescriptions.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationProviderAttributeDescriptions.properties
index 18e6fb8a4c..18e6fb8a4c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationProviderAttributeDescriptions.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationProviderAttributeDescriptions.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/AbstractLDAPSSLSocketFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/AbstractLDAPSSLSocketFactory.java
index 3e8b2e210e..3e8b2e210e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/AbstractLDAPSSLSocketFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/AbstractLDAPSSLSocketFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java
index 5cfc8b7a0b..5cfc8b7a0b 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java
index 4cbf5096df..4cbf5096df 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
index f36ef1516c..f36ef1516c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java
index 8f8686db88..8f8686db88 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java
index a4c4fff42f..a4c4fff42f 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java
index 3a73f577fe..3a73f577fe 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServer.java
index d10193e743..d10193e743 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java
index 4650234972..4650234972 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java
index fc324b686a..fc324b686a 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java
index a2d9fa5e3e..a2d9fa5e3e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java
index 4e82940439..4e82940439 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java
index c4c4b4e0cf..c4c4b4e0cf 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexSaslServer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexSaslServer.java
index e19baaa7c6..e19baaa7c6 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexSaslServer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexSaslServer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexServerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexServerFactory.java
index 06c9108a73..06c9108a73 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexServerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexServerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java
index 70c13233b0..70c13233b0 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java
index 5f5ee08c21..5f5ee08c21 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java
index 05acd3b27f..05acd3b27f 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainPasswordCallback.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainPasswordCallback.java
index 0ea2f3c92e..0ea2f3c92e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainPasswordCallback.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainPasswordCallback.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
index a811806c00..a811806c00 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java
index 445e5ef812..445e5ef812 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
index c66e7fd4e4..c66e7fd4e4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupManager.java
index e11a4f83db..e11a4f83db 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupManagerFactory.java
index 50f08623cd..50f08623cd 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupManagerFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupProviderAttributeDescriptions.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupProviderAttributeDescriptions.properties
index 2c2d2ab9e3..2c2d2ab9e3 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupProviderAttributeDescriptions.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupProviderAttributeDescriptions.properties
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupDatabase.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupDatabase.java
index 98c12782d8..98c12782d8 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupDatabase.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupDatabase.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupManager.java
index 3fd6dd2800..3fd6dd2800 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupPrincipal.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupPrincipal.java
index a9590bb964..a9590bb964 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupPrincipal.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupPrincipal.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java
index f382f90010..f382f90010 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
index 37d87bb628..37d87bb628 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractDurableConfiguredObjectRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractDurableConfiguredObjectRecoverer.java
index dbe8bf22a0..dbe8bf22a0 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractDurableConfiguredObjectRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractDurableConfiguredObjectRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
index 4a1452d86c..4a1452d86c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java
index 3abf083026..3abf083026 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java
index a3534d3fa5..a3534d3fa5 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/ConfiguredObjectRecord.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/ConfiguredObjectRecord.java
index 44490385d9..44490385d9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/ConfiguredObjectRecord.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/ConfiguredObjectRecord.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/DependencyListener.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DependencyListener.java
index 120c904cf7..120c904cf7 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/DependencyListener.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DependencyListener.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java
index 7fb80bde96..7fb80bde96 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java
index 6b0748b0c3..6b0748b0c3 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreCreator.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreCreator.java
index 3a69f802f0..3a69f802f0 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreCreator.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreCreator.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java
index d311685375..d311685375 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreUpgrader.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreUpgrader.java
index 1d3e4cc672..1d3e4cc672 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreUpgrader.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreUpgrader.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfiguredObjectRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfiguredObjectRecoverer.java
index e065728bd3..e065728bd3 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfiguredObjectRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfiguredObjectRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/Event.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Event.java
index c681126c11..c681126c11 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/Event.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Event.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/EventListener.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/EventListener.java
index 33ae7b5b24..33ae7b5b24 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/EventListener.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/EventListener.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java
index bf3de2611d..bf3de2611d 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/HAMessageStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/HAMessageStore.java
index 59483751ca..59483751ca 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/HAMessageStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/HAMessageStore.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
index 8eed1fa5a4..8eed1fa5a4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStoreFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStoreFactory.java
index 374a35d10d..374a35d10d 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStoreFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStoreFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageMetaDataTypeRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageMetaDataTypeRegistry.java
index 64f3ab15ee..64f3ab15ee 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageMetaDataTypeRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageMetaDataTypeRegistry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStore.java
index 996d71d51d..996d71d51d 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStore.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java
index b0a736c66c..b0a736c66c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java
index 93b669e6e4..93b669e6e4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreCreator.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreCreator.java
index a8013b8e9b..a8013b8e9b 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreCreator.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreCreator.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreRecoveryHandler.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreRecoveryHandler.java
index ba65b8e1ec..ba65b8e1ec 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreRecoveryHandler.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreRecoveryHandler.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/NonNullUpgrader.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/NonNullUpgrader.java
index a671e93b26..a671e93b26 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/NonNullUpgrader.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/NonNullUpgrader.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/NullMessageStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/NullMessageStore.java
index 57dbfabaa4..57dbfabaa4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/NullMessageStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/NullMessageStore.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/NullUpgrader.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/NullUpgrader.java
index c8a812fa89..c8a812fa89 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/NullUpgrader.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/NullUpgrader.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/OperationalLoggingListener.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/OperationalLoggingListener.java
index 4ab1a3ab05..4ab1a3ab05 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/OperationalLoggingListener.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/OperationalLoggingListener.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/State.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/State.java
index 1d0936cec4..1d0936cec4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/State.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/State.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/StateManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StateManager.java
index 613b329beb..613b329beb 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/StateManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StateManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java
index 9ae6cca8e6..9ae6cca8e6 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/StoreContext.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StoreContext.java
index 88cc68bc71..88cc68bc71 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/StoreContext.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StoreContext.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/StoreFuture.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StoreFuture.java
index 7d3bf90a75..7d3bf90a75 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/StoreFuture.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StoreFuture.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
index e7302270bb..e7302270bb 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java
index 7909003855..7909003855 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java
index ed6b89e373..ed6b89e373 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLog.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLog.java
index da7f8d18b2..da7f8d18b2 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLog.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLog.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLogRecoveryHandler.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLogRecoveryHandler.java
index bd4da648f9..bd4da648f9 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLogRecoveryHandler.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLogRecoveryHandler.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java
index 576dca847d..576dca847d 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedDependency.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedDependency.java
index 98348efbd2..98348efbd2 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedDependency.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedDependency.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedObject.java
index 7ebebadae7..7ebebadae7 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedObject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedObject.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/UpgraderProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UpgraderProvider.java
index c2ea0745ff..c2ea0745ff 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/UpgraderProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UpgraderProvider.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java
index 54978776e7..54978776e7 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/AssignedSubscriptionMessageGroupManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/AssignedSubscriptionMessageGroupManager.java
index efedad1181..efedad1181 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/AssignedSubscriptionMessageGroupManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/AssignedSubscriptionMessageGroupManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java
index 632b59d3fa..632b59d3fa 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/DefinedGroupMessageGroupManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/DefinedGroupMessageGroupManager.java
index f38e23b342..f38e23b342 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/DefinedGroupMessageGroupManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/DefinedGroupMessageGroupManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/MessageGroupManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/MessageGroupManager.java
index 8ce4ce3344..8ce4ce3344 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/MessageGroupManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/MessageGroupManager.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/RecordDeliveryMethod.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/RecordDeliveryMethod.java
index e2ed4104de..e2ed4104de 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/RecordDeliveryMethod.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/RecordDeliveryMethod.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/Subscription.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/Subscription.java
index 36d49d8279..36d49d8279 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/Subscription.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/Subscription.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java
index bf5ce31bd9..bf5ce31bd9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/AlreadyKnownDtxException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AlreadyKnownDtxException.java
index faa4ec592f..faa4ec592f 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/AlreadyKnownDtxException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AlreadyKnownDtxException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
index 31e4dc6def..31e4dc6def 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
index b081641f47..b081641f47 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java
index ab987f0fb9..ab987f0fb9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
index fb32b654ce..fb32b654ce 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxException.java
index d18d0cb68b..d18d0cb68b 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxNotSelectedException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxNotSelectedException.java
index c1289b1fdd..c1289b1fdd 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxNotSelectedException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxNotSelectedException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java
index 117beb82ef..117beb82ef 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/IncorrectDtxStateException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/IncorrectDtxStateException.java
index 45f094e4b9..45f094e4b9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/IncorrectDtxStateException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/IncorrectDtxStateException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/JoinAndResumeDtxException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/JoinAndResumeDtxException.java
index a25e5a4ed6..a25e5a4ed6 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/JoinAndResumeDtxException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/JoinAndResumeDtxException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
index 23265199c7..23265199c7 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/NotAssociatedDtxException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/NotAssociatedDtxException.java
index de070546a7..de070546a7 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/NotAssociatedDtxException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/NotAssociatedDtxException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/RollbackOnlyDtxException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/RollbackOnlyDtxException.java
index 6cf12d8631..6cf12d8631 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/RollbackOnlyDtxException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/RollbackOnlyDtxException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java
index 8acac00479..8acac00479 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/SuspendAndFailDtxException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/SuspendAndFailDtxException.java
index 228844fd63..228844fd63 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/SuspendAndFailDtxException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/SuspendAndFailDtxException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/TimeoutDtxException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/TimeoutDtxException.java
index 50f7708d8a..50f7708d8a 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/TimeoutDtxException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/TimeoutDtxException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/txn/UnknownDtxBranchException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/UnknownDtxBranchException.java
index c23e518365..c23e518365 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/txn/UnknownDtxBranchException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/UnknownDtxBranchException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/util/ByteBufferOutputStream.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ByteBufferOutputStream.java
index ca9a41bc32..ca9a41bc32 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/util/ByteBufferOutputStream.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ByteBufferOutputStream.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/util/MapJsonSerializer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/MapJsonSerializer.java
index 2d9ba38555..2d9ba38555 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/util/MapJsonSerializer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/MapJsonSerializer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/util/MapValueConverter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/MapValueConverter.java
index 37e0177b00..37e0177b00 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/util/MapValueConverter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/MapValueConverter.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/util/ParameterizedTypeImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ParameterizedTypeImpl.java
index 29bc81caab..29bc81caab 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/util/ParameterizedTypeImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ParameterizedTypeImpl.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/util/ResourceBundleLoader.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ResourceBundleLoader.java
index a0ed4e27f4..a0ed4e27f4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/util/ResourceBundleLoader.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ResourceBundleLoader.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/util/StringUtil.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/StringUtil.java
index 97e3573fff..97e3573fff 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/util/StringUtil.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/StringUtil.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index 0cd4f0b6b2..0cd4f0b6b2 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/BindingRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/BindingRecoverer.java
index a321c285b7..a321c285b7 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/BindingRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/BindingRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java
index 8d05e719ee..8d05e719ee 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java
index f055760efe..f055760efe 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeIsAlternateException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeIsAlternateException.java
index 4be64a3b94..4be64a3b94 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeIsAlternateException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeIsAlternateException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeRecoverer.java
index 6ad7014c47..6ad7014c47 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
index 1b0e50fd34..1b0e50fd34 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
index cb7f213f06..cb7f213f06 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueRecoverer.java
index 02d628da68..02d628da68 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueRecoverer.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/RequiredExchangeException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/RequiredExchangeException.java
index da4c9825b1..da4c9825b1 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/RequiredExchangeException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/RequiredExchangeException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ReservedExchangeNameException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ReservedExchangeNameException.java
index 585f045ad9..585f045ad9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ReservedExchangeNameException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ReservedExchangeNameException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java
index b7e51d88d3..b7e51d88d3 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java
index 08f35c08f9..08f35c08f9 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/State.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/State.java
index 55e2539dcf..55e2539dcf 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/State.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/State.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/UnknownExchangeException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/UnknownExchangeException.java
index 5704126f62..5704126f62 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/UnknownExchangeException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/UnknownExchangeException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
index 2ebbedccd4..2ebbedccd4 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
index 39ca3197b4..39ca3197b4 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostFactoryRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostFactoryRegistry.java
index 626615a59f..626615a59f 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostFactoryRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostFactoryRegistry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostListener.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostListener.java
index 8527435eea..8527435eea 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostListener.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostListener.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
index 483e11942b..483e11942b 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/plugins/QueueExistsException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/plugins/QueueExistsException.java
index 54f7d0d172..54f7d0d172 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/plugins/QueueExistsException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/plugins/QueueExistsException.java
diff --git a/java/broker-core/src/main/java/org/apache/qpid/tools/security/Passwd.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/tools/security/Passwd.java
index cd833c89c4..cd833c89c4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/tools/security/Passwd.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/tools/security/Passwd.java
diff --git a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.AuthenticationManagerFactory b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.AuthenticationManagerFactory
index 8ff67030ef..8ff67030ef 100644
--- a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.AuthenticationManagerFactory
+++ b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.AuthenticationManagerFactory
diff --git a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ConfigurationStoreFactory b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ConfigurationStoreFactory
index cd314abcae..cd314abcae 100644
--- a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ConfigurationStoreFactory
+++ b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ConfigurationStoreFactory
diff --git a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
index d183d91f18..d183d91f18 100644
--- a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
+++ b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
diff --git a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ExchangeType b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ExchangeType
index 4ad646b7a0..4ad646b7a0 100644
--- a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ExchangeType
+++ b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ExchangeType
diff --git a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.GroupManagerFactory b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.GroupManagerFactory
index 6bfb55ff18..6bfb55ff18 100644
--- a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.GroupManagerFactory
+++ b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.GroupManagerFactory
diff --git a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.JDBCConnectionProviderFactory b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.JDBCConnectionProviderFactory
index e0ae6e97cc..e0ae6e97cc 100644
--- a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.JDBCConnectionProviderFactory
+++ b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.JDBCConnectionProviderFactory
diff --git a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.PreferencesProviderFactory b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.PreferencesProviderFactory
index 9fe8379120..9fe8379120 100644
--- a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.PreferencesProviderFactory
+++ b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.PreferencesProviderFactory
diff --git a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.VirtualHostFactory b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.VirtualHostFactory
index 81217884e4..81217884e4 100644
--- a/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.VirtualHostFactory
+++ b/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.VirtualHostFactory
diff --git a/java/broker-core/src/main/resources/initial-config.json b/qpid/java/broker-core/src/main/resources/initial-config.json
index 7173433aa8..7173433aa8 100644
--- a/java/broker-core/src/main/resources/initial-config.json
+++ b/qpid/java/broker-core/src/main/resources/initial-config.json
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
index c22fcf4a14..c22fcf4a14 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/SelectorParserTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/SelectorParserTest.java
index 3e0e217eee..3e0e217eee 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/SelectorParserTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/SelectorParserTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java
index 96078d766c..96078d766c 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java
index a7772ffd10..a7772ffd10 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerPropertiesTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerPropertiesTest.java
index 5e9e19ffaf..5e9e19ffaf 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerPropertiesTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerPropertiesTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
index 96ac92a0f9..96ac92a0f9 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
index dc9ddf7b32..dc9ddf7b32 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java
index 674abbfeb7..674abbfeb7 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/AuthenticationProviderRecovererTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/AuthenticationProviderRecovererTest.java
index ab5147c1e3..ab5147c1e3 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/AuthenticationProviderRecovererTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/AuthenticationProviderRecovererTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
index c45f4f72a8..c45f4f72a8 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java
index 9e2f2fcf32..9e2f2fcf32 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/GroupProviderRecovererTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/GroupProviderRecovererTest.java
index d6f03a9758..d6f03a9758 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/GroupProviderRecovererTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/GroupProviderRecovererTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
index e0a736df89..e0a736df89 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/PluginRecovererTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/PluginRecovererTest.java
index 42fd742407..42fd742407 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/PluginRecovererTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/PluginRecovererTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/PreferencesProviderRecovererTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/PreferencesProviderRecovererTest.java
index 1fc630dae0..1fc630dae0 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/PreferencesProviderRecovererTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/PreferencesProviderRecovererTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
index 4d92f99306..4d92f99306 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java
index f00d12b77d..f00d12b77d 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java
index df7e06e2e6..df7e06e2e6 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStoreTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStoreTest.java
index 54c8592c2b..54c8592c2b 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStoreTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStoreTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
index 34b4fbf1ab..34b4fbf1ab 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStoreTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStoreTest.java
index ffb084f767..ffb084f767 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStoreTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStoreTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
index c23c4715e8..c23c4715e8 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java
index cd6302d55b..cd6302d55b 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java
index 86ae3e6e9c..86ae3e6e9c 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
index 7335d43b2e..7335d43b2e 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
index 833df34fd8..833df34fd8 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
index 0f1ab65244..0f1ab65244 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
index a84f5e1ecb..a84f5e1ecb 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
index 91002edfc6..91002edfc6 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java
index e2a6a56ee2..e2a6a56ee2 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
index b0cb0ca0ab..b0cb0ca0ab 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
index be31f3d039..be31f3d039 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
index e2e112be8f..e2e112be8f 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
index 41b42fac78..41b42fac78 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
index d1cf256563..d1cf256563 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AbstractManagementActorTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AbstractManagementActorTest.java
index bf38bb64bf..bf38bb64bf 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AbstractManagementActorTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AbstractManagementActorTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
index 30c3a51604..30c3a51604 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
index 1cb6474e41..1cb6474e41 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
index 701ccaab47..701ccaab47 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
index 905de4b639..905de4b639 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
index a0bfa592db..a0bfa592db 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
index 55153b7389..55153b7389 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
index 92915e7092..92915e7092 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java
index 30f4e16e42..30f4e16e42 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/log4j/LoggingFacadeTest.log4j.xml b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/log4j/LoggingFacadeTest.log4j.xml
index 62ec877d3d..62ec877d3d 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/log4j/LoggingFacadeTest.log4j.xml
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/log4j/LoggingFacadeTest.log4j.xml
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/log4j/LoggingManagementFacadeTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/log4j/LoggingManagementFacadeTest.java
index 72b34868ba..72b34868ba 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/log4j/LoggingManagementFacadeTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/log4j/LoggingManagementFacadeTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
index 229d75c69f..229d75c69f 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
index 22de8349c6..22de8349c6 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
index 6571d20711..6571d20711 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
index 2f1276508c..2f1276508c 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
index fedc3fc52b..fedc3fc52b 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
index f1452b8b88..f1452b8b88 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
index dfc9357402..dfc9357402 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
index 3377573b9d..3377573b9d 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
index d51e6a6bb7..d51e6a6bb7 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
index b2bc351f8f..b2bc351f8f 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
index 17d68ef7c3..17d68ef7c3 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
index cd8f13d52e..cd8f13d52e 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
index e52ead451e..e52ead451e 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
index a3d96c6d12..a3d96c6d12 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
index e9a9317102..e9a9317102 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
index b327738797..b327738797 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
index 3d43ef0f44..3d43ef0f44 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
index e2765f338b..e2765f338b 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
index b9efac1ae8..b9efac1ae8 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
index 7684db0b3d..7684db0b3d 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java
index 72cf09585c..72cf09585c 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/model/UUIDGeneratorTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/UUIDGeneratorTest.java
index c686a24e99..c686a24e99 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/model/UUIDGeneratorTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/UUIDGeneratorTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
index 7d8dd67f93..7d8dd67f93 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactoryTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactoryTest.java
index 59eaf96ec3..59eaf96ec3 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactoryTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactoryTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactoryTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactoryTest.java
index 64dfad94c3..64dfad94c3 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactoryTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactoryTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java
index 8b0847e0d2..8b0847e0d2 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
index 54826b8c88..54826b8c88 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/model/configuration/ConfigurationEntryTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/configuration/ConfigurationEntryTest.java
index dd48d7b56d..dd48d7b56d 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/model/configuration/ConfigurationEntryTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/configuration/ConfigurationEntryTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
index a468fa072b..a468fa072b 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
index 29a03b2ee7..29a03b2ee7 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java
index 6538724a71..6538724a71 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/InboundMessageAdapterTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/InboundMessageAdapterTest.java
index 584e26d88f..584e26d88f 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/InboundMessageAdapterTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/InboundMessageAdapterTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
index 2a0c12ff3e..2a0c12ff3e 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
index f5d4f1219d..f5d4f1219d 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
index df2de7f0e0..df2de7f0e0 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
index e8c0470915..e8c0470915 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
index d348c3e67b..d348c3e67b 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
index beb5bda7ff..beb5bda7ff 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java
index 674af36b77..674af36b77 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
index 3a41bb9c72..3a41bb9c72 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
index c115af5a38..c115af5a38 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
index c2c2fc4b98..c2c2fc4b98 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
index 63b3a7d165..63b3a7d165 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryImplTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryImplTest.java
index acd0ccbdeb..acd0ccbdeb 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryImplTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryImplTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
index 7add2d4d43..7add2d4d43 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/SubjectCreatorTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/SubjectCreatorTest.java
index 9edd345360..9edd345360 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/SubjectCreatorTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/SubjectCreatorTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
index cd5791952f..cd5791952f 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTestHelper.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTestHelper.java
index e9d8d16fce..e9d8d16fce 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTestHelper.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTestHelper.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticationResultTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticationResultTest.java
index a023cbdbb2..a023cbdbb2 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticationResultTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticationResultTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/TestPrincipalUtils.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/TestPrincipalUtils.java
index ea6b40e3de..ea6b40e3de 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/TestPrincipalUtils.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/TestPrincipalUtils.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/UsernamePrincipalTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/UsernamePrincipalTest.java
index 5e025d3ca8..5e025d3ca8 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/UsernamePrincipalTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/UsernamePrincipalTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
index 4102a1fc68..4102a1fc68 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
index abb0b15a76..abb0b15a76 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
index eecbcdf38d..eecbcdf38d 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
index 44faa57dbe..44faa57dbe 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java
index a4dd97e6a1..a4dd97e6a1 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerTest.java
index cfeb7c525b..cfeb7c525b 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactoryTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactoryTest.java
index b3d94a5043..b3d94a5043 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactoryTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactoryTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java
index 586bff5683..586bff5683 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactoryTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactoryTest.java
index 9ff8d18238..9ff8d18238 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactoryTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactoryTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
index cba6058426..cba6058426 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java
index 110206a83d..110206a83d 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
index cadc5d3a3d..cadc5d3a3d 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGeneratorTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGeneratorTest.java
index fccffc0163..fccffc0163 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGeneratorTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGeneratorTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java
index 3079222b1c..3079222b1c 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java
index b3e929dd6c..b3e929dd6c 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
index f5247634ac..f5247634ac 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslUtil.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslUtil.java
index 251ebc4c81..251ebc4c81 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslUtil.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslUtil.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/TestPrincipalDatabase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/TestPrincipalDatabase.java
index 17c63d738c..17c63d738c 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/TestPrincipalDatabase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/TestPrincipalDatabase.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java
index 6245064bf7..6245064bf7 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java
index 5dd51250dc..5dd51250dc 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java
index b020c1655a..b020c1655a 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupManagerFactoryTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupManagerFactoryTest.java
index 90308d316b..90308d316b 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupManagerFactoryTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupManagerFactoryTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupManagerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupManagerTest.java
index 152703d548..152703d548 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupManagerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupManagerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/security/group/GroupPrincipalTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/GroupPrincipalTest.java
index d285a0797a..d285a0797a 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/security/group/GroupPrincipalTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/GroupPrincipalTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
index 147879f5e8..147879f5e8 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
index fd8148f2ce..fd8148f2ce 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java
index 2be79c5839..2be79c5839 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
index b6300e6f48..b6300e6f48 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
index 6b6d62378e..6b6d62378e 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
index 7ebfd54df6..7ebfd54df6 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/store/OperationalLoggingListenerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/OperationalLoggingListenerTest.java
index c309dad5eb..c309dad5eb 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/store/OperationalLoggingListenerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/OperationalLoggingListenerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/store/StateManagerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/StateManagerTest.java
index 18efb976eb..18efb976eb 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/store/StateManagerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/StateManagerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java
index 32df355c07..32df355c07 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStoreFactory.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStoreFactory.java
index fd2d4215ab..fd2d4215ab 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStoreFactory.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStoreFactory.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java
index d99adb91fe..d99adb91fe 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataFactory.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataFactory.java
index 8acdd25e97..8acdd25e97 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataFactory.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataFactory.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataType.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataType.java
index 25f1df7a20..25f1df7a20 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataType.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataType.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
index bb3c0cf535..bb3c0cf535 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
index 77f09dc567..77f09dc567 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/subscription/SubscriptionListTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/subscription/SubscriptionListTest.java
index c4d1a1e614..c4d1a1e614 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/subscription/SubscriptionListTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/subscription/SubscriptionListTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java
index 5c1012d50b..5c1012d50b 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
index 06b8539eb1..06b8539eb1 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
index 4904cbc6fb..4904cbc6fb 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java
index 15c135ea2c..15c135ea2c 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java
index aa5b555b3b..aa5b555b3b 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
index 0221f3d509..0221f3d509 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
index cb1fc2737d..cb1fc2737d 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/util/MapJsonSerializerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/MapJsonSerializerTest.java
index 56567523df..56567523df 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/util/MapJsonSerializerTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/MapJsonSerializerTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/util/StringUtilTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/StringUtilTest.java
index c468ca2e0d..c468ca2e0d 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/util/StringUtilTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/StringUtilTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
index 987a541d05..987a541d05 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/HouseKeepingTaskTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/HouseKeepingTaskTest.java
index 8b4a52bb79..8b4a52bb79 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/HouseKeepingTaskTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/HouseKeepingTaskTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
index 1ca7ff1b65..1ca7ff1b65 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java
index 03cb483e40..03cb483e40 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/tools/security/PasswdTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/tools/security/PasswdTest.java
index b2a7234c8a..b2a7234c8a 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/tools/security/PasswdTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/tools/security/PasswdTest.java
diff --git a/java/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType b/qpid/java/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
index 5edf3448f9..5edf3448f9 100644
--- a/java/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
+++ b/qpid/java/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
diff --git a/java/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory b/qpid/java/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
index 9512fb8117..9512fb8117 100644
--- a/java/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
+++ b/qpid/java/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
diff --git a/java/broker-core/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java b/qpid/java/broker-core/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
index a10d3b6a77..a10d3b6a77 100644
--- a/java/broker-core/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
+++ b/qpid/java/broker-core/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
diff --git a/java/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm b/qpid/java/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
index 803c2151da..803c2151da 100644
--- a/java/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
+++ b/qpid/java/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
diff --git a/java/broker-core/src/xsl/qmf.xsl b/qpid/java/broker-core/src/xsl/qmf.xsl
index c45d1e419e..c45d1e419e 100644
--- a/java/broker-core/src/xsl/qmf.xsl
+++ b/qpid/java/broker-core/src/xsl/qmf.xsl
diff --git a/java/broker-plugins/access-control/build.xml b/qpid/java/broker-plugins/access-control/build.xml
index eea98937d4..eea98937d4 100644
--- a/java/broker-plugins/access-control/build.xml
+++ b/qpid/java/broker-plugins/access-control/build.xml
diff --git a/java/broker-plugins/access-control/pom.xml b/qpid/java/broker-plugins/access-control/pom.xml
index c4b966d9ae..c4b966d9ae 100644
--- a/java/broker-plugins/access-control/pom.xml
+++ b/qpid/java/broker-plugins/access-control/pom.xml
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java
index f87374ac80..f87374ac80 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclAction.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclAction.java
index e4bf21a082..e4bf21a082 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclAction.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclAction.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
index 45af85be6c..45af85be6c 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java
index 4fff0bebf5..4fff0bebf5 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ClientAction.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ClientAction.java
index fed20a56c8..fed20a56c8 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ClientAction.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ClientAction.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ConfigurationFile.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ConfigurationFile.java
index 966c32e24e..966c32e24e 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ConfigurationFile.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ConfigurationFile.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
index ab309c54ce..ab309c54ce 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java
index cef9a8696b..cef9a8696b 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
index e321e0e8f0..e321e0e8f0 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/XMLConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/XMLConfiguration.java
index a4f6f8b65a..a4f6f8b65a 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/XMLConfiguration.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/XMLConfiguration.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/AccessControlFirewallException.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/AccessControlFirewallException.java
index d08a052efd..d08a052efd 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/AccessControlFirewallException.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/AccessControlFirewallException.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/FirewallRule.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/FirewallRule.java
index 482a795693..482a795693 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/FirewallRule.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/FirewallRule.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/FirewallRuleFactory.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/FirewallRuleFactory.java
index 64be26c209..64be26c209 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/FirewallRuleFactory.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/FirewallRuleFactory.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
index fb13426fbb..fb13426fbb 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java
index 2e979b38f1..2e979b38f1 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java
index ad619a0e0b..ad619a0e0b 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
index 6beeef2f18..6beeef2f18 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactory.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactory.java
index f4e041a8d2..f4e041a8d2 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactory.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactory.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/FileAccessControlProviderAttributeDescriptions.properties b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/FileAccessControlProviderAttributeDescriptions.properties
index e847e90f57..e847e90f57 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/FileAccessControlProviderAttributeDescriptions.properties
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/FileAccessControlProviderAttributeDescriptions.properties
diff --git a/java/broker-plugins/access-control/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.AccessControlFactory b/qpid/java/broker-plugins/access-control/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.AccessControlFactory
index b6c429baab..b6c429baab 100644
--- a/java/broker-plugins/access-control/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.AccessControlFactory
+++ b/qpid/java/broker-plugins/access-control/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.AccessControlFactory
diff --git a/java/broker-plugins/access-control/src/main/resources/acl.xsd b/qpid/java/broker-plugins/access-control/src/main/resources/acl.xsd
index 9a165b50b8..9a165b50b8 100644
--- a/java/broker-plugins/access-control/src/main/resources/acl.xsd
+++ b/qpid/java/broker-plugins/access-control/src/main/resources/acl.xsd
diff --git a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclActionTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclActionTest.java
index 14620cff70..14620cff70 100644
--- a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclActionTest.java
+++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclActionTest.java
diff --git a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclRulePredicatesTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclRulePredicatesTest.java
index 93b765d0fb..93b765d0fb 100644
--- a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclRulePredicatesTest.java
+++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclRulePredicatesTest.java
diff --git a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ActionTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ActionTest.java
index 00e06106bf..00e06106bf 100644
--- a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ActionTest.java
+++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ActionTest.java
diff --git a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ClientActionTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ClientActionTest.java
index ae5d3fda74..ae5d3fda74 100644
--- a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ClientActionTest.java
+++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ClientActionTest.java
diff --git a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java
index 3a324bc571..3a324bc571 100644
--- a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java
+++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java
diff --git a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleTest.java
index 2ae7759679..2ae7759679 100644
--- a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleTest.java
+++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleTest.java
diff --git a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRuleTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRuleTest.java
index be82cb294a..be82cb294a 100644
--- a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRuleTest.java
+++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRuleTest.java
diff --git a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRuleTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRuleTest.java
index e521039db2..e521039db2 100644
--- a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRuleTest.java
+++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRuleTest.java
diff --git a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactoryTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactoryTest.java
index 07422e6bdb..07422e6bdb 100644
--- a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactoryTest.java
+++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactoryTest.java
diff --git a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java
index a8406308c0..a8406308c0 100644
--- a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java
+++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java
diff --git a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java
index cc93c540df..cc93c540df 100644
--- a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java
+++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/build.xml b/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml
index 3537be172d..3537be172d 100644
--- a/java/broker-plugins/amqp-0-10-protocol/build.xml
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml
diff --git a/java/broker-plugins/amqp-0-10-protocol/pom.xml b/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml
index c24dd918e0..c24dd918e0 100644
--- a/java/broker-plugins/amqp-0-10-protocol/pom.xml
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
index cee1a04b17..cee1a04b17 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java
index 4b38b8a1a3..4b38b8a1a3 100755
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/FlowCreditManager_0_10.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/FlowCreditManager_0_10.java
index 7f092814da..7f092814da 100755
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/FlowCreditManager_0_10.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/FlowCreditManager_0_10.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java
index ce0155b789..ce0155b789 100755
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java
index f5f2a8d43f..f5f2a8d43f 100755
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java
index c6ae0c6e47..c6ae0c6e47 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaDataType_0_10.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaDataType_0_10.java
index 90fb443f5b..90fb443f5b 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaDataType_0_10.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaDataType_0_10.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
index 092ea7c3c9..092ea7c3c9 100755
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java
index 1b506d9bf8..1b506d9bf8 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java
index e5914d1d4e..e5914d1d4e 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngineCreator_0_10.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngineCreator_0_10.java
index ab50a33b9b..ab50a33b9b 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngineCreator_0_10.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngineCreator_0_10.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java
index 9e41a5234c..9e41a5234c 100755
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
index 72d6a0832d..72d6a0832d 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
index 129a811b61..129a811b61 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
index abe784cefa..abe784cefa 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
index 46626e3e92..46626e3e92 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Subscription_0_10.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Subscription_0_10.java
index 77b63906cc..77b63906cc 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Subscription_0_10.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Subscription_0_10.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/TransferMessageReference.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/TransferMessageReference.java
index 0c04f22232..0c04f22232 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/TransferMessageReference.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/TransferMessageReference.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java
index 8e48741b91..8e48741b91 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
index 995b0fabdc..995b0fabdc 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
index 36118fe053..36118fe053 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
index 3d94e26671..3d94e26671 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
index 421adb33a8..421adb33a8 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
index 1c4a694be6..1c4a694be6 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/build.xml b/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml
index 0ab2b0b833..0ab2b0b833 100644
--- a/java/broker-plugins/amqp-0-8-protocol/build.xml
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml
diff --git a/java/broker-plugins/amqp-0-8-protocol/pom.xml b/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml
index 2e9954bc46..2e9954bc46 100644
--- a/java/broker-plugins/amqp-0-8-protocol/pom.xml
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
index a603807f87..a603807f87 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
index 416a4da183..416a4da183 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessageReference.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessageReference.java
index 3adc9f70cd..3adc9f70cd 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessageReference.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessageReference.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java
index 8faf1a7c65..8faf1a7c65 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
index 4cacae134e..4cacae134e 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java
index 559ab3468e..559ab3468e 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ContentHeaderBodyAdapter.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ContentHeaderBodyAdapter.java
index f5c43003a4..f5c43003a4 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ContentHeaderBodyAdapter.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ContentHeaderBodyAdapter.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeue.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeue.java
index 5e416b52ca..5e416b52ca 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeue.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeue.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java
index 5267651a66..5267651a66 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
index 4cc590d8cc..4cc590d8cc 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataType_0_8.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataType_0_8.java
index 9b50127ec7..9b50127ec7 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataType_0_8.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataType_0_8.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java
index 5ee56508d7..5ee56508d7 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java
index 2a29348261..2a29348261 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java
index dad6bef032..dad6bef032 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactory.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactory.java
index 6646dc0cc2..6646dc0cc2 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactory.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactory.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImpl.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImpl.java
index 93b51a0567..93b51a0567 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImpl.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImpl.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionImpl.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionImpl.java
index d1d86fe478..d1d86fe478 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionImpl.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionImpl.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java
index 1d41bcdcf4..1d41bcdcf4 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java
index 17b2c7b985..17b2c7b985 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java
index ae07d60c4e..ae07d60c4e 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicAckMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicAckMethodHandler.java
index f623d27e87..f623d27e87 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicAckMethodHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicAckMethodHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicCancelMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicCancelMethodHandler.java
index 5a6a7bdc18..5a6a7bdc18 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicCancelMethodHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicCancelMethodHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.java
index 836de44f4e..836de44f4e 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java
index 5238a41e49..5238a41e49 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java
index 497e97db3e..497e97db3e 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicQosHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicQosHandler.java
index e4a6636a74..e4a6636a74 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicQosHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicQosHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java
index 0a79466b35..0a79466b35 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java
index b54e1c7dcf..b54e1c7dcf 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRejectMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRejectMethodHandler.java
index 0cfdff3338..0cfdff3338 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRejectMethodHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRejectMethodHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseHandler.java
index e96d098618..e96d098618 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseOkHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseOkHandler.java
index 2a220ff78d..2a220ff78d 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseOkHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseOkHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelFlowHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelFlowHandler.java
index cc1677c93e..cc1677c93e 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelFlowHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelFlowHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java
index 442c912032..442c912032 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseMethodHandler.java
index 60f9c1d495..60f9c1d495 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseMethodHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseMethodHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseOkMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseOkMethodHandler.java
index fe46b6c0cd..fe46b6c0cd 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseOkMethodHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseOkMethodHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java
index 62b13baac2..62b13baac2 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java
index d319f080d2..d319f080d2 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java
index 9350327346..9350327346 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionTuneOkMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionTuneOkMethodHandler.java
index 5fddab6576..5fddab6576 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionTuneOkMethodHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionTuneOkMethodHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java
index 0535236f94..0535236f94 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java
index 154c38a4bf..154c38a4bf 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java
index 75f749fe9a..75f749fe9a 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/OnCurrentThreadExecutor.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/OnCurrentThreadExecutor.java
index 6ff511ea30..6ff511ea30 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/OnCurrentThreadExecutor.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/OnCurrentThreadExecutor.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
index d95d59f75f..d95d59f75f 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java
index 3fdce83c2a..3fdce83c2a 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.java
index d3c196a789..d3c196a789 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.java
index ff845d3c16..ff845d3c16 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java
index d568e0f581..d568e0f581 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java
index 43e97c0cb6..43e97c0cb6 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_9.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_9.java
index 1ee6d732c2..1ee6d732c2 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_9.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_9.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_91.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_91.java
index b11b9cff2b..b11b9cff2b 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_91.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_91.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java
index f05219712f..f05219712f 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxCommitHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxCommitHandler.java
index b257030a59..b257030a59 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxCommitHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxCommitHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxRollbackHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxRollbackHandler.java
index 19d0da007b..19d0da007b 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxRollbackHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxRollbackHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxSelectHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxSelectHandler.java
index a43e1ebdab..a43e1ebdab 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxSelectHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxSelectHandler.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/UnexpectedMethodException.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/UnexpectedMethodException.java
index 32a9f768ec..32a9f768ec 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/UnexpectedMethodException.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/UnexpectedMethodException.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java
index 48e42ce5a3..48e42ce5a3 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java
index dd5e13e56a..dd5e13e56a 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterRegistry.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterRegistry.java
index d4332b37ee..d4332b37ee 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterRegistry.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterRegistry.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQState.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQState.java
index ee97d5fa87..ee97d5fa87 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQState.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQState.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java
index 0555bba98b..0555bba98b 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/IllegalStateTransitionException.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/IllegalStateTransitionException.java
index f61553f8a2..f61553f8a2 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/IllegalStateTransitionException.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/IllegalStateTransitionException.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateAwareMethodListener.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateAwareMethodListener.java
index 63ab23919d..63ab23919d 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateAwareMethodListener.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateAwareMethodListener.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateListener.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateListener.java
index e065ae0d42..e065ae0d42 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateListener.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateListener.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
index 43ad3adf13..43ad3adf13 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
index 57ca615a04..57ca615a04 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
index b358c7c5c5..b358c7c5c5 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngineTest.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngineTest.java
index f5e58cfd02..f5e58cfd02 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngineTest.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngineTest.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
index 4ab64ca100..4ab64ca100 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java
index 43f88ca2a3..43f88ca2a3 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
index 0919607bd7..0919607bd7 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
index 7f36b4a081..7f36b4a081 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
index 5b1e5af7bd..5b1e5af7bd 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MaxChannelsTest.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MaxChannelsTest.java
index a77475c05f..a77475c05f 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MaxChannelsTest.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MaxChannelsTest.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockAMQMessage.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockAMQMessage.java
index 1cc3607298..1cc3607298 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockAMQMessage.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockAMQMessage.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java
index ab29e58a6c..ab29e58a6c 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java
index 15573a871f..15573a871f 100755
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
index 4f9df3b38d..4f9df3b38d 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
index 87fbcfa9b3..87fbcfa9b3 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImplTest.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImplTest.java
index e98dd63450..e98dd63450 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImplTest.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImplTest.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/build.xml b/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml
index 00926c0787..00926c0787 100644
--- a/java/broker-plugins/amqp-1-0-protocol/build.xml
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml
diff --git a/java/broker-plugins/amqp-1-0-protocol/pom.xml b/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml
index 31b42ef0e2..31b42ef0e2 100644
--- a/java/broker-plugins/amqp-1-0-protocol/pom.xml
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
index 4cb9767514..4cb9767514 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Destination.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Destination.java
index d45758391c..d45758391c 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Destination.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Destination.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java
index 2cef27267b..2cef27267b 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Link_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Link_1_0.java
index 5ce24f406d..5ce24f406d 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Link_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Link_1_0.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java
index 5925bf0c32..5925bf0c32 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaDataType_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaDataType_1_0.java
index 44b1de74e1..44b1de74e1 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaDataType_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaDataType_1_0.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
index 8d48d70d9a..8d48d70d9a 100755
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
index 68e9a88b0b..68e9a88b0b 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0_SASL.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0_SASL.java
index d3936782da..d3936782da 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0_SASL.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0_SASL.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java
index d614f44981..d614f44981 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java
index af3f0b7872..af3f0b7872 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingDestination.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingDestination.java
index 4ae0596e25..4ae0596e25 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingDestination.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingDestination.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLinkAttachment.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLinkAttachment.java
index 46b9682c74..46b9682c74 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLinkAttachment.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLinkAttachment.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java
index e971672767..e971672767 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingDestination.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingDestination.java
index 6d601c9dda..6d601c9dda 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingDestination.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingDestination.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkAttachment.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkAttachment.java
index 09a2ddea3a..09a2ddea3a 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkAttachment.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkAttachment.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
index 0351de3e00..0351de3e00 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
index d3962c779c..d3962c779c 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java
index b9695ba87a..b9695ba87a 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java
index a05d14816a..a05d14816a 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/UnsettledAction.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/UnsettledAction.java
index 0fee4086b4..0fee4086b4 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/UnsettledAction.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/UnsettledAction.java
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
index 91c673215c..91c673215c 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
index 190574b7cc..190574b7cc 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
diff --git a/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml
index 161a4c394c..161a4c394c 100644
--- a/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml
diff --git a/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
index 1403caee0a..1403caee0a 100644
--- a/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
diff --git a/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
index a70bd4b243..a70bd4b243 100644
--- a/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
diff --git a/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
index 045eb72cb1..045eb72cb1 100644
--- a/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
diff --git a/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml
index 26a89bfed9..26a89bfed9 100644
--- a/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml
diff --git a/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
index deccb6cf22..deccb6cf22 100644
--- a/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
diff --git a/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
index e832ef7569..e832ef7569 100644
--- a/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
diff --git a/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
index e1e8fbd9d3..e1e8fbd9d3 100644
--- a/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
diff --git a/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
index 5aeef786ae..5aeef786ae 100644
--- a/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
diff --git a/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml
index f28b6760e5..f28b6760e5 100644
--- a/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml
diff --git a/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
index ec725e7e57..ec725e7e57 100644
--- a/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
diff --git a/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
index 0d9d59ff56..0d9d59ff56 100644
--- a/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
diff --git a/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
index cf4643f2b8..cf4643f2b8 100644
--- a/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
diff --git a/java/broker-plugins/derby-store/build.xml b/qpid/java/broker-plugins/derby-store/build.xml
index 95d3263fbc..95d3263fbc 100644
--- a/java/broker-plugins/derby-store/build.xml
+++ b/qpid/java/broker-plugins/derby-store/build.xml
diff --git a/java/broker-plugins/derby-store/pom.xml b/qpid/java/broker-plugins/derby-store/pom.xml
index 51578a5db6..51578a5db6 100644
--- a/java/broker-plugins/derby-store/pom.xml
+++ b/qpid/java/broker-plugins/derby-store/pom.xml
diff --git a/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
index bc8d157346..bc8d157346 100644
--- a/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
diff --git a/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java
index 47a451ccf6..47a451ccf6 100644
--- a/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java
diff --git a/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/store/derby/add.js b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/store/derby/add.js
index 04016b5fae..04016b5fae 100644
--- a/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/store/derby/add.js
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/store/derby/add.js
diff --git a/java/broker-plugins/derby-store/src/main/java/resources/virtualhost/store/derby/add.html b/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhost/store/derby/add.html
index 2ed5b35c10..2ed5b35c10 100644
--- a/java/broker-plugins/derby-store/src/main/java/resources/virtualhost/store/derby/add.html
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhost/store/derby/add.html
diff --git a/java/broker-plugins/derby-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory b/qpid/java/broker-plugins/derby-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
index 88ca1fed5e..88ca1fed5e 100644
--- a/java/broker-plugins/derby-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
+++ b/qpid/java/broker-plugins/derby-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
diff --git a/java/broker-plugins/derby-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory b/qpid/java/broker-plugins/derby-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
index 88ca1fed5e..88ca1fed5e 100644
--- a/java/broker-plugins/derby-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
+++ b/qpid/java/broker-plugins/derby-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
diff --git a/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java b/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java
index 4a1a3251e3..4a1a3251e3 100644
--- a/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java
+++ b/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java
diff --git a/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java b/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java
index 479675dac1..479675dac1 100644
--- a/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java
+++ b/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java
diff --git a/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java b/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
index 859fad629b..859fad629b 100644
--- a/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
+++ b/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
diff --git a/java/broker-plugins/jdbc-provider-bone/build.xml b/qpid/java/broker-plugins/jdbc-provider-bone/build.xml
index 8c8e44c072..8c8e44c072 100644
--- a/java/broker-plugins/jdbc-provider-bone/build.xml
+++ b/qpid/java/broker-plugins/jdbc-provider-bone/build.xml
diff --git a/java/broker-plugins/jdbc-provider-bone/pom.xml b/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml
index 52631a44e3..52631a44e3 100644
--- a/java/broker-plugins/jdbc-provider-bone/pom.xml
+++ b/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml
diff --git a/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProvider.java b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProvider.java
index 1cde6f130d..1cde6f130d 100644
--- a/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProvider.java
+++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProvider.java
diff --git a/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java
index 73876eceb4..73876eceb4 100644
--- a/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java
+++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java
diff --git a/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/store/pool/bonecp/add.js b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/store/pool/bonecp/add.js
index f051116868..f051116868 100644
--- a/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/store/pool/bonecp/add.js
+++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/store/pool/bonecp/add.js
diff --git a/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html
index 52da8f52ae..52da8f52ae 100644
--- a/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html
+++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html
diff --git a/java/broker-plugins/jdbc-provider-bone/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.JDBCConnectionProviderFactory b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.JDBCConnectionProviderFactory
index 70157b44c3..70157b44c3 100644
--- a/java/broker-plugins/jdbc-provider-bone/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.JDBCConnectionProviderFactory
+++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.JDBCConnectionProviderFactory
diff --git a/java/broker-plugins/jdbc-store/build.xml b/qpid/java/broker-plugins/jdbc-store/build.xml
index 4a8e72898c..4a8e72898c 100644
--- a/java/broker-plugins/jdbc-store/build.xml
+++ b/qpid/java/broker-plugins/jdbc-store/build.xml
diff --git a/java/broker-plugins/jdbc-store/pom.xml b/qpid/java/broker-plugins/jdbc-store/pom.xml
index 1cc75d8465..1cc75d8465 100644
--- a/java/broker-plugins/jdbc-store/pom.xml
+++ b/qpid/java/broker-plugins/jdbc-store/pom.xml
diff --git a/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProvider.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProvider.java
index 7945ae3b46..7945ae3b46 100644
--- a/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProvider.java
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProvider.java
diff --git a/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java
index 8fc7de12d0..8fc7de12d0 100644
--- a/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java
diff --git a/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java
index 6fdfa40561..6fdfa40561 100644
--- a/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java
diff --git a/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java
index 1144eaaf18..1144eaaf18 100644
--- a/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java
diff --git a/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js
index dd79aae2fa..dd79aae2fa 100644
--- a/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js
diff --git a/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/pool/none/add.js b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/pool/none/add.js
index 7276737873..7276737873 100644
--- a/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/pool/none/add.js
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/pool/none/add.js
diff --git a/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/store/jdbc/add.html b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/store/jdbc/add.html
index 966b4fcc06..966b4fcc06 100644
--- a/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/store/jdbc/add.html
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/store/jdbc/add.html
diff --git a/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/store/pool/none/add.html b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/store/pool/none/add.html
index e69de29bb2..e69de29bb2 100644
--- a/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/store/pool/none/add.html
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/store/pool/none/add.html
diff --git a/java/broker-plugins/jdbc-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory b/qpid/java/broker-plugins/jdbc-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
index a77458f27d..a77458f27d 100644
--- a/java/broker-plugins/jdbc-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
diff --git a/java/broker-plugins/jdbc-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory b/qpid/java/broker-plugins/jdbc-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
index a77458f27d..a77458f27d 100644
--- a/java/broker-plugins/jdbc-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
diff --git a/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java b/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
index 9c348383c6..9c348383c6 100644
--- a/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
+++ b/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
diff --git a/java/broker-plugins/management-http/build.xml b/qpid/java/broker-plugins/management-http/build.xml
index d921b91580..d921b91580 100644
--- a/java/broker-plugins/management-http/build.xml
+++ b/qpid/java/broker-plugins/management-http/build.xml
diff --git a/java/broker-plugins/management-http/pom.xml b/qpid/java/broker-plugins/management-http/pom.xml
index 36925369fe..36925369fe 100644
--- a/java/broker-plugins/management-http/pom.xml
+++ b/qpid/java/broker-plugins/management-http/pom.xml
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java
index 31a777d0bb..31a777d0bb 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 0f5e5e8f58..0f5e5e8f58 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
index 7d89daa427..7d89daa427 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementFactory.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementFactory.java
index fd40f56ef8..fd40f56ef8 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementFactory.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementFactory.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java
index 990ff1c53b..990ff1c53b 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ForbiddingAuthorisationFilter.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ForbiddingAuthorisationFilter.java
index 16f85ace2c..16f85ace2c 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ForbiddingAuthorisationFilter.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ForbiddingAuthorisationFilter.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/RedirectingAuthorisationFilter.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/RedirectingAuthorisationFilter.java
index c5e9890620..c5e9890620 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/RedirectingAuthorisationFilter.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/RedirectingAuthorisationFilter.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/log/LogFileDetails.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/log/LogFileDetails.java
index 09dabd0e73..09dabd0e73 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/log/LogFileDetails.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/log/LogFileDetails.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/log/LogFileHelper.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/log/LogFileHelper.java
index 4104661017..4104661017 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/log/LogFileHelper.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/log/LogFileHelper.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java
index e6ae47dcff..e6ae47dcff 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java
index 618aaed319..618aaed319 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/LogFileServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/LogFileServlet.java
index 321cfae66c..321cfae66c 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/LogFileServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/LogFileServlet.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
index a08d6496bf..a08d6496bf 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/Action.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/Action.java
index 3241a7560e..3241a7560e 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/Action.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/Action.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
index 03dd7c66a8..03dd7c66a8 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java
index 80ce338d0a..80ce338d0a 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/KeyComparator.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/KeyComparator.java
index 3d862ce321..3d862ce321 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/KeyComparator.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/KeyComparator.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogFileListingServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogFileListingServlet.java
index 8b88e51e9c..8b88e51e9c 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogFileListingServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogFileListingServlet.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsServlet.java
index 35523ddf0f..35523ddf0f 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsServlet.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java
index 29cc881be7..29cc881be7 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogoutServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogoutServlet.java
index 34b115ed13..34b115ed13 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogoutServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogoutServlet.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MapComparator.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MapComparator.java
index 84d987813b..84d987813b 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MapComparator.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MapComparator.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java
index 4d85d52997..4d85d52997 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
index ac0d369402..ac0d369402 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/PluginClassProviderAction.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/PluginClassProviderAction.java
index 1f6e26106f..1f6e26106f 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/PluginClassProviderAction.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/PluginClassProviderAction.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
index 08a8676601..08a8676601 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
index 2b035fed8f..2b035fed8f 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java
index 40d3c02768..40d3c02768 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java
index 355b5df177..355b5df177 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListAccessControlProviderAttributes.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListAccessControlProviderAttributes.java
index 6887217016..6887217016 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListAccessControlProviderAttributes.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListAccessControlProviderAttributes.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListAuthenticationProviderAttributes.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListAuthenticationProviderAttributes.java
index 5c629587e0..5c629587e0 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListAuthenticationProviderAttributes.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListAuthenticationProviderAttributes.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListBrokerAttribute.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListBrokerAttribute.java
index dc414e6a64..dc414e6a64 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListBrokerAttribute.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListBrokerAttribute.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListGroupProviderAttributes.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListGroupProviderAttributes.java
index d1414faa71..d1414faa71 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListGroupProviderAttributes.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListGroupProviderAttributes.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListTimeZones.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListTimeZones.java
index 56bc7b1bf7..56bc7b1bf7 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListTimeZones.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListTimeZones.java
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporter.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporter.java
index 238f1b4719..238f1b4719 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporter.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporter.java
diff --git a/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/showAclFile.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/showAclFile.html
index 182e651a51..182e651a51 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/showAclFile.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/showAclFile.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
index 8e2e068b93..8e2e068b93 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/addBinding.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addBinding.html
index 9aebca90d7..9aebca90d7 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/addBinding.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addBinding.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/addExchange.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html
index 8c9968e37a..8c9968e37a 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/addExchange.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/addPort.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
index 59abbadf32..59abbadf32 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/addPort.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/addPreferencesProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addPreferencesProvider.html
index bca2320888..bca2320888 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/addPreferencesProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addPreferencesProvider.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/addQueue.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
index 9a24e23407..9a24e23407 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/addVirtualHost.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHost.html
index 282f4ab8f6..282f4ab8f6 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/addVirtualHost.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHost.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/addUser.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/addUser.html
index 785605f694..785605f694 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/addUser.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/addUser.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/add.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/add.html
index 7196493e7c..7196493e7c 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/add.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/add.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html
index bc302d1e65..bc302d1e65 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/setPassword.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/setPassword.html
index 3d67463abd..3d67463abd 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/setPassword.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/setPassword.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/showPrincipalDatabaseAuthenticationManager.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/showPrincipalDatabaseAuthenticationManager.html
index e6c067fddf..e6c067fddf 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/showPrincipalDatabaseAuthenticationManager.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/showPrincipalDatabaseAuthenticationManager.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/common/TimeZoneSelector.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/common/TimeZoneSelector.html
index 2b2fca7d8a..2b2fca7d8a 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/common/TimeZoneSelector.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/common/TimeZoneSelector.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/css/common.css b/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
index d9064f40c9..d9064f40c9 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/css/common.css
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
diff --git a/java/broker-plugins/management-http/src/main/java/resources/footer.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/footer.html
index fa84825e80..fa84825e80 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/footer.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/footer.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/grid/showColumnDefDialog.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/grid/showColumnDefDialog.html
index 5b6b8ad774..5b6b8ad774 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/grid/showColumnDefDialog.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/grid/showColumnDefDialog.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/grid/showRowNumberLimitDialog.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/grid/showRowNumberLimitDialog.html
index 087d54c0f9..087d54c0f9 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/grid/showRowNumberLimitDialog.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/grid/showRowNumberLimitDialog.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/group/addGroupMember.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/group/addGroupMember.html
index 0372468f91..0372468f91 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/group/addGroupMember.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/group/addGroupMember.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/group/showGroup.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/group/showGroup.html
index 4fddf727d0..4fddf727d0 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/group/showGroup.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/group/showGroup.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/groupprovider/addGroup.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/groupprovider/addGroup.html
index 8d3431808a..8d3431808a 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/groupprovider/addGroup.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/groupprovider/addGroup.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/groupprovider/showFileGroupManager.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/groupprovider/showFileGroupManager.html
index 5055cbdc47..5055cbdc47 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/groupprovider/showFileGroupManager.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/groupprovider/showFileGroupManager.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/images/auto-refresh.png b/qpid/java/broker-plugins/management-http/src/main/java/resources/images/auto-refresh.png
index 493636f467..493636f467 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/images/auto-refresh.png
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/images/auto-refresh.png
diff --git a/java/broker-plugins/management-http/src/main/java/resources/images/download.png b/qpid/java/broker-plugins/management-http/src/main/java/resources/images/download.png
index b64b41d476..b64b41d476 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/images/download.png
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/images/download.png
diff --git a/java/broker-plugins/management-http/src/main/java/resources/images/gear.png b/qpid/java/broker-plugins/management-http/src/main/java/resources/images/gear.png
index 0bb4394b46..0bb4394b46 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/images/gear.png
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/images/gear.png
diff --git a/java/broker-plugins/management-http/src/main/java/resources/images/help.png b/qpid/java/broker-plugins/management-http/src/main/java/resources/images/help.png
index f7d3698d25..f7d3698d25 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/images/help.png
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/images/help.png
diff --git a/java/broker-plugins/management-http/src/main/java/resources/images/log-viewer.png b/qpid/java/broker-plugins/management-http/src/main/java/resources/images/log-viewer.png
index 858fd48beb..858fd48beb 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/images/log-viewer.png
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/images/log-viewer.png
diff --git a/java/broker-plugins/management-http/src/main/java/resources/images/qpid-logo.png b/qpid/java/broker-plugins/management-http/src/main/java/resources/images/qpid-logo.png
index ae0fbb462f..ae0fbb462f 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/images/qpid-logo.png
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/images/qpid-logo.png
diff --git a/java/broker-plugins/management-http/src/main/java/resources/images/refresh.png b/qpid/java/broker-plugins/management-http/src/main/java/resources/images/refresh.png
index 083044979b..083044979b 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/images/refresh.png
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/images/refresh.png
diff --git a/java/broker-plugins/management-http/src/main/java/resources/index.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
index f17e8d8bba..f17e8d8bba 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/index.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js
index be9bef3519..be9bef3519 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js
index 2d99f886ed..2d99f886ed 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
index fdc07f27ca..fdc07f27ca 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/TimeZoneSelector.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/TimeZoneSelector.js
index fa4bd8c873..fa4bd8c873 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/TimeZoneSelector.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/TimeZoneSelector.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/UpdatableStore.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/UpdatableStore.js
index ea3ba78372..ea3ba78372 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/UpdatableStore.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/UpdatableStore.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/footer.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/footer.js
index ea13b1fc53..ea13b1fc53 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/footer.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/footer.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/formatter.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/formatter.js
index 2f8683ee1c..2f8683ee1c 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/formatter.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/formatter.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js
index d285dfaad6..d285dfaad6 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/EnhancedFilter.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/EnhancedFilter.js
index 262210f879..262210f879 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/EnhancedFilter.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/EnhancedFilter.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/EnhancedFilterTools.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/EnhancedFilterTools.js
index 187ed8cfc6..187ed8cfc6 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/EnhancedFilterTools.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/EnhancedFilterTools.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/FilterSummary.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/FilterSummary.js
index d29e4027df..d29e4027df 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/FilterSummary.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/FilterSummary.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/GridUpdater.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/GridUpdater.js
index 8d58b6dec0..8d58b6dec0 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/GridUpdater.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/GridUpdater.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js
index db3ae5a2ea..db3ae5a2ea 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/UpdatableGrid.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/UpdatableGrid.js
index 04041388bd..04041388bd 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/UpdatableGrid.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/UpdatableGrid.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/properties.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/properties.js
index 8d85345b74..8d85345b74 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/properties.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/properties.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/timezone.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/timezone.js
index d03b44843a..d03b44843a 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/timezone.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/timezone.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/updater.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/updater.js
index f31fd1aa1f..f31fd1aa1f 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/updater.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/updater.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
index 3d349830ac..3d349830ac 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
index 1a056d681c..1a056d681c 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
index 4e96f2e5a4..4e96f2e5a4 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
index aebaa39564..aebaa39564 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
index b0ad1c661b..b0ad1c661b 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
index 48c82621b4..48c82621b4 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
index fdaaa2c116..fdaaa2c116 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
index 36930be85a..36930be85a 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
index 3f47c6d0ba..3f47c6d0ba 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
index 45c54745da..45c54745da 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
index 5db2cecf0c..5db2cecf0c 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
index c8e6f9845c..c8e6f9845c 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js
index ebf06377f4..ebf06377f4 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
index 54cfe225c8..54cfe225c8 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
index e3d880ce24..e3d880ce24 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js
index 44dee22007..44dee22007 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
index e92fb4492e..e92fb4492e 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
index 3aa9d0baee..3aa9d0baee 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
index d20897c1d8..d20897c1d8 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
index 428a26c3c9..428a26c3c9 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js
index 83e724d0e9..83e724d0e9 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js
index 915092a9d1..915092a9d1 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
index c8cd33fd6a..c8cd33fd6a 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js
index 4fdcffb7f1..4fdcffb7f1 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
index 18abfa443f..18abfa443f 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
index 40f8f83fbb..40f8f83fbb 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
index e8b8dd1721..e8b8dd1721 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js
index 4873baeef7..4873baeef7 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js
index 09433b196d..09433b196d 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/preferences/filesystempreferences/add.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/preferences/filesystempreferences/add.js
index 06dd9dd0e3..06dd9dd0e3 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/preferences/filesystempreferences/add.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/preferences/filesystempreferences/add.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/preferences/filesystempreferences/show.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/preferences/filesystempreferences/show.js
index 7521f820b9..7521f820b9 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/preferences/filesystempreferences/show.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/preferences/filesystempreferences/show.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
index e7888b9807..e7888b9807 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
index ea918644e9..ea918644e9 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js
index 1861cc6ffe..1861cc6ffe 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js
index 670a0a893a..670a0a893a 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js
index 95870dadf7..95870dadf7 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js
index 7f7a8c3886..7f7a8c3886 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js
index 8cc488324f..8cc488324f 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
index 9baf6a2b15..9baf6a2b15 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js
index a1eaa7c449..a1eaa7c449 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js
index 1281e44166..1281e44166 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js
index 5511b176a3..5511b176a3 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/standard/addVirtualHost.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/standard/addVirtualHost.js
index 164e118e09..164e118e09 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/standard/addVirtualHost.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/standard/addVirtualHost.js
diff --git a/java/broker-plugins/management-http/src/main/java/resources/login.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/login.html
index aaa2855bd2..aaa2855bd2 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/login.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/login.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/logs/showLogFileDownloadDialog.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/logs/showLogFileDownloadDialog.html
index bc633d059a..bc633d059a 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/logs/showLogFileDownloadDialog.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/logs/showLogFileDownloadDialog.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/logs/showLogViewer.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/logs/showLogViewer.html
index ab927153fa..ab927153fa 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/logs/showLogViewer.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/logs/showLogViewer.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/moveCopyMessages.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/moveCopyMessages.html
index f188c3001c..f188c3001c 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/moveCopyMessages.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/moveCopyMessages.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html
index ea4bfc93f8..ea4bfc93f8 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html
index d8f139e692..d8f139e692 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html
index d017683225..d017683225 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
index a60a7d5ff7..a60a7d5ff7 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showBroker.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
index 366ef27c8a..366ef27c8a 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showConnection.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
index 4611b77f6c..4611b77f6c 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showExchange.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html
index cdc88ece6a..cdc88ece6a 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showExchange.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html
index 5ab5573b40..5ab5573b40 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html
index 5caee836d3..5caee836d3 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showMessage.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showMessage.html
index 9a6ec55686..9a6ec55686 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showMessage.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showMessage.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html
index f2f3134037..f2f3134037 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showPort.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
index 4f460b85c1..4f460b85c1 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showPort.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showPreferences.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferences.html
index 2695d8f099..2695d8f099 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showPreferences.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferences.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
index a1885acddf..a1885acddf 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProviderFields.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProviderFields.html
index 0da104821b..0da104821b 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProviderFields.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProviderFields.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showQueue.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
index 89b7327957..89b7327957 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html
index 6f9146fdfe..6f9146fdfe 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
index 69856365db..69856365db 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
diff --git a/java/broker-plugins/management-http/src/main/java/resources/virtualhost/standard/add.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/standard/add.html
index 3519d0dbd6..3519d0dbd6 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/virtualhost/standard/add.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/standard/add.html
diff --git a/java/broker-plugins/management-http/src/main/resources-maven/dojoconfig.properties b/qpid/java/broker-plugins/management-http/src/main/resources-maven/dojoconfig.properties
index 153b568482..153b568482 100644
--- a/java/broker-plugins/management-http/src/main/resources-maven/dojoconfig.properties
+++ b/qpid/java/broker-plugins/management-http/src/main/resources-maven/dojoconfig.properties
diff --git a/java/broker-plugins/management-http/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.PluginFactory b/qpid/java/broker-plugins/management-http/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.PluginFactory
index 7ffb9a9013..7ffb9a9013 100644
--- a/java/broker-plugins/management-http/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.PluginFactory
+++ b/qpid/java/broker-plugins/management-http/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.PluginFactory
diff --git a/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java
index 10bc9f941b..10bc9f941b 100644
--- a/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java
+++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java
diff --git a/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java
index d0a357fd28..d0a357fd28 100644
--- a/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java
+++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java
diff --git a/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/log/LogFileHelperTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/log/LogFileHelperTest.java
index 608ef28f02..608ef28f02 100644
--- a/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/log/LogFileHelperTest.java
+++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/log/LogFileHelperTest.java
diff --git a/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
index 8e5c5e1c10..8e5c5e1c10 100644
--- a/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
+++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
diff --git a/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
index 1d43c44587..1d43c44587 100644
--- a/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
+++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
diff --git a/java/broker-plugins/management-jmx/build.xml b/qpid/java/broker-plugins/management-jmx/build.xml
index 0209ecbd7a..0209ecbd7a 100644
--- a/java/broker-plugins/management-jmx/build.xml
+++ b/qpid/java/broker-plugins/management-jmx/build.xml
diff --git a/java/broker-plugins/management-jmx/pom.xml b/qpid/java/broker-plugins/management-jmx/pom.xml
index 8fd525e7d6..8fd525e7d6 100644
--- a/java/broker-plugins/management-jmx/pom.xml
+++ b/qpid/java/broker-plugins/management-jmx/pom.xml
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/AMQManagedObject.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/AMQManagedObject.java
index 5c39a0c26a..5c39a0c26a 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/AMQManagedObject.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/AMQManagedObject.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/CustomRMIServerSocketFactory.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/CustomRMIServerSocketFactory.java
index b7aab78e45..b7aab78e45 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/CustomRMIServerSocketFactory.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/CustomRMIServerSocketFactory.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/DefaultManagedObject.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/DefaultManagedObject.java
index 4446f96802..4446f96802 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/DefaultManagedObject.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/DefaultManagedObject.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
index 32aac51008..32aac51008 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
index 18e9f9f809..18e9f9f809 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
index 486ea5e6f1..486ea5e6f1 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanIntrospector.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanIntrospector.java
index 79ddc8cfc0..79ddc8cfc0 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanIntrospector.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanIntrospector.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
index 8bc2afb176..8bc2afb176 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanProvider.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanProvider.java
index a0ef052314..a0ef052314 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanProvider.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanProvider.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObject.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObject.java
index 40b778fd93..40b778fd93 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObject.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObject.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObjectRegistry.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObjectRegistry.java
index 2ae0ac7052..2ae0ac7052 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObjectRegistry.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObjectRegistry.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java
index ae0574dc21..ae0574dc21 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidSslRMIServerSocketFactory.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidSslRMIServerSocketFactory.java
index ab114f0888..ab114f0888 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidSslRMIServerSocketFactory.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidSslRMIServerSocketFactory.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/UsernameAccessor.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/UsernameAccessor.java
index 0cbb0d2687..0cbb0d2687 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/UsernameAccessor.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/UsernameAccessor.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/UsernameCachingRMIJRMPServer.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/UsernameCachingRMIJRMPServer.java
index 838e9e5664..838e9e5664 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/UsernameCachingRMIJRMPServer.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/UsernameCachingRMIJRMPServer.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/AbstractStatisticsGatheringMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/AbstractStatisticsGatheringMBean.java
index 6ab7db3629..6ab7db3629 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/AbstractStatisticsGatheringMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/AbstractStatisticsGatheringMBean.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
index d0c0d5e73f..d0c0d5e73f 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBean.java
index 3e1a47c431..3e1a47c431 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBean.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java
index d6f4b5d8c9..d6f4b5d8c9 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/MBeanUtils.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/MBeanUtils.java
index 97e84d4796..97e84d4796 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/MBeanUtils.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/MBeanUtils.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
index cda32cc3f8..cda32cc3f8 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBean.java
index 67d5861dec..67d5861dec 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBean.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java
index 62733168ef..62733168ef 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ShutdownMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ShutdownMBean.java
index ed69c351f7..ed69c351f7 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ShutdownMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ShutdownMBean.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java
index cce38d26b1..cce38d26b1 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java
index e9e3e1df49..e9e3e1df49 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
index 2c88f83405..2c88f83405 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
diff --git a/java/broker-plugins/management-jmx/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.PluginFactory b/qpid/java/broker-plugins/management-jmx/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.PluginFactory
index 8fa778269e..8fa778269e 100644
--- a/java/broker-plugins/management-jmx/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.PluginFactory
+++ b/qpid/java/broker-plugins/management-jmx/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.PluginFactory
diff --git a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java
index 5af1369239..5af1369239 100644
--- a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java
diff --git a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporterTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporterTest.java
index ba9c2cdaa5..ba9c2cdaa5 100644
--- a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporterTest.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporterTest.java
diff --git a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/NoopManagedObjectRegistry.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/NoopManagedObjectRegistry.java
index a2631bab7f..a2631bab7f 100644
--- a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/NoopManagedObjectRegistry.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/NoopManagedObjectRegistry.java
diff --git a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java
index 0c5fb0bf1f..0c5fb0bf1f 100644
--- a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java
diff --git a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBeanTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBeanTest.java
index e2b4567867..e2b4567867 100644
--- a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBeanTest.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBeanTest.java
diff --git a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBeanTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBeanTest.java
index 0f33e78d03..0f33e78d03 100644
--- a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBeanTest.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBeanTest.java
diff --git a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/MBeanTestUtils.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/MBeanTestUtils.java
index 5f913e5f33..5f913e5f33 100644
--- a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/MBeanTestUtils.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/MBeanTestUtils.java
diff --git a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
index 3711a90f3b..3711a90f3b 100644
--- a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
diff --git a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBeanTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBeanTest.java
index 86eab0245e..86eab0245e 100644
--- a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBeanTest.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBeanTest.java
diff --git a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBeanTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBeanTest.java
index 8ca6c521eb..8ca6c521eb 100644
--- a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBeanTest.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBeanTest.java
diff --git a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java
index 4240dd5280..4240dd5280 100644
--- a/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java
diff --git a/java/broker-plugins/memory-store/build.xml b/qpid/java/broker-plugins/memory-store/build.xml
index 6d107b7803..6d107b7803 100644
--- a/java/broker-plugins/memory-store/build.xml
+++ b/qpid/java/broker-plugins/memory-store/build.xml
diff --git a/java/broker-plugins/memory-store/pom.xml b/qpid/java/broker-plugins/memory-store/pom.xml
index 6bfd2a8d49..6bfd2a8d49 100644
--- a/java/broker-plugins/memory-store/pom.xml
+++ b/qpid/java/broker-plugins/memory-store/pom.xml
diff --git a/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java b/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
index 61fef91e83..61fef91e83 100644
--- a/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
+++ b/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
diff --git a/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java b/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java
index 49f823e7ee..49f823e7ee 100644
--- a/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java
+++ b/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java
diff --git a/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js b/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js
index 3a9b23274d..3a9b23274d 100644
--- a/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js
+++ b/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js
diff --git a/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/store/memory/add.html b/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/store/memory/add.html
index e69de29bb2..e69de29bb2 100644
--- a/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/store/memory/add.html
+++ b/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/store/memory/add.html
diff --git a/java/broker-plugins/memory-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory b/qpid/java/broker-plugins/memory-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
index 02f22eb21a..02f22eb21a 100644
--- a/java/broker-plugins/memory-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
+++ b/qpid/java/broker-plugins/memory-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
diff --git a/java/broker/bin/qpid-passwd b/qpid/java/broker/bin/qpid-passwd
index 07b7db0cd3..07b7db0cd3 100755
--- a/java/broker/bin/qpid-passwd
+++ b/qpid/java/broker/bin/qpid-passwd
diff --git a/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server
index 8d4c56381b..8d4c56381b 100755
--- a/java/broker/bin/qpid-server
+++ b/qpid/java/broker/bin/qpid-server
diff --git a/java/broker/bin/qpid-server.bat b/qpid/java/broker/bin/qpid-server.bat
index ea76a54479..ea76a54479 100755
--- a/java/broker/bin/qpid-server.bat
+++ b/qpid/java/broker/bin/qpid-server.bat
diff --git a/java/broker/bin/qpid.stop b/qpid/java/broker/bin/qpid.stop
index 867f9788e2..867f9788e2 100755
--- a/java/broker/bin/qpid.stop
+++ b/qpid/java/broker/bin/qpid.stop
diff --git a/java/broker/bin/qpid.stopall b/qpid/java/broker/bin/qpid.stopall
index 4ab2df3b4b..4ab2df3b4b 100755
--- a/java/broker/bin/qpid.stopall
+++ b/qpid/java/broker/bin/qpid.stopall
diff --git a/java/broker/build.xml b/qpid/java/broker/build.xml
index 91a020b41d..91a020b41d 100644
--- a/java/broker/build.xml
+++ b/qpid/java/broker/build.xml
diff --git a/java/broker/etc/broker_example.acl b/qpid/java/broker/etc/broker_example.acl
index 29dca90f15..29dca90f15 100644
--- a/java/broker/etc/broker_example.acl
+++ b/qpid/java/broker/etc/broker_example.acl
diff --git a/java/broker/etc/groups b/qpid/java/broker/etc/groups
index e3912ece99..e3912ece99 100644
--- a/java/broker/etc/groups
+++ b/qpid/java/broker/etc/groups
diff --git a/java/broker/etc/log4j.xml b/qpid/java/broker/etc/log4j.xml
index 71a13875a1..71a13875a1 100644
--- a/java/broker/etc/log4j.xml
+++ b/qpid/java/broker/etc/log4j.xml
diff --git a/java/broker/etc/md5passwd b/qpid/java/broker/etc/md5passwd
index f7185c0e92..f7185c0e92 100644
--- a/java/broker/etc/md5passwd
+++ b/qpid/java/broker/etc/md5passwd
diff --git a/java/broker/etc/passwd b/qpid/java/broker/etc/passwd
index f0dcb80f25..f0dcb80f25 100644
--- a/java/broker/etc/passwd
+++ b/qpid/java/broker/etc/passwd
diff --git a/java/broker/pom.xml b/qpid/java/broker/pom.xml
index 7f09d5c046..7f09d5c046 100644
--- a/java/broker/pom.xml
+++ b/qpid/java/broker/pom.xml
diff --git a/java/broker/python-test.xml b/qpid/java/broker/python-test.xml
index 5c263e3169..5c263e3169 100644
--- a/java/broker/python-test.xml
+++ b/qpid/java/broker/python-test.xml
diff --git a/java/broker/scripts/resetAlerting.sh b/qpid/java/broker/scripts/resetAlerting.sh
index ebbdc168d2..ebbdc168d2 100644
--- a/java/broker/scripts/resetAlerting.sh
+++ b/qpid/java/broker/scripts/resetAlerting.sh
diff --git a/java/broker/src/main/assembly/qpid-broker-bin.xml b/qpid/java/broker/src/main/assembly/qpid-broker-bin.xml
index c7a190bbf2..c7a190bbf2 100644
--- a/java/broker/src/main/assembly/qpid-broker-bin.xml
+++ b/qpid/java/broker/src/main/assembly/qpid-broker-bin.xml
diff --git a/java/broker/src/main/java/org/apache/qpid/server/Main.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
index 20b73e965c..20b73e965c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/Main.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/MainTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java
index f3b1749808..f3b1749808 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/MainTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java
diff --git a/java/build.deps b/qpid/java/build.deps
index 67a67783c9..67a67783c9 100644
--- a/java/build.deps
+++ b/qpid/java/build.deps
diff --git a/java/build.xml b/qpid/java/build.xml
index e761677f6d..e761677f6d 100644
--- a/java/build.xml
+++ b/qpid/java/build.xml
diff --git a/java/client-plugins/.gitignore b/qpid/java/client-plugins/.gitignore
index e5f63e731b..e5f63e731b 100644
--- a/java/client-plugins/.gitignore
+++ b/qpid/java/client-plugins/.gitignore
diff --git a/java/client-plugins/README.txt b/qpid/java/client-plugins/README.txt
index 64884f27a2..64884f27a2 100644
--- a/java/client-plugins/README.txt
+++ b/qpid/java/client-plugins/README.txt
diff --git a/java/client/README.txt b/qpid/java/client/README.txt
index a8c7da32c5..a8c7da32c5 100644
--- a/java/client/README.txt
+++ b/qpid/java/client/README.txt
diff --git a/java/client/build.xml b/qpid/java/client/build.xml
index 0375b83c65..0375b83c65 100644
--- a/java/client/build.xml
+++ b/qpid/java/client/build.xml
diff --git a/java/client/example/build.xml b/qpid/java/client/example/build.xml
index 8b0d59bd8a..8b0d59bd8a 100644
--- a/java/client/example/build.xml
+++ b/qpid/java/client/example/build.xml
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/Drain.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/Drain.java
index f0eb83ad24..f0eb83ad24 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/Drain.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/Drain.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/Hello.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/Hello.java
index 949ee4dac6..949ee4dac6 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/Hello.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/Hello.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/ListReceiver.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/ListReceiver.java
index b12cfab9de..b12cfab9de 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/ListReceiver.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/ListReceiver.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/ListSender.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/ListSender.java
index fe2c1ec472..fe2c1ec472 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/ListSender.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/ListSender.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/MapReceiver.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/MapReceiver.java
index 89db04f8d3..89db04f8d3 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/MapReceiver.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/MapReceiver.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/MapSender.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/MapSender.java
index 0ce9383add..0ce9383add 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/MapSender.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/MapSender.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
index 9360be4106..9360be4106 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/Spout.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/Spout.java
index 09e813f8c1..09e813f8c1 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/Spout.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/Spout.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/hello.properties b/qpid/java/client/example/src/main/java/org/apache/qpid/example/hello.properties
index fdfbd418f8..fdfbd418f8 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/hello.properties
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/hello.properties
diff --git a/java/client/pom.xml b/qpid/java/client/pom.xml
index e97b5b7a0d..e97b5b7a0d 100644
--- a/java/client/pom.xml
+++ b/qpid/java/client/pom.xml
diff --git a/java/client/src/main/assembly/qpid-client-bin.xml b/qpid/java/client/src/main/assembly/qpid-client-bin.xml
index cc48890fa0..cc48890fa0 100644
--- a/java/client/src/main/assembly/qpid-client-bin.xml
+++ b/qpid/java/client/src/main/assembly/qpid-client-bin.xml
diff --git a/java/client/src/main/java/client.bnd b/qpid/java/client/src/main/java/client.bnd
index 63b1e3b34c..63b1e3b34c 100755
--- a/java/client/src/main/java/client.bnd
+++ b/qpid/java/client/src/main/java/client.bnd
diff --git a/java/client/src/main/java/client.log4j b/qpid/java/client/src/main/java/client.log4j
index 19cc946118..19cc946118 100644
--- a/java/client/src/main/java/client.log4j
+++ b/qpid/java/client/src/main/java/client.log4j
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java
index c324e22ab1..c324e22ab1 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
index 6bae0166d1..6bae0166d1 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
index 25d37aafb1..25d37aafb1 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
index 0dc5cc68c1..0dc5cc68c1 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java
index 0329deee03..0329deee03 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
index 95b1178407..95b1178407 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_9.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_9.java
index 70ecedfd8b..70ecedfd8b 100755
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_9.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_9.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
index dfbf7ec60a..dfbf7ec60a 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_9_1.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_9_1.java
index 442dd7b286..442dd7b286 100755
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_9_1.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_9_1.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
index a2d4b5ee17..a2d4b5ee17 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
index d59f48542f..d59f48542f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
index 91c23ff384..91c23ff384 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
index 714c38d37b..714c38d37b 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQNoConsumersException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQNoConsumersException.java
index 08867b5de7..08867b5de7 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQNoConsumersException.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQNoConsumersException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQNoRouteException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQNoRouteException.java
index 42ed9c3df7..42ed9c3df7 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQNoRouteException.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQNoRouteException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
index 0f375e4921..0f375e4921 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
index 0c6031ea91..0c6031ea91 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java
index c8cb49b53e..c8cb49b53e 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 018a1ec851..018a1ec851 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSessionAdapter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSessionAdapter.java
index e94099f066..e94099f066 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSessionAdapter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSessionAdapter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSessionDirtyException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSessionDirtyException.java
index a1b240ed54..a1b240ed54 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSessionDirtyException.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSessionDirtyException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
index 9657a49d98..9657a49d98 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
index 3ff7416d8f..3ff7416d8f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java
index 11145e17b2..11145e17b2 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
index db54b320dc..db54b320dc 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
index 4cc32022dc..4cc32022dc 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
index 0f44ac5501..0f44ac5501 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQUndefinedDestination.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQUndefinedDestination.java
index fa2afb3ee4..fa2afb3ee4 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQUndefinedDestination.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQUndefinedDestination.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQXAResource.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQXAResource.java
index cce6b91781..cce6b91781 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQXAResource.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQXAResource.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
index b5e008da5a..b5e008da5a 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
index ef7b8cc217..ef7b8cc217 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
index f733e6bbca..f733e6bbca 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
index 5acaa5c543..5acaa5c543 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
index f717ca4655..f717ca4655 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
index 3cb723e5a8..3cb723e5a8 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/ChannelToSessionMap.java b/qpid/java/client/src/main/java/org/apache/qpid/client/ChannelToSessionMap.java
index 2fdb35de49..2fdb35de49 100644
--- a/java/client/src/main/java/org/apache/qpid/client/ChannelToSessionMap.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/ChannelToSessionMap.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/Closeable.java b/qpid/java/client/src/main/java/org/apache/qpid/client/Closeable.java
index 2f7fbad30c..2f7fbad30c 100644
--- a/java/client/src/main/java/org/apache/qpid/client/Closeable.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/Closeable.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/ConnectionTuneParameters.java b/qpid/java/client/src/main/java/org/apache/qpid/client/ConnectionTuneParameters.java
index 40264f837e..40264f837e 100644
--- a/java/client/src/main/java/org/apache/qpid/client/ConnectionTuneParameters.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/ConnectionTuneParameters.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java b/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
index b2d1072e2b..b2d1072e2b 100644
--- a/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/HeartbeatListener.java b/qpid/java/client/src/main/java/org/apache/qpid/client/HeartbeatListener.java
index 32a7cb0b73..32a7cb0b73 100644
--- a/java/client/src/main/java/org/apache/qpid/client/HeartbeatListener.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/HeartbeatListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/JMSAMQException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/JMSAMQException.java
index 1151a97cf4..1151a97cf4 100644
--- a/java/client/src/main/java/org/apache/qpid/client/JMSAMQException.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/JMSAMQException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/JmsNotImplementedException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/JmsNotImplementedException.java
index 903514c35f..903514c35f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/JmsNotImplementedException.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/JmsNotImplementedException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/MessageConsumerPair.java b/qpid/java/client/src/main/java/org/apache/qpid/client/MessageConsumerPair.java
index 134159afe1..134159afe1 100644
--- a/java/client/src/main/java/org/apache/qpid/client/MessageConsumerPair.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/MessageConsumerPair.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java b/qpid/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java
index 03574ceab3..03574ceab3 100644
--- a/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/QueueReceiverAdaptor.java b/qpid/java/client/src/main/java/org/apache/qpid/client/QueueReceiverAdaptor.java
index b778ee22d6..b778ee22d6 100644
--- a/java/client/src/main/java/org/apache/qpid/client/QueueReceiverAdaptor.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/QueueReceiverAdaptor.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java
index 0b797df9dd..0b797df9dd 100644
--- a/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/RejectBehaviour.java b/qpid/java/client/src/main/java/org/apache/qpid/client/RejectBehaviour.java
index e3c958044e..e3c958044e 100644
--- a/java/client/src/main/java/org/apache/qpid/client/RejectBehaviour.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/RejectBehaviour.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/TemporaryDestination.java b/qpid/java/client/src/main/java/org/apache/qpid/client/TemporaryDestination.java
index 6da3825359..6da3825359 100644
--- a/java/client/src/main/java/org/apache/qpid/client/TemporaryDestination.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/TemporaryDestination.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java
index 0f3be4ba18..0f3be4ba18 100644
--- a/java/client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java b/qpid/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
index 9bdef22f96..9bdef22f96 100644
--- a/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java b/qpid/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java
index d9514338ce..d9514338ce 100644
--- a/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java b/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
index 6c745feea8..6c745feea8 100644
--- a/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java b/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
index fa0bdcb4c9..fa0bdcb4c9 100644
--- a/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverException.java
index 037b0dc2d1..037b0dc2d1 100644
--- a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverException.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
index 4099da18d2..4099da18d2 100644
--- a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverNoopSupport.java b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverNoopSupport.java
index a69e808880..a69e808880 100644
--- a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverNoopSupport.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverNoopSupport.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverProtectedOperation.java b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverProtectedOperation.java
index e9c5f24791..e9c5f24791 100644
--- a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverProtectedOperation.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverProtectedOperation.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverRetrySupport.java b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverRetrySupport.java
index d3d33d3c75..d3d33d3c75 100644
--- a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverRetrySupport.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverRetrySupport.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverState.java b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverState.java
index 807a5f7d13..807a5f7d13 100644
--- a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverState.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverState.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java
index ef2e7e1d65..ef2e7e1d65 100644
--- a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/filter/JMSSelectorFilter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/filter/JMSSelectorFilter.java
index bab518b0ec..bab518b0ec 100644
--- a/java/client/src/main/java/org/apache/qpid/client/filter/JMSSelectorFilter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/filter/JMSSelectorFilter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/filter/MessageFilter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/filter/MessageFilter.java
index fec78d6ba5..fec78d6ba5 100644
--- a/java/client/src/main/java/org/apache/qpid/client/filter/MessageFilter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/filter/MessageFilter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java
index fa544f2d2e..fa544f2d2e 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java
index 9b5eea3bba..9b5eea3bba 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
index 3f57e180e7..3f57e180e7 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
index a09d298ae8..a09d298ae8 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
index 85328d78ea..85328d78ea 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
index 058484c339..058484c339 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowMethodHandler.java
index 46b1f08db3..46b1f08db3 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
index c15404ea08..c15404ea08 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
index e1a0e18262..e1a0e18262 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java
index f4fc3a4715..f4fc3a4715 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java
index 5f33561a8f..5f33561a8f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java
index 28ad6037d4..28ad6037d4 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/CloseWhenNoRouteSettingsHelper.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/CloseWhenNoRouteSettingsHelper.java
index baae072167..baae072167 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/CloseWhenNoRouteSettingsHelper.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/CloseWhenNoRouteSettingsHelper.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
index f038fc6e4f..f038fc6e4f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
index 1b197de910..1b197de910 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
index 0ccb9b72b1..0ccb9b72b1 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
index 8afb6ffcb4..8afb6ffcb4 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
index b0c30f82fa..b0c30f82fa 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
index 617380e149..617380e149 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
index b60127cf93..b60127cf93 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
index 3c76a8ac38..3c76a8ac38 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate.java
index d01c4ac33d..d01c4ac33d 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegateFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegateFactory.java
index e5b95f54f4..e5b95f54f4 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegateFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegateFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
index ea0319c9df..ea0319c9df 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
index fe9f9f4d00..fe9f9f4d00 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessage.java
index 1d2cb43322..1d2cb43322 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessageFactory.java
index b503dccb91..b503dccb91 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessageFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java
index 69ecd7bfba..69ecd7bfba 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java
index 183ec4cb40..183ec4cb40 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractAMQMessageDelegate.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractAMQMessageDelegate.java
index ad19b0e620..ad19b0e620 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractAMQMessageDelegate.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractAMQMessageDelegate.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
index 9c7bd0bdcf..9c7bd0bdcf 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
index 9e15b08f12..9e15b08f12 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
index 608567674a..608567674a 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/CloseConsumerMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/CloseConsumerMessage.java
index 4af04912e5..4af04912e5 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/CloseConsumerMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/CloseConsumerMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java
index c3f36a545a..c3f36a545a 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
index 6ffa051ff8..6ffa051ff8 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java
index c8c01f16ee..c8c01f16ee 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
index 122a5c4ef2..122a5c4ef2 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
index 0b05179215..0b05179215 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java
index 72bc8d59ea..72bc8d59ea 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
index c2a919c1c5..c2a919c1c5 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java
index a1727811ae..a1727811ae 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java
index 223facbb59..223facbb59 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java
index 56fa8e5e38..56fa8e5e38 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
index 097a3bb5c0..097a3bb5c0 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java
index 0b28e6ca85..0b28e6ca85 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
index 5abd02f150..5abd02f150 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
index 70c6aa4c75..70c6aa4c75 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
index 4154003b23..4154003b23 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java
index 21bb206349..21bb206349 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/ReturnMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/ReturnMessage.java
index e253e43a86..e253e43a86 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/ReturnMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/ReturnMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java
index bb0e3b447f..bb0e3b447f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
index f31bc88509..f31bc88509 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_8.java
index 5ed98dc8ea..5ed98dc8ea 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_8.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_8.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java
index 99154e820f..99154e820f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java
index a614690f83..a614690f83 100644
--- a/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/messaging/address/Node.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Node.java
index cc8e11b91a..cc8e11b91a 100644
--- a/java/client/src/main/java/org/apache/qpid/client/messaging/address/Node.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Node.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidExchangeOptions.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidExchangeOptions.java
index 3ad9aff9ea..3ad9aff9ea 100644
--- a/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidExchangeOptions.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidExchangeOptions.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidQueueOptions.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidQueueOptions.java
index 5b6c027f4a..5b6c027f4a 100644
--- a/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidQueueOptions.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidQueueOptions.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
index ba5a98411f..ba5a98411f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
index 4027ccb725..4027ccb725 100644
--- a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
index b865c51cb7..b865c51cb7 100644
--- a/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
index 068e105731..068e105731 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java
index ce6d9bdc50..ce6d9bdc50 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties b/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
index 8855a040ea..8855a040ea 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java
index b43229292f..b43229292f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties b/qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
index b903208927..b903208927 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/JCAProvider.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/JCAProvider.java
index c9bcaf0d15..c9bcaf0d15 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/JCAProvider.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/JCAProvider.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java
index fe24d48329..fe24d48329 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
index 99b5f247ef..99b5f247ef 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java
index 5f9a240e8f..5f9a240e8f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java
index f1d7da2e94..f1d7da2e94 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClient.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClient.java
index 0f56b2ef6c..0f56b2ef6c 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClient.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClient.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClientFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClientFactory.java
index 283ba5f632..283ba5f632 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClientFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClientFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClient.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClient.java
index 9965176772..9965176772 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClient.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClient.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClientFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClientFactory.java
index b3ce1a0d23..b3ce1a0d23 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClientFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClientFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/AMQMethodNotImplementedException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQMethodNotImplementedException.java
index f7d8b2bf35..f7d8b2bf35 100644
--- a/java/client/src/main/java/org/apache/qpid/client/state/AMQMethodNotImplementedException.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQMethodNotImplementedException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/AMQState.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQState.java
index d32d10542f..d32d10542f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/state/AMQState.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQState.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/AMQStateChangedEvent.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateChangedEvent.java
index edef54ccd6..edef54ccd6 100644
--- a/java/client/src/main/java/org/apache/qpid/client/state/AMQStateChangedEvent.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateChangedEvent.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/AMQStateListener.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateListener.java
index 110471aad0..110471aad0 100644
--- a/java/client/src/main/java/org/apache/qpid/client/state/AMQStateListener.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
index ed75e1f4c3..ed75e1f4c3 100644
--- a/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
index 6b038e09c8..6b038e09c8 100644
--- a/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java
index fd2f003a56..fd2f003a56 100644
--- a/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
index f0d7feb059..f0d7feb059 100644
--- a/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/ClientConnectionDelegate.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/ClientConnectionDelegate.java
index e9b946d5b7..e9b946d5b7 100644
--- a/java/client/src/main/java/org/apache/qpid/client/transport/ClientConnectionDelegate.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/ClientConnectionDelegate.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java b/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java
index 754b5ff6a7..754b5ff6a7 100644
--- a/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/url/URLParser_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser_0_10.java
index d81868f924..d81868f924 100644
--- a/java/client/src/main/java/org/apache/qpid/client/url/URLParser_0_10.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser_0_10.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java
index 22dc17e53c..22dc17e53c 100644
--- a/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStream.java b/qpid/java/client/src/main/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStream.java
index 669a0f1abf..669a0f1abf 100644
--- a/java/client/src/main/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStream.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStream.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java b/qpid/java/client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java
index c8d12142e6..c8d12142e6 100644
--- a/java/client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
index b039d8b005..b039d8b005 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/ChannelLimitReachedException.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/ChannelLimitReachedException.java
index e8c2b9d682..e8c2b9d682 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/ChannelLimitReachedException.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/ChannelLimitReachedException.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/Connection.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/Connection.java
index 616c6dbbec..616c6dbbec 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/Connection.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/Connection.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/ConnectionListener.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionListener.java
index 11c235901c..11c235901c 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/ConnectionListener.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
index 3050e84419..3050e84419 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
index 0b4f0800d2..0b4f0800d2 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/ListMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/ListMessage.java
index 21dd2a89ee..21dd2a89ee 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/ListMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/ListMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/Message.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/Message.java
index 53c615a1fd..53c615a1fd 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/Message.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/Message.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/MessageConsumer.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/MessageConsumer.java
index caac2b5c1f..caac2b5c1f 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/MessageConsumer.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/MessageConsumer.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/MessageProducer.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/MessageProducer.java
index 82c2b88c30..82c2b88c30 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/MessageProducer.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/MessageProducer.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/Session.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/Session.java
index 4801f87295..4801f87295 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/Session.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/Session.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/TopicSubscriber.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/TopicSubscriber.java
index fe43ae8cd0..fe43ae8cd0 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/TopicSubscriber.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/TopicSubscriber.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverExchangeMethod.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverExchangeMethod.java
index a5eda29274..a5eda29274 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverExchangeMethod.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverExchangeMethod.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverMethod.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverMethod.java
index 1cef067e5f..1cef067e5f 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverMethod.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverMethod.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
index 52c7d00000..52c7d00000 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
index 1ef71eccba..1ef71eccba 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/failover/NoFailover.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/NoFailover.java
index 82cb0f9153..82cb0f9153 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/failover/NoFailover.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/NoFailover.java
diff --git a/java/client/src/main/java/org/apache/qpid/jndi/Example.properties b/qpid/java/client/src/main/java/org/apache/qpid/jndi/Example.properties
index def53d8494..def53d8494 100644
--- a/java/client/src/main/java/org/apache/qpid/jndi/Example.properties
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jndi/Example.properties
diff --git a/java/client/src/main/java/org/apache/qpid/jndi/NameParserImpl.java b/qpid/java/client/src/main/java/org/apache/qpid/jndi/NameParserImpl.java
index a3174aec7a..a3174aec7a 100644
--- a/java/client/src/main/java/org/apache/qpid/jndi/NameParserImpl.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jndi/NameParserImpl.java
diff --git a/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
index 8c23ddad5e..8c23ddad5e 100644
--- a/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java b/qpid/java/client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java
index 76ec5f9498..76ec5f9498 100644
--- a/java/client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java
diff --git a/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java b/qpid/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java
index b90f4308cd..b90f4308cd 100644
--- a/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java
index e8455f6dfa..e8455f6dfa 100644
--- a/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java b/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java
index c5edd62143..c5edd62143 100644
--- a/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java b/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java
index a3fce7611f..a3fce7611f 100644
--- a/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/AMQConnectionFactoryTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQConnectionFactoryTest.java
index bb92fa4ecd..bb92fa4ecd 100644
--- a/java/client/src/test/java/org/apache/qpid/client/AMQConnectionFactoryTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQConnectionFactoryTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/AMQConnectionUnitTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQConnectionUnitTest.java
index d309251b44..d309251b44 100644
--- a/java/client/src/test/java/org/apache/qpid/client/AMQConnectionUnitTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQConnectionUnitTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java
index 6433c9acb7..6433c9acb7 100644
--- a/java/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java
index bc48ee8895..bc48ee8895 100644
--- a/java/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java
index 40ed9319f1..40ed9319f1 100644
--- a/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
index c56cf9a72b..c56cf9a72b 100644
--- a/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/BasicMessageConsumer_0_8_Test.java b/qpid/java/client/src/test/java/org/apache/qpid/client/BasicMessageConsumer_0_8_Test.java
index 066ece7ed1..066ece7ed1 100644
--- a/java/client/src/test/java/org/apache/qpid/client/BasicMessageConsumer_0_8_Test.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/BasicMessageConsumer_0_8_Test.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/ConnectionListenerSupport.java b/qpid/java/client/src/test/java/org/apache/qpid/client/ConnectionListenerSupport.java
index fc66e60bc0..fc66e60bc0 100644
--- a/java/client/src/test/java/org/apache/qpid/client/ConnectionListenerSupport.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/ConnectionListenerSupport.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/DispatcherDaemonTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/DispatcherDaemonTest.java
index b9c4bfc676..b9c4bfc676 100644
--- a/java/client/src/test/java/org/apache/qpid/client/DispatcherDaemonTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/DispatcherDaemonTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java b/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
index 009598d8a4..009598d8a4 100644
--- a/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/handler/CloseWhenNoRouteSettingsHelperTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/handler/CloseWhenNoRouteSettingsHelperTest.java
index f1d7a76c75..f1d7a76c75 100644
--- a/java/client/src/test/java/org/apache/qpid/client/handler/CloseWhenNoRouteSettingsHelperTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/handler/CloseWhenNoRouteSettingsHelperTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10Test.java b/qpid/java/client/src/test/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10Test.java
index 68f678c1b8..68f678c1b8 100644
--- a/java/client/src/test/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10Test.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10Test.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/message/AMQPEncodedListMessageUnitTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/message/AMQPEncodedListMessageUnitTest.java
index e131ab3dd2..e131ab3dd2 100644
--- a/java/client/src/test/java/org/apache/qpid/client/message/AMQPEncodedListMessageUnitTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/message/AMQPEncodedListMessageUnitTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
index c535fdd705..c535fdd705 100644
--- a/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java b/qpid/java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java
index b5c31e7c5e..b5c31e7c5e 100644
--- a/java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/messaging/address/AddressHelperTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/messaging/address/AddressHelperTest.java
index 7401168978..7401168978 100644
--- a/java/client/src/test/java/org/apache/qpid/client/messaging/address/AddressHelperTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/messaging/address/AddressHelperTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
index 4c9448cb39..4c9448cb39 100644
--- a/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/security/CallbackHandlerRegistryTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/security/CallbackHandlerRegistryTest.java
index b451ad630f..b451ad630f 100644
--- a/java/client/src/test/java/org/apache/qpid/client/security/CallbackHandlerRegistryTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/security/CallbackHandlerRegistryTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/security/DynamicSaslRegistrarTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/security/DynamicSaslRegistrarTest.java
index 4281984212..4281984212 100644
--- a/java/client/src/test/java/org/apache/qpid/client/security/DynamicSaslRegistrarTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/security/DynamicSaslRegistrarTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java
index 290ef7420a..290ef7420a 100644
--- a/java/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java
index 70f279d53c..70f279d53c 100644
--- a/java/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/transport/MockSender.java b/qpid/java/client/src/test/java/org/apache/qpid/client/transport/MockSender.java
index 7c3988c19a..7c3988c19a 100644
--- a/java/client/src/test/java/org/apache/qpid/client/transport/MockSender.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/transport/MockSender.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/transport/TestNetworkConnection.java b/qpid/java/client/src/test/java/org/apache/qpid/client/transport/TestNetworkConnection.java
index 1ec217e468..1ec217e468 100644
--- a/java/client/src/test/java/org/apache/qpid/client/transport/TestNetworkConnection.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/transport/TestNetworkConnection.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStreamTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStreamTest.java
index 91460ab4e7..91460ab4e7 100644
--- a/java/client/src/test/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStreamTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStreamTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/filter/JMSSelectorFilterTest.java b/qpid/java/client/src/test/java/org/apache/qpid/filter/JMSSelectorFilterTest.java
index 8782b92ee9..8782b92ee9 100644
--- a/java/client/src/test/java/org/apache/qpid/filter/JMSSelectorFilterTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/filter/JMSSelectorFilterTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/jms/FailoverPolicyTest.java b/qpid/java/client/src/test/java/org/apache/qpid/jms/FailoverPolicyTest.java
index cb9623237c..cb9623237c 100644
--- a/java/client/src/test/java/org/apache/qpid/jms/FailoverPolicyTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/jms/FailoverPolicyTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/jndi/JNDITest.properties b/qpid/java/client/src/test/java/org/apache/qpid/jndi/JNDITest.properties
index 07017a05a6..07017a05a6 100644
--- a/java/client/src/test/java/org/apache/qpid/jndi/JNDITest.properties
+++ b/qpid/java/client/src/test/java/org/apache/qpid/jndi/JNDITest.properties
diff --git a/java/client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java b/qpid/java/client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java
index 2914244103..2914244103 100644
--- a/java/client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
index b408ad8ad1..b408ad8ad1 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java
index e27c684adc..e27c684adc 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
index ad9d3d3516..ad9d3d3516 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
index 0bdd3062ea..0bdd3062ea 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java
index 3498045601..3498045601 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
index 7f2288ea3d..7f2288ea3d 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
index 9c9664931a..9c9664931a 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java
index 1ab3ad0573..1ab3ad0573 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
index f75c660ec3..f75c660ec3 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageUnitTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageUnitTest.java
index a2c5bf624f..a2c5bf624f 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageUnitTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageUnitTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java
index 648e4b0c83..648e4b0c83 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java
index a80b3d145b..a80b3d145b 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
index 04122a6d51..04122a6d51 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java
index d93ba23a25..d93ba23a25 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java
index 4ad9069ba0..4ad9069ba0 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties
index 2fd961a078..2fd961a078 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties
diff --git a/java/common.xml b/qpid/java/common.xml
index 889cf3c4d8..889cf3c4d8 100644
--- a/java/common.xml
+++ b/qpid/java/common.xml
diff --git a/java/common/Composite.tpl b/qpid/java/common/Composite.tpl
index b03f002f16..b03f002f16 100644
--- a/java/common/Composite.tpl
+++ b/qpid/java/common/Composite.tpl
diff --git a/java/common/Constant.tpl b/qpid/java/common/Constant.tpl
index 911f790bcf..911f790bcf 100644
--- a/java/common/Constant.tpl
+++ b/qpid/java/common/Constant.tpl
diff --git a/java/common/Enum.tpl b/qpid/java/common/Enum.tpl
index 79ade419c5..79ade419c5 100644
--- a/java/common/Enum.tpl
+++ b/qpid/java/common/Enum.tpl
diff --git a/java/common/Invoker.tpl b/qpid/java/common/Invoker.tpl
index 3f317f96df..3f317f96df 100644
--- a/java/common/Invoker.tpl
+++ b/qpid/java/common/Invoker.tpl
diff --git a/java/common/MethodDelegate.tpl b/qpid/java/common/MethodDelegate.tpl
index fd3e069b6b..fd3e069b6b 100644
--- a/java/common/MethodDelegate.tpl
+++ b/qpid/java/common/MethodDelegate.tpl
diff --git a/java/common/Option.tpl b/qpid/java/common/Option.tpl
index fc85d6b2f5..fc85d6b2f5 100644
--- a/java/common/Option.tpl
+++ b/qpid/java/common/Option.tpl
diff --git a/java/common/StructFactory.tpl b/qpid/java/common/StructFactory.tpl
index 6e7d1158cd..6e7d1158cd 100644
--- a/java/common/StructFactory.tpl
+++ b/qpid/java/common/StructFactory.tpl
diff --git a/java/common/Type.tpl b/qpid/java/common/Type.tpl
index 31ac02af73..31ac02af73 100644
--- a/java/common/Type.tpl
+++ b/qpid/java/common/Type.tpl
diff --git a/java/common/bin/qpid-jaddr b/qpid/java/common/bin/qpid-jaddr
index 5c8efa069d..5c8efa069d 100755
--- a/java/common/bin/qpid-jaddr
+++ b/qpid/java/common/bin/qpid-jaddr
diff --git a/java/common/bin/qpid-run b/qpid/java/common/bin/qpid-run
index 7e8d4c92c5..7e8d4c92c5 100755
--- a/java/common/bin/qpid-run
+++ b/qpid/java/common/bin/qpid-run
diff --git a/java/common/build-generate-sources.xml b/qpid/java/common/build-generate-sources.xml
index 339887f3dd..339887f3dd 100644
--- a/java/common/build-generate-sources.xml
+++ b/qpid/java/common/build-generate-sources.xml
diff --git a/java/common/build.xml b/qpid/java/common/build.xml
index c2f777b18b..c2f777b18b 100644
--- a/java/common/build.xml
+++ b/qpid/java/common/build.xml
diff --git a/java/common/codegen b/qpid/java/common/codegen
index 6a1effc07b..6a1effc07b 100755
--- a/java/common/codegen
+++ b/qpid/java/common/codegen
diff --git a/java/common/etc/qpid-run.conf b/qpid/java/common/etc/qpid-run.conf
index b9765fe3ce..b9765fe3ce 100644
--- a/java/common/etc/qpid-run.conf
+++ b/qpid/java/common/etc/qpid-run.conf
diff --git a/java/common/etc/qpid-run.conf.dev b/qpid/java/common/etc/qpid-run.conf.dev
index a5419eb4e8..a5419eb4e8 100644
--- a/java/common/etc/qpid-run.conf.dev
+++ b/qpid/java/common/etc/qpid-run.conf.dev
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpClass.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpClass.java
index 26195da2e3..26195da2e3 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpClass.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpClass.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
index a27a50d07e..a27a50d07e 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstant.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
index df5bc6c362..df5bc6c362 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
index ab8b8be61e..ab8b8be61e 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomain.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
index ba8552a6a6..ba8552a6a6 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
index 0cd9d214bd..0cd9d214bd 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
index e39550b96f..e39550b96f 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpField.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpField.java
index 7c721cf913..7c721cf913 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpField.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpField.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
index 0bb5e03a61..0bb5e03a61 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
index 5993a1b715..5993a1b715 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethod.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
index 4ec39b209e..4ec39b209e 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
index d98dab4a39..d98dab4a39 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpModel.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpModel.java
index 45f0adb18d..45f0adb18d 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpModel.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpModel.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
index 0633eff1e1..0633eff1e1 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
index fede88631a..fede88631a 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
index 10978d0e4a..10978d0e4a 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpParseException.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
index 3f3d4611fc..3f3d4611fc 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
index 1ac09ea453..1ac09ea453 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
index 127a8835b0..127a8835b0 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersion.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
index dbeef1b895..dbeef1b895 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
index 6419e23a1e..6419e23a1e 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java
index d85510ee98..d85510ee98 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java
index 641f50c3f8..641f50c3f8 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java
index 9ab7eb178b..9ab7eb178b 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/CppGenerator.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/CppGenerator.java
index 4f58cba34e..4f58cba34e 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/CppGenerator.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/CppGenerator.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
index 9fc81dd428..9fc81dd428 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/GenerateMethod.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/GenerateMethod.java
index 8b0bb99b41..8b0bb99b41 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/GenerateMethod.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/GenerateMethod.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/Generator.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/Generator.java
index 5d6e7be527..5d6e7be527 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/Generator.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/Generator.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/JavaGenerator.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
index 7730fca1bd..7730fca1bd 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/LanguageConverter.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
index 5e692d86e7..5e692d86e7 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/Main.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/Main.java
index c0584f7ca7..c0584f7ca7 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/Main.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/Main.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java
index ffeefed900..ffeefed900 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/NodeAware.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/NodeAware.java
index f832da75ad..f832da75ad 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/NodeAware.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/NodeAware.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/Printable.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/Printable.java
index aa13df7b68..aa13df7b68 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/Printable.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/Printable.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java
index 8e1af1c551..8e1af1c551 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionField.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionField.java
index b795663d15..b795663d15 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionField.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionField.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java
index 59a6d9e28a..59a6d9e28a 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java
index 22b416e45a..22b416e45a 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
index 39ce666288..39ce666288 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/Utils.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/Utils.java
index 1cedaeea12..1cedaeea12 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/Utils.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/Utils.java
diff --git a/java/common/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java b/qpid/java/common/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
index a9cdd56e88..a9cdd56e88 100644
--- a/java/common/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
+++ b/qpid/java/common/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
diff --git a/java/common/genutil.py b/qpid/java/common/genutil.py
index 7996cca450..7996cca450 100644
--- a/java/common/genutil.py
+++ b/qpid/java/common/genutil.py
diff --git a/java/common/pom.xml b/qpid/java/common/pom.xml
index 7aa4cd2a0c..7aa4cd2a0c 100644
--- a/java/common/pom.xml
+++ b/qpid/java/common/pom.xml
diff --git a/java/common/readme.txt b/qpid/java/common/readme.txt
index 12841fa08d..12841fa08d 100644
--- a/java/common/readme.txt
+++ b/qpid/java/common/readme.txt
diff --git a/java/common/src/main/grammar/SelectorParser.jj b/qpid/java/common/src/main/grammar/SelectorParser.jj
index ec3a27142f..ec3a27142f 100644
--- a/java/common/src/main/grammar/SelectorParser.jj
+++ b/qpid/java/common/src/main/grammar/SelectorParser.jj
diff --git a/java/common/src/main/java/common.bnd b/qpid/java/common/src/main/java/common.bnd
index 76ee9d740f..76ee9d740f 100755
--- a/java/common/src/main/java/common.bnd
+++ b/qpid/java/common/src/main/java/common.bnd
diff --git a/java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java
index 1b2eabdc86..1b2eabdc86 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQChannelException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
index df71ece787..df71ece787 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java
index b2ce3c1b32..b2ce3c1b32 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
index ef108eeb67..ef108eeb67 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
index d9a9ee0782..d9a9ee0782 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java
index 5ec5c42ab9..5ec5c42ab9 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java
index 591202d934..591202d934 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQInternalException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQInternalException.java
index 59dc800c0e..59dc800c0e 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQInternalException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQInternalException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
index 2bbaaef1fc..2bbaaef1fc 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
index c117968a29..c117968a29 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java
index ab5141be9d..ab5141be9d 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQProtocolException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQProtocolException.java
index 7744b128ce..7744b128ce 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQProtocolException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQProtocolException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQSecurityException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQSecurityException.java
index d145d2c21d..d145d2c21d 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQSecurityException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQSecurityException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQStoreException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQStoreException.java
index 45aa36a20b..45aa36a20b 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQStoreException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQStoreException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java
index 4ae8282af5..4ae8282af5 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java
index 01a569b693..01a569b693 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java
index 0eefc03016..0eefc03016 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
index 82ffe583c3..82ffe583c3 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
diff --git a/java/common/src/main/java/org/apache/qpid/api/Message.java b/qpid/java/common/src/main/java/org/apache/qpid/api/Message.java
index c0427c2f37..c0427c2f37 100644
--- a/java/common/src/main/java/org/apache/qpid/api/Message.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/api/Message.java
diff --git a/java/common/src/main/java/org/apache/qpid/codec/AMQCodecFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQCodecFactory.java
index c81af9760b..c81af9760b 100644
--- a/java/common/src/main/java/org/apache/qpid/codec/AMQCodecFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQCodecFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java b/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
index ffdb7e6573..ffdb7e6573 100644
--- a/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/codec/MarkableDataInput.java b/qpid/java/common/src/main/java/org/apache/qpid/codec/MarkableDataInput.java
index a1513135a3..a1513135a3 100644
--- a/java/common/src/main/java/org/apache/qpid/codec/MarkableDataInput.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/codec/MarkableDataInput.java
diff --git a/java/common/src/main/java/org/apache/qpid/common/AMQPFilterTypes.java b/qpid/java/common/src/main/java/org/apache/qpid/common/AMQPFilterTypes.java
index f50e65214c..f50e65214c 100644
--- a/java/common/src/main/java/org/apache/qpid/common/AMQPFilterTypes.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/common/AMQPFilterTypes.java
diff --git a/java/common/src/main/java/org/apache/qpid/common/Closeable.java b/qpid/java/common/src/main/java/org/apache/qpid/common/Closeable.java
index 45a98b5843..45a98b5843 100644
--- a/java/common/src/main/java/org/apache/qpid/common/Closeable.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/common/Closeable.java
diff --git a/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java
index 2c783aeaa4..2c783aeaa4 100644
--- a/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/common/ServerPropertyNames.java b/qpid/java/common/src/main/java/org/apache/qpid/common/ServerPropertyNames.java
index 3d792459a9..3d792459a9 100644
--- a/java/common/src/main/java/org/apache/qpid/common/ServerPropertyNames.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/common/ServerPropertyNames.java
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java
index b73f08f824..b73f08f824 100644
--- a/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
index b43b9d450b..b43b9d450b 100644
--- a/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
index 6bae93a1b8..6bae93a1b8 100644
--- a/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/Configured.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/Configured.java
index 22903888fe..22903888fe 100644
--- a/java/common/src/main/java/org/apache/qpid/configuration/Configured.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/configuration/Configured.java
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java
index b8181e3b87..b8181e3b87 100644
--- a/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java
index 81702ee1ea..81702ee1ea 100644
--- a/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/QpidProperty.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/QpidProperty.java
index 3ed32a604a..3ed32a604a 100644
--- a/java/common/src/main/java/org/apache/qpid/configuration/QpidProperty.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/configuration/QpidProperty.java
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/Validator.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/Validator.java
index e65bddf10b..e65bddf10b 100644
--- a/java/common/src/main/java/org/apache/qpid/configuration/Validator.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/configuration/Validator.java
diff --git a/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
index 3590254d27..3590254d27 100644
--- a/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java b/qpid/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
index 5e59628fb6..5e59628fb6 100644
--- a/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
index 47d970cfbd..47d970cfbd 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java
index 6467bbbe1f..6467bbbe1f 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java
index 13e1604d5f..13e1604d5f 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
index 2cfb97dc6c..2cfb97dc6c 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java
index 20c9f1438a..20c9f1438a 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/Expression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/Expression.java
index 1030c7b588..1030c7b588 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/Expression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/Expression.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/FilterableMessage.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/FilterableMessage.java
index 98c34bafd2..98c34bafd2 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/FilterableMessage.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/FilterableMessage.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java
index f8ec19d23b..f8ec19d23b 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/PropertyExpression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/PropertyExpression.java
index 4fb9c0e62f..4fb9c0e62f 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/PropertyExpression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/PropertyExpression.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/SelectorParsingException.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/SelectorParsingException.java
index 53909a0009..53909a0009 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/SelectorParsingException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/SelectorParsingException.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/UnaryExpression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/UnaryExpression.java
index b80b89840c..b80b89840c 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/UnaryExpression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/UnaryExpression.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/selector/ParseException.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/selector/ParseException.java
index bf28ada12b..bf28ada12b 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/selector/ParseException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/selector/ParseException.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/selector/SelectorParser.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/selector/SelectorParser.java
index ed85de9d8e..ed85de9d8e 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/selector/SelectorParser.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/selector/SelectorParser.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/selector/SelectorParserConstants.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/selector/SelectorParserConstants.java
index 2ffdcddc6c..2ffdcddc6c 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/selector/SelectorParserConstants.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/selector/SelectorParserConstants.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/selector/SelectorParserTokenManager.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/selector/SelectorParserTokenManager.java
index 96781acf84..96781acf84 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/selector/SelectorParserTokenManager.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/selector/SelectorParserTokenManager.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/selector/SimpleCharStream.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/selector/SimpleCharStream.java
index c492e5cc23..c492e5cc23 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/selector/SimpleCharStream.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/selector/SimpleCharStream.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/selector/Token.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/selector/Token.java
index aebd21dacc..aebd21dacc 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/selector/Token.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/selector/Token.java
diff --git a/java/common/src/main/java/org/apache/qpid/filter/selector/TokenMgrError.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/selector/TokenMgrError.java
index 835339dc53..835339dc53 100644
--- a/java/common/src/main/java/org/apache/qpid/filter/selector/TokenMgrError.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/selector/TokenMgrError.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
index cb0c78ef37..cb0c78ef37 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlock.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlock.java
index fd42084429..fd42084429 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlock.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlock.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
index 9d5e654ad0..9d5e654ad0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java
index 238f28e73e..238f28e73e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
index 2373edb478..2373edb478 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
index 966a03605c..966a03605c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
index 7fe293b6b7..7fe293b6b7 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
index 571570d7b4..571570d7b4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
index 88b1ca7189..88b1ca7189 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java
index ab09c1de6d..ab09c1de6d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java
index 6b819364da..6b819364da 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java
index 3165c373a9..3165c373a9 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java
index c9b0973ea6..c9b0973ea6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
index a06fa2d15b..a06fa2d15b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQShortStringTokenizer.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortStringTokenizer.java
index 25ab60327a..25ab60327a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQShortStringTokenizer.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortStringTokenizer.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQType.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
index 5c89af09c4..5c89af09c4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
index 94a7d127b3..94a7d127b3 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
index c4dc86bf11..c4dc86bf11 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AccessRequestBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AccessRequestBody.java
index 38701385d6..38701385d6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AccessRequestBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AccessRequestBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java
index aa7c171411..aa7c171411 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicAckBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicAckBody.java
index 41c4af5ff0..41c4af5ff0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicAckBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicAckBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBody.java
index 853b1583b9..853b1583b9 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java
index 623e89275a..623e89275a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
index d263899082..d263899082 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java
index a73cb9605d..a73cb9605d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
index 366c8231a1..366c8231a1 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java
index 07781c0026..07781c0026 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java
index b2a27cf840..b2a27cf840 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
index 758d15ba37..758d15ba37 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
index fac54d975c..fac54d975c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
index f71e012cd8..f71e012cd8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java
index 909a5dae8b..909a5dae8b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java
index b37cd30e73..b37cd30e73 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
index 57e5637222..57e5637222 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverOkBody.java
index a4abdd0cd7..a4abdd0cd7 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
index 9175da5796..9175da5796 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java
index c34aeda625..c34aeda625 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
index 87cd1083fb..87cd1083fb 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
index ace37b61fa..ace37b61fa 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BodyFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BodyFactory.java
index 554e9373d8..554e9373d8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BodyFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BodyFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ByteArrayDataInput.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ByteArrayDataInput.java
index 854f77e135..854f77e135 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ByteArrayDataInput.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ByteArrayDataInput.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
index 5c2354551a..5c2354551a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
index d791b9125e..d791b9125e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java
index 4d9b8b4c3a..4d9b8b4c3a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java
index 08a75df9a5..08a75df9a5 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java
index 750156ea9c..750156ea9c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelOkBody.java
index 4f332aea8f..4f332aea8f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java
index 0333cdae9f..0333cdae9f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java
index 7682cea782..7682cea782 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelPingBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelPingBody.java
index 29f2013e79..29f2013e79 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelPingBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelPingBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelPongBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelPongBody.java
index 2ac2388246..2ac2388246 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelPongBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelPongBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelResumeBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelResumeBody.java
index f3b77e1db9..f3b77e1db9 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelResumeBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelResumeBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java
index 0b31d99463..0b31d99463 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java
index 7162c37062..7162c37062 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/CompositeAMQDataBlock.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/CompositeAMQDataBlock.java
index 098e3652ad..098e3652ad 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/CompositeAMQDataBlock.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/CompositeAMQDataBlock.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java
index d03892d29f..d03892d29f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java
index f849095877..f849095877 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java
index cfa52b5f44..cfa52b5f44 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java
index eb2122fd74..eb2122fd74 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java
index df200e8572..df200e8572 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java
index ebcdc2cf4d..ebcdc2cf4d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java
index 7abbe9d18c..7abbe9d18c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java
index 3219a9f392..3219a9f392 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java
index bd45ce0fa0..bd45ce0fa0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java
index 82a1b2f04b..82a1b2f04b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java
index 15cdd44c08..15cdd44c08 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/Content.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/Content.java
index e5feeec2a4..e5feeec2a4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/Content.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/Content.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
index 6d6ec708d0..6d6ec708d0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentBodyFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBodyFactory.java
index 10df105ee6..10df105ee6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ContentBodyFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBodyFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
index f6fa89a91c..f6fa89a91c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBodyFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBodyFactory.java
index 83a5211013..83a5211013 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBodyFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBodyFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderProperties.java
index 2e1b988aa3..2e1b988aa3 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderProperties.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
index ff97c0b28f..ff97c0b28f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/DtxSelectBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/DtxSelectBody.java
index d6d7c87e23..d6d7c87e23 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/DtxSelectBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/DtxSelectBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/DtxSelectOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/DtxSelectOkBody.java
index 9ea4585b35..9ea4585b35 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/DtxSelectOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/DtxSelectOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/DtxStartBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/DtxStartBody.java
index e721bfcdd1..e721bfcdd1 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/DtxStartBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/DtxStartBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/DtxStartOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/DtxStartOkBody.java
index c16e9d7447..c16e9d7447 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/DtxStartOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/DtxStartOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/EncodableAMQDataBlock.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodableAMQDataBlock.java
index 9cf96e698c..9cf96e698c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/EncodableAMQDataBlock.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodableAMQDataBlock.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
index 1ecd8a13b7..1ecd8a13b7 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java
index fa1fb441a8..fa1fb441a8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java
index 7a60e4dc21..7a60e4dc21 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java
index 8ffb998e47..8ffb998e47 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBody.java
index 848963ce1b..848963ce1b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java
index 5ce3a7415f..5ce3a7415f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBody.java
index 54ce0940d5..54ce0940d5 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ExtendedDataInput.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ExtendedDataInput.java
index 04c1677892..04c1677892 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ExtendedDataInput.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ExtendedDataInput.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
index b9ed1b2154..b9ed1b2154 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java
index a2d4d27396..a2d4d27396 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileAckBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileAckBody.java
index 9d5f186521..9d5f186521 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FileAckBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileAckBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileCancelBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileCancelBody.java
index ac85455ff5..ac85455ff5 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FileCancelBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileCancelBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileCancelOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileCancelOkBody.java
index 40364887c8..40364887c8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FileCancelOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileCancelOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileConsumeBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileConsumeBody.java
index 632bc1cf85..632bc1cf85 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FileConsumeBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileConsumeBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileConsumeOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileConsumeOkBody.java
index dd6dd3f64b..dd6dd3f64b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FileConsumeOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileConsumeOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileDeliverBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileDeliverBody.java
index 3b8fa3fe79..3b8fa3fe79 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FileDeliverBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileDeliverBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileOpenBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileOpenBody.java
index 25ea3834bc..25ea3834bc 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FileOpenBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileOpenBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileOpenOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileOpenOkBody.java
index 4edff34eb4..4edff34eb4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FileOpenOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileOpenOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FilePublishBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FilePublishBody.java
index 5377882c27..5377882c27 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FilePublishBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FilePublishBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileQosBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileQosBody.java
index 378b6a3b5d..378b6a3b5d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FileQosBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileQosBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileQosOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileQosOkBody.java
index 7296b36cc2..7296b36cc2 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FileQosOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileQosOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileRejectBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileRejectBody.java
index c569d8ed9f..c569d8ed9f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FileRejectBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileRejectBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileReturnBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileReturnBody.java
index 8bd5825141..8bd5825141 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FileReturnBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileReturnBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileStageBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileStageBody.java
index 976fa3b0da..976fa3b0da 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FileStageBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FileStageBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
index 1613cd055e..1613cd055e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBodyFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBodyFactory.java
index 971caca41a..971caca41a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBodyFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBodyFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageAppendBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageAppendBody.java
index c981ad00f8..c981ad00f8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageAppendBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageAppendBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageCancelBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageCancelBody.java
index e440aca42f..e440aca42f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageCancelBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageCancelBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageCheckpointBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageCheckpointBody.java
index 1cc6dc598b..1cc6dc598b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageCheckpointBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageCheckpointBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageCloseBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageCloseBody.java
index 6898edec00..6898edec00 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageCloseBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageCloseBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageConsumeBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageConsumeBody.java
index 13fe4aec2b..13fe4aec2b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageConsumeBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageConsumeBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageEmptyBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageEmptyBody.java
index d4f1c6e02a..d4f1c6e02a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageEmptyBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageEmptyBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageGetBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageGetBody.java
index c2641679a8..c2641679a8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageGetBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageGetBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageOffsetBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageOffsetBody.java
index 3b7d94ae2e..3b7d94ae2e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageOffsetBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageOffsetBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageOkBody.java
index c349acd2bb..c349acd2bb 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageOpenBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageOpenBody.java
index da021bd42c..da021bd42c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageOpenBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageOpenBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageQosBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageQosBody.java
index ecedcebcee..ecedcebcee 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageQosBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageQosBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageRecoverBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageRecoverBody.java
index 37188d5dc9..37188d5dc9 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageRecoverBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageRecoverBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageRejectBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageRejectBody.java
index 3bd858c20d..3bd858c20d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageRejectBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageRejectBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageResumeBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageResumeBody.java
index ef68b97c19..ef68b97c19 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageResumeBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageResumeBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageTransferBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageTransferBody.java
index 11f8848431..11f8848431 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageTransferBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageTransferBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MethodDispatcher.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MethodDispatcher.java
index 03b122a7a7..03b122a7a7 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MethodDispatcher.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MethodDispatcher.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java
index 84274ba3a6..84274ba3a6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
index 0a06f0f1e9..0a06f0f1e9 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ProtocolVersion.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolVersion.java
index 33c613ec94..33c613ec94 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ProtocolVersion.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolVersion.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java
index d5f3b2b924..d5f3b2b924 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBody.java
index 3e2f0104f8..3e2f0104f8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java
index 23066457e6..23066457e6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBody.java
index 0557f2c54d..0557f2c54d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBody.java
index 2cced4d67e..2cced4d67e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBody.java
index 41acf6f246..41acf6f246 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBody.java
index 1965345997..1965345997 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBody.java
index 2641dcf81d..2641dcf81d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java
index 9c6caafc74..9c6caafc74 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindOkBody.java
index bdd8eb9359..bdd8eb9359 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java
index 6df8defed1..6df8defed1 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamCancelBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamCancelBody.java
index f5325ae4c0..f5325ae4c0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamCancelBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamCancelBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamCancelOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamCancelOkBody.java
index f19410d97f..f19410d97f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamCancelOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamCancelOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeBody.java
index 0226547fd8..0226547fd8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeOkBody.java
index 3d089823e2..3d089823e2 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamDeliverBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamDeliverBody.java
index 76a6231ad6..76a6231ad6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamDeliverBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamDeliverBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamPublishBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamPublishBody.java
index 98860389bc..98860389bc 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamPublishBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamPublishBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamQosBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamQosBody.java
index e28c4abd59..e28c4abd59 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamQosBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamQosBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamQosOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamQosOkBody.java
index 1a71ba1dfa..1a71ba1dfa 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamQosOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamQosOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamReturnBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamReturnBody.java
index e87863080d..e87863080d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamReturnBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamReturnBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestContentBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestContentBody.java
index 96b5a056c5..96b5a056c5 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/TestContentBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestContentBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestContentOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestContentOkBody.java
index 9da514a20b..9da514a20b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/TestContentOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestContentOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestIntegerBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestIntegerBody.java
index a024aba9c6..a024aba9c6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/TestIntegerBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestIntegerBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestIntegerOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestIntegerOkBody.java
index 7f7003031c..7f7003031c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/TestIntegerOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestIntegerOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestStringBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestStringBody.java
index 9474521aad..9474521aad 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/TestStringBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestStringBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestStringOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestStringOkBody.java
index 7dc519a92e..7dc519a92e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/TestStringOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestStringOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestTableBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestTableBody.java
index 4b80b72771..4b80b72771 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/TestTableBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestTableBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestTableOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestTableOkBody.java
index af3f3ca864..af3f3ca864 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/TestTableOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/TestTableOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TunnelRequestBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/TunnelRequestBody.java
index 98785aa4cc..98785aa4cc 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/TunnelRequestBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/TunnelRequestBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TxCommitBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/TxCommitBody.java
index 189ea0cd40..189ea0cd40 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/TxCommitBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/TxCommitBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBody.java
index 3df65e0504..3df65e0504 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBody.java
index d440dc8e04..d440dc8e04 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBody.java
index c542ff790a..c542ff790a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TxSelectBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/TxSelectBody.java
index c3c881cd9d..c3c881cd9d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/TxSelectBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/TxSelectBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBody.java
index 6841283bb2..6841283bb2 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java
index 1d7c05e9cc..1d7c05e9cc 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/ContentChunk.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ContentChunk.java
index 470b7b05e3..470b7b05e3 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/abstraction/ContentChunk.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ContentChunk.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java
index a96bdcc171..a96bdcc171 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java
index 01d1a8a17b..01d1a8a17b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java
index 53c70c8d71..53c70c8d71 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
index d1e53d6907..d1e53d6907 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java
index 8d51343507..8d51343507 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestBodyImpl.java
index 88897e0ff6..88897e0ff6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestOkBodyImpl.java
index 95087228f2..95087228f2 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicAckBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicAckBodyImpl.java
index b1f9757391..b1f9757391 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicAckBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicAckBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicCancelBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicCancelBodyImpl.java
index f536b9d8a5..f536b9d8a5 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicCancelBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicCancelBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicCancelOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicCancelOkBodyImpl.java
index ae2fe58ff9..ae2fe58ff9 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicCancelOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicCancelOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicConsumeBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicConsumeBodyImpl.java
index 177dc6ace2..177dc6ace2 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicConsumeBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicConsumeBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicConsumeOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicConsumeOkBodyImpl.java
index 647c58cbc4..647c58cbc4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicConsumeOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicConsumeOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicDeliverBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicDeliverBodyImpl.java
index 3d2602e605..3d2602e605 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicDeliverBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicDeliverBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetBodyImpl.java
index 0b21ddf8e9..0b21ddf8e9 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetEmptyBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetEmptyBodyImpl.java
index 29cf72d053..29cf72d053 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetEmptyBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetEmptyBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetOkBodyImpl.java
index 00bbdd7082..00bbdd7082 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicPublishBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicPublishBodyImpl.java
index b9f941b85e..b9f941b85e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicPublishBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicPublishBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicQosBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicQosBodyImpl.java
index c461f6b118..c461f6b118 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicQosBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicQosBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicQosOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicQosOkBodyImpl.java
index 9bc5d6f3b8..9bc5d6f3b8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicQosOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicQosOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverBodyImpl.java
index 498e8f85dc..498e8f85dc 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncBodyImpl.java
index 05390ea493..05390ea493 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncOkBodyImpl.java
index 0b889e4a21..0b889e4a21 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRejectBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRejectBodyImpl.java
index 3e8cf6b825..3e8cf6b825 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRejectBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRejectBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicReturnBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicReturnBodyImpl.java
index c88391dca3..c88391dca3 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicReturnBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicReturnBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelCloseBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelCloseBodyImpl.java
index ceadeb8f7c..ceadeb8f7c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelCloseBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelCloseBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelCloseOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelCloseOkBodyImpl.java
index 5df83134f7..5df83134f7 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelCloseOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelCloseOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelFlowBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelFlowBodyImpl.java
index 62e9bf90a0..62e9bf90a0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelFlowBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelFlowBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelFlowOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelFlowOkBodyImpl.java
index 5c73bd2ff4..5c73bd2ff4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelFlowOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelFlowOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOkBodyImpl.java
index 7945fcec47..7945fcec47 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenBodyImpl.java
index 10c06cb132..10c06cb132 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenOkBodyImpl.java
index 1c2a3f4a57..1c2a3f4a57 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelPingBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelPingBodyImpl.java
index ba02f17b99..ba02f17b99 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelPingBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelPingBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelPongBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelPongBodyImpl.java
index da37e5127e..da37e5127e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelPongBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelPongBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelResumeBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelResumeBodyImpl.java
index 47fc5c60be..47fc5c60be 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelResumeBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelResumeBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java
index f1bf0d5a53..f1bf0d5a53 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseBodyImpl.java
index e0f8704f67..e0f8704f67 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseOkBodyImpl.java
index 98f73b0beb..98f73b0beb 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionOpenBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionOpenBodyImpl.java
index 86c40656bb..86c40656bb 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionOpenBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionOpenBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionOpenOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionOpenOkBodyImpl.java
index 0439fc01b8..0439fc01b8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionOpenOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionOpenOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionRedirectBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionRedirectBodyImpl.java
index 270161db47..270161db47 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionRedirectBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionRedirectBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionSecureBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionSecureBodyImpl.java
index 19b9532f5b..19b9532f5b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionSecureBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionSecureBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionSecureOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionSecureOkBodyImpl.java
index 7891d7d24c..7891d7d24c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionSecureOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionSecureOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionStartBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionStartBodyImpl.java
index ec82327f4d..ec82327f4d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionStartBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionStartBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionStartOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionStartOkBodyImpl.java
index cdc77c87fd..cdc77c87fd 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionStartOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionStartOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionTuneBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionTuneBodyImpl.java
index a5cb1f4d77..a5cb1f4d77 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionTuneBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionTuneBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionTuneOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionTuneOkBodyImpl.java
index 2dee4765f5..2dee4765f5 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionTuneOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionTuneOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxSelectBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxSelectBodyImpl.java
index 5739697389..5739697389 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxSelectBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxSelectBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxSelectOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxSelectOkBodyImpl.java
index b379501617..b379501617 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxSelectOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxSelectOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxStartBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxStartBodyImpl.java
index 162c0b31ad..162c0b31ad 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxStartBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxStartBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxStartOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxStartOkBodyImpl.java
index fbe9b86e56..fbe9b86e56 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxStartOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxStartOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeBoundBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeBoundBodyImpl.java
index 92ba4edc03..92ba4edc03 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeBoundBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeBoundBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeBoundOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeBoundOkBodyImpl.java
index 4f594b9a70..4f594b9a70 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeBoundOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeBoundOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeclareBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeclareBodyImpl.java
index 50b6889735..50b6889735 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeclareBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeclareBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeclareOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeclareOkBodyImpl.java
index adaff55cc8..adaff55cc8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeclareOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeclareOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeleteBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeleteBodyImpl.java
index 60da6c8330..60da6c8330 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeleteBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeleteBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeleteOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeleteOkBodyImpl.java
index 89eab25c74..89eab25c74 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeleteOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeleteOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileAckBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileAckBodyImpl.java
index b2e0727fc3..b2e0727fc3 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileAckBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileAckBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileCancelBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileCancelBodyImpl.java
index a1cddb1bc1..a1cddb1bc1 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileCancelBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileCancelBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileCancelOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileCancelOkBodyImpl.java
index 258b55f6d8..258b55f6d8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileCancelOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileCancelOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileConsumeBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileConsumeBodyImpl.java
index d841fab69d..d841fab69d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileConsumeBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileConsumeBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileConsumeOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileConsumeOkBodyImpl.java
index 139ab0cbce..139ab0cbce 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileConsumeOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileConsumeOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileDeliverBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileDeliverBodyImpl.java
index 5e4b15ef74..5e4b15ef74 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileDeliverBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileDeliverBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileOpenBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileOpenBodyImpl.java
index 7c2352eee3..7c2352eee3 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileOpenBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileOpenBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileOpenOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileOpenOkBodyImpl.java
index 05a132cce2..05a132cce2 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileOpenOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileOpenOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FilePublishBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FilePublishBodyImpl.java
index f04a869bcc..f04a869bcc 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FilePublishBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FilePublishBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileQosBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileQosBodyImpl.java
index 0d6fe98029..0d6fe98029 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileQosBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileQosBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileQosOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileQosOkBodyImpl.java
index b7703c633a..b7703c633a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileQosOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileQosOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileRejectBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileRejectBodyImpl.java
index b73014ebe2..b73014ebe2 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileRejectBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileRejectBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileReturnBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileReturnBodyImpl.java
index 4a0d600f13..4a0d600f13 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileReturnBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileReturnBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileStageBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileStageBodyImpl.java
index dfb76279e8..dfb76279e8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileStageBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileStageBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageAppendBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageAppendBodyImpl.java
index 4964c77ab6..4964c77ab6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageAppendBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageAppendBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCancelBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCancelBodyImpl.java
index 661b6cd9a3..661b6cd9a3 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCancelBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCancelBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCheckpointBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCheckpointBodyImpl.java
index 921348ac71..921348ac71 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCheckpointBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCheckpointBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCloseBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCloseBodyImpl.java
index 78185ec507..78185ec507 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCloseBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCloseBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageConsumeBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageConsumeBodyImpl.java
index fe72503c17..fe72503c17 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageConsumeBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageConsumeBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageEmptyBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageEmptyBodyImpl.java
index 1383836f8e..1383836f8e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageEmptyBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageEmptyBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageGetBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageGetBodyImpl.java
index b812309ac0..b812309ac0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageGetBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageGetBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOffsetBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOffsetBodyImpl.java
index 52d907df2b..52d907df2b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOffsetBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOffsetBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOkBodyImpl.java
index c0477e2c13..c0477e2c13 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOpenBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOpenBodyImpl.java
index d500317bfe..d500317bfe 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOpenBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOpenBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageQosBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageQosBodyImpl.java
index ce4b655131..ce4b655131 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageQosBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageQosBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageRecoverBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageRecoverBodyImpl.java
index 7fac0d9a46..7fac0d9a46 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageRecoverBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageRecoverBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageRejectBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageRejectBodyImpl.java
index eb15a960c5..eb15a960c5 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageRejectBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageRejectBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageResumeBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageResumeBodyImpl.java
index b8bcb2f309..b8bcb2f309 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageResumeBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageResumeBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageTransferBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageTransferBodyImpl.java
index 947334812c..947334812c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageTransferBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageTransferBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
index b3eb1211a5..b3eb1211a5 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodDispatcher_0_9.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodDispatcher_0_9.java
index 00c81e1180..00c81e1180 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodDispatcher_0_9.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodDispatcher_0_9.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodRegistry_0_9.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodRegistry_0_9.java
index f0e317fc1e..f0e317fc1e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodRegistry_0_9.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodRegistry_0_9.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueBindBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueBindBodyImpl.java
index 989a6d4877..989a6d4877 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueBindBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueBindBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueBindOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueBindOkBodyImpl.java
index 1469912b2b..1469912b2b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueBindOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueBindOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeclareBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeclareBodyImpl.java
index 7b2926f32f..7b2926f32f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeclareBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeclareBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeclareOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeclareOkBodyImpl.java
index 1c76725d2b..1c76725d2b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeclareOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeclareOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeleteBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeleteBodyImpl.java
index ea48a1d24a..ea48a1d24a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeleteBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeleteBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeleteOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeleteOkBodyImpl.java
index acc7a59887..acc7a59887 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeleteOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeleteOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueuePurgeBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueuePurgeBodyImpl.java
index 8a1a4e206c..8a1a4e206c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueuePurgeBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueuePurgeBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueuePurgeOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueuePurgeOkBodyImpl.java
index db50a822f6..db50a822f6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueuePurgeOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueuePurgeOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindBodyImpl.java
index fd5bb7b953..fd5bb7b953 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindOkBodyImpl.java
index 03544b17d6..03544b17d6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java
index 4100e7a031..4100e7a031 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamCancelBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamCancelBodyImpl.java
index 81ec1102f5..81ec1102f5 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamCancelBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamCancelBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamCancelOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamCancelOkBodyImpl.java
index ec9676d782..ec9676d782 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamCancelOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamCancelOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamConsumeBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamConsumeBodyImpl.java
index ff4712d091..ff4712d091 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamConsumeBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamConsumeBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamConsumeOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamConsumeOkBodyImpl.java
index cca83758e4..cca83758e4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamConsumeOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamConsumeOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamDeliverBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamDeliverBodyImpl.java
index 87e341ee5c..87e341ee5c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamDeliverBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamDeliverBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamPublishBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamPublishBodyImpl.java
index 59161fe291..59161fe291 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamPublishBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamPublishBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamQosBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamQosBodyImpl.java
index b9413d3ef2..b9413d3ef2 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamQosBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamQosBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamQosOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamQosOkBodyImpl.java
index a5119c7f6d..a5119c7f6d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamQosOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamQosOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamReturnBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamReturnBodyImpl.java
index bb60ea982e..bb60ea982e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamReturnBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamReturnBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TunnelRequestBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TunnelRequestBodyImpl.java
index fae6e1c3b9..fae6e1c3b9 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TunnelRequestBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TunnelRequestBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxCommitBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxCommitBodyImpl.java
index 9663cc86f5..9663cc86f5 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxCommitBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxCommitBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxCommitOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxCommitOkBodyImpl.java
index fa009903b9..fa009903b9 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxCommitOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxCommitOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxRollbackBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxRollbackBodyImpl.java
index c143c34081..c143c34081 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxRollbackBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxRollbackBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxRollbackOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxRollbackOkBodyImpl.java
index a5238b8804..a5238b8804 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxRollbackOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxRollbackOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxSelectBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxSelectBodyImpl.java
index 9a43987fa2..9a43987fa2 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxSelectBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxSelectBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxSelectOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxSelectOkBodyImpl.java
index c06bf4c501..c06bf4c501 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxSelectOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxSelectOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/AMQMethodBody_0_91.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/AMQMethodBody_0_91.java
index 60b8a7e1a6..60b8a7e1a6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/AMQMethodBody_0_91.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/AMQMethodBody_0_91.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicAckBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicAckBodyImpl.java
index 059ae8fab8..059ae8fab8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicAckBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicAckBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicCancelBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicCancelBodyImpl.java
index 08a07960ac..08a07960ac 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicCancelBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicCancelBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicCancelOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicCancelOkBodyImpl.java
index 380fa70a18..380fa70a18 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicCancelOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicCancelOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicConsumeBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicConsumeBodyImpl.java
index b299c5c0d4..b299c5c0d4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicConsumeBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicConsumeBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicConsumeOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicConsumeOkBodyImpl.java
index 2241370c75..2241370c75 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicConsumeOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicConsumeOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicDeliverBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicDeliverBodyImpl.java
index a1a9bf6113..a1a9bf6113 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicDeliverBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicDeliverBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetBodyImpl.java
index 2f9ca99673..2f9ca99673 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetEmptyBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetEmptyBodyImpl.java
index 2f40867d71..2f40867d71 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetEmptyBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetEmptyBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetOkBodyImpl.java
index 9666f447f1..9666f447f1 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicPublishBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicPublishBodyImpl.java
index b347420128..b347420128 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicPublishBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicPublishBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicQosBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicQosBodyImpl.java
index 00372b9c49..00372b9c49 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicQosBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicQosBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicQosOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicQosOkBodyImpl.java
index a36b2e6d66..a36b2e6d66 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicQosOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicQosOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverBodyImpl.java
index e21c382a24..e21c382a24 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java
index c0679cf939..c0679cf939 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java
index a75d344831..a75d344831 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRejectBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRejectBodyImpl.java
index b5b549d4a9..b5b549d4a9 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRejectBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRejectBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicReturnBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicReturnBodyImpl.java
index 26ba2f8b95..26ba2f8b95 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicReturnBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicReturnBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelCloseBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelCloseBodyImpl.java
index 77f0dc2c9a..77f0dc2c9a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelCloseBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelCloseBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelCloseOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelCloseOkBodyImpl.java
index 91dd7b998a..91dd7b998a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelCloseOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelCloseOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelFlowBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelFlowBodyImpl.java
index ce22049d31..ce22049d31 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelFlowBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelFlowBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelFlowOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelFlowOkBodyImpl.java
index 427acd045c..427acd045c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelFlowOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelFlowOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenBodyImpl.java
index e204006fb3..e204006fb3 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenOkBodyImpl.java
index d891cb3374..d891cb3374 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.java
index e60a4b6d0c..e60a4b6d0c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java
index 92c78ac484..92c78ac484 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java
index 8bf23cb8fb..8bf23cb8fb 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionOpenBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionOpenBodyImpl.java
index 20284f6462..20284f6462 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionOpenBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionOpenBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionOpenOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionOpenOkBodyImpl.java
index 346b26f039..346b26f039 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionOpenOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionOpenOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionSecureBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionSecureBodyImpl.java
index 1573403c41..1573403c41 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionSecureBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionSecureBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionSecureOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionSecureOkBodyImpl.java
index bf44d51a00..bf44d51a00 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionSecureOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionSecureOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionStartBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionStartBodyImpl.java
index b849c4fcfb..b849c4fcfb 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionStartBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionStartBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionStartOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionStartOkBodyImpl.java
index 59bbf147e3..59bbf147e3 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionStartOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionStartOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionTuneBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionTuneBodyImpl.java
index 2c98b56858..2c98b56858 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionTuneBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionTuneBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionTuneOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionTuneOkBodyImpl.java
index 8a6a6aac3a..8a6a6aac3a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionTuneOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionTuneOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeBoundBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeBoundBodyImpl.java
index 69e70d7477..69e70d7477 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeBoundBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeBoundBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeBoundOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeBoundOkBodyImpl.java
index c21838081f..c21838081f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeBoundOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeBoundOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeclareBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeclareBodyImpl.java
index 68b9ce084d..68b9ce084d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeclareBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeclareBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeclareOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeclareOkBodyImpl.java
index 2861d1e954..2861d1e954 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeclareOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeclareOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeleteBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeleteBodyImpl.java
index f259d6433d..f259d6433d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeleteBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeleteBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeleteOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeleteOkBodyImpl.java
index fc4ef99a5b..fc4ef99a5b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeleteOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeleteOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
index d33749d795..d33749d795 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodDispatcher_0_91.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodDispatcher_0_91.java
index 9846ce4b48..9846ce4b48 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodDispatcher_0_91.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodDispatcher_0_91.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodRegistry_0_91.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodRegistry_0_91.java
index 40970f2266..40970f2266 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodRegistry_0_91.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodRegistry_0_91.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueBindBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueBindBodyImpl.java
index 3c79181d1d..3c79181d1d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueBindBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueBindBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueBindOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueBindOkBodyImpl.java
index b73ed8840d..b73ed8840d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueBindOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueBindOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeclareBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeclareBodyImpl.java
index 3f315cd239..3f315cd239 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeclareBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeclareBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeclareOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeclareOkBodyImpl.java
index 6f4452199d..6f4452199d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeclareOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeclareOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeleteBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeleteBodyImpl.java
index 1d021d9c18..1d021d9c18 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeleteBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeleteBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeleteOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeleteOkBodyImpl.java
index 30e54e15a2..30e54e15a2 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeleteOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeleteOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueuePurgeBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueuePurgeBodyImpl.java
index b217a8b3f2..b217a8b3f2 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueuePurgeBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueuePurgeBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueuePurgeOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueuePurgeOkBodyImpl.java
index 268ebcff54..268ebcff54 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueuePurgeOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueuePurgeOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindBodyImpl.java
index d29db36ffa..d29db36ffa 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindOkBodyImpl.java
index 01747fa536..01747fa536 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.java
index b24b8253d2..b24b8253d2 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxCommitBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxCommitBodyImpl.java
index 8e2427efc4..8e2427efc4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxCommitBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxCommitBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxCommitOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxCommitOkBodyImpl.java
index df7af95c0f..df7af95c0f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxCommitOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxCommitOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxRollbackBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxRollbackBodyImpl.java
index 3b3e1d5366..3b3e1d5366 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxRollbackBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxRollbackBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxRollbackOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxRollbackOkBodyImpl.java
index 0d820a4b82..0d820a4b82 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxRollbackOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxRollbackOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxSelectBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxSelectBodyImpl.java
index ad0fe78e9a..ad0fe78e9a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxSelectBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxSelectBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxSelectOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxSelectOkBodyImpl.java
index bfc6296b24..bfc6296b24 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxSelectOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxSelectOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java
index 35645854c0..35645854c0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestBodyImpl.java
index a29363f293..a29363f293 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestOkBodyImpl.java
index 5c207b59d4..5c207b59d4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicAckBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicAckBodyImpl.java
index 81f84ecf7f..81f84ecf7f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicAckBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicAckBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelBodyImpl.java
index 196268654b..196268654b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelOkBodyImpl.java
index 082348616d..082348616d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeBodyImpl.java
index d11f18986f..d11f18986f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeOkBodyImpl.java
index 7327b2da3f..7327b2da3f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicDeliverBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicDeliverBodyImpl.java
index 58cf16fe55..58cf16fe55 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicDeliverBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicDeliverBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetBodyImpl.java
index d348101cee..d348101cee 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetEmptyBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetEmptyBodyImpl.java
index 3e49be1eb1..3e49be1eb1 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetEmptyBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetEmptyBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetOkBodyImpl.java
index bcfefe2e34..bcfefe2e34 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicPublishBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicPublishBodyImpl.java
index dc5d82a5b4..dc5d82a5b4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicPublishBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicPublishBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosBodyImpl.java
index 76fdfac3cd..76fdfac3cd 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosOkBodyImpl.java
index a9d7ca998c..a9d7ca998c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverBodyImpl.java
index 2ad62004bc..2ad62004bc 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverOkBodyImpl.java
index 4d247b7edd..4d247b7edd 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRejectBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRejectBodyImpl.java
index b1ae381f12..b1ae381f12 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRejectBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRejectBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicReturnBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicReturnBodyImpl.java
index 9675aec1a1..9675aec1a1 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicReturnBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicReturnBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java
index eecd44b026..eecd44b026 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseBodyImpl.java
index dccb691dc8..dccb691dc8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseOkBodyImpl.java
index ed3eab5da9..ed3eab5da9 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowBodyImpl.java
index 12886543cf..12886543cf 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowOkBodyImpl.java
index 8b6ae9c444..8b6ae9c444 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenBodyImpl.java
index c4dab6343d..c4dab6343d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java
index f84a0c314d..f84a0c314d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java
index 52e44a8e4d..52e44a8e4d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseBodyImpl.java
index eab4ef05ee..eab4ef05ee 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseOkBodyImpl.java
index 876715a37b..876715a37b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenBodyImpl.java
index 7745a8de0a..7745a8de0a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenOkBodyImpl.java
index b74a2857cd..b74a2857cd 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java
index 59eadf1be3..59eadf1be3 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureBodyImpl.java
index 29b341463e..29b341463e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureOkBodyImpl.java
index 046abf439c..046abf439c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartBodyImpl.java
index 1f23a9da6e..1f23a9da6e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartOkBodyImpl.java
index 24ecf380ac..24ecf380ac 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneBodyImpl.java
index 83aff93055..83aff93055 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneOkBodyImpl.java
index a6221b9815..a6221b9815 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxSelectBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxSelectBodyImpl.java
index ac2ff8b225..ac2ff8b225 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxSelectBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxSelectBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxSelectOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxSelectOkBodyImpl.java
index 2281853e00..2281853e00 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxSelectOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxSelectOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxStartBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxStartBodyImpl.java
index b5a1faa760..b5a1faa760 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxStartBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxStartBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxStartOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxStartOkBodyImpl.java
index 73fd13e7d3..73fd13e7d3 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxStartOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxStartOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundBodyImpl.java
index c391f1b7ee..c391f1b7ee 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundOkBodyImpl.java
index cfbe77d70e..cfbe77d70e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareBodyImpl.java
index de47e0b867..de47e0b867 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareOkBodyImpl.java
index 8d8ca793b8..8d8ca793b8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteBodyImpl.java
index 2bfc0f13f4..2bfc0f13f4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteOkBodyImpl.java
index 996072088c..996072088c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileAckBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileAckBodyImpl.java
index 1efad0825a..1efad0825a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileAckBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileAckBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileCancelBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileCancelBodyImpl.java
index 422f6d8f16..422f6d8f16 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileCancelBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileCancelBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileCancelOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileCancelOkBodyImpl.java
index b100ce9f1b..b100ce9f1b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileCancelOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileCancelOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileConsumeBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileConsumeBodyImpl.java
index 0a6aa06da4..0a6aa06da4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileConsumeBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileConsumeBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileConsumeOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileConsumeOkBodyImpl.java
index cde5176f42..cde5176f42 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileConsumeOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileConsumeOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileDeliverBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileDeliverBodyImpl.java
index 3cfd508dd7..3cfd508dd7 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileDeliverBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileDeliverBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileOpenBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileOpenBodyImpl.java
index aa79d22961..aa79d22961 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileOpenBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileOpenBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileOpenOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileOpenOkBodyImpl.java
index 48845f7074..48845f7074 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileOpenOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileOpenOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FilePublishBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FilePublishBodyImpl.java
index c3e01ec686..c3e01ec686 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FilePublishBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FilePublishBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileQosBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileQosBodyImpl.java
index f78156d8df..f78156d8df 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileQosBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileQosBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileQosOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileQosOkBodyImpl.java
index 17076f49b3..17076f49b3 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileQosOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileQosOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileRejectBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileRejectBodyImpl.java
index a4e7a57540..a4e7a57540 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileRejectBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileRejectBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileReturnBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileReturnBodyImpl.java
index bf696ca668..bf696ca668 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileReturnBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileReturnBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileStageBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileStageBodyImpl.java
index 8e2185801b..8e2185801b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileStageBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileStageBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
index 575816db4f..575816db4f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodDispatcher_8_0.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodDispatcher_8_0.java
index dc4f33ab6d..dc4f33ab6d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodDispatcher_8_0.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodDispatcher_8_0.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodRegistry_8_0.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodRegistry_8_0.java
index f3c1888e2a..f3c1888e2a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodRegistry_8_0.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodRegistry_8_0.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindBodyImpl.java
index b4acb6ae06..b4acb6ae06 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindOkBodyImpl.java
index 6a0b78db2d..6a0b78db2d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareBodyImpl.java
index 4e835bd12b..4e835bd12b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareOkBodyImpl.java
index 09abf5865e..09abf5865e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteBodyImpl.java
index ada079c4c1..ada079c4c1 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteOkBodyImpl.java
index 54eea482fa..54eea482fa 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeBodyImpl.java
index ae4f9d3483..ae4f9d3483 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeOkBodyImpl.java
index 576e175044..576e175044 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ServerMethodDispatcher_8_0.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ServerMethodDispatcher_8_0.java
index 5c8ad68cd0..5c8ad68cd0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ServerMethodDispatcher_8_0.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ServerMethodDispatcher_8_0.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamCancelBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamCancelBodyImpl.java
index 80032c93da..80032c93da 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamCancelBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamCancelBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamCancelOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamCancelOkBodyImpl.java
index f7d5f28269..f7d5f28269 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamCancelOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamCancelOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamConsumeBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamConsumeBodyImpl.java
index 2e55068f1d..2e55068f1d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamConsumeBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamConsumeBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamConsumeOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamConsumeOkBodyImpl.java
index 052efc1fdd..052efc1fdd 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamConsumeOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamConsumeOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamDeliverBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamDeliverBodyImpl.java
index 8bbde690a0..8bbde690a0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamDeliverBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamDeliverBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamPublishBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamPublishBodyImpl.java
index 6977e839ff..6977e839ff 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamPublishBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamPublishBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamQosBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamQosBodyImpl.java
index 50fe23c170..50fe23c170 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamQosBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamQosBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamQosOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamQosOkBodyImpl.java
index 6f8977e4eb..6f8977e4eb 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamQosOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamQosOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamReturnBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamReturnBodyImpl.java
index 7b79956958..7b79956958 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamReturnBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamReturnBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestContentBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestContentBodyImpl.java
index 832ee12e2c..832ee12e2c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestContentBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestContentBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestContentOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestContentOkBodyImpl.java
index 32c9e92c2f..32c9e92c2f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestContentOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestContentOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestIntegerBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestIntegerBodyImpl.java
index 8d01d2d4d8..8d01d2d4d8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestIntegerBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestIntegerBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestIntegerOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestIntegerOkBodyImpl.java
index b46b6c74d4..b46b6c74d4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestIntegerOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestIntegerOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestStringBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestStringBodyImpl.java
index 8bdb72d58a..8bdb72d58a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestStringBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestStringBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestStringOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestStringOkBodyImpl.java
index be927e13ea..be927e13ea 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestStringOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestStringOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestTableBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestTableBodyImpl.java
index 5c4b9e8d33..5c4b9e8d33 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestTableBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestTableBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestTableOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestTableOkBodyImpl.java
index ea16a3b157..ea16a3b157 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestTableOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestTableOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TunnelRequestBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TunnelRequestBodyImpl.java
index 5bb0e64ec8..5bb0e64ec8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TunnelRequestBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TunnelRequestBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitBodyImpl.java
index 096c401c02..096c401c02 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitOkBodyImpl.java
index 76274be34a..76274be34a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackBodyImpl.java
index f68f881861..f68f881861 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackOkBodyImpl.java
index 7ec3d8b83b..7ec3d8b83b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectBodyImpl.java
index 69f4dd2ec5..69f4dd2ec5 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectOkBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectOkBodyImpl.java
index fc1279c908..fc1279c908 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectOkBodyImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectOkBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/Address.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java
index bccae8e671..bccae8e671 100644
--- a/java/common/src/main/java/org/apache/qpid/messaging/Address.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/AddressParser.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/AddressParser.java
index 4e3782673c..4e3782673c 100644
--- a/java/common/src/main/java/org/apache/qpid/messaging/util/AddressParser.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/AddressParser.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java
index c5c2cacd1a..c5c2cacd1a 100644
--- a/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/LexError.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/LexError.java
index b8d346dca4..b8d346dca4 100644
--- a/java/common/src/main/java/org/apache/qpid/messaging/util/LexError.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/LexError.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/Lexer.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Lexer.java
index 9638ec78e2..9638ec78e2 100644
--- a/java/common/src/main/java/org/apache/qpid/messaging/util/Lexer.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Lexer.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/Lexicon.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Lexicon.java
index 9ab610f37a..9ab610f37a 100644
--- a/java/common/src/main/java/org/apache/qpid/messaging/util/Lexicon.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Lexicon.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/LineInfo.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/LineInfo.java
index 4952fc38a3..4952fc38a3 100644
--- a/java/common/src/main/java/org/apache/qpid/messaging/util/LineInfo.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/LineInfo.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/ParseError.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/ParseError.java
index ce758e15fa..ce758e15fa 100644
--- a/java/common/src/main/java/org/apache/qpid/messaging/util/ParseError.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/ParseError.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/Parser.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Parser.java
index 3019326963..3019326963 100644
--- a/java/common/src/main/java/org/apache/qpid/messaging/util/Parser.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Parser.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/PyPrint.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/PyPrint.java
index 2681893482..2681893482 100644
--- a/java/common/src/main/java/org/apache/qpid/messaging/util/PyPrint.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/PyPrint.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/Token.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Token.java
index b9458d7997..b9458d7997 100644
--- a/java/common/src/main/java/org/apache/qpid/messaging/util/Token.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Token.java
diff --git a/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java b/qpid/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java
index 0df9a85676..0df9a85676 100644
--- a/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java
diff --git a/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java
index 6f9d872f98..6f9d872f98 100644
--- a/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
index 2a2342ca14..2a2342ca14 100644
--- a/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java
index fd6907a152..fd6907a152 100644
--- a/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
index 8cc9709c9c..8cc9709c9c 100644
--- a/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java
index 65884e4950..65884e4950 100644
--- a/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
index 33604b05d9..33604b05d9 100644
--- a/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngine.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngine.java
index 6774d0a45a..6774d0a45a 100644
--- a/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngine.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngine.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngineFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngineFactory.java
index 885a6a975d..885a6a975d 100644
--- a/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngineFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngineFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
index 56f950dd85..56f950dd85 100644
--- a/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/ServerProtocolEngine.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/ServerProtocolEngine.java
index e8362f79f0..e8362f79f0 100644
--- a/java/common/src/main/java/org/apache/qpid/protocol/ServerProtocolEngine.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/protocol/ServerProtocolEngine.java
diff --git a/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java
index e9dec362a6..e9dec362a6 100644
--- a/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java
index a96dac4109..a96dac4109 100644
--- a/java/common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/thread/LoggingUncaughtExceptionHandler.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/LoggingUncaughtExceptionHandler.java
index 58d80454b7..58d80454b7 100644
--- a/java/common/src/main/java/org/apache/qpid/thread/LoggingUncaughtExceptionHandler.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/thread/LoggingUncaughtExceptionHandler.java
diff --git a/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java
index 06f5e6b835..06f5e6b835 100644
--- a/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java
diff --git a/java/common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java
index 631ee98b94..631ee98b94 100644
--- a/java/common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/thread/ThreadFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/ThreadFactory.java
index c8f1cbfcba..c8f1cbfcba 100644
--- a/java/common/src/main/java/org/apache/qpid/thread/ThreadFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/thread/ThreadFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/thread/Threading.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/Threading.java
index d3ccc138dd..d3ccc138dd 100644
--- a/java/common/src/main/java/org/apache/qpid/thread/Threading.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/thread/Threading.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Acquired.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Acquired.java
index 28e6e4c4e6..28e6e4c4e6 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Acquired.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Acquired.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Binary.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java
index e3e6f81f7c..e3e6f81f7c 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Binary.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Binding.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Binding.java
index 8418c42189..8418c42189 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Binding.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Binding.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
index 75eb0e19a7..75eb0e19a7 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
index cdca726148..cdca726148 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Connection.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionClose.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionClose.java
index 8888f354d8..8888f354d8 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionClose.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionClose.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionCloseCode.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionCloseCode.java
index 18c5b257d2..18c5b257d2 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionCloseCode.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionCloseCode.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionCloseOk.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionCloseOk.java
index b954ac2162..b954ac2162 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionCloseOk.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionCloseOk.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
index fdd35d49ef..fdd35d49ef 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionException.java
index 6d3972eb43..6d3972eb43 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionHeartbeat.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionHeartbeat.java
index 190bca0eaa..190bca0eaa 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionHeartbeat.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionHeartbeat.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionInvoker.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionInvoker.java
index 29045e17de..29045e17de 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionInvoker.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionInvoker.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionListener.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionListener.java
index 616e76825a..616e76825a 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionListener.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionListener.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionOpen.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionOpen.java
index b17a3810f2..b17a3810f2 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionOpen.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionOpen.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionOpenOk.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionOpenOk.java
index 0cbbba51bb..0cbbba51bb 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionOpenOk.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionOpenOk.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionRedirect.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionRedirect.java
index c84758c54c..c84758c54c 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionRedirect.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionRedirect.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionSecure.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSecure.java
index 44fbac2b19..44fbac2b19 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionSecure.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSecure.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionSecureOk.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSecureOk.java
index 2a2b7df83a..2a2b7df83a 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionSecureOk.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSecureOk.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
index 2ff08fd751..2ff08fd751 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionStart.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionStart.java
index 6193122c56..6193122c56 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionStart.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionStart.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionStartOk.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionStartOk.java
index 13fe27de34..13fe27de34 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionStartOk.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionStartOk.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionTune.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionTune.java
index b838532878..b838532878 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionTune.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionTune.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionTuneOk.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionTuneOk.java
index 17b5d34752..17b5d34752 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionTuneOk.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionTuneOk.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Constant.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Constant.java
index 17355d3465..17355d3465 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Constant.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Constant.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/DeliveryProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/DeliveryProperties.java
index ded5a42247..ded5a42247 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/DeliveryProperties.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/DeliveryProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/DtxCommit.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxCommit.java
index 315b37025d..315b37025d 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/DtxCommit.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxCommit.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/DtxEnd.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxEnd.java
index 70cac46379..70cac46379 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/DtxEnd.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxEnd.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/DtxForget.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxForget.java
index 0d57488e78..0d57488e78 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/DtxForget.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxForget.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/DtxGetTimeout.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxGetTimeout.java
index 42293a865f..42293a865f 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/DtxGetTimeout.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxGetTimeout.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/DtxPrepare.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxPrepare.java
index 8a771e638f..8a771e638f 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/DtxPrepare.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxPrepare.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/DtxRecover.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxRecover.java
index bbda4a0a60..bbda4a0a60 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/DtxRecover.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxRecover.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/DtxRollback.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxRollback.java
index d3cb28638c..d3cb28638c 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/DtxRollback.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxRollback.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/DtxSelect.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxSelect.java
index b70a4884ff..b70a4884ff 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/DtxSelect.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxSelect.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/DtxSetTimeout.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxSetTimeout.java
index 0c8b78e12c..0c8b78e12c 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/DtxSetTimeout.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxSetTimeout.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/DtxStart.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxStart.java
index 7e60f1fbf1..7e60f1fbf1 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/DtxStart.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxStart.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/DtxXaStatus.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxXaStatus.java
index 9300354ad4..9300354ad4 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/DtxXaStatus.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/DtxXaStatus.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ExchangeBind.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeBind.java
index 6ef3b0b460..6ef3b0b460 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ExchangeBind.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeBind.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ExchangeBound.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeBound.java
index 5847feed9b..5847feed9b 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ExchangeBound.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeBound.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ExchangeBoundResult.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeBoundResult.java
index 04d944ea33..04d944ea33 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ExchangeBoundResult.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeBoundResult.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ExchangeDeclare.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeDeclare.java
index e339801f44..e339801f44 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ExchangeDeclare.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeDeclare.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ExchangeDelete.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeDelete.java
index a7dcd0cf2c..a7dcd0cf2c 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ExchangeDelete.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeDelete.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ExchangeQuery.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeQuery.java
index d5f46e7bbf..d5f46e7bbf 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ExchangeQuery.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeQuery.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ExchangeQueryResult.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeQueryResult.java
index 9f83a4aaa7..9f83a4aaa7 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ExchangeQueryResult.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeQueryResult.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ExchangeUnbind.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeUnbind.java
index ba3fe95952..ba3fe95952 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ExchangeUnbind.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExchangeUnbind.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ExecutionErrorCode.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExecutionErrorCode.java
index 0ba83296e7..0ba83296e7 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ExecutionErrorCode.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExecutionErrorCode.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ExecutionException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExecutionException.java
index 0f61272476..0f61272476 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ExecutionException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExecutionException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ExecutionResult.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExecutionResult.java
index 123848b7eb..123848b7eb 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ExecutionResult.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExecutionResult.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ExecutionSync.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExecutionSync.java
index db35beb161..db35beb161 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ExecutionSync.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ExecutionSync.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Field.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Field.java
index bc6bf10041..bc6bf10041 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Field.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Field.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/FileReturnCode.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/FileReturnCode.java
index 2c0b4d510b..2c0b4d510b 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/FileReturnCode.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/FileReturnCode.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/FragmentProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/FragmentProperties.java
index 0b9774355e..0b9774355e 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/FragmentProperties.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/FragmentProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Future.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Future.java
index d8cde61af5..d8cde61af5 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Future.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Future.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/GetTimeoutResult.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/GetTimeoutResult.java
index ebff105464..ebff105464 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/GetTimeoutResult.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/GetTimeoutResult.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Header.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Header.java
index 7ac75f9163..7ac75f9163 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Header.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Header.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageAccept.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageAccept.java
index e30a4e4f66..e30a4e4f66 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageAccept.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageAccept.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageAcceptMode.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageAcceptMode.java
index 0f11560c66..0f11560c66 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageAcceptMode.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageAcceptMode.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageAcquire.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageAcquire.java
index 6ef5283163..6ef5283163 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageAcquire.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageAcquire.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageAcquireMode.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageAcquireMode.java
index 3d46baf1af..3d46baf1af 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageAcquireMode.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageAcquireMode.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageCancel.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageCancel.java
index 1ab510150d..1ab510150d 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageCancel.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageCancel.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageCreditUnit.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageCreditUnit.java
index f3ade93c69..f3ade93c69 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageCreditUnit.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageCreditUnit.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageDeliveryMode.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageDeliveryMode.java
index eb21465c10..eb21465c10 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageDeliveryMode.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageDeliveryMode.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageDeliveryPriority.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageDeliveryPriority.java
index d5d1b861e8..d5d1b861e8 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageDeliveryPriority.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageDeliveryPriority.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageFlow.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageFlow.java
index 0ece4245b3..0ece4245b3 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageFlow.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageFlow.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageFlowMode.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageFlowMode.java
index 60670260fb..60670260fb 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageFlowMode.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageFlowMode.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageFlush.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageFlush.java
index 8e093dd003..8e093dd003 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageFlush.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageFlush.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageProperties.java
index 37b5e7a052..37b5e7a052 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageProperties.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageReject.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageReject.java
index 60cb37d55c..60cb37d55c 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageReject.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageReject.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageRejectCode.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageRejectCode.java
index dc41de100b..dc41de100b 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageRejectCode.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageRejectCode.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageRelease.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageRelease.java
index 557139dd01..557139dd01 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageRelease.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageRelease.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageResume.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageResume.java
index e0dfbdfd57..e0dfbdfd57 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageResume.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageResume.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageResumeResult.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageResumeResult.java
index 1524b09509..1524b09509 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageResumeResult.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageResumeResult.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageSetFlowMode.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageSetFlowMode.java
index 09457b9764..09457b9764 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageSetFlowMode.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageSetFlowMode.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageStop.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageStop.java
index 45bb0ffe68..45bb0ffe68 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageStop.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageStop.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageSubscribe.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageSubscribe.java
index 4f9a1edf64..4f9a1edf64 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageSubscribe.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageSubscribe.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MessageTransfer.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageTransfer.java
index 38fe5d89d8..38fe5d89d8 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MessageTransfer.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MessageTransfer.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Method.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Method.java
index cddcd45d6f..cddcd45d6f 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Method.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Method.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/MethodDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/MethodDelegate.java
index 33f52d9f2b..33f52d9f2b 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/MethodDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/MethodDelegate.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java
index 12f8d801dc..12f8d801dc 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Option.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Option.java
index 72187795b3..72187795b3 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Option.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Option.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java
index a90948fc1d..a90948fc1d 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ProtocolError.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolError.java
index 8a5edc302e..8a5edc302e 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ProtocolError.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolError.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java
index b51a540701..b51a540701 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java
index 3959dc8d95..3959dc8d95 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java
index db8064268c..db8064268c 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/QueueDeclare.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/QueueDeclare.java
index 2b7495e622..2b7495e622 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/QueueDeclare.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/QueueDeclare.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/QueueDelete.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/QueueDelete.java
index 2c0040ff1d..2c0040ff1d 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/QueueDelete.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/QueueDelete.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/QueuePurge.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/QueuePurge.java
index 972149e251..972149e251 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/QueuePurge.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/QueuePurge.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/QueueQuery.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/QueueQuery.java
index 22da74f6b7..22da74f6b7 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/QueueQuery.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/QueueQuery.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/QueueQueryResult.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/QueueQueryResult.java
index ca0c027603..ca0c027603 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/QueueQueryResult.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/QueueQueryResult.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Range.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Range.java
index 413ec8e8fd..413ec8e8fd 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Range.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Range.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/RangeSet.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/RangeSet.java
index 19990a4610..19990a4610 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/RangeSet.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/RangeSet.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/RangeSetFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/RangeSetFactory.java
index 0f049aba8e..0f049aba8e 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/RangeSetFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/RangeSetFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/RangeSetImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/RangeSetImpl.java
index adf18e2920..adf18e2920 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/RangeSetImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/RangeSetImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Receiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Receiver.java
index 2a994580dc..2a994580dc 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Receiver.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Receiver.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/RecoverResult.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/RecoverResult.java
index 7a78f373f6..7a78f373f6 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/RecoverResult.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/RecoverResult.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ReplyTo.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ReplyTo.java
index 38340db5ce..38340db5ce 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ReplyTo.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ReplyTo.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SegmentType.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SegmentType.java
index c9ba87abf4..c9ba87abf4 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SegmentType.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SegmentType.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Sender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java
index 6519702c76..6519702c76 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Sender.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SenderClosedException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SenderClosedException.java
index 924c327861..924c327861 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SenderClosedException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SenderClosedException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SenderException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SenderException.java
index a96079dc27..a96079dc27 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SenderException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SenderException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
index 1e0d5b9698..1e0d5b9698 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Session.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java
index 8b29d6e424..8b29d6e424 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Session.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionAttach.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionAttach.java
index cc056c2157..cc056c2157 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionAttach.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionAttach.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionAttached.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionAttached.java
index edba391120..edba391120 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionAttached.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionAttached.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionClosedException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionClosedException.java
index 01fe05c851..01fe05c851 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionClosedException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionClosedException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionCommandFragment.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionCommandFragment.java
index 6ae2d45238..6ae2d45238 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionCommandFragment.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionCommandFragment.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionCommandPoint.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionCommandPoint.java
index b0bb0559fe..b0bb0559fe 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionCommandPoint.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionCommandPoint.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionCompleted.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionCompleted.java
index 2b30f376b2..2b30f376b2 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionCompleted.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionCompleted.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionConfirmed.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionConfirmed.java
index d162fb8e10..d162fb8e10 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionConfirmed.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionConfirmed.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java
index cabff1cd13..cabff1cd13 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionDetach.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDetach.java
index c6f8e9bad4..c6f8e9bad4 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionDetach.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDetach.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionDetachCode.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDetachCode.java
index 892f0edc36..892f0edc36 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionDetachCode.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDetachCode.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionDetached.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDetached.java
index d577d7c28a..d577d7c28a 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionDetached.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDetached.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionException.java
index 6095b892f8..6095b892f8 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionExpected.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionExpected.java
index 324316f88c..324316f88c 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionExpected.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionExpected.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionFlush.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionFlush.java
index 193fe9b255..193fe9b255 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionFlush.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionFlush.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionGap.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionGap.java
index 62cf753df6..62cf753df6 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionGap.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionGap.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionHeader.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionHeader.java
index 9287d594b1..9287d594b1 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionHeader.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionHeader.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionInvoker.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionInvoker.java
index 2d5c54d96c..2d5c54d96c 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionInvoker.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionInvoker.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionKnownCompleted.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionKnownCompleted.java
index 4f78724ee0..4f78724ee0 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionKnownCompleted.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionKnownCompleted.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionListener.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionListener.java
index eb650eb9ed..eb650eb9ed 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionListener.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionListener.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionRequestTimeout.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionRequestTimeout.java
index 7608c8e75e..7608c8e75e 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionRequestTimeout.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionRequestTimeout.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionTimeout.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionTimeout.java
index cc5054ab28..cc5054ab28 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/SessionTimeout.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionTimeout.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/StreamReturnCode.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/StreamReturnCode.java
index 7a4e8c083b..7a4e8c083b 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/StreamReturnCode.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/StreamReturnCode.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Struct.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Struct.java
index 045939e415..045939e415 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Struct.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Struct.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/StructFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/StructFactory.java
index 4dcd02da9f..4dcd02da9f 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/StructFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/StructFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Track.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Track.java
index 861a992a83..861a992a83 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Track.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Track.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/TransportException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/TransportException.java
index 0de190dfad..0de190dfad 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/TransportException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/TransportException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/TxCommit.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/TxCommit.java
index 837aa1e1d4..837aa1e1d4 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/TxCommit.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/TxCommit.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/TxRollback.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/TxRollback.java
index f8b54f2e5c..f8b54f2e5c 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/TxRollback.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/TxRollback.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/TxSelect.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/TxSelect.java
index 6fd886e94e..6fd886e94e 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/TxSelect.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/TxSelect.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Type.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Type.java
index 05904f2995..05904f2995 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Type.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Type.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/XaResult.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/XaResult.java
index c9d502f7ea..c9d502f7ea 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/XaResult.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/XaResult.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Xid.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Xid.java
index 4e142079af..4e142079af 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Xid.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Xid.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
index 27fce6e167..27fce6e167 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java
index 2b93697bfc..2b93697bfc 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java
index a8ac44200f..a8ac44200f 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java
index d9150bed65..d9150bed65 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java
index fb3f91a3ce..fb3f91a3ce 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/codec/Encodable.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encodable.java
index 37ce8a5cb7..37ce8a5cb7 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/codec/Encodable.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encodable.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java
index 5a3cec5616..5a3cec5616 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
index a80b988cea..a80b988cea 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/ConnectionBinding.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/ConnectionBinding.java
index 5a5de597c2..5a5de597c2 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/ConnectionBinding.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/ConnectionBinding.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
index fe437ecf93..fe437ecf93 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/Frame.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Frame.java
index 9416c4c9fa..9416c4c9fa 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/Frame.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Frame.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/IncomingNetworkTransport.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/IncomingNetworkTransport.java
index 8437ef1a94..8437ef1a94 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/IncomingNetworkTransport.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/IncomingNetworkTransport.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java
index 86e05db818..86e05db818 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/NetworkConnection.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkConnection.java
index 050d194c47..050d194c47 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/NetworkConnection.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkConnection.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java
index fbdfe6e84c..fbdfe6e84c 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java
index 91314cd4ad..91314cd4ad 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/NetworkTransport.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkTransport.java
index f71d39c381..f71d39c381 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/NetworkTransport.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkTransport.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/OutgoingNetworkTransport.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/OutgoingNetworkTransport.java
index 45231aa05d..45231aa05d 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/OutgoingNetworkTransport.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/OutgoingNetworkTransport.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/Ticker.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Ticker.java
index 210b014a57..210b014a57 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/Ticker.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Ticker.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java
index 55ba95ad75..55ba95ad75 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/TransportActivity.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/TransportActivity.java
index 2ee336d9b2..2ee336d9b2 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/TransportActivity.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/TransportActivity.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IdleTimeoutTicker.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IdleTimeoutTicker.java
index 54a2a360bb..54a2a360bb 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/io/IdleTimeoutTicker.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IdleTimeoutTicker.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkConnection.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkConnection.java
index f5c09ac2cc..f5c09ac2cc 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkConnection.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkConnection.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
index 18a8bf2779..18a8bf2779 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
index 06a43e21c6..06a43e21c6 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
index 17400cca8b..17400cca8b 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/SSLStatus.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/SSLStatus.java
index 9db7dd557a..9db7dd557a 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/security/SSLStatus.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/SSLStatus.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayer.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayer.java
index 51ef266ee9..51ef266ee9 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayer.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayer.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayerFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayerFactory.java
index bfd1ae8181..bfd1ae8181 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayerFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayerFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java
index a90ea52202..a90ea52202 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java
index 59e9453454..59e9453454 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java
index 098f2fb20c..098f2fb20c 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java
index 0dccf37979..0dccf37979 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidMultipleTrustManager.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidMultipleTrustManager.java
index 0705f31fcb..0705f31fcb 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidMultipleTrustManager.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidMultipleTrustManager.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidPeersOnlyTrustManager.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidPeersOnlyTrustManager.java
index c988ff8d69..c988ff8d69 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidPeersOnlyTrustManager.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidPeersOnlyTrustManager.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLBufferingSender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLBufferingSender.java
index 24f95d7798..24f95d7798 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLBufferingSender.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLBufferingSender.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
index 13a16d07b5..13a16d07b5 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java
index 88943695d4..88943695d4 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
index 7553e3dad8..7553e3dad8 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java
index bd3e9bbcbc..bd3e9bbcbc 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/util/Logger.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Logger.java
index 8c4818df92..8c4818df92 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/util/Logger.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Logger.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/util/Waiter.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Waiter.java
index e034d779ca..e034d779ca 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/util/Waiter.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Waiter.java
diff --git a/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesCodes.java b/qpid/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesCodes.java
index 0e12ac65d8..0e12ac65d8 100644
--- a/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesCodes.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesCodes.java
diff --git a/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesContentReader.java b/qpid/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesContentReader.java
index 0ba865f1e6..0ba865f1e6 100644
--- a/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesContentReader.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesContentReader.java
diff --git a/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesContentWriter.java b/qpid/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesContentWriter.java
index c7ca2d7df7..c7ca2d7df7 100644
--- a/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesContentWriter.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesContentWriter.java
diff --git a/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesFormatException.java b/qpid/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesFormatException.java
index 24fdbcfde5..24fdbcfde5 100644
--- a/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesFormatException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesFormatException.java
diff --git a/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java b/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
index 77902c3531..77902c3531 100644
--- a/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
diff --git a/java/common/src/main/java/org/apache/qpid/url/BindingURL.java b/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURL.java
index 80a1ae540b..80a1ae540b 100644
--- a/java/common/src/main/java/org/apache/qpid/url/BindingURL.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURL.java
diff --git a/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java b/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
index ee823978b4..ee823978b4 100644
--- a/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
diff --git a/java/common/src/main/java/org/apache/qpid/url/URLHelper.java b/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
index 8516e7fa0e..8516e7fa0e 100644
--- a/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
diff --git a/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java b/qpid/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
index 3ff7195794..3ff7195794 100644
--- a/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/ByteBufferInputStream.java b/qpid/java/common/src/main/java/org/apache/qpid/util/ByteBufferInputStream.java
index b72b342187..b72b342187 100644
--- a/java/common/src/main/java/org/apache/qpid/util/ByteBufferInputStream.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/ByteBufferInputStream.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/BytesDataOutput.java b/qpid/java/common/src/main/java/org/apache/qpid/util/BytesDataOutput.java
index 7fca54a9ee..7fca54a9ee 100644
--- a/java/common/src/main/java/org/apache/qpid/util/BytesDataOutput.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/BytesDataOutput.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java b/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
index 3d17bbf6ea..3d17bbf6ea 100644
--- a/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/FileUtils.java b/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
index 7362099070..7362099070 100644
--- a/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/NameUUIDGen.java b/qpid/java/common/src/main/java/org/apache/qpid/util/NameUUIDGen.java
index e764c8536b..e764c8536b 100644
--- a/java/common/src/main/java/org/apache/qpid/util/NameUUIDGen.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/NameUUIDGen.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/RandomUUIDGen.java b/qpid/java/common/src/main/java/org/apache/qpid/util/RandomUUIDGen.java
index 60b402a105..60b402a105 100644
--- a/java/common/src/main/java/org/apache/qpid/util/RandomUUIDGen.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/RandomUUIDGen.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/Serial.java b/qpid/java/common/src/main/java/org/apache/qpid/util/Serial.java
index 287c094b88..287c094b88 100644
--- a/java/common/src/main/java/org/apache/qpid/util/Serial.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/Serial.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/Strings.java b/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
index f2d51ccfde..f2d51ccfde 100644
--- a/java/common/src/main/java/org/apache/qpid/util/Strings.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/UUIDGen.java b/qpid/java/common/src/main/java/org/apache/qpid/util/UUIDGen.java
index 3cfe5afdac..3cfe5afdac 100644
--- a/java/common/src/main/java/org/apache/qpid/util/UUIDGen.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/UUIDGen.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/UUIDs.java b/qpid/java/common/src/main/java/org/apache/qpid/util/UUIDs.java
index d9b2dd8413..d9b2dd8413 100644
--- a/java/common/src/main/java/org/apache/qpid/util/UUIDs.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/UUIDs.java
diff --git a/java/common/src/test/java/org/apache/qpid/AMQExceptionTest.java b/qpid/java/common/src/test/java/org/apache/qpid/AMQExceptionTest.java
index 9fceef337c..9fceef337c 100644
--- a/java/common/src/test/java/org/apache/qpid/AMQExceptionTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/AMQExceptionTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java b/qpid/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java
index cb820b333b..cb820b333b 100644
--- a/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/configuration/QpidPropertyTest.java b/qpid/java/common/src/test/java/org/apache/qpid/configuration/QpidPropertyTest.java
index 335270264c..335270264c 100644
--- a/java/common/src/test/java/org/apache/qpid/configuration/QpidPropertyTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/configuration/QpidPropertyTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java b/qpid/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
index 61ac04213e..61ac04213e 100644
--- a/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java b/qpid/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
index 4902e8ad64..4902e8ad64 100644
--- a/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java b/qpid/java/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java
index 1ecf450551..1ecf450551 100644
--- a/java/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java b/qpid/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
index 5a57db1650..5a57db1650 100644
--- a/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/pool/ReferenceCountingExecutorServiceTest.java b/qpid/java/common/src/test/java/org/apache/qpid/pool/ReferenceCountingExecutorServiceTest.java
index de73a2ff88..de73a2ff88 100644
--- a/java/common/src/test/java/org/apache/qpid/pool/ReferenceCountingExecutorServiceTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/pool/ReferenceCountingExecutorServiceTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/ssl/SSLContextFactoryTest.java b/qpid/java/common/src/test/java/org/apache/qpid/ssl/SSLContextFactoryTest.java
index c5fa852f95..c5fa852f95 100644
--- a/java/common/src/test/java/org/apache/qpid/ssl/SSLContextFactoryTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/ssl/SSLContextFactoryTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/ssl/TrustManagerTest.java b/qpid/java/common/src/test/java/org/apache/qpid/ssl/TrustManagerTest.java
index 3b76d81e42..3b76d81e42 100644
--- a/java/common/src/test/java/org/apache/qpid/ssl/TrustManagerTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/ssl/TrustManagerTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java b/qpid/java/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java
index 7b0f93700a..7b0f93700a 100644
--- a/java/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java
index d031842f9d..d031842f9d 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
index 12bbd20228..12bbd20228 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/GenTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/GenTest.java
index 512a0a29a6..512a0a29a6 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/GenTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/GenTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
index 14589eb541..14589eb541 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/SessionTimeoutTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/SessionTimeoutTest.java
index 5f1c1254a2..5f1c1254a2 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/SessionTimeoutTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/SessionTimeoutTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/codec/BBEncoderTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/codec/BBEncoderTest.java
index 79bf184fe2..79bf184fe2 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/codec/BBEncoderTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/codec/BBEncoderTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java
index bf9a5843d6..bf9a5843d6 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java
index 5cdd7a8597..5cdd7a8597 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
index 641bc5fa34..641bc5fa34 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/network/io/IoTransport.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoTransport.java
index e9005ab2e4..e9005ab2e4 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/network/io/IoTransport.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoTransport.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/network/security/ssl/SSLUtilTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/security/ssl/SSLUtilTest.java
index 2d17f7a3c7..2d17f7a3c7 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/network/security/ssl/SSLUtilTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/security/ssl/SSLUtilTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java b/qpid/java/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java
index 53626b6658..53626b6658 100644
--- a/java/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java b/qpid/java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java
index 7ba5038faa..7ba5038faa 100644
--- a/java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java b/qpid/java/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java
index d6767eb9c0..d6767eb9c0 100644
--- a/java/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/util/PropertyUtilsTest.java b/qpid/java/common/src/test/java/org/apache/qpid/util/PropertyUtilsTest.java
index c5464aab79..c5464aab79 100644
--- a/java/common/src/test/java/org/apache/qpid/util/PropertyUtilsTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/util/PropertyUtilsTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/util/SerialTest.java b/qpid/java/common/src/test/java/org/apache/qpid/util/SerialTest.java
index c3fcf73b38..c3fcf73b38 100644
--- a/java/common/src/test/java/org/apache/qpid/util/SerialTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/util/SerialTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/util/default.properties b/qpid/java/common/src/test/java/org/apache/qpid/util/default.properties
index 8214cc1fee..8214cc1fee 100644
--- a/java/common/src/test/java/org/apache/qpid/util/default.properties
+++ b/qpid/java/common/src/test/java/org/apache/qpid/util/default.properties
diff --git a/java/common/src/test/java/org/apache/qpid/util/mydefaults.properties b/qpid/java/common/src/test/java/org/apache/qpid/util/mydefaults.properties
index c0a21d08d1..c0a21d08d1 100644
--- a/java/common/src/test/java/org/apache/qpid/util/mydefaults.properties
+++ b/qpid/java/common/src/test/java/org/apache/qpid/util/mydefaults.properties
diff --git a/java/common/templates/method/MethodBodyInterface.vm b/qpid/java/common/templates/method/MethodBodyInterface.vm
index 29ecc4f115..29ecc4f115 100644
--- a/java/common/templates/method/MethodBodyInterface.vm
+++ b/qpid/java/common/templates/method/MethodBodyInterface.vm
diff --git a/java/common/templates/method/version/MethodBodyClass.vm b/qpid/java/common/templates/method/version/MethodBodyClass.vm
index a960d357d2..a960d357d2 100644
--- a/java/common/templates/method/version/MethodBodyClass.vm
+++ b/qpid/java/common/templates/method/version/MethodBodyClass.vm
diff --git a/java/common/templates/model/ClientMethodDispatcherInterface.vm b/qpid/java/common/templates/model/ClientMethodDispatcherInterface.vm
index e814d6b672..e814d6b672 100644
--- a/java/common/templates/model/ClientMethodDispatcherInterface.vm
+++ b/qpid/java/common/templates/model/ClientMethodDispatcherInterface.vm
diff --git a/java/common/templates/model/MethodDispatcherInterface.vm b/qpid/java/common/templates/model/MethodDispatcherInterface.vm
index 698d68e76c..698d68e76c 100644
--- a/java/common/templates/model/MethodDispatcherInterface.vm
+++ b/qpid/java/common/templates/model/MethodDispatcherInterface.vm
diff --git a/java/common/templates/model/MethodRegistryClass.vm b/qpid/java/common/templates/model/MethodRegistryClass.vm
index cad115aa6c..cad115aa6c 100644
--- a/java/common/templates/model/MethodRegistryClass.vm
+++ b/qpid/java/common/templates/model/MethodRegistryClass.vm
diff --git a/java/common/templates/model/ProtocolVersionListClass.vm b/qpid/java/common/templates/model/ProtocolVersionListClass.vm
index e8e2b8cc5d..e8e2b8cc5d 100644
--- a/java/common/templates/model/ProtocolVersionListClass.vm
+++ b/qpid/java/common/templates/model/ProtocolVersionListClass.vm
diff --git a/java/common/templates/model/ServerMethodDispatcherInterface.vm b/qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm
index fd7b643806..fd7b643806 100644
--- a/java/common/templates/model/ServerMethodDispatcherInterface.vm
+++ b/qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm
diff --git a/java/common/templates/model/version/ClientMethodDispatcherInterface.vm b/qpid/java/common/templates/model/version/ClientMethodDispatcherInterface.vm
index 24fe9e8223..24fe9e8223 100644
--- a/java/common/templates/model/version/ClientMethodDispatcherInterface.vm
+++ b/qpid/java/common/templates/model/version/ClientMethodDispatcherInterface.vm
diff --git a/java/common/templates/model/version/MethodDispatcherInterface.vm b/qpid/java/common/templates/model/version/MethodDispatcherInterface.vm
index 2209188b15..2209188b15 100644
--- a/java/common/templates/model/version/MethodDispatcherInterface.vm
+++ b/qpid/java/common/templates/model/version/MethodDispatcherInterface.vm
diff --git a/java/common/templates/model/version/MethodRegistryClass.vm b/qpid/java/common/templates/model/version/MethodRegistryClass.vm
index 0c14bdd786..0c14bdd786 100644
--- a/java/common/templates/model/version/MethodRegistryClass.vm
+++ b/qpid/java/common/templates/model/version/MethodRegistryClass.vm
diff --git a/java/common/templates/model/version/ServerMethodDispatcherInterface.vm b/qpid/java/common/templates/model/version/ServerMethodDispatcherInterface.vm
index a26154ff84..a26154ff84 100644
--- a/java/common/templates/model/version/ServerMethodDispatcherInterface.vm
+++ b/qpid/java/common/templates/model/version/ServerMethodDispatcherInterface.vm
diff --git a/java/common/templating.py b/qpid/java/common/templating.py
index 732e96fa60..732e96fa60 100644
--- a/java/common/templating.py
+++ b/qpid/java/common/templating.py
diff --git a/java/doc/AMQBlazeDetailedDesign.vsd b/qpid/java/doc/AMQBlazeDetailedDesign.vsd
index 90577c69cf..90577c69cf 100644
--- a/java/doc/AMQBlazeDetailedDesign.vsd
+++ b/qpid/java/doc/AMQBlazeDetailedDesign.vsd
diff --git a/java/doc/FramingClassDiagram.vsd b/qpid/java/doc/FramingClassDiagram.vsd
index 8db65255ea..8db65255ea 100644
--- a/java/doc/FramingClassDiagram.vsd
+++ b/qpid/java/doc/FramingClassDiagram.vsd
diff --git a/java/doc/Qpid-architecture.dia b/qpid/java/doc/Qpid-architecture.dia
index 4bdfd2ee93..4bdfd2ee93 100644
--- a/java/doc/Qpid-architecture.dia
+++ b/qpid/java/doc/Qpid-architecture.dia
diff --git a/java/doc/broker-0.5-network.dia b/qpid/java/doc/broker-0.5-network.dia
index f30decde4b..f30decde4b 100644
--- a/java/doc/broker-0.5-network.dia
+++ b/qpid/java/doc/broker-0.5-network.dia
diff --git a/java/doc/broker-0.N-network-phase-1.dia b/qpid/java/doc/broker-0.N-network-phase-1.dia
index 4ac8213b23..4ac8213b23 100644
--- a/java/doc/broker-0.N-network-phase-1.dia
+++ b/qpid/java/doc/broker-0.N-network-phase-1.dia
diff --git a/java/doc/broker-0.N-state.dia b/qpid/java/doc/broker-0.N-state.dia
index 5ef83a871b..5ef83a871b 100644
--- a/java/doc/broker-0.N-state.dia
+++ b/qpid/java/doc/broker-0.N-state.dia
diff --git a/java/doc/broker-overview.dia b/qpid/java/doc/broker-overview.dia
index 2d943beadf..2d943beadf 100644
--- a/java/doc/broker-overview.dia
+++ b/qpid/java/doc/broker-overview.dia
diff --git a/java/doc/broker-priority-queue-subscription.dia b/qpid/java/doc/broker-priority-queue-subscription.dia
index 2289899435..2289899435 100644
--- a/java/doc/broker-priority-queue-subscription.dia
+++ b/qpid/java/doc/broker-priority-queue-subscription.dia
diff --git a/java/doc/broker-queue-subscription.dia b/qpid/java/doc/broker-queue-subscription.dia
index d146ad136d..d146ad136d 100644
--- a/java/doc/broker-queue-subscription.dia
+++ b/qpid/java/doc/broker-queue-subscription.dia
diff --git a/java/doc/client-0.5-connection-creation.dia b/qpid/java/doc/client-0.5-connection-creation.dia
index b7c6d185a1..b7c6d185a1 100644
--- a/java/doc/client-0.5-connection-creation.dia
+++ b/qpid/java/doc/client-0.5-connection-creation.dia
diff --git a/java/doc/client-0.5-network-processing.dia b/qpid/java/doc/client-0.5-network-processing.dia
index acacc4f462..acacc4f462 100644
--- a/java/doc/client-0.5-network-processing.dia
+++ b/qpid/java/doc/client-0.5-network-processing.dia
diff --git a/java/doc/client-0.N-network-processing.dia b/qpid/java/doc/client-0.N-network-processing.dia
index ed2c340969..ed2c340969 100644
--- a/java/doc/client-0.N-network-processing.dia
+++ b/qpid/java/doc/client-0.N-network-processing.dia
diff --git a/java/doc/common-0.N-network.dia b/qpid/java/doc/common-0.N-network.dia
index 826ac32e5b..826ac32e5b 100644
--- a/java/doc/common-0.N-network.dia
+++ b/qpid/java/doc/common-0.N-network.dia
diff --git a/java/doc/network-driver-protocol-engine-sequence.dia b/qpid/java/doc/network-driver-protocol-engine-sequence.dia
index 16cdc7e1dc..16cdc7e1dc 100644
--- a/java/doc/network-driver-protocol-engine-sequence.dia
+++ b/qpid/java/doc/network-driver-protocol-engine-sequence.dia
diff --git a/java/doc/noddy-network-blocks.dia b/qpid/java/doc/noddy-network-blocks.dia
index 06abc109b1..06abc109b1 100644
--- a/java/doc/noddy-network-blocks.dia
+++ b/qpid/java/doc/noddy-network-blocks.dia
diff --git a/java/etc/code-style.xml b/qpid/java/etc/code-style.xml
index 298275fd58..298275fd58 100644
--- a/java/etc/code-style.xml
+++ b/qpid/java/etc/code-style.xml
diff --git a/java/etc/coding_standards.xml b/qpid/java/etc/coding_standards.xml
index fdb42c1b9c..fdb42c1b9c 100644
--- a/java/etc/coding_standards.xml
+++ b/qpid/java/etc/coding_standards.xml
diff --git a/java/etc/license_header.txt b/qpid/java/etc/license_header.txt
index 02ee6e8f98..02ee6e8f98 100644
--- a/java/etc/license_header.txt
+++ b/qpid/java/etc/license_header.txt
diff --git a/java/etc/log4j.xml b/qpid/java/etc/log4j.xml
index 266c466a3a..266c466a3a 100644
--- a/java/etc/log4j.xml
+++ b/qpid/java/etc/log4j.xml
diff --git a/java/genpom b/qpid/java/genpom
index 243985dd7b..243985dd7b 100755
--- a/java/genpom
+++ b/qpid/java/genpom
diff --git a/java/ivy.nexus.xml b/qpid/java/ivy.nexus.xml
index d492169ff3..d492169ff3 100644
--- a/java/ivy.nexus.xml
+++ b/qpid/java/ivy.nexus.xml
diff --git a/java/ivy.retrieve.xml b/qpid/java/ivy.retrieve.xml
index 388e2d0dc4..388e2d0dc4 100644
--- a/java/ivy.retrieve.xml
+++ b/qpid/java/ivy.retrieve.xml
diff --git a/java/ivysettings.nexus.xml b/qpid/java/ivysettings.nexus.xml
index 03f84f9f7c..03f84f9f7c 100644
--- a/java/ivysettings.nexus.xml
+++ b/qpid/java/ivysettings.nexus.xml
diff --git a/java/ivysettings.retrieve.xml b/qpid/java/ivysettings.retrieve.xml
index cc50121821..cc50121821 100644
--- a/java/ivysettings.retrieve.xml
+++ b/qpid/java/ivysettings.retrieve.xml
diff --git a/java/jca/README-GERONIMO.txt b/qpid/java/jca/README-GERONIMO.txt
index 3b72a7e094..3b72a7e094 100644
--- a/java/jca/README-GERONIMO.txt
+++ b/qpid/java/jca/README-GERONIMO.txt
diff --git a/java/jca/README-JBOSS-EAP6.txt b/qpid/java/jca/README-JBOSS-EAP6.txt
index 219bfb6468..219bfb6468 100644
--- a/java/jca/README-JBOSS-EAP6.txt
+++ b/qpid/java/jca/README-JBOSS-EAP6.txt
diff --git a/java/jca/README-JBOSS.txt b/qpid/java/jca/README-JBOSS.txt
index 717565b938..717565b938 100644
--- a/java/jca/README-JBOSS.txt
+++ b/qpid/java/jca/README-JBOSS.txt
diff --git a/java/jca/README.txt b/qpid/java/jca/README.txt
index d4c14112a4..d4c14112a4 100644
--- a/java/jca/README.txt
+++ b/qpid/java/jca/README.txt
diff --git a/java/jca/build.xml b/qpid/java/jca/build.xml
index 7137467e4b..7137467e4b 100644
--- a/java/jca/build.xml
+++ b/qpid/java/jca/build.xml
diff --git a/java/jca/example/.gitignore b/qpid/java/jca/example/.gitignore
index 624fd61581..624fd61581 100644
--- a/java/jca/example/.gitignore
+++ b/qpid/java/jca/example/.gitignore
diff --git a/java/jca/example/README-EXAMPLE.txt b/qpid/java/jca/example/README-EXAMPLE.txt
index fd0af585ef..fd0af585ef 100644
--- a/java/jca/example/README-EXAMPLE.txt
+++ b/qpid/java/jca/example/README-EXAMPLE.txt
diff --git a/java/jca/example/README-GERONIMO.txt b/qpid/java/jca/example/README-GERONIMO.txt
index d58d034c79..d58d034c79 100644
--- a/java/jca/example/README-GERONIMO.txt
+++ b/qpid/java/jca/example/README-GERONIMO.txt
diff --git a/java/jca/example/README-GLASSFISH.txt b/qpid/java/jca/example/README-GLASSFISH.txt
index 1b73ba68fd..1b73ba68fd 100644
--- a/java/jca/example/README-GLASSFISH.txt
+++ b/qpid/java/jca/example/README-GLASSFISH.txt
diff --git a/java/jca/example/README-JBOSS.txt b/qpid/java/jca/example/README-JBOSS.txt
index e23b3ba308..e23b3ba308 100644
--- a/java/jca/example/README-JBOSS.txt
+++ b/qpid/java/jca/example/README-JBOSS.txt
diff --git a/java/jca/example/README-JBOSS7.txt b/qpid/java/jca/example/README-JBOSS7.txt
index 5234a0b293..5234a0b293 100644
--- a/java/jca/example/README-JBOSS7.txt
+++ b/qpid/java/jca/example/README-JBOSS7.txt
diff --git a/java/jca/example/build-geronimo-properties.xml b/qpid/java/jca/example/build-geronimo-properties.xml
index a20753117f..a20753117f 100644
--- a/java/jca/example/build-geronimo-properties.xml
+++ b/qpid/java/jca/example/build-geronimo-properties.xml
diff --git a/java/jca/example/build-glassfish-properties.xml b/qpid/java/jca/example/build-glassfish-properties.xml
index 90561e70cf..90561e70cf 100644
--- a/java/jca/example/build-glassfish-properties.xml
+++ b/qpid/java/jca/example/build-glassfish-properties.xml
diff --git a/java/jca/example/build-jboss-properties.xml b/qpid/java/jca/example/build-jboss-properties.xml
index f79793d9c4..f79793d9c4 100644
--- a/java/jca/example/build-jboss-properties.xml
+++ b/qpid/java/jca/example/build-jboss-properties.xml
diff --git a/java/jca/example/build-jboss7-properties.xml b/qpid/java/jca/example/build-jboss7-properties.xml
index e24719ba8e..e24719ba8e 100644
--- a/java/jca/example/build-jboss7-properties.xml
+++ b/qpid/java/jca/example/build-jboss7-properties.xml
diff --git a/java/jca/example/build-properties.xml.temp b/qpid/java/jca/example/build-properties.xml.temp
index 1d62db9af5..1d62db9af5 100644
--- a/java/jca/example/build-properties.xml.temp
+++ b/qpid/java/jca/example/build-properties.xml.temp
diff --git a/java/jca/example/build.xml b/qpid/java/jca/example/build.xml
index 7a75f9abc6..7a75f9abc6 100644
--- a/java/jca/example/build.xml
+++ b/qpid/java/jca/example/build.xml
diff --git a/java/jca/example/conf/application.xml b/qpid/java/jca/example/conf/application.xml
index d181bcda67..d181bcda67 100644
--- a/java/jca/example/conf/application.xml
+++ b/qpid/java/jca/example/conf/application.xml
diff --git a/java/jca/example/conf/ejb-jar.xml b/qpid/java/jca/example/conf/ejb-jar.xml
index a1aa859d96..a1aa859d96 100644
--- a/java/jca/example/conf/ejb-jar.xml
+++ b/qpid/java/jca/example/conf/ejb-jar.xml
diff --git a/java/jca/example/conf/geronimo-application.xml b/qpid/java/jca/example/conf/geronimo-application.xml
index 384f6b2e75..384f6b2e75 100644
--- a/java/jca/example/conf/geronimo-application.xml
+++ b/qpid/java/jca/example/conf/geronimo-application.xml
diff --git a/java/jca/example/conf/geronimo-ra.xml b/qpid/java/jca/example/conf/geronimo-ra.xml
index a7511f647f..a7511f647f 100644
--- a/java/jca/example/conf/geronimo-ra.xml
+++ b/qpid/java/jca/example/conf/geronimo-ra.xml
diff --git a/java/jca/example/conf/glassfish-ejb-jar.xml b/qpid/java/jca/example/conf/glassfish-ejb-jar.xml
index e3ea140472..e3ea140472 100644
--- a/java/jca/example/conf/glassfish-ejb-jar.xml
+++ b/qpid/java/jca/example/conf/glassfish-ejb-jar.xml
diff --git a/java/jca/example/conf/glassfish-resources.xml b/qpid/java/jca/example/conf/glassfish-resources.xml
index 9eab4302d5..9eab4302d5 100644
--- a/java/jca/example/conf/glassfish-resources.xml
+++ b/qpid/java/jca/example/conf/glassfish-resources.xml
diff --git a/java/jca/example/conf/glassfish-web.xml b/qpid/java/jca/example/conf/glassfish-web.xml
index 950ee73d51..950ee73d51 100644
--- a/java/jca/example/conf/glassfish-web.xml
+++ b/qpid/java/jca/example/conf/glassfish-web.xml
diff --git a/java/jca/example/conf/jboss-ejb-client.properties b/qpid/java/jca/example/conf/jboss-ejb-client.properties
index 9b62e6794c..9b62e6794c 100644
--- a/java/jca/example/conf/jboss-ejb-client.properties
+++ b/qpid/java/jca/example/conf/jboss-ejb-client.properties
diff --git a/java/jca/example/conf/jboss-web.xml b/qpid/java/jca/example/conf/jboss-web.xml
index 32a97d1c35..32a97d1c35 100644
--- a/java/jca/example/conf/jboss-web.xml
+++ b/qpid/java/jca/example/conf/jboss-web.xml
diff --git a/java/jca/example/conf/jboss.xml b/qpid/java/jca/example/conf/jboss.xml
index 0f22797789..0f22797789 100644
--- a/java/jca/example/conf/jboss.xml
+++ b/qpid/java/jca/example/conf/jboss.xml
diff --git a/java/jca/example/conf/log4j.properties b/qpid/java/jca/example/conf/log4j.properties
index 1139ab9e85..1139ab9e85 100644
--- a/java/jca/example/conf/log4j.properties
+++ b/qpid/java/jca/example/conf/log4j.properties
diff --git a/java/jca/example/conf/qpid-jca-ds.xml b/qpid/java/jca/example/conf/qpid-jca-ds.xml
index ad75876808..ad75876808 100644
--- a/java/jca/example/conf/qpid-jca-ds.xml
+++ b/qpid/java/jca/example/conf/qpid-jca-ds.xml
diff --git a/java/jca/example/conf/qpid-standalone.xml b/qpid/java/jca/example/conf/qpid-standalone.xml
index 2e22bd3f99..2e22bd3f99 100644
--- a/java/jca/example/conf/qpid-standalone.xml
+++ b/qpid/java/jca/example/conf/qpid-standalone.xml
diff --git a/java/jca/example/conf/web.xml b/qpid/java/jca/example/conf/web.xml
index 6e53d7beba..6e53d7beba 100644
--- a/java/jca/example/conf/web.xml
+++ b/qpid/java/jca/example/conf/web.xml
diff --git a/java/jca/example/qpid-jca-example-properties.xml b/qpid/java/jca/example/qpid-jca-example-properties.xml
index ab0f6267ba..ab0f6267ba 100644
--- a/java/jca/example/qpid-jca-example-properties.xml
+++ b/qpid/java/jca/example/qpid-jca-example-properties.xml
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidRequestResponseClient.java b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidRequestResponseClient.java
index fd5b3efff0..fd5b3efff0 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidRequestResponseClient.java
+++ b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidRequestResponseClient.java
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java
index a5a33e36ec..a5a33e36ec 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java
+++ b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestUtil.java b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestUtil.java
index 7a53335d79..7a53335d79 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestUtil.java
+++ b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestUtil.java
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeListenerBean.java b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeListenerBean.java
index bdb722a87b..bdb722a87b 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeListenerBean.java
+++ b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeListenerBean.java
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeSubscriberBean.java b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeSubscriberBean.java
index f2e4d6aaa5..f2e4d6aaa5 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeSubscriberBean.java
+++ b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeSubscriberBean.java
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloListenerBean.java b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloListenerBean.java
index 75e0acab79..75e0acab79 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloListenerBean.java
+++ b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloListenerBean.java
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloSubscriberBean.java b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloSubscriberBean.java
index 882c85fa18..882c85fa18 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloSubscriberBean.java
+++ b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloSubscriberBean.java
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidJMSResponderBean.java b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidJMSResponderBean.java
index 6e99d4fe7f..6e99d4fe7f 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidJMSResponderBean.java
+++ b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidJMSResponderBean.java
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTest.java b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTest.java
index 14488fda53..14488fda53 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTest.java
+++ b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTest.java
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestBean.java b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestBean.java
index a5f4770257..a5f4770257 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestBean.java
+++ b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestBean.java
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestLocal.java b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestLocal.java
index 73a0de08c2..73a0de08c2 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestLocal.java
+++ b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestLocal.java
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestRemote.java b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestRemote.java
index 2abb4d71f5..2abb4d71f5 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestRemote.java
+++ b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestRemote.java
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidUtil.java b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidUtil.java
index d96a4e8163..d96a4e8163 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidUtil.java
+++ b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidUtil.java
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidRequestResponseServlet.java b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidRequestResponseServlet.java
index d069a0c943..d069a0c943 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidRequestResponseServlet.java
+++ b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidRequestResponseServlet.java
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidTestServlet.java b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidTestServlet.java
index 7526daa83d..7526daa83d 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidTestServlet.java
+++ b/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidTestServlet.java
diff --git a/java/jca/pom.xml b/qpid/java/jca/pom.xml
index 467175db90..467175db90 100644
--- a/java/jca/pom.xml
+++ b/qpid/java/jca/pom.xml
diff --git a/java/jca/rar/pom.xml b/qpid/java/jca/rar/pom.xml
index 192f34255d..192f34255d 100644
--- a/java/jca/rar/pom.xml
+++ b/qpid/java/jca/rar/pom.xml
diff --git a/java/jca/rar/src/main/resources/META-INF/jboss-ra.xml b/qpid/java/jca/rar/src/main/resources/META-INF/jboss-ra.xml
index f459b1efc1..f459b1efc1 100644
--- a/java/jca/rar/src/main/resources/META-INF/jboss-ra.xml
+++ b/qpid/java/jca/rar/src/main/resources/META-INF/jboss-ra.xml
diff --git a/java/jca/rar/src/main/resources/META-INF/ra.xml b/qpid/java/jca/rar/src/main/resources/META-INF/ra.xml
index 4819bc8ad5..4819bc8ad5 100755
--- a/java/jca/rar/src/main/resources/META-INF/ra.xml
+++ b/qpid/java/jca/rar/src/main/resources/META-INF/ra.xml
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryObjectFactory.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryObjectFactory.java
index 2dc94ed194..2dc94ed194 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryObjectFactory.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryObjectFactory.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java
index 3bddfd80a4..3bddfd80a4 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRABytesMessage.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRABytesMessage.java
index d30a45c739..d30a45c739 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRABytesMessage.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRABytesMessage.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionFactory.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionFactory.java
index 1e8fb13c79..1e8fb13c79 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionFactory.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionFactory.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionFactoryImpl.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionFactoryImpl.java
index 77a38d5b34..77a38d5b34 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionFactoryImpl.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionFactoryImpl.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionManager.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionManager.java
index 7ba5dd5374..7ba5dd5374 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionManager.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionManager.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionMetaData.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionMetaData.java
index ec14c2a492..ec14c2a492 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionMetaData.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionMetaData.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java
index 779709839a..779709839a 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRACredential.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRACredential.java
index 2b42f9dc3d..2b42f9dc3d 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRACredential.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRACredential.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAException.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAException.java
index 9c070f6184..9c070f6184 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAException.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAException.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRALocalTransaction.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRALocalTransaction.java
index eeb49b6b52..eeb49b6b52 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRALocalTransaction.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRALocalTransaction.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMCFProperties.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMCFProperties.java
index dd60c175de..dd60c175de 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMCFProperties.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMCFProperties.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnection.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnection.java
index eccf77aff2..eccf77aff2 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnection.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnection.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java
index 8744a9deec..8744a9deec 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMapMessage.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMapMessage.java
index 797a28a09a..797a28a09a 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMapMessage.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMapMessage.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessage.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessage.java
index 295a453010..295a453010 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessage.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessage.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageConsumer.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageConsumer.java
index aa0e6adb0e..aa0e6adb0e 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageConsumer.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageConsumer.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageListener.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageListener.java
index e272df818f..e272df818f 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageListener.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageListener.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageProducer.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageProducer.java
index ce0656e30d..ce0656e30d 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageProducer.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageProducer.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMetaData.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMetaData.java
index 0ad7d089c3..0ad7d089c3 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMetaData.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMetaData.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAObjectMessage.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAObjectMessage.java
index 926319bb85..926319bb85 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAObjectMessage.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAObjectMessage.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAProperties.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAProperties.java
index 69320575b0..69320575b0 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAProperties.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAProperties.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueBrowser.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueBrowser.java
index bcd2d3b63c..bcd2d3b63c 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueBrowser.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueBrowser.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueReceiver.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueReceiver.java
index ad1f7fc43b..ad1f7fc43b 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueReceiver.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueReceiver.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueSender.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueSender.java
index 7a123618be..7a123618be 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueSender.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueSender.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASession.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASession.java
index a72f51da51..a72f51da51 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASession.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASession.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactory.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactory.java
index 2747282a3c..2747282a3c 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactory.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactory.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactoryImpl.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactoryImpl.java
index f3253e1400..f3253e1400 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactoryImpl.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactoryImpl.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionImpl.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionImpl.java
index c4cfeaba48..c4cfeaba48 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionImpl.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionImpl.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAStreamMessage.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAStreamMessage.java
index 3c2bee33f2..3c2bee33f2 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAStreamMessage.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAStreamMessage.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRATextMessage.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRATextMessage.java
index d74d006a7f..d74d006a7f 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRATextMessage.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRATextMessage.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRATopicPublisher.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRATopicPublisher.java
index b753690142..b753690142 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRATopicPublisher.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRATopicPublisher.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRATopicSubscriber.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRATopicSubscriber.java
index e423f468e0..e423f468e0 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRATopicSubscriber.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRATopicSubscriber.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAXAResource.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAXAResource.java
index 37ae7f5514..37ae7f5514 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAXAResource.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAXAResource.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
index 96fa83ceef..96fa83ceef 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/Util.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/Util.java
index 491595b9fb..491595b9fb 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/Util.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/Util.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/admin/AdminObjectFactory.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/AdminObjectFactory.java
index 213ea815f2..213ea815f2 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/admin/AdminObjectFactory.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/AdminObjectFactory.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidBindingURL.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidBindingURL.java
index 503f59eecc..503f59eecc 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidBindingURL.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidBindingURL.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java
index d7ca29e04a..d7ca29e04a 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidDestinationProxy.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidDestinationProxy.java
index 7fc84ea69f..7fc84ea69f 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidDestinationProxy.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidDestinationProxy.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidQueue.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidQueue.java
index 1b93d1c42c..1b93d1c42c 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidQueue.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidQueue.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidQueueImpl.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidQueueImpl.java
index 162099d1ee..162099d1ee 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidQueueImpl.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidQueueImpl.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidTopic.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidTopic.java
index f87c35d9e2..f87c35d9e2 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidTopic.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidTopic.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidTopicImpl.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidTopicImpl.java
index 8ac1a679ea..8ac1a679ea 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidTopicImpl.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidTopicImpl.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivation.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivation.java
index 2327512a62..2327512a62 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivation.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivation.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivationSpec.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivationSpec.java
index 3d9a88adb5..3d9a88adb5 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivationSpec.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivationSpec.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidExceptionHandler.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidExceptionHandler.java
index 8775362eb5..8775362eb5 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidExceptionHandler.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidExceptionHandler.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidMessageHandler.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidMessageHandler.java
index a02adf0dad..a02adf0dad 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidMessageHandler.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidMessageHandler.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/tm/GeronimoTransactionManagerLocator.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/GeronimoTransactionManagerLocator.java
index 3a47824631..3a47824631 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/tm/GeronimoTransactionManagerLocator.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/GeronimoTransactionManagerLocator.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/tm/GlassfishTransactionManagerLocator.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/GlassfishTransactionManagerLocator.java
index cff53d2710..cff53d2710 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/tm/GlassfishTransactionManagerLocator.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/GlassfishTransactionManagerLocator.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/tm/JBoss7TransactionManagerLocator.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/JBoss7TransactionManagerLocator.java
index 6103433cbf..6103433cbf 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/tm/JBoss7TransactionManagerLocator.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/JBoss7TransactionManagerLocator.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/tm/JBossTransactionManagerLocator.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/JBossTransactionManagerLocator.java
index 5a5b585984..5a5b585984 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/tm/JBossTransactionManagerLocator.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/JBossTransactionManagerLocator.java
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/tm/WLSTransactionManagerLocator.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/WLSTransactionManagerLocator.java
index 29e673d28e..29e673d28e 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/tm/WLSTransactionManagerLocator.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/WLSTransactionManagerLocator.java
diff --git a/java/jca/src/test/java/org/apache/qpid/ra/QpidActivationSpecTest.java b/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidActivationSpecTest.java
index e811427223..e811427223 100644
--- a/java/jca/src/test/java/org/apache/qpid/ra/QpidActivationSpecTest.java
+++ b/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidActivationSpecTest.java
diff --git a/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java b/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java
index a6788a72c5..a6788a72c5 100644
--- a/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java
+++ b/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java
diff --git a/java/lib/ivy/README.txt b/qpid/java/lib/ivy/README.txt
index f8a01f39b4..f8a01f39b4 100644
--- a/java/lib/ivy/README.txt
+++ b/qpid/java/lib/ivy/README.txt
diff --git a/java/lib/poms/bcel-5.2.xml b/qpid/java/lib/poms/bcel-5.2.xml
index 09d404adf2..09d404adf2 100644
--- a/java/lib/poms/bcel-5.2.xml
+++ b/qpid/java/lib/poms/bcel-5.2.xml
diff --git a/java/lib/poms/bonecp-0.7.1.RELEASE.xml b/qpid/java/lib/poms/bonecp-0.7.1.RELEASE.xml
index 6a9ff3d214..6a9ff3d214 100644
--- a/java/lib/poms/bonecp-0.7.1.RELEASE.xml
+++ b/qpid/java/lib/poms/bonecp-0.7.1.RELEASE.xml
diff --git a/java/lib/poms/commons-beanutils-core-1.8.3.xml b/qpid/java/lib/poms/commons-beanutils-core-1.8.3.xml
index 10d664fca8..10d664fca8 100644
--- a/java/lib/poms/commons-beanutils-core-1.8.3.xml
+++ b/qpid/java/lib/poms/commons-beanutils-core-1.8.3.xml
diff --git a/java/lib/poms/commons-cli-1.2.xml b/qpid/java/lib/poms/commons-cli-1.2.xml
index 5b4f0e35d7..5b4f0e35d7 100644
--- a/java/lib/poms/commons-cli-1.2.xml
+++ b/qpid/java/lib/poms/commons-cli-1.2.xml
diff --git a/java/lib/poms/commons-codec-1.6.xml b/qpid/java/lib/poms/commons-codec-1.6.xml
index 95f6f24aa2..95f6f24aa2 100644
--- a/java/lib/poms/commons-codec-1.6.xml
+++ b/qpid/java/lib/poms/commons-codec-1.6.xml
diff --git a/java/lib/poms/commons-collections-3.2.1.xml b/qpid/java/lib/poms/commons-collections-3.2.1.xml
index 85be0c2e6a..85be0c2e6a 100644
--- a/java/lib/poms/commons-collections-3.2.1.xml
+++ b/qpid/java/lib/poms/commons-collections-3.2.1.xml
diff --git a/java/lib/poms/commons-configuration-1.8.xml b/qpid/java/lib/poms/commons-configuration-1.8.xml
index 337b9d0993..337b9d0993 100644
--- a/java/lib/poms/commons-configuration-1.8.xml
+++ b/qpid/java/lib/poms/commons-configuration-1.8.xml
diff --git a/java/lib/poms/commons-digester-1.8.1.xml b/qpid/java/lib/poms/commons-digester-1.8.1.xml
index 56b38bf778..56b38bf778 100644
--- a/java/lib/poms/commons-digester-1.8.1.xml
+++ b/qpid/java/lib/poms/commons-digester-1.8.1.xml
diff --git a/java/lib/poms/commons-lang-2.6.xml b/qpid/java/lib/poms/commons-lang-2.6.xml
index be092371ce..be092371ce 100644
--- a/java/lib/poms/commons-lang-2.6.xml
+++ b/qpid/java/lib/poms/commons-lang-2.6.xml
diff --git a/java/lib/poms/commons-logging-1.1.1.xml b/qpid/java/lib/poms/commons-logging-1.1.1.xml
index bf14523b24..bf14523b24 100644
--- a/java/lib/poms/commons-logging-1.1.1.xml
+++ b/qpid/java/lib/poms/commons-logging-1.1.1.xml
diff --git a/java/lib/poms/commons-pool-1.4.xml b/qpid/java/lib/poms/commons-pool-1.4.xml
index 21a18596b9..21a18596b9 100644
--- a/java/lib/poms/commons-pool-1.4.xml
+++ b/qpid/java/lib/poms/commons-pool-1.4.xml
diff --git a/java/lib/poms/derby-10.8.2.2.xml b/qpid/java/lib/poms/derby-10.8.2.2.xml
index 897dddd607..897dddd607 100644
--- a/java/lib/poms/derby-10.8.2.2.xml
+++ b/qpid/java/lib/poms/derby-10.8.2.2.xml
diff --git a/java/lib/poms/dojo-1.9.1.xml b/qpid/java/lib/poms/dojo-1.9.1.xml
index 0b8c341353..0b8c341353 100644
--- a/java/lib/poms/dojo-1.9.1.xml
+++ b/qpid/java/lib/poms/dojo-1.9.1.xml
diff --git a/java/lib/poms/geronimo-ejb_3.0_spec-1.0.1.xml b/qpid/java/lib/poms/geronimo-ejb_3.0_spec-1.0.1.xml
index 42811b5ca7..42811b5ca7 100644
--- a/java/lib/poms/geronimo-ejb_3.0_spec-1.0.1.xml
+++ b/qpid/java/lib/poms/geronimo-ejb_3.0_spec-1.0.1.xml
diff --git a/java/lib/poms/geronimo-j2ee-connector_1.5_spec-2.0.0.xml b/qpid/java/lib/poms/geronimo-j2ee-connector_1.5_spec-2.0.0.xml
index 728144a8ea..728144a8ea 100644
--- a/java/lib/poms/geronimo-j2ee-connector_1.5_spec-2.0.0.xml
+++ b/qpid/java/lib/poms/geronimo-j2ee-connector_1.5_spec-2.0.0.xml
diff --git a/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml b/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml
index 0fe38d5477..0fe38d5477 100644
--- a/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml
+++ b/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml
diff --git a/java/lib/poms/geronimo-jta_1.1_spec-1.1.1.xml b/qpid/java/lib/poms/geronimo-jta_1.1_spec-1.1.1.xml
index b6ff5f7023..b6ff5f7023 100644
--- a/java/lib/poms/geronimo-jta_1.1_spec-1.1.1.xml
+++ b/qpid/java/lib/poms/geronimo-jta_1.1_spec-1.1.1.xml
diff --git a/java/lib/poms/geronimo-kernel-2.2.1.xml b/qpid/java/lib/poms/geronimo-kernel-2.2.1.xml
index 0a4c539f7e..0a4c539f7e 100644
--- a/java/lib/poms/geronimo-kernel-2.2.1.xml
+++ b/qpid/java/lib/poms/geronimo-kernel-2.2.1.xml
diff --git a/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml b/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml
index 11228afcfa..11228afcfa 100644
--- a/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml
+++ b/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml
diff --git a/java/lib/poms/guava-14.0.1.xml b/qpid/java/lib/poms/guava-14.0.1.xml
index 79e42308c2..79e42308c2 100644
--- a/java/lib/poms/guava-14.0.1.xml
+++ b/qpid/java/lib/poms/guava-14.0.1.xml
diff --git a/java/lib/poms/jackson-core-asl-1.9.0.xml b/qpid/java/lib/poms/jackson-core-asl-1.9.0.xml
index cc5947b72b..cc5947b72b 100644
--- a/java/lib/poms/jackson-core-asl-1.9.0.xml
+++ b/qpid/java/lib/poms/jackson-core-asl-1.9.0.xml
diff --git a/java/lib/poms/jackson-mapper-asl-1.9.0.xml b/qpid/java/lib/poms/jackson-mapper-asl-1.9.0.xml
index ff74f5a503..ff74f5a503 100644
--- a/java/lib/poms/jackson-mapper-asl-1.9.0.xml
+++ b/qpid/java/lib/poms/jackson-mapper-asl-1.9.0.xml
diff --git a/java/lib/poms/je-5.0.97.xml b/qpid/java/lib/poms/je-5.0.97.xml
index 9ab0f3a1fe..9ab0f3a1fe 100644
--- a/java/lib/poms/je-5.0.97.xml
+++ b/qpid/java/lib/poms/je-5.0.97.xml
diff --git a/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml
index 5beba95d17..5beba95d17 100644
--- a/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml
diff --git a/java/lib/poms/jetty-http-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml
index 5c840bedd6..5c840bedd6 100644
--- a/java/lib/poms/jetty-http-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml
diff --git a/java/lib/poms/jetty-io-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml
index 9cec3998ea..9cec3998ea 100644
--- a/java/lib/poms/jetty-io-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml
diff --git a/java/lib/poms/jetty-security-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml
index 9501750ba0..9501750ba0 100644
--- a/java/lib/poms/jetty-security-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml
diff --git a/java/lib/poms/jetty-server-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml
index 587860b50f..587860b50f 100644
--- a/java/lib/poms/jetty-server-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml
diff --git a/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml
index 4c0ff0a41b..4c0ff0a41b 100644
--- a/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml
diff --git a/java/lib/poms/jetty-util-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml
index f5c990248f..f5c990248f 100644
--- a/java/lib/poms/jetty-util-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml
diff --git a/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml
index 4d3ebd1666..4d3ebd1666 100644
--- a/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml
diff --git a/java/lib/poms/junit-3.8.1.xml b/qpid/java/lib/poms/junit-3.8.1.xml
index 0462e9c0d2..0462e9c0d2 100644
--- a/java/lib/poms/junit-3.8.1.xml
+++ b/qpid/java/lib/poms/junit-3.8.1.xml
diff --git a/java/lib/poms/log4j-1.2.16.xml b/qpid/java/lib/poms/log4j-1.2.16.xml
index b60a30d993..b60a30d993 100644
--- a/java/lib/poms/log4j-1.2.16.xml
+++ b/qpid/java/lib/poms/log4j-1.2.16.xml
diff --git a/java/lib/poms/org.apache.felix.main-2.0.5.xml b/qpid/java/lib/poms/org.apache.felix.main-2.0.5.xml
index 91718725dc..91718725dc 100644
--- a/java/lib/poms/org.apache.felix.main-2.0.5.xml
+++ b/qpid/java/lib/poms/org.apache.felix.main-2.0.5.xml
diff --git a/java/lib/poms/slf4j-api-1.6.4.xml b/qpid/java/lib/poms/slf4j-api-1.6.4.xml
index 4eb7c2fe96..4eb7c2fe96 100644
--- a/java/lib/poms/slf4j-api-1.6.4.xml
+++ b/qpid/java/lib/poms/slf4j-api-1.6.4.xml
diff --git a/java/lib/poms/slf4j-log4j12-1.6.4.xml b/qpid/java/lib/poms/slf4j-log4j12-1.6.4.xml
index 516dda9eeb..516dda9eeb 100644
--- a/java/lib/poms/slf4j-log4j12-1.6.4.xml
+++ b/qpid/java/lib/poms/slf4j-log4j12-1.6.4.xml
diff --git a/java/lib/poms/xalan-2.7.0.xml b/qpid/java/lib/poms/xalan-2.7.0.xml
index 3fd89aacd8..3fd89aacd8 100644
--- a/java/lib/poms/xalan-2.7.0.xml
+++ b/qpid/java/lib/poms/xalan-2.7.0.xml
diff --git a/java/management/common/build.xml b/qpid/java/management/common/build.xml
index 2315027b14..2315027b14 100644
--- a/java/management/common/build.xml
+++ b/qpid/java/management/common/build.xml
diff --git a/java/management/common/pom.xml b/qpid/java/management/common/pom.xml
index ad5d103165..ad5d103165 100644
--- a/java/management/common/pom.xml
+++ b/qpid/java/management/common/pom.xml
diff --git a/java/management/common/src/main/java/management-common.bnd b/qpid/java/management/common/src/main/java/management-common.bnd
index 459c3e60a8..459c3e60a8 100644
--- a/java/management/common/src/main/java/management-common.bnd
+++ b/qpid/java/management/common/src/main/java/management-common.bnd
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java
index 25267cc888..25267cc888 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
index ced943d01a..ced943d01a 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
index 91f80b27c4..91f80b27c4 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
index bf74fa5b13..bf74fa5b13 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
index 32e5fbd125..32e5fbd125 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
index dbce388054..dbce388054 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
index b1519a27b6..b1519a27b6 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
index 657f9f90e4..657f9f90e4 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
index 14e7211049..14e7211049 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
index 3131969813..3131969813 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
index d70c7dd8f3..d70c7dd8f3 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
index 99b7c283d8..99b7c283d8 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
index 25f2d09608..25f2d09608 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/CRAMMD5HashedSaslClientFactory.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/CRAMMD5HashedSaslClientFactory.java
index ec819ae65f..ec819ae65f 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/CRAMMD5HashedSaslClientFactory.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/CRAMMD5HashedSaslClientFactory.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/ClientSaslFactory.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/ClientSaslFactory.java
index 263c2962ea..263c2962ea 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/ClientSaslFactory.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/ClientSaslFactory.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/Constants.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/Constants.java
index 31010baf8b..31010baf8b 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/Constants.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/Constants.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/JCAProvider.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/JCAProvider.java
index cb2007dd50..cb2007dd50 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/JCAProvider.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/JCAProvider.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
index 01af41c2c9..01af41c2c9 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/SaslProvider.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/SaslProvider.java
index 1eb44e35df..1eb44e35df 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/SaslProvider.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/SaslProvider.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
index caee5d481a..caee5d481a 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
index 314ef70144..314ef70144 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
diff --git a/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java b/qpid/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java
index 042e666601..042e666601 100644
--- a/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java
+++ b/qpid/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java
diff --git a/java/management/example/build.xml b/qpid/java/management/example/build.xml
index e195d4bd47..e195d4bd47 100644
--- a/java/management/example/build.xml
+++ b/qpid/java/management/example/build.xml
diff --git a/java/management/example/pom.xml b/qpid/java/management/example/pom.xml
index bdddc3d2dc..bdddc3d2dc 100644
--- a/java/management/example/pom.xml
+++ b/qpid/java/management/example/pom.xml
diff --git a/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/AddQueue.java b/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/AddQueue.java
index f82408bd27..f82408bd27 100644
--- a/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/AddQueue.java
+++ b/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/AddQueue.java
diff --git a/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/DeleteMessagesFromTopOfTmp.java b/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/DeleteMessagesFromTopOfTmp.java
index 5d529a8ff6..5d529a8ff6 100644
--- a/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/DeleteMessagesFromTopOfTmp.java
+++ b/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/DeleteMessagesFromTopOfTmp.java
diff --git a/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java b/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java
index 2b34e2da5d..2b34e2da5d 100644
--- a/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java
+++ b/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java
diff --git a/java/maven-settings.xml b/qpid/java/maven-settings.xml
index 0f2e3e6156..0f2e3e6156 100644
--- a/java/maven-settings.xml
+++ b/qpid/java/maven-settings.xml
diff --git a/java/module.xml b/qpid/java/module.xml
index 28c31f967d..28c31f967d 100644
--- a/java/module.xml
+++ b/qpid/java/module.xml
diff --git a/java/perftests/build.xml b/qpid/java/perftests/build.xml
index 449dd7e89b..449dd7e89b 100644
--- a/java/perftests/build.xml
+++ b/qpid/java/perftests/build.xml
diff --git a/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef b/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
index 73d1a93b11..73d1a93b11 100644
--- a/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
diff --git a/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef b/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
index 2cd5e8d9d5..2cd5e8d9d5 100644
--- a/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
diff --git a/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef b/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
index ae59f61741..ae59f61741 100644
--- a/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
diff --git a/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef b/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef
index f5ce7662f3..f5ce7662f3 100644
--- a/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef
diff --git a/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef b/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
index d67c8881de..d67c8881de 100644
--- a/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
diff --git a/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef b/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
index b78c7c53d2..b78c7c53d2 100644
--- a/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
diff --git a/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef b/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
index d00d1e9d00..d00d1e9d00 100644
--- a/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
diff --git a/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef b/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
index a808334560..a808334560 100644
--- a/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
diff --git a/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
index a8abd6f02c..a8abd6f02c 100644
--- a/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
diff --git a/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
index ebc040cd25..ebc040cd25 100644
--- a/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
diff --git a/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef b/qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef
index bf55750c4a..bf55750c4a 100644
--- a/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef
diff --git a/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef b/qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef
index 5f846c6ca0..5f846c6ca0 100644
--- a/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef
diff --git a/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef b/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
index 248db4905f..248db4905f 100644
--- a/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
diff --git a/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef b/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
index 50816a8cd3..50816a8cd3 100644
--- a/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
diff --git a/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef
index 67821b8581..67821b8581 100644
--- a/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef
diff --git a/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef
index 7fbf55a2ab..7fbf55a2ab 100644
--- a/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef
diff --git a/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef
index 1734265adf..1734265adf 100644
--- a/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef
diff --git a/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef
index ef7beb252d..ef7beb252d 100644
--- a/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef
diff --git a/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef b/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
index ef82fdf45f..ef82fdf45f 100644
--- a/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
diff --git a/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef b/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
index 394b23227c..394b23227c 100644
--- a/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
diff --git a/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef b/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
index c418709a82..c418709a82 100644
--- a/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
diff --git a/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef b/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef
index f25dd89a2b..f25dd89a2b 100644
--- a/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef
diff --git a/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
index 6b7939157a..6b7939157a 100644
--- a/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
diff --git a/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
index c04e393046..c04e393046 100644
--- a/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
diff --git a/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef b/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
index fa688feb1f..fa688feb1f 100644
--- a/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
diff --git a/java/perftests/etc/chartdefs/timeseries/1001-Large-Messages-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1001-Large-Messages-Transient.chartdef
index e77f7b4eff..e77f7b4eff 100644
--- a/java/perftests/etc/chartdefs/timeseries/1001-Large-Messages-Transient.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/timeseries/1001-Large-Messages-Transient.chartdef
diff --git a/java/perftests/etc/chartdefs/timeseries/1002-Large-Messages-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1002-Large-Messages-Persistent.chartdef
index ffcf8c26b8..ffcf8c26b8 100644
--- a/java/perftests/etc/chartdefs/timeseries/1002-Large-Messages-Persistent.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/timeseries/1002-Large-Messages-Persistent.chartdef
diff --git a/java/perftests/etc/chartdefs/timeseries/1011-MultipleProducersAndConsumers-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1011-MultipleProducersAndConsumers-Persistent.chartdef
index 8f9b4cec9c..8f9b4cec9c 100644
--- a/java/perftests/etc/chartdefs/timeseries/1011-MultipleProducersAndConsumers-Persistent.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/timeseries/1011-MultipleProducersAndConsumers-Persistent.chartdef
diff --git a/java/perftests/etc/chartdefs/timeseries/1030-Batch-Size-Small.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1030-Batch-Size-Small.chartdef
index f755bf4a5b..f755bf4a5b 100644
--- a/java/perftests/etc/chartdefs/timeseries/1030-Batch-Size-Small.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/timeseries/1030-Batch-Size-Small.chartdef
diff --git a/java/perftests/etc/chartdefs/timeseries/1031-Batch-Size-Large.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1031-Batch-Size-Large.chartdef
index ca390f8226..ca390f8226 100644
--- a/java/perftests/etc/chartdefs/timeseries/1031-Batch-Size-Large.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/timeseries/1031-Batch-Size-Large.chartdef
diff --git a/java/perftests/etc/chartdefs/timeseries/1040-SortedQueue.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1040-SortedQueue.chartdef
index 6dce3a1a77..6dce3a1a77 100644
--- a/java/perftests/etc/chartdefs/timeseries/1040-SortedQueue.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/timeseries/1040-SortedQueue.chartdef
diff --git a/java/perftests/etc/log4j.properties b/qpid/java/perftests/etc/log4j.properties
index ec00e022ac..ec00e022ac 100644
--- a/java/perftests/etc/log4j.properties
+++ b/qpid/java/perftests/etc/log4j.properties
diff --git a/java/perftests/etc/perftests-jndi.properties b/qpid/java/perftests/etc/perftests-jndi.properties
index 173606cd9d..173606cd9d 100644
--- a/java/perftests/etc/perftests-jndi.properties
+++ b/qpid/java/perftests/etc/perftests-jndi.properties
diff --git a/java/perftests/etc/run-perftests.sh b/qpid/java/perftests/etc/run-perftests.sh
index de435ecfca..de435ecfca 100755
--- a/java/perftests/etc/run-perftests.sh
+++ b/qpid/java/perftests/etc/run-perftests.sh
diff --git a/java/perftests/etc/testdefs/AcknowledgementModes.json b/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json
index 071edf3f0e..071edf3f0e 100644
--- a/java/perftests/etc/testdefs/AcknowledgementModes.json
+++ b/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json
diff --git a/java/perftests/etc/testdefs/BatchSize.js b/qpid/java/perftests/etc/testdefs/BatchSize.js
index f17751b7b5..f17751b7b5 100644
--- a/java/perftests/etc/testdefs/BatchSize.js
+++ b/qpid/java/perftests/etc/testdefs/BatchSize.js
diff --git a/java/perftests/etc/testdefs/BatchSizeConsumerVaries.js b/qpid/java/perftests/etc/testdefs/BatchSizeConsumerVaries.js
index b491f431c9..b491f431c9 100644
--- a/java/perftests/etc/testdefs/BatchSizeConsumerVaries.js
+++ b/qpid/java/perftests/etc/testdefs/BatchSizeConsumerVaries.js
diff --git a/java/perftests/etc/testdefs/BatchSizeProducerVaries.js b/qpid/java/perftests/etc/testdefs/BatchSizeProducerVaries.js
index ac23c52c9e..ac23c52c9e 100644
--- a/java/perftests/etc/testdefs/BatchSizeProducerVaries.js
+++ b/qpid/java/perftests/etc/testdefs/BatchSizeProducerVaries.js
diff --git a/java/perftests/etc/testdefs/Latency-MessageSize.json b/qpid/java/perftests/etc/testdefs/Latency-MessageSize.json
index 4486d7a4b5..4486d7a4b5 100644
--- a/java/perftests/etc/testdefs/Latency-MessageSize.json
+++ b/qpid/java/perftests/etc/testdefs/Latency-MessageSize.json
diff --git a/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json b/qpid/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json
index aefd51dde0..aefd51dde0 100644
--- a/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json
+++ b/qpid/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json
diff --git a/java/perftests/etc/testdefs/MessageSize.json b/qpid/java/perftests/etc/testdefs/MessageSize.json
index 6d796bd824..6d796bd824 100644
--- a/java/perftests/etc/testdefs/MessageSize.json
+++ b/qpid/java/perftests/etc/testdefs/MessageSize.json
diff --git a/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js b/qpid/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js
index 0dd45b0392..0dd45b0392 100644
--- a/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js
+++ b/qpid/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js
diff --git a/java/perftests/etc/testdefs/QueueConsumersWithOverlappingSelectors.js b/qpid/java/perftests/etc/testdefs/QueueConsumersWithOverlappingSelectors.js
index 20cfb4ad45..20cfb4ad45 100644
--- a/java/perftests/etc/testdefs/QueueConsumersWithOverlappingSelectors.js
+++ b/qpid/java/perftests/etc/testdefs/QueueConsumersWithOverlappingSelectors.js
diff --git a/java/perftests/etc/testdefs/QueueTypes.json b/qpid/java/perftests/etc/testdefs/QueueTypes.json
index 427f3d9795..427f3d9795 100644
--- a/java/perftests/etc/testdefs/QueueTypes.json
+++ b/qpid/java/perftests/etc/testdefs/QueueTypes.json
diff --git a/java/perftests/etc/testdefs/Topic-AckModes.js b/qpid/java/perftests/etc/testdefs/Topic-AckModes.js
index 3f7eb5d3a7..3f7eb5d3a7 100644
--- a/java/perftests/etc/testdefs/Topic-AckModes.js
+++ b/qpid/java/perftests/etc/testdefs/Topic-AckModes.js
diff --git a/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js b/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js
index 1d38ff08e5..1d38ff08e5 100644
--- a/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js
+++ b/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js
diff --git a/java/perftests/etc/testdefs/Topic-NumberOfTopics.js b/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js
index 811f8e3a07..811f8e3a07 100644
--- a/java/perftests/etc/testdefs/Topic-NumberOfTopics.js
+++ b/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js
diff --git a/java/perftests/etc/testdefs/Topic-Persistence.js b/qpid/java/perftests/etc/testdefs/Topic-Persistence.js
index 96872b6c55..96872b6c55 100644
--- a/java/perftests/etc/testdefs/Topic-Persistence.js
+++ b/qpid/java/perftests/etc/testdefs/Topic-Persistence.js
diff --git a/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js b/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js
index d8fa03a1a5..d8fa03a1a5 100644
--- a/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js
+++ b/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js
diff --git a/java/perftests/etc/testdefs/VaryingNumberOfProducerSessionsSingleConnection.js b/qpid/java/perftests/etc/testdefs/VaryingNumberOfProducerSessionsSingleConnection.js
index c62a8344b1..c62a8344b1 100644
--- a/java/perftests/etc/testdefs/VaryingNumberOfProducerSessionsSingleConnection.js
+++ b/qpid/java/perftests/etc/testdefs/VaryingNumberOfProducerSessionsSingleConnection.js
diff --git a/java/perftests/etc/visualisation-timeseries.sh b/qpid/java/perftests/etc/visualisation-timeseries.sh
index 3f35b9047c..3f35b9047c 100755
--- a/java/perftests/etc/visualisation-timeseries.sh
+++ b/qpid/java/perftests/etc/visualisation-timeseries.sh
diff --git a/java/perftests/etc/visualisation.sh b/qpid/java/perftests/etc/visualisation.sh
index 4c10d7e2e2..4c10d7e2e2 100755
--- a/java/perftests/etc/visualisation.sh
+++ b/qpid/java/perftests/etc/visualisation.sh
diff --git a/java/perftests/example/PQBT-AA-Qpid-01.json b/qpid/java/perftests/example/PQBT-AA-Qpid-01.json
index 28cb4fa410..28cb4fa410 100644
--- a/java/perftests/example/PQBT-AA-Qpid-01.json
+++ b/qpid/java/perftests/example/PQBT-AA-Qpid-01.json
diff --git a/java/perftests/example/TQBT-TX-Qpid-01.json b/qpid/java/perftests/example/TQBT-TX-Qpid-01.json
index eea8666fa4..eea8666fa4 100644
--- a/java/perftests/example/TQBT-TX-Qpid-01.json
+++ b/qpid/java/perftests/example/TQBT-TX-Qpid-01.json
diff --git a/java/perftests/example/brokerconfig/log4j.xml b/qpid/java/perftests/example/brokerconfig/log4j.xml
index 7e53d2667b..7e53d2667b 100644
--- a/java/perftests/example/brokerconfig/log4j.xml
+++ b/qpid/java/perftests/example/brokerconfig/log4j.xml
diff --git a/java/perftests/example/brokerconfig/passwd b/qpid/java/perftests/example/brokerconfig/passwd
index 99f0f05c6a..99f0f05c6a 100644
--- a/java/perftests/example/brokerconfig/passwd
+++ b/qpid/java/perftests/example/brokerconfig/passwd
diff --git a/java/perftests/example/brokerconfig/virtualhosts.xml b/qpid/java/perftests/example/brokerconfig/virtualhosts.xml
index b0dbc89833..b0dbc89833 100644
--- a/java/perftests/example/brokerconfig/virtualhosts.xml
+++ b/qpid/java/perftests/example/brokerconfig/virtualhosts.xml
diff --git a/java/perftests/example/config-one-test.json b/qpid/java/perftests/example/config-one-test.json
index 8f4e577d49..8f4e577d49 100644
--- a/java/perftests/example/config-one-test.json
+++ b/qpid/java/perftests/example/config-one-test.json
diff --git a/java/perftests/example/config-stress-testing-manyp-c1-with-psfc.json b/qpid/java/perftests/example/config-stress-testing-manyp-c1-with-psfc.json
index 42c0f4a155..42c0f4a155 100644
--- a/java/perftests/example/config-stress-testing-manyp-c1-with-psfc.json
+++ b/qpid/java/perftests/example/config-stress-testing-manyp-c1-with-psfc.json
diff --git a/java/perftests/example/config-stress-testing.json b/qpid/java/perftests/example/config-stress-testing.json
index f6029b848d..f6029b848d 100644
--- a/java/perftests/example/config-stress-testing.json
+++ b/qpid/java/perftests/example/config-stress-testing.json
diff --git a/java/perftests/example/config-two-tests.json b/qpid/java/perftests/example/config-two-tests.json
index 79d305b100..79d305b100 100644
--- a/java/perftests/example/config-two-tests.json
+++ b/qpid/java/perftests/example/config-two-tests.json
diff --git a/java/perftests/example/log4j-client.properties b/qpid/java/perftests/example/log4j-client.properties
index b724cbf5f2..b724cbf5f2 100644
--- a/java/perftests/example/log4j-client.properties
+++ b/qpid/java/perftests/example/log4j-client.properties
diff --git a/java/perftests/example/log4j.properties b/qpid/java/perftests/example/log4j.properties
index cabb774156..cabb774156 100644
--- a/java/perftests/example/log4j.properties
+++ b/qpid/java/perftests/example/log4j.properties
diff --git a/java/perftests/example/perftests-jndi.properties b/qpid/java/perftests/example/perftests-jndi.properties
index 1c0fd57663..1c0fd57663 100644
--- a/java/perftests/example/perftests-jndi.properties
+++ b/qpid/java/perftests/example/perftests-jndi.properties
diff --git a/java/perftests/example/perftests.js b/qpid/java/perftests/example/perftests.js
index be7d5e0be4..be7d5e0be4 100644
--- a/java/perftests/example/perftests.js
+++ b/qpid/java/perftests/example/perftests.js
diff --git a/java/perftests/example/run-client.sh b/qpid/java/perftests/example/run-client.sh
index 18679a5d08..18679a5d08 100755
--- a/java/perftests/example/run-client.sh
+++ b/qpid/java/perftests/example/run-client.sh
diff --git a/java/perftests/example/run.sh b/qpid/java/perftests/example/run.sh
index 0f15f570bb..0f15f570bb 100755
--- a/java/perftests/example/run.sh
+++ b/qpid/java/perftests/example/run.sh
diff --git a/java/perftests/pom.xml b/qpid/java/perftests/pom.xml
index 25d0cce626..25d0cce626 100644
--- a/java/perftests/pom.xml
+++ b/qpid/java/perftests/pom.xml
diff --git a/java/perftests/src/main/assembly/qpid-perftests-bin.xml b/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml
index 52ac6884ae..52ac6884ae 100644
--- a/java/perftests/src/main/assembly/qpid-perftests-bin.xml
+++ b/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml
diff --git a/java/perftests/src/main/java/json2.js b/qpid/java/perftests/src/main/java/json2.js
index 2dbf60d398..2dbf60d398 100644
--- a/java/perftests/src/main/java/json2.js
+++ b/qpid/java/perftests/src/main/java/json2.js
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java
index 9e865010f8..9e865010f8 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/ArgumentParser.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ArgumentParser.java
index e962bfe799..e962bfe799 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/ArgumentParser.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ArgumentParser.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/ClientRunner.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ClientRunner.java
index 9c2f4a3d95..9c2f4a3d95 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/ClientRunner.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ClientRunner.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java
index ee374e180d..ee374e180d 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java
index 449130a328..449130a328 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/DistributedTestConstants.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/DistributedTestConstants.java
index a6f872e841..a6f872e841 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/DistributedTestConstants.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/DistributedTestConstants.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/DistributedTestException.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/DistributedTestException.java
index d1d24dcfff..d1d24dcfff 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/DistributedTestException.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/DistributedTestException.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/ResultsFileWriter.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ResultsFileWriter.java
index 81b717403d..81b717403d 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/ResultsFileWriter.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ResultsFileWriter.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/Visitor.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/Visitor.java
index 52dad9aa4d..52dad9aa4d 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/Visitor.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/Visitor.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java
index 0d5457c992..0d5457c992 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/ClientCommandVisitor.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ClientCommandVisitor.java
index 791897323e..791897323e 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/ClientCommandVisitor.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ClientCommandVisitor.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/ClientState.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ClientState.java
index c88c0a6c86..c88c0a6c86 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/ClientState.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ClientState.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
index d3a5e30191..d3a5e30191 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/MessageProvider.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/MessageProvider.java
index 6af1e1316a..6af1e1316a 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/MessageProvider.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/MessageProvider.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/Participant.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/Participant.java
index 941ec90565..941ec90565 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/Participant.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/Participant.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java
index 10f62708a4..10f62708a4 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutorRegistry.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutorRegistry.java
index 3d9780e640..3d9780e640 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutorRegistry.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutorRegistry.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantResultFactory.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantResultFactory.java
index 50c0a74ccd..50c0a74ccd 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantResultFactory.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantResultFactory.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java
index a9da837dea..a9da837dea 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/GeneratedPropertySupport.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/GeneratedPropertySupport.java
index a49ebf756e..a49ebf756e 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/GeneratedPropertySupport.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/GeneratedPropertySupport.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/GeneratedPropertyValue.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/GeneratedPropertyValue.java
index 39c093fac5..39c093fac5 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/GeneratedPropertyValue.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/GeneratedPropertyValue.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/ListPropertyValue.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/ListPropertyValue.java
index 4444351976..4444351976 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/ListPropertyValue.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/ListPropertyValue.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java
index e0ae137c35..e0ae137c35 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/PropertyValue.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/PropertyValue.java
index 97adc0cee1..97adc0cee1 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/PropertyValue.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/PropertyValue.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/PropertyValueFactory.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/PropertyValueFactory.java
index fa44b2da1e..fa44b2da1e 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/PropertyValueFactory.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/PropertyValueFactory.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/RandomPropertyValue.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/RandomPropertyValue.java
index 4f44a4bca8..4f44a4bca8 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/RandomPropertyValue.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/RandomPropertyValue.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/RangePropertyValue.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/RangePropertyValue.java
index 3aca4d4bca..3aca4d4bca 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/RangePropertyValue.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/RangePropertyValue.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/SimplePropertyValue.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/SimplePropertyValue.java
index 9141e68656..9141e68656 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/SimplePropertyValue.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/SimplePropertyValue.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithLimits.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithLimits.java
index f64107c125..f64107c125 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithLimits.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithLimits.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithLimitsFactory.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithLimitsFactory.java
index 4d17d76568..4d17d76568 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithLimitsFactory.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithLimitsFactory.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimits.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimits.java
index f729a72fa5..f729a72fa5 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimits.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimits.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimit.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimit.java
index 4fa3960d92..4fa3960d92 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimit.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimit.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/ClientRegistry.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/ClientRegistry.java
index 559bdf2451..559bdf2451 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/ClientRegistry.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/ClientRegistry.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/CommandForClient.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/CommandForClient.java
index 6c0c253807..6c0c253807 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/CommandForClient.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/CommandForClient.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/CommandListener.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/CommandListener.java
index e2f40bebe8..e2f40bebe8 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/CommandListener.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/CommandListener.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/Controller.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/Controller.java
index 513e633566..513e633566 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/Controller.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/Controller.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/ParticipatingClients.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/ParticipatingClients.java
index 077d628697..077d628697 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/ParticipatingClients.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/ParticipatingClients.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/ResultsForAllTests.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/ResultsForAllTests.java
index d4474e2c12..d4474e2c12 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/ResultsForAllTests.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/ResultsForAllTests.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestResult.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestResult.java
index 756c641532..756c641532 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestResult.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestResult.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java
index e973f07c12..e973f07c12 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunnerFactory.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunnerFactory.java
index bf0e5afb9c..bf0e5afb9c 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunnerFactory.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunnerFactory.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ClientConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ClientConfig.java
index 4353a85cd3..4353a85cd3 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ClientConfig.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ClientConfig.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/Config.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/Config.java
index fe56137276..fe56137276 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/Config.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/Config.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConfigReader.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConfigReader.java
index bd7d239a90..bd7d239a90 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConfigReader.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConfigReader.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConnectionConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConnectionConfig.java
index e2cc31e21e..e2cc31e21e 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConnectionConfig.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConnectionConfig.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConsumerConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConsumerConfig.java
index dcccccdd5f..dcccccdd5f 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConsumerConfig.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConsumerConfig.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/IterationValue.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/IterationValue.java
index ef953a5d07..ef953a5d07 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/IterationValue.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/IterationValue.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluator.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluator.java
index bbc22af00f..bbc22af00f 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluator.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluator.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/MessageProviderConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/MessageProviderConfig.java
index 318ec7f045..318ec7f045 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/MessageProviderConfig.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/MessageProviderConfig.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
index 99ae4b7426..99ae4b7426 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ProducerConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ProducerConfig.java
index 88c188d3ac..88c188d3ac 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ProducerConfig.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ProducerConfig.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/QueueConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/QueueConfig.java
index 45a4551cbc..45a4551cbc 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/QueueConfig.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/QueueConfig.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/SessionConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/SessionConfig.java
index 12372e5391..12372e5391 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/SessionConfig.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/SessionConfig.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestConfig.java
index 2bb5f1b289..2bb5f1b289 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestConfig.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestConfig.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestInstance.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestInstance.java
index 9f555ef4da..9f555ef4da 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestInstance.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestInstance.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java
index fdea03ae5e..fdea03ae5e 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
index f242111dc5..f242111dc5 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java
index 782f7ae2fd..782f7ae2fd 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/jms/JmsMessageAdaptor.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/JmsMessageAdaptor.java
index c9dba21a74..c9dba21a74 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/jms/JmsMessageAdaptor.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/JmsMessageAdaptor.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/jms/NoOpQueueCreator.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/NoOpQueueCreator.java
index d7e0007b28..d7e0007b28 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/jms/NoOpQueueCreator.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/NoOpQueueCreator.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java
index ef2cfb6cd4..ef2cfb6cd4 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/jms/QueueCreator.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/QueueCreator.java
index a37cd7888c..a37cd7888c 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/jms/QueueCreator.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/QueueCreator.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/json/JsonHandler.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/json/JsonHandler.java
index 8e50cd4f11..8e50cd4f11 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/json/JsonHandler.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/json/JsonHandler.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/json/PropertyValueAdapter.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/json/PropertyValueAdapter.java
index 94f712e652..94f712e652 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/json/PropertyValueAdapter.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/json/PropertyValueAdapter.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/Command.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/Command.java
index 86b4d0e439..86b4d0e439 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/Command.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/Command.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CommandType.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CommandType.java
index b04cbdaba1..b04cbdaba1 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CommandType.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CommandType.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/ConsumerParticipantResult.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/ConsumerParticipantResult.java
index e78f6965d2..e78f6965d2 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/ConsumerParticipantResult.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/ConsumerParticipantResult.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConnectionCommand.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConnectionCommand.java
index c5a96e9a94..c5a96e9a94 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConnectionCommand.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConnectionCommand.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConsumerCommand.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConsumerCommand.java
index 07a60504c8..07a60504c8 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConsumerCommand.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConsumerCommand.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateMessageProviderCommand.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateMessageProviderCommand.java
index 3f30fdd96a..3f30fdd96a 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateMessageProviderCommand.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateMessageProviderCommand.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java
index e7349bf795..e7349bf795 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateProducerCommand.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateProducerCommand.java
index 69dfe1ff5a..69dfe1ff5a 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateProducerCommand.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateProducerCommand.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateResponderCommand.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateResponderCommand.java
index 85a2b5e548..85a2b5e548 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateResponderCommand.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateResponderCommand.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateSessionCommand.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateSessionCommand.java
index f6f59c26af..f6f59c26af 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateSessionCommand.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateSessionCommand.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/NoOpCommand.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/NoOpCommand.java
index 1cdaf00163..1cdaf00163 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/NoOpCommand.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/NoOpCommand.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/OutputAttribute.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/OutputAttribute.java
index b912eaa1cb..b912eaa1cb 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/OutputAttribute.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/OutputAttribute.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantAttribute.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantAttribute.java
index 1154ff306c..1154ff306c 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantAttribute.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantAttribute.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantAttributeExtractor.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantAttributeExtractor.java
index 95a19ceefc..95a19ceefc 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantAttributeExtractor.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantAttributeExtractor.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantResult.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantResult.java
index 0a824a316b..0a824a316b 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantResult.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantResult.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/ProducerParticipantResult.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/ProducerParticipantResult.java
index 2d9399a3d3..2d9399a3d3 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/ProducerParticipantResult.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/ProducerParticipantResult.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/RegisterClientCommand.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/RegisterClientCommand.java
index af880a37d9..af880a37d9 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/RegisterClientCommand.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/RegisterClientCommand.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/Response.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/Response.java
index aac056efcb..aac056efcb 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/Response.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/Response.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/StartTestCommand.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/StartTestCommand.java
index 4a53697ecd..4a53697ecd 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/StartTestCommand.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/StartTestCommand.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/StopClientCommand.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/StopClientCommand.java
index 08758aaa69..08758aaa69 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/StopClientCommand.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/StopClientCommand.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/message/TearDownTestCommand.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/TearDownTestCommand.java
index 6b1367d4f9..6b1367d4f9 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/message/TearDownTestCommand.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/TearDownTestCommand.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/AggregatedTestResult.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/AggregatedTestResult.java
index 5e6da2e65b..5e6da2e65b 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/AggregatedTestResult.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/AggregatedTestResult.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/Aggregator.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/Aggregator.java
index cde30d36e5..cde30d36e5 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/Aggregator.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/Aggregator.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ITestResult.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ITestResult.java
index 6230067486..6230067486 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ITestResult.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ITestResult.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregator.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregator.java
index c21a78d359..c21a78d359 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregator.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregator.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/SeriesStatistics.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/SeriesStatistics.java
index b93c210473..b93c210473 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/SeriesStatistics.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/SeriesStatistics.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregator.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregator.java
index 954828b043..954828b043 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregator.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregator.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormatter.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormatter.java
index ea7a3f78c7..ea7a3f78c7 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormatter.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormatter.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparator.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparator.java
index 0e1fbbc3c6..0e1fbbc3c6 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparator.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparator.java
diff --git a/java/perftests/src/main/java/test-utils.js b/qpid/java/perftests/src/main/java/test-utils.js
index cbf27786b7..cbf27786b7 100644
--- a/java/perftests/src/main/java/test-utils.js
+++ b/qpid/java/perftests/src/main/java/test-utils.js
diff --git a/java/perftests/src/main/resources/perftests.properties b/qpid/java/perftests/src/main/resources/perftests.properties
index d8823f9dc5..d8823f9dc5 100644
--- a/java/perftests/src/main/resources/perftests.properties
+++ b/qpid/java/perftests/src/main/resources/perftests.properties
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/ArgumentParserTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ArgumentParserTest.java
index 3be82627fe..3be82627fe 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/ArgumentParserTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ArgumentParserTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelperTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelperTest.java
index 629442d86c..629442d86c 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelperTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelperTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileTestHelper.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileTestHelper.java
index 71cd61db82..71cd61db82 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileTestHelper.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileTestHelper.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/ResultsFileWriterTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ResultsFileWriterTest.java
index ab55e8003d..ab55e8003d 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/ResultsFileWriterTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ResultsFileWriterTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/VisitorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/VisitorTest.java
index 09f7da4efb..09f7da4efb 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/VisitorTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/VisitorTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ClientCommandVisitorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ClientCommandVisitorTest.java
index 2b29471558..2b29471558 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ClientCommandVisitorTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ClientCommandVisitorTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ClientTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ClientTest.java
index 8139961fa4..8139961fa4 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ClientTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ClientTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ConsumerParticipantTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ConsumerParticipantTest.java
index f75415a2bf..f75415a2bf 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ConsumerParticipantTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ConsumerParticipantTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java
index 8863e0f289..8863e0f289 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantExecutorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantExecutorTest.java
index 6720047cd1..6720047cd1 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantExecutorTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantExecutorTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantRegistryTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantRegistryTest.java
index 5cc8d2f30a..5cc8d2f30a 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantRegistryTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantRegistryTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantResultFactoryTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantResultFactoryTest.java
index 9eab459443..9eab459443 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantResultFactoryTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantResultFactoryTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java
index a013cb0a06..a013cb0a06 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java
index 08ee8715fd..08ee8715fd 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java
index 3172eb07ed..3172eb07ed 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java
index eba1bcc435..eba1bcc435 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java
index 9651dd95ce..9651dd95ce 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java
index b0649a49ae..b0649a49ae 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/SimplePropertyValueTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/SimplePropertyValueTest.java
index f1977015fe..f1977015fe 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/SimplePropertyValueTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/SimplePropertyValueTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimitsTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimitsTest.java
index 0880512333..0880512333 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimitsTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimitsTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimitTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimitTest.java
index 2abdba2446..2abdba2446 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimitTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimitTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java
index c07d9fcb81..c07d9fcb81 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java
index f773c727a1..f773c727a1 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ParticipatingClientsTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ParticipatingClientsTest.java
index da180f328f..da180f328f 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ParticipatingClientsTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ParticipatingClientsTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/TestRunnerTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/TestRunnerTest.java
index d8b25e76fa..d8b25e76fa 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/TestRunnerTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/TestRunnerTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ClientConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ClientConfigTest.java
index 4bf4307eaf..4bf4307eaf 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ClientConfigTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ClientConfigTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest-test-config.js b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest-test-config.js
index 527300eff4..527300eff4 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest-test-config.js
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest-test-config.js
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java
index e208945901..e208945901 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTest.java
index 291ce2af78..291ce2af78 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java
index ce5f92724f..ce5f92724f 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConnectionConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConnectionConfigTest.java
index 0eee80e425..0eee80e425 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConnectionConfigTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConnectionConfigTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConsumerConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConsumerConfigTest.java
index 0aa05a176e..0aa05a176e 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConsumerConfigTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConsumerConfigTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/IterationValueTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/IterationValueTest.java
index 860f6af565..860f6af565 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/IterationValueTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/IterationValueTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest-test-config.js b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest-test-config.js
index eab98e8bd7..eab98e8bd7 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest-test-config.js
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest-test-config.js
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest.java
index 55c1d4a7bd..55c1d4a7bd 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/MessageProviderConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/MessageProviderConfigTest.java
index 148c07b1ca..148c07b1ca 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/MessageProviderConfigTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/MessageProviderConfigTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
index b6efd68cbd..b6efd68cbd 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ProducerConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ProducerConfigTest.java
index 44fca4bb7c..44fca4bb7c 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ProducerConfigTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ProducerConfigTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/SessionConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/SessionConfigTest.java
index 02cdbb8fca..02cdbb8fca 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/SessionConfigTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/SessionConfigTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestConfigTest.java
index be7c7a7c8c..be7c7a7c8c 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestConfigTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestConfigTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestInstanceTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestInstanceTest.java
index 187b57c399..187b57c399 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestInstanceTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestInstanceTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/sampleConfig.json b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/sampleConfig.json
index 9e1168129b..9e1168129b 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/sampleConfig.json
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/sampleConfig.json
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/db/ResultsDbWriterTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/db/ResultsDbWriterTest.java
index abc6b44493..abc6b44493 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/db/ResultsDbWriterTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/db/ResultsDbWriterTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/jms/JmsMessageAdaptorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/jms/JmsMessageAdaptorTest.java
index d4f0cb1f22..d4f0cb1f22 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/jms/JmsMessageAdaptorTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/jms/JmsMessageAdaptorTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/message/JsonHandlerTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/message/JsonHandlerTest.java
index 2e0c2e1ecd..2e0c2e1ecd 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/message/JsonHandlerTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/message/JsonHandlerTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/message/ParticipantResultTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/message/ParticipantResultTest.java
index e9d444d59c..e9d444d59c 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/message/ParticipantResultTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/message/ParticipantResultTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsTestFixture.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsTestFixture.java
index 1edef031bf..1edef031bf 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsTestFixture.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsTestFixture.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/AggregatorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/AggregatorTest.java
index 011eb4e68b..011eb4e68b 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/AggregatorTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/AggregatorTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregatorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregatorTest.java
index 41da1edb33..41da1edb33 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregatorTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregatorTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/SeriesStatisticsTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/SeriesStatisticsTest.java
index 7417dddc4f..7417dddc4f 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/SeriesStatisticsTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/SeriesStatisticsTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregatorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregatorTest.java
index b254a0e3bf..b254a0e3bf 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregatorTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregatorTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormatterTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormatterTest.java
index bbf73b23d2..bbf73b23d2 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormatterTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormatterTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparatorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparatorTest.java
index ed109a2e27..ed109a2e27 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparatorTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparatorTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/expectedOutput.csv b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/expectedOutput.csv
index 02ea67d56d..02ea67d56d 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/expectedOutput.csv
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/expectedOutput.csv
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java
index 96daf64526..96daf64526 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java
index 59396d46c0..59396d46c0 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java
index b06ab0c735..b06ab0c735 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java
index d599bdc5c4..d599bdc5c4 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java
index a3c0430865..a3c0430865 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java
index 75783eef4b..75783eef4b 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java
index 5b5a60ac43..5b5a60ac43 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java
index dcbff6518b..dcbff6518b 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java
index 54bb9efa98..54bb9efa98 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
index ddb4cb7e51..ddb4cb7e51 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json
index 89123302b7..89123302b7 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json
index 605e5cb585..605e5cb585 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json
index a008dc40d8..a008dc40d8 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json
index f94c4f0ae0..f94c4f0ae0 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json
index 4abd7f4feb..4abd7f4feb 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java
index 74c4724901..74c4724901 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json
index b49603ef23..b49603ef23 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
index a0c2a4b342..a0c2a4b342 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json
index 1b7cc51265..1b7cc51265 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json
diff --git a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/perftests.systests.properties b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/perftests.systests.properties
index 149e632048..149e632048 100644
--- a/java/perftests/src/test/java/org/apache/qpid/systest/disttest/perftests.systests.properties
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/perftests.systests.properties
diff --git a/java/perftests/visualisation-jfc/build.xml b/qpid/java/perftests/visualisation-jfc/build.xml
index 04deb39d36..04deb39d36 100644
--- a/java/perftests/visualisation-jfc/build.xml
+++ b/qpid/java/perftests/visualisation-jfc/build.xml
diff --git a/java/perftests/visualisation-jfc/pom.xml b/qpid/java/perftests/visualisation-jfc/pom.xml
index da84df1d2e..da84df1d2e 100644
--- a/java/perftests/visualisation-jfc/pom.xml
+++ b/qpid/java/perftests/visualisation-jfc/pom.xml
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartType.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartType.java
index 5a77f22148..5a77f22148 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartType.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartType.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingException.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingException.java
index 120a4dc750..120a4dc750 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingException.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingException.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java
index 9401b77ab0..9401b77ab0 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BarChart3DBuilder.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BarChart3DBuilder.java
index b10fd477ed..b10fd477ed 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BarChart3DBuilder.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BarChart3DBuilder.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BarChartBuilder.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BarChartBuilder.java
index 7705ef5d3a..7705ef5d3a 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BarChartBuilder.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BarChartBuilder.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilder.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilder.java
index 9cadf0ec3c..9cadf0ec3c 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilder.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilder.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryDataSetBasedChartBuilder.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryDataSetBasedChartBuilder.java
index 0d08fd8ad1..0d08fd8ad1 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryDataSetBasedChartBuilder.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryDataSetBasedChartBuilder.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryStrokeAndPaintApplier.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryStrokeAndPaintApplier.java
index cbf5cbe515..cbf5cbe515 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryStrokeAndPaintApplier.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryStrokeAndPaintApplier.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilder.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilder.java
index 425b83596f..425b83596f 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilder.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilder.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilderFactory.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilderFactory.java
index 63a0573676..63a0573676 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilderFactory.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilderFactory.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactory.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactory.java
index 49d777c506..49d777c506 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactory.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactory.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/LineChart3DBuilder.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/LineChart3DBuilder.java
index b92a25f5ac..b92a25f5ac 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/LineChart3DBuilder.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/LineChart3DBuilder.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/LineChartBuilder.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/LineChartBuilder.java
index 3f5b18acda..3f5b18acda 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/LineChartBuilder.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/LineChartBuilder.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/SeriesPainter.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/SeriesPainter.java
index 854635dc87..854635dc87 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/SeriesPainter.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/SeriesPainter.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/SeriesStrokeAndPaintApplier.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/SeriesStrokeAndPaintApplier.java
index 4d6c37a9f4..4d6c37a9f4 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/SeriesStrokeAndPaintApplier.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/SeriesStrokeAndPaintApplier.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarChartBuilder.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarChartBuilder.java
index c5ad2d7dad..c5ad2d7dad 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarChartBuilder.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarChartBuilder.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesHolder.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesHolder.java
index 803a098dfa..803a098dfa 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesHolder.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesHolder.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesLineChartBuilder.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesLineChartBuilder.java
index 7249ae6332..7249ae6332 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesLineChartBuilder.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesLineChartBuilder.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java
index 575712f06c..575712f06c 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYLineChartBuilder.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYLineChartBuilder.java
index 48b02a7c60..48b02a7c60 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYLineChartBuilder.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYLineChartBuilder.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinition.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinition.java
index 5030c42e89..5030c42e89 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinition.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinition.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java
index e0f43cb34a..e0f43cb34a 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinition.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinition.java
index d89ff855e2..d89ff855e2 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinition.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinition.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java
index e7d828bdcc..e7d828bdcc 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/DatasetHolder.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/DatasetHolder.java
index 14fd50facc..14fd50facc 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/DatasetHolder.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/DatasetHolder.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilder.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilder.java
index 180aa54c6d..180aa54c6d 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilder.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilder.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGenerator.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGenerator.java
index 77f367b0f1..77f367b0f1 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGenerator.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGenerator.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesBuilder.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesBuilder.java
index a865c838c6..a865c838c6 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesBuilder.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesBuilder.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRow.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRow.java
index 9c16866939..9c16866939 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRow.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRow.java
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java
index 341f01ccd1..341f01ccd1 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java
diff --git a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilderTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilderTest.java
index c8a98aafa0..c8a98aafa0 100644
--- a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilderTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilderTest.java
diff --git a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilderFactoryTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilderFactoryTest.java
index 14f81566a6..14f81566a6 100644
--- a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilderFactoryTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilderFactoryTest.java
diff --git a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
index 7af3a6b35e..7af3a6b35e 100644
--- a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
diff --git a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactoryTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactoryTest.java
index 2656c780bb..2656c780bb 100644
--- a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactoryTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactoryTest.java
diff --git a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesBuilderCallbackTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesBuilderCallbackTest.java
index 88e76e667c..88e76e667c 100644
--- a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesBuilderCallbackTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesBuilderCallbackTest.java
diff --git a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java
index 47eee43002..47eee43002 100644
--- a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java
diff --git a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java
index e937e80108..e937e80108 100644
--- a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java
diff --git a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilderTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilderTest.java
index b6b4dbe56b..b6b4dbe56b 100644
--- a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilderTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilderTest.java
diff --git a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGeneratorTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGeneratorTest.java
index d53d0ccfe1..d53d0ccfe1 100644
--- a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGeneratorTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGeneratorTest.java
diff --git a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRowTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRowTest.java
index 064971aa35..064971aa35 100644
--- a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRowTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRowTest.java
diff --git a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java
index 9703c66e1f..9703c66e1f 100644
--- a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java
diff --git a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html
index e7dadcb05b..e7dadcb05b 100755
--- a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html
diff --git a/java/pom.xml b/qpid/java/pom.xml
index 7ea1db66aa..7ea1db66aa 100644
--- a/java/pom.xml
+++ b/qpid/java/pom.xml
diff --git a/java/qpid-test-utils/build.xml b/qpid/java/qpid-test-utils/build.xml
index 4423c365f8..4423c365f8 100644
--- a/java/qpid-test-utils/build.xml
+++ b/qpid/java/qpid-test-utils/build.xml
diff --git a/java/qpid-test-utils/pom.xml b/qpid/java/qpid-test-utils/pom.xml
index 4e90eb334c..4e90eb334c 100644
--- a/java/qpid-test-utils/pom.xml
+++ b/qpid/java/qpid-test-utils/pom.xml
diff --git a/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java
index d3586c364f..d3586c364f 100644
--- a/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java
+++ b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java
diff --git a/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
index 20d5dd5453..20d5dd5453 100644
--- a/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
diff --git a/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
index 26bbe151d2..26bbe151d2 100644
--- a/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
+++ b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
diff --git a/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java
index c48f164d98..c48f164d98 100644
--- a/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java
+++ b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java
diff --git a/java/release-docs/RELEASE_NOTES.txt b/qpid/java/release-docs/RELEASE_NOTES.txt
index f94c45fd4d..f94c45fd4d 100644
--- a/java/release-docs/RELEASE_NOTES.txt
+++ b/qpid/java/release-docs/RELEASE_NOTES.txt
diff --git a/java/resources/LICENSE b/qpid/java/resources/LICENSE
index 12d0eecaf2..12d0eecaf2 100644
--- a/java/resources/LICENSE
+++ b/qpid/java/resources/LICENSE
diff --git a/java/resources/NOTICE b/qpid/java/resources/NOTICE
index add7753a4b..add7753a4b 100644
--- a/java/resources/NOTICE
+++ b/qpid/java/resources/NOTICE
diff --git a/java/resources/README.txt b/qpid/java/resources/README.txt
index eec46a52f0..eec46a52f0 100644
--- a/java/resources/README.txt
+++ b/qpid/java/resources/README.txt
diff --git a/java/systests/build.xml b/qpid/java/systests/build.xml
index 78bfeaec46..78bfeaec46 100644
--- a/java/systests/build.xml
+++ b/qpid/java/systests/build.xml
diff --git a/java/systests/etc/bin/fail.py b/qpid/java/systests/etc/bin/fail.py
index 517f31d075..517f31d075 100644
--- a/java/systests/etc/bin/fail.py
+++ b/qpid/java/systests/etc/bin/fail.py
diff --git a/java/systests/etc/config-systests.json b/qpid/java/systests/etc/config-systests.json
index 12a8a5c5a6..12a8a5c5a6 100644
--- a/java/systests/etc/config-systests.json
+++ b/qpid/java/systests/etc/config-systests.json
diff --git a/java/systests/etc/groups-systests b/qpid/java/systests/etc/groups-systests
index e3912ece99..e3912ece99 100644
--- a/java/systests/etc/groups-systests
+++ b/qpid/java/systests/etc/groups-systests
diff --git a/java/systests/etc/log.properties b/qpid/java/systests/etc/log.properties
index ff36b7cd0c..ff36b7cd0c 100644
--- a/java/systests/etc/log.properties
+++ b/qpid/java/systests/etc/log.properties
diff --git a/java/systests/etc/virtualhosts-systests-bdb-settings.xml b/qpid/java/systests/etc/virtualhosts-systests-bdb-settings.xml
index 350f05c178..350f05c178 100644
--- a/java/systests/etc/virtualhosts-systests-bdb-settings.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-bdb-settings.xml
diff --git a/java/systests/etc/virtualhosts-systests-bdb.xml b/qpid/java/systests/etc/virtualhosts-systests-bdb.xml
index a797f3dbb5..a797f3dbb5 100644
--- a/java/systests/etc/virtualhosts-systests-bdb.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-bdb.xml
diff --git a/java/systests/etc/virtualhosts-systests-derby-mem-settings.xml b/qpid/java/systests/etc/virtualhosts-systests-derby-mem-settings.xml
index 4e28f6d330..4e28f6d330 100644
--- a/java/systests/etc/virtualhosts-systests-derby-mem-settings.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-derby-mem-settings.xml
diff --git a/java/systests/etc/virtualhosts-systests-derby-mem.xml b/qpid/java/systests/etc/virtualhosts-systests-derby-mem.xml
index 5fd8762ec9..5fd8762ec9 100644
--- a/java/systests/etc/virtualhosts-systests-derby-mem.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-derby-mem.xml
diff --git a/java/systests/etc/virtualhosts-systests-derby-settings.xml b/qpid/java/systests/etc/virtualhosts-systests-derby-settings.xml
index f9cc3d2336..f9cc3d2336 100644
--- a/java/systests/etc/virtualhosts-systests-derby-settings.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-derby-settings.xml
diff --git a/java/systests/etc/virtualhosts-systests-derby.xml b/qpid/java/systests/etc/virtualhosts-systests-derby.xml
index 3e7034ad94..3e7034ad94 100644
--- a/java/systests/etc/virtualhosts-systests-derby.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-derby.xml
diff --git a/java/systests/etc/virtualhosts-systests-firewall-2.xml b/qpid/java/systests/etc/virtualhosts-systests-firewall-2.xml
index 20908e6eb4..20908e6eb4 100644
--- a/java/systests/etc/virtualhosts-systests-firewall-2.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-firewall-2.xml
diff --git a/java/systests/etc/virtualhosts-systests-firewall-3.xml b/qpid/java/systests/etc/virtualhosts-systests-firewall-3.xml
index 90377f345f..90377f345f 100644
--- a/java/systests/etc/virtualhosts-systests-firewall-3.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-firewall-3.xml
diff --git a/java/systests/etc/virtualhosts-systests-firewall.xml b/qpid/java/systests/etc/virtualhosts-systests-firewall.xml
index 17860e4075..17860e4075 100644
--- a/java/systests/etc/virtualhosts-systests-firewall.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-firewall.xml
diff --git a/java/systests/etc/virtualhosts-systests-settings.xml b/qpid/java/systests/etc/virtualhosts-systests-settings.xml
index 5d4ec28b71..5d4ec28b71 100644
--- a/java/systests/etc/virtualhosts-systests-settings.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-settings.xml
diff --git a/java/systests/etc/virtualhosts-systests.xml b/qpid/java/systests/etc/virtualhosts-systests.xml
index d2bdad3cc6..d2bdad3cc6 100644
--- a/java/systests/etc/virtualhosts-systests.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests.xml
diff --git a/java/systests/pom.xml b/qpid/java/systests/pom.xml
index 62f1a89480..62f1a89480 100644
--- a/java/systests/pom.xml
+++ b/qpid/java/systests/pom.xml
diff --git a/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
index 3025414e4a..3025414e4a 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java
index c5dd523214..c5dd523214 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/AsynchMessageListenerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/AsynchMessageListenerTest.java
index 09402c140d..09402c140d 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/AsynchMessageListenerTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/AsynchMessageListenerTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/HeartbeatTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/HeartbeatTest.java
index 881a37a970..881a37a970 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/HeartbeatTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/HeartbeatTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java
index 08ed2258b2..08ed2258b2 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/SynchReceiveTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/SynchReceiveTest.java
index bf147197e4..bf147197e4 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/SynchReceiveTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/SynchReceiveTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/failover/AddressBasedFailoverBehaviourTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/AddressBasedFailoverBehaviourTest.java
index 99fcbc5dc0..99fcbc5dc0 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/failover/AddressBasedFailoverBehaviourTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/AddressBasedFailoverBehaviourTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
index 8822fc5373..8822fc5373 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
index afc630296d..afc630296d 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
index 787e727e66..787e727e66 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/message/NonQpidObjectMessage.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/message/NonQpidObjectMessage.java
index 3aabfa1c40..3aabfa1c40 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/message/NonQpidObjectMessage.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/message/NonQpidObjectMessage.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java
index 69441d2be6..69441d2be6 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java
index 0f12c8c7e6..0f12c8c7e6 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/session/QueueDeclareTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/session/QueueDeclareTest.java
index fefed5b4ab..fefed5b4ab 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/session/QueueDeclareTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/session/QueueDeclareTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
index a19ba21c5c..a19ba21c5c 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java
index e18f70b01d..e18f70b01d 100644
--- a/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java
index 0ca90ac2ea..0ca90ac2ea 100644
--- a/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/ra/QpidRAXAResourceTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAXAResourceTest.java
index c8116d8cef..c8116d8cef 100644
--- a/java/systests/src/main/java/org/apache/qpid/ra/QpidRAXAResourceTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAXAResourceTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java
index 80001099a8..80001099a8 100644
--- a/java/systests/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java
index 1158a1d220..1158a1d220 100644
--- a/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
index eba2a638c0..eba2a638c0 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
index 23a00431d1..23a00431d1 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
index 69b529cf40..69b529cf40 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
index babe2d207d..babe2d207d 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
index 84017b6850..84017b6850 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
index 37f960a65a..37f960a65a 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
index 68ec101245..68ec101245 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java
index 646c17d1f2..646c17d1f2 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
index 6bd2b7569b..6bd2b7569b 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
index cec339c033..cec339c033 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
index 2eccab102b..2eccab102b 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
index c9f3aca91f..c9f3aca91f 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
index edffa7c0c0..edffa7c0c0 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java
index 1c7b4c6be8..1c7b4c6be8 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
index 9f532ec5f7..9f532ec5f7 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java
index 29f74c5818..29f74c5818 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
index 25dd5fd2f8..25dd5fd2f8 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/message/MessageProtocolConversionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/message/MessageProtocolConversionTest.java
index 2a5f8b9b95..2a5f8b9b95 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/message/MessageProtocolConversionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/message/MessageProtocolConversionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java
index 82b421a531..82b421a531 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
index c999be634b..c999be634b 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/ConflationQueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ConflationQueueTest.java
index 0e59e9cceb..0e59e9cceb 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/ConflationQueueTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ConflationQueueTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java
index 21e3bfa055..21e3bfa055 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java
index d5cee17fa8..d5cee17fa8 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java
index 41d93b5ca2..41d93b5ca2 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
index cbf4e032db..cbf4e032db 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java
index a6c9885568..a6c9885568 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
index 8bebcc703d..8bebcc703d 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/QueueBindTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueBindTest.java
index 64ba0156e6..64ba0156e6 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/QueueBindTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueBindTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
index dd57c1e3f7..dd57c1e3f7 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java
index 844e3ecc11..844e3ecc11 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
index 3ac0872814..3ac0872814 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
index 7a3edd316f..7a3edd316f 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java
index 50c80692dd..50c80692dd 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java
index e200741161..e200741161 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLTest.java
index 00c85e80c8..00c85e80c8 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
index 6cc4ec17c7..6cc4ec17c7 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java
index 44057025ba..44057025ba 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/stats/StatisticsReportingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/stats/StatisticsReportingTest.java
index 6d53896371..6d53896371 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/stats/StatisticsReportingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/stats/StatisticsReportingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
index f89e33ccc4..f89e33ccc4 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java
index 555c4dd20d..555c4dd20d 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java
index e19aeb38e7..e19aeb38e7 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
index e08061deea..e08061deea 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStoreFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStoreFactory.java
index 80ef79ae71..80ef79ae71 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStoreFactory.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStoreFactory.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java
index c4b16133f0..c4b16133f0 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java
index b7732a8270..b7732a8270 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/util/RunStats.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/util/RunStats.java
index ec67fc68b3..ec67fc68b3 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/util/RunStats.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/util/RunStats.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/util/TimedRun.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/util/TimedRun.java
index 1291380311..1291380311 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/util/TimedRun.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/util/TimedRun.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java
index f6b56f64ce..f6b56f64ce 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java
index 34b13dfaca..34b13dfaca 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java
index 594239b2ee..594239b2ee 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java
index 3717c1594d..3717c1594d 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java
index 4358b4b450..4358b4b450 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
index f396c79351..f396c79351 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
index 2d6943f643..2d6943f643 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java
index 6e4ea13cfc..6e4ea13cfc 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java
index 9ab88f8bbf..9ab88f8bbf 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java
index 1423bc557e..1423bc557e 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
index 312443cfa7..312443cfa7 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java
index fa435eecc8..fa435eecc8 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
index ad328eaede..ad328eaede 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
index bb01d1facf..bb01d1facf 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java
index c8320a6d82..c8320a6d82 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java
index 666c78f070..666c78f070 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
index 18370185e5..18370185e5 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
index b5d036c9e4..b5d036c9e4 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
index 05c8e362a1..05c8e362a1 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java
index 1da1c6394e..1da1c6394e 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
index d09d5a8d02..d09d5a8d02 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java
index 67e50b1bd1..67e50b1bd1 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java
index ab38d77b6c..ab38d77b6c 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
index c38d9bb396..c38d9bb396 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java
index 8f2c138869..8f2c138869 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java
index e00a9889e6..e00a9889e6 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/MessagesRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/MessagesRestTest.java
index d8dc7f35c0..d8dc7f35c0 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/MessagesRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/MessagesRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java
index bae259ece7..bae259ece7 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
index 7f604bada7..7f604bada7 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java
index bf2044aa74..bf2044aa74 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
index 57398ea929..57398ea929 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
index fec516bc2b..fec516bc2b 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
index 7d99b30049..7d99b30049 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java
index 1c05f17e25..1c05f17e25 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
index da72dd6f05..da72dd6f05 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
index 8b788780d6..8b788780d6 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java
index 9965587343..9965587343 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/UserRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserRestTest.java
index e2a6762731..e2a6762731 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/UserRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
index 969f222316..969f222316 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
index 666449b658..666449b658 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java
index b39d994198..b39d994198 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java
index 9a578d01fb..9a578d01fb 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java
index 96ea5c92b3..96ea5c92b3 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java
index b187ca955a..b187ca955a 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java
index 6ed84ac95a..6ed84ac95a 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java
index 4c4e219695..4c4e219695 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
index deb8e4f12b..deb8e4f12b 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
index fa36d73283..fa36d73283 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java
index f8bc051be7..f8bc051be7 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/ImmediateAndMandatoryPublishingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/ImmediateAndMandatoryPublishingTest.java
index d012b9abbb..d012b9abbb 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/ImmediateAndMandatoryPublishingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/ImmediateAndMandatoryPublishingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
index 6b6b4a7b3c..6b6b4a7b3c 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
index f30b8043ad..f30b8043ad 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
index b19809b8f2..b19809b8f2 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
index c97343464c..c97343464c 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
index bb1c0d3698..bb1c0d3698 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java
index d79788f017..d79788f017 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
index 2ed3f356d3..2ed3f356d3 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
index 7ba0bd17f3..7ba0bd17f3 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
index bd826259bc..bd826259bc 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
index 2875e2c6b1..2875e2c6b1 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java
index 1ee5b997f2..1ee5b997f2 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSReplyToTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSReplyToTest.java
index fe8180d6c6..fe8180d6c6 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSReplyToTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSReplyToTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java
index dc1f690b1e..dc1f690b1e 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java
index 3bd2c4a44e..3bd2c4a44e 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
index 5dcf678510..5dcf678510 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/queue/LVQTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/queue/LVQTest.java
index 51566403b3..51566403b3 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/queue/LVQTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/queue/LVQTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java
index b785326ef2..b785326ef2 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
index 182cd5ff0c..182cd5ff0c 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitTimeoutDelayTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitTimeoutDelayTest.java
index 28467231ed..28467231ed 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitTimeoutDelayTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitTimeoutDelayTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java
index 23efb656d2..23efb656d2 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
index 1b4407f255..1b4407f255 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
index 841d0ea4ba..841d0ea4ba 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/ClientAcknowledgeTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/ClientAcknowledgeTest.java
index 291e1697ca..291e1697ca 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/ClientAcknowledgeTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/ClientAcknowledgeTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java
index 23ea4ac258..23ea4ac258 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
index a121b39a56..a121b39a56 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
index 599c8061a7..599c8061a7 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
index 8961574d1e..8961574d1e 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
index 7bd737ee53..7bd737ee53 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
index 3f998938d9..3f998938d9 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
index 2d8847ea33..2d8847ea33 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
index 10d53b7487..10d53b7487 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
index 52213d15c4..52213d15c4 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
index 3ef8524656..3ef8524656 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SessionStartTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
index cc64dbb125..cc64dbb125 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
index 0a568d57ad..0a568d57ad 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/close/CloseTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/close/CloseTest.java
index 48d290c986..48d290c986 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/close/CloseTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/close/CloseTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
index 0d81b66be0..0d81b66be0 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
index 734e3f2268..734e3f2268 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
index 40db17f799..40db17f799 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/QueueSessionFactoryTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/QueueSessionFactoryTest.java
index 370e44b3d5..370e44b3d5 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/QueueSessionFactoryTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/QueueSessionFactoryTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/TopicSessionFactoryTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/TopicSessionFactoryTest.java
index ce15d452ab..ce15d452ab 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/TopicSessionFactoryTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/TopicSessionFactoryTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
index b7874ee85e..b7874ee85e 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java
index 4a92728d82..4a92728d82 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java
index bf1fbbf1a3..bf1fbbf1a3 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
index 0650531d2b..0650531d2b 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
index 963a23b0ba..963a23b0ba 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java
index 141de1e5a8..141de1e5a8 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
index 728ef85bd2..728ef85bd2 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
index e893a58282..e893a58282 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
index 41ab35f233..41ab35f233 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java
index b43fe35a09..b43fe35a09 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java
index df32bd7858..df32bd7858 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
index a4e9a992b4..a4e9a992b4 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
index 957063b2e1..957063b2e1 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java
index 3b30b7d63f..3b30b7d63f 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
index c292c718bb..c292c718bb 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
index 3f2d6f92ab..3f2d6f92ab 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
index f8ab593c88..f8ab593c88 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8En b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8En
index c9734b1988..c9734b1988 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8En
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8En
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Jp b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Jp
index ae10752dab..ae10752dab 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Jp
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Jp
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
index cc95afafa2..cc95afafa2 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
index 4b61b6269c..4b61b6269c 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TemporaryTopicTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TemporaryTopicTest.java
index a5b9ce8365..a5b9ce8365 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TemporaryTopicTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TemporaryTopicTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
index 5fbbc7f67f..5fbbc7f67f 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
index 6bf20d7708..6bf20d7708 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
index 0be4f7ff1d..0be4f7ff1d 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
index 4f7d592958..4f7d592958 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java
index d93c7a2e71..d93c7a2e71 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java
index f5a234163d..f5a234163d 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java
index 721dc027c6..721dc027c6 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
index b5d1bff842..b5d1bff842 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
index 39973e12c7..39973e12c7 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java
index 3fbe76323a..3fbe76323a 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java
index d955979ad6..d955979ad6 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelper.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelper.java
index 12d286f822..12d286f822 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelper.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelper.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelperTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelperTest.java
index f0bcea8e6e..f0bcea8e6e 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelperTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelperTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerHolder.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerHolder.java
index 3af57327d2..3af57327d2 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerHolder.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerHolder.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java
index 3a9354d822..3a9354d822 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
index f6c481431a..f6c481431a 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
index 8bad73d0ea..8bad73d0ea 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
index 4e5c4ca034..4e5c4ca034 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java
index 9413e38606..9413e38606 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 8248fc9de2..8248fc9de2 100755
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnection.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnection.java
index 0e0032da64..0e0032da64 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnection.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnection.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtils.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtils.java
index 83294c13ad..83294c13ad 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtils.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtils.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtilsException.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtilsException.java
index 838828598b..838828598b 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtilsException.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtilsException.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
index bce97a574a..bce97a574a 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
index 9e893bb7bb..9e893bb7bb 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/TestUtils.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestUtils.java
index c651d3ec7f..c651d3ec7f 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/TestUtils.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestUtils.java
diff --git a/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java b/qpid/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java
index 151d1473ac..151d1473ac 100644
--- a/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java
diff --git a/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java b/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java
index d77731d09f..d77731d09f 100644
--- a/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java
diff --git a/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
index 89f707fbef..89f707fbef 100644
--- a/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
diff --git a/java/systests/src/main/java/systests.log4j b/qpid/java/systests/src/main/java/systests.log4j
index 6d596d1d19..6d596d1d19 100644
--- a/java/systests/src/main/java/systests.log4j
+++ b/qpid/java/systests/src/main/java/systests.log4j
diff --git a/java/systests/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory b/qpid/java/systests/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
index fdd7a904c3..fdd7a904c3 100644
--- a/java/systests/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
+++ b/qpid/java/systests/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
diff --git a/java/tasks/src/org/apache/qpid/tasks/BaseTask.java b/qpid/java/tasks/src/org/apache/qpid/tasks/BaseTask.java
index be604b14cf..be604b14cf 100644
--- a/java/tasks/src/org/apache/qpid/tasks/BaseTask.java
+++ b/qpid/java/tasks/src/org/apache/qpid/tasks/BaseTask.java
diff --git a/java/tasks/src/org/apache/qpid/tasks/Foreach.java b/qpid/java/tasks/src/org/apache/qpid/tasks/Foreach.java
index 91b8a25ce2..91b8a25ce2 100644
--- a/java/tasks/src/org/apache/qpid/tasks/Foreach.java
+++ b/qpid/java/tasks/src/org/apache/qpid/tasks/Foreach.java
diff --git a/java/tasks/src/org/apache/qpid/tasks/Map.java b/qpid/java/tasks/src/org/apache/qpid/tasks/Map.java
index e66f34b319..e66f34b319 100644
--- a/java/tasks/src/org/apache/qpid/tasks/Map.java
+++ b/qpid/java/tasks/src/org/apache/qpid/tasks/Map.java
diff --git a/java/tasks/src/org/apache/qpid/tasks/PropertyMapper.java b/qpid/java/tasks/src/org/apache/qpid/tasks/PropertyMapper.java
index cc741380fd..cc741380fd 100644
--- a/java/tasks/src/org/apache/qpid/tasks/PropertyMapper.java
+++ b/qpid/java/tasks/src/org/apache/qpid/tasks/PropertyMapper.java
diff --git a/java/tasks/src/org/apache/qpid/tasks/Require.java b/qpid/java/tasks/src/org/apache/qpid/tasks/Require.java
index 84870c90e4..84870c90e4 100644
--- a/java/tasks/src/org/apache/qpid/tasks/Require.java
+++ b/qpid/java/tasks/src/org/apache/qpid/tasks/Require.java
diff --git a/java/test-profiles/CPPExcludes b/qpid/java/test-profiles/CPPExcludes
index 6ce0936c08..6ce0936c08 100755
--- a/java/test-profiles/CPPExcludes
+++ b/qpid/java/test-profiles/CPPExcludes
diff --git a/java/test-profiles/CPPNoPrefetchExcludes b/qpid/java/test-profiles/CPPNoPrefetchExcludes
index e10b2fa659..e10b2fa659 100644
--- a/java/test-profiles/CPPNoPrefetchExcludes
+++ b/qpid/java/test-profiles/CPPNoPrefetchExcludes
diff --git a/java/test-profiles/CPPPrefetchExcludes b/qpid/java/test-profiles/CPPPrefetchExcludes
index 9b4d69cebd..9b4d69cebd 100644
--- a/java/test-profiles/CPPPrefetchExcludes
+++ b/qpid/java/test-profiles/CPPPrefetchExcludes
diff --git a/java/test-profiles/CPPTransientExcludes b/qpid/java/test-profiles/CPPTransientExcludes
index a214cf5b5c..a214cf5b5c 100644
--- a/java/test-profiles/CPPTransientExcludes
+++ b/qpid/java/test-profiles/CPPTransientExcludes
diff --git a/java/test-profiles/Excludes b/qpid/java/test-profiles/Excludes
index 7a6089004e..7a6089004e 100644
--- a/java/test-profiles/Excludes
+++ b/qpid/java/test-profiles/Excludes
diff --git a/java/test-profiles/Java010Excludes b/qpid/java/test-profiles/Java010Excludes
index 093821647d..093821647d 100755
--- a/java/test-profiles/Java010Excludes
+++ b/qpid/java/test-profiles/Java010Excludes
diff --git a/java/test-profiles/JavaBDBExcludes b/qpid/java/test-profiles/JavaBDBExcludes
index 0750beb339..0750beb339 100644
--- a/java/test-profiles/JavaBDBExcludes
+++ b/qpid/java/test-profiles/JavaBDBExcludes
diff --git a/java/test-profiles/JavaDerbyExcludes b/qpid/java/test-profiles/JavaDerbyExcludes
index 7ea00680c1..7ea00680c1 100644
--- a/java/test-profiles/JavaDerbyExcludes
+++ b/qpid/java/test-profiles/JavaDerbyExcludes
diff --git a/java/test-profiles/JavaExcludes b/qpid/java/test-profiles/JavaExcludes
index 618dfd8586..618dfd8586 100644
--- a/java/test-profiles/JavaExcludes
+++ b/qpid/java/test-profiles/JavaExcludes
diff --git a/java/test-profiles/JavaPersistentExcludes b/qpid/java/test-profiles/JavaPersistentExcludes
index 240f6dc330..240f6dc330 100644
--- a/java/test-profiles/JavaPersistentExcludes
+++ b/qpid/java/test-profiles/JavaPersistentExcludes
diff --git a/java/test-profiles/JavaPre010Excludes b/qpid/java/test-profiles/JavaPre010Excludes
index 7f9a20e245..7f9a20e245 100644
--- a/java/test-profiles/JavaPre010Excludes
+++ b/qpid/java/test-profiles/JavaPre010Excludes
diff --git a/java/test-profiles/JavaTransientExcludes b/qpid/java/test-profiles/JavaTransientExcludes
index 2f96584589..2f96584589 100644
--- a/java/test-profiles/JavaTransientExcludes
+++ b/qpid/java/test-profiles/JavaTransientExcludes
diff --git a/java/test-profiles/XAExcludes b/qpid/java/test-profiles/XAExcludes
index 907864a730..907864a730 100644
--- a/java/test-profiles/XAExcludes
+++ b/qpid/java/test-profiles/XAExcludes
diff --git a/java/test-profiles/cpp.async.excludes b/qpid/java/test-profiles/cpp.async.excludes
index d700538345..d700538345 100644
--- a/java/test-profiles/cpp.async.excludes
+++ b/qpid/java/test-profiles/cpp.async.excludes
diff --git a/java/test-profiles/cpp.async.testprofile b/qpid/java/test-profiles/cpp.async.testprofile
index 5357e87687..5357e87687 100644
--- a/java/test-profiles/cpp.async.testprofile
+++ b/qpid/java/test-profiles/cpp.async.testprofile
diff --git a/java/test-profiles/cpp.cluster.testprofile b/qpid/java/test-profiles/cpp.cluster.testprofile
index 22a082e85b..22a082e85b 100644
--- a/java/test-profiles/cpp.cluster.testprofile
+++ b/qpid/java/test-profiles/cpp.cluster.testprofile
diff --git a/java/test-profiles/cpp.excludes b/qpid/java/test-profiles/cpp.excludes
index c8fae1797e..c8fae1797e 100644
--- a/java/test-profiles/cpp.excludes
+++ b/qpid/java/test-profiles/cpp.excludes
diff --git a/java/test-profiles/cpp.noprefetch.testprofile b/qpid/java/test-profiles/cpp.noprefetch.testprofile
index 4764cb576b..4764cb576b 100644
--- a/java/test-profiles/cpp.noprefetch.testprofile
+++ b/qpid/java/test-profiles/cpp.noprefetch.testprofile
diff --git a/java/test-profiles/cpp.ssl.excludes b/qpid/java/test-profiles/cpp.ssl.excludes
index 3d7b929831..3d7b929831 100644
--- a/java/test-profiles/cpp.ssl.excludes
+++ b/qpid/java/test-profiles/cpp.ssl.excludes
diff --git a/java/test-profiles/cpp.ssl.testprofile b/qpid/java/test-profiles/cpp.ssl.testprofile
index b3bb5e22f7..b3bb5e22f7 100644
--- a/java/test-profiles/cpp.ssl.testprofile
+++ b/qpid/java/test-profiles/cpp.ssl.testprofile
diff --git a/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile
index 7cc7fdc821..7cc7fdc821 100644
--- a/java/test-profiles/cpp.testprofile
+++ b/qpid/java/test-profiles/cpp.testprofile
diff --git a/java/test-profiles/java-bdb-spawn.0-10.testprofile b/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile
index 78ab05a179..78ab05a179 100644
--- a/java/test-profiles/java-bdb-spawn.0-10.testprofile
+++ b/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile
diff --git a/java/test-profiles/java-bdb-spawn.0-8.testprofile b/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile
index 7f6efcbc3d..7f6efcbc3d 100644
--- a/java/test-profiles/java-bdb-spawn.0-8.testprofile
+++ b/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile
diff --git a/java/test-profiles/java-bdb-spawn.0-9-1.testprofile b/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
index 28668b94f7..28668b94f7 100644
--- a/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
diff --git a/java/test-profiles/java-bdb-spawn.0-9.testprofile b/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile
index aa8e6830d4..aa8e6830d4 100644
--- a/java/test-profiles/java-bdb-spawn.0-9.testprofile
+++ b/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile
diff --git a/java/test-profiles/java-bdb.0-10.testprofile b/qpid/java/test-profiles/java-bdb.0-10.testprofile
index 8c4b145e0b..8c4b145e0b 100644
--- a/java/test-profiles/java-bdb.0-10.testprofile
+++ b/qpid/java/test-profiles/java-bdb.0-10.testprofile
diff --git a/java/test-profiles/java-bdb.0-8.testprofile b/qpid/java/test-profiles/java-bdb.0-8.testprofile
index acf031040e..acf031040e 100644
--- a/java/test-profiles/java-bdb.0-8.testprofile
+++ b/qpid/java/test-profiles/java-bdb.0-8.testprofile
diff --git a/java/test-profiles/java-bdb.0-9-1.testprofile b/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
index fa86720bbb..fa86720bbb 100644
--- a/java/test-profiles/java-bdb.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
diff --git a/java/test-profiles/java-bdb.0-9.testprofile b/qpid/java/test-profiles/java-bdb.0-9.testprofile
index ed3d7b2170..ed3d7b2170 100644
--- a/java/test-profiles/java-bdb.0-9.testprofile
+++ b/qpid/java/test-profiles/java-bdb.0-9.testprofile
diff --git a/java/test-profiles/java-dby-mem.0-10.testprofile b/qpid/java/test-profiles/java-dby-mem.0-10.testprofile
index bfe031b338..bfe031b338 100644
--- a/java/test-profiles/java-dby-mem.0-10.testprofile
+++ b/qpid/java/test-profiles/java-dby-mem.0-10.testprofile
diff --git a/java/test-profiles/java-dby-mem.0-8.testprofile b/qpid/java/test-profiles/java-dby-mem.0-8.testprofile
index 28bce8e434..28bce8e434 100644
--- a/java/test-profiles/java-dby-mem.0-8.testprofile
+++ b/qpid/java/test-profiles/java-dby-mem.0-8.testprofile
diff --git a/java/test-profiles/java-dby-mem.0-9-1.testprofile b/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile
index 0d2f82ebb5..0d2f82ebb5 100644
--- a/java/test-profiles/java-dby-mem.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile
diff --git a/java/test-profiles/java-dby-mem.0-9.testprofile b/qpid/java/test-profiles/java-dby-mem.0-9.testprofile
index 4dd9fbb899..4dd9fbb899 100644
--- a/java/test-profiles/java-dby-mem.0-9.testprofile
+++ b/qpid/java/test-profiles/java-dby-mem.0-9.testprofile
diff --git a/java/test-profiles/java-dby-spawn.0-10.testprofile b/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
index 9795533b52..9795533b52 100644
--- a/java/test-profiles/java-dby-spawn.0-10.testprofile
+++ b/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
diff --git a/java/test-profiles/java-dby-spawn.0-8.testprofile b/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile
index a980fd181d..a980fd181d 100644
--- a/java/test-profiles/java-dby-spawn.0-8.testprofile
+++ b/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile
diff --git a/java/test-profiles/java-dby-spawn.0-9-1.testprofile b/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
index 04428b5021..04428b5021 100644
--- a/java/test-profiles/java-dby-spawn.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
diff --git a/java/test-profiles/java-dby-spawn.0-9.testprofile b/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile
index 4724eba660..4724eba660 100644
--- a/java/test-profiles/java-dby-spawn.0-9.testprofile
+++ b/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile
diff --git a/java/test-profiles/java-dby.0-10.testprofile b/qpid/java/test-profiles/java-dby.0-10.testprofile
index a2b1a41c31..a2b1a41c31 100644
--- a/java/test-profiles/java-dby.0-10.testprofile
+++ b/qpid/java/test-profiles/java-dby.0-10.testprofile
diff --git a/java/test-profiles/java-dby.0-8.testprofile b/qpid/java/test-profiles/java-dby.0-8.testprofile
index 509796331f..509796331f 100644
--- a/java/test-profiles/java-dby.0-8.testprofile
+++ b/qpid/java/test-profiles/java-dby.0-8.testprofile
diff --git a/java/test-profiles/java-dby.0-9-1.testprofile b/qpid/java/test-profiles/java-dby.0-9-1.testprofile
index be087a6344..be087a6344 100644
--- a/java/test-profiles/java-dby.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-dby.0-9-1.testprofile
diff --git a/java/test-profiles/java-dby.0-9.testprofile b/qpid/java/test-profiles/java-dby.0-9.testprofile
index 3b5e586ba4..3b5e586ba4 100644
--- a/java/test-profiles/java-dby.0-9.testprofile
+++ b/qpid/java/test-profiles/java-dby.0-9.testprofile
diff --git a/java/test-profiles/java-mms-spawn.0-10.testprofile b/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
index 71aaf48562..71aaf48562 100644
--- a/java/test-profiles/java-mms-spawn.0-10.testprofile
+++ b/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
diff --git a/java/test-profiles/java-mms-spawn.0-8.testprofile b/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile
index 6365fa20f0..6365fa20f0 100644
--- a/java/test-profiles/java-mms-spawn.0-8.testprofile
+++ b/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile
diff --git a/java/test-profiles/java-mms-spawn.0-9-1.testprofile b/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
index 1eb4b00a1d..1eb4b00a1d 100644
--- a/java/test-profiles/java-mms-spawn.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
diff --git a/java/test-profiles/java-mms-spawn.0-9.testprofile b/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile
index 4ebce66c05..4ebce66c05 100644
--- a/java/test-profiles/java-mms-spawn.0-9.testprofile
+++ b/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile
diff --git a/java/test-profiles/java-mms.0-10.testprofile b/qpid/java/test-profiles/java-mms.0-10.testprofile
index 0de5ffea09..0de5ffea09 100644
--- a/java/test-profiles/java-mms.0-10.testprofile
+++ b/qpid/java/test-profiles/java-mms.0-10.testprofile
diff --git a/java/test-profiles/java-mms.0-8.testprofile b/qpid/java/test-profiles/java-mms.0-8.testprofile
index dddad95157..dddad95157 100644
--- a/java/test-profiles/java-mms.0-8.testprofile
+++ b/qpid/java/test-profiles/java-mms.0-8.testprofile
diff --git a/java/test-profiles/java-mms.0-9-1.testprofile b/qpid/java/test-profiles/java-mms.0-9-1.testprofile
index 3c2f68a2c9..3c2f68a2c9 100644
--- a/java/test-profiles/java-mms.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-mms.0-9-1.testprofile
diff --git a/java/test-profiles/java-mms.0-9.testprofile b/qpid/java/test-profiles/java-mms.0-9.testprofile
index 992168b044..992168b044 100644
--- a/java/test-profiles/java-mms.0-9.testprofile
+++ b/qpid/java/test-profiles/java-mms.0-9.testprofile
diff --git a/java/test-profiles/kill-broker b/qpid/java/test-profiles/kill-broker
index ed62e0f1c6..ed62e0f1c6 100755
--- a/java/test-profiles/kill-broker
+++ b/qpid/java/test-profiles/kill-broker
diff --git a/java/test-profiles/log4j-test.xml b/qpid/java/test-profiles/log4j-test.xml
index a393fa0952..a393fa0952 100644
--- a/java/test-profiles/log4j-test.xml
+++ b/qpid/java/test-profiles/log4j-test.xml
diff --git a/java/test-profiles/python_tests/Java010PythonExcludes b/qpid/java/test-profiles/python_tests/Java010PythonExcludes
index de870e5e27..de870e5e27 100644
--- a/java/test-profiles/python_tests/Java010PythonExcludes
+++ b/qpid/java/test-profiles/python_tests/Java010PythonExcludes
diff --git a/java/test-profiles/python_tests/JavaPre010PythonExcludes b/qpid/java/test-profiles/python_tests/JavaPre010PythonExcludes
index 7c104fb8ca..7c104fb8ca 100644
--- a/java/test-profiles/python_tests/JavaPre010PythonExcludes
+++ b/qpid/java/test-profiles/python_tests/JavaPre010PythonExcludes
diff --git a/java/test-profiles/start-broker b/qpid/java/test-profiles/start-broker
index c5c477e999..c5c477e999 100755
--- a/java/test-profiles/start-broker
+++ b/qpid/java/test-profiles/start-broker
diff --git a/java/test-profiles/test-provider.properties b/qpid/java/test-profiles/test-provider.properties
index fe27cfcfaf..fe27cfcfaf 100644
--- a/java/test-profiles/test-provider.properties
+++ b/qpid/java/test-profiles/test-provider.properties
diff --git a/java/test-profiles/test_resources/ssl/CA_db/cert8.db b/qpid/java/test-profiles/test_resources/ssl/CA_db/cert8.db
index 846e59e82d..846e59e82d 100644
--- a/java/test-profiles/test_resources/ssl/CA_db/cert8.db
+++ b/qpid/java/test-profiles/test_resources/ssl/CA_db/cert8.db
diff --git a/java/test-profiles/test_resources/ssl/CA_db/key3.db b/qpid/java/test-profiles/test_resources/ssl/CA_db/key3.db
index dd60e1e05e..dd60e1e05e 100644
--- a/java/test-profiles/test_resources/ssl/CA_db/key3.db
+++ b/qpid/java/test-profiles/test_resources/ssl/CA_db/key3.db
diff --git a/java/test-profiles/test_resources/ssl/CA_db/rootca.crt b/qpid/java/test-profiles/test_resources/ssl/CA_db/rootca.crt
index d9cdd9891c..d9cdd9891c 100644
--- a/java/test-profiles/test_resources/ssl/CA_db/rootca.crt
+++ b/qpid/java/test-profiles/test_resources/ssl/CA_db/rootca.crt
diff --git a/java/test-profiles/test_resources/ssl/CA_db/secmod.db b/qpid/java/test-profiles/test_resources/ssl/CA_db/secmod.db
index a13e3e602c..a13e3e602c 100644
--- a/java/test-profiles/test_resources/ssl/CA_db/secmod.db
+++ b/qpid/java/test-profiles/test_resources/ssl/CA_db/secmod.db
diff --git a/java/test-profiles/test_resources/ssl/app1.crt b/qpid/java/test-profiles/test_resources/ssl/app1.crt
index c04b07fce8..c04b07fce8 100644
--- a/java/test-profiles/test_resources/ssl/app1.crt
+++ b/qpid/java/test-profiles/test_resources/ssl/app1.crt
diff --git a/java/test-profiles/test_resources/ssl/app1.req b/qpid/java/test-profiles/test_resources/ssl/app1.req
index b4f1ff9a2c..b4f1ff9a2c 100644
--- a/java/test-profiles/test_resources/ssl/app1.req
+++ b/qpid/java/test-profiles/test_resources/ssl/app1.req
diff --git a/java/test-profiles/test_resources/ssl/app2.crt b/qpid/java/test-profiles/test_resources/ssl/app2.crt
index 5c889a4c31..5c889a4c31 100644
--- a/java/test-profiles/test_resources/ssl/app2.crt
+++ b/qpid/java/test-profiles/test_resources/ssl/app2.crt
diff --git a/java/test-profiles/test_resources/ssl/app2.req b/qpid/java/test-profiles/test_resources/ssl/app2.req
index 53f3494168..53f3494168 100644
--- a/java/test-profiles/test_resources/ssl/app2.req
+++ b/qpid/java/test-profiles/test_resources/ssl/app2.req
diff --git a/java/test-profiles/test_resources/ssl/java_broker.crt b/qpid/java/test-profiles/test_resources/ssl/java_broker.crt
index 9b88c04962..9b88c04962 100644
--- a/java/test-profiles/test_resources/ssl/java_broker.crt
+++ b/qpid/java/test-profiles/test_resources/ssl/java_broker.crt
diff --git a/java/test-profiles/test_resources/ssl/java_broker.req b/qpid/java/test-profiles/test_resources/ssl/java_broker.req
index 5aa50d9b39..5aa50d9b39 100644
--- a/java/test-profiles/test_resources/ssl/java_broker.req
+++ b/qpid/java/test-profiles/test_resources/ssl/java_broker.req
diff --git a/java/test-profiles/test_resources/ssl/java_broker_keystore.jks b/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks
index 29ae3a8e67..29ae3a8e67 100644
--- a/java/test-profiles/test_resources/ssl/java_broker_keystore.jks
+++ b/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks
diff --git a/java/test-profiles/test_resources/ssl/java_broker_peerstore.jks b/qpid/java/test-profiles/test_resources/ssl/java_broker_peerstore.jks
index a716581a7e..a716581a7e 100644
--- a/java/test-profiles/test_resources/ssl/java_broker_peerstore.jks
+++ b/qpid/java/test-profiles/test_resources/ssl/java_broker_peerstore.jks
diff --git a/java/test-profiles/test_resources/ssl/java_broker_truststore.jks b/qpid/java/test-profiles/test_resources/ssl/java_broker_truststore.jks
index 2af95f21f8..2af95f21f8 100644
--- a/java/test-profiles/test_resources/ssl/java_broker_truststore.jks
+++ b/qpid/java/test-profiles/test_resources/ssl/java_broker_truststore.jks
diff --git a/java/test-profiles/test_resources/ssl/java_client_keystore.jks b/qpid/java/test-profiles/test_resources/ssl/java_client_keystore.jks
index e3a850a248..e3a850a248 100644
--- a/java/test-profiles/test_resources/ssl/java_client_keystore.jks
+++ b/qpid/java/test-profiles/test_resources/ssl/java_client_keystore.jks
diff --git a/java/test-profiles/test_resources/ssl/java_client_truststore.jks b/qpid/java/test-profiles/test_resources/ssl/java_client_truststore.jks
index 2af95f21f8..2af95f21f8 100644
--- a/java/test-profiles/test_resources/ssl/java_client_truststore.jks
+++ b/qpid/java/test-profiles/test_resources/ssl/java_client_truststore.jks
diff --git a/java/test-profiles/test_resources/ssl/java_client_untrusted_keystore.jks b/qpid/java/test-profiles/test_resources/ssl/java_client_untrusted_keystore.jks
index 45a0c10667..45a0c10667 100644
--- a/java/test-profiles/test_resources/ssl/java_client_untrusted_keystore.jks
+++ b/qpid/java/test-profiles/test_resources/ssl/java_client_untrusted_keystore.jks
diff --git a/java/test-profiles/test_resources/ssl/pfile b/qpid/java/test-profiles/test_resources/ssl/pfile
index f3097ab130..f3097ab130 100644
--- a/java/test-profiles/test_resources/ssl/pfile
+++ b/qpid/java/test-profiles/test_resources/ssl/pfile
diff --git a/java/test-profiles/test_resources/ssl/server_db/cert8.db b/qpid/java/test-profiles/test_resources/ssl/server_db/cert8.db
index d55f529c52..d55f529c52 100644
--- a/java/test-profiles/test_resources/ssl/server_db/cert8.db
+++ b/qpid/java/test-profiles/test_resources/ssl/server_db/cert8.db
diff --git a/java/test-profiles/test_resources/ssl/server_db/key3.db b/qpid/java/test-profiles/test_resources/ssl/server_db/key3.db
index 12f3c394c5..12f3c394c5 100644
--- a/java/test-profiles/test_resources/ssl/server_db/key3.db
+++ b/qpid/java/test-profiles/test_resources/ssl/server_db/key3.db
diff --git a/java/test-profiles/test_resources/ssl/server_db/secmod.db b/qpid/java/test-profiles/test_resources/ssl/server_db/secmod.db
index 97a5b9b2fe..97a5b9b2fe 100644
--- a/java/test-profiles/test_resources/ssl/server_db/secmod.db
+++ b/qpid/java/test-profiles/test_resources/ssl/server_db/secmod.db
diff --git a/java/test-profiles/test_resources/ssl/server_db/server.crt b/qpid/java/test-profiles/test_resources/ssl/server_db/server.crt
index 4f1c007d16..4f1c007d16 100644
--- a/java/test-profiles/test_resources/ssl/server_db/server.crt
+++ b/qpid/java/test-profiles/test_resources/ssl/server_db/server.crt
diff --git a/java/test-profiles/test_resources/ssl/server_db/server.req b/qpid/java/test-profiles/test_resources/ssl/server_db/server.req
index 5551516586..5551516586 100644
--- a/java/test-profiles/test_resources/ssl/server_db/server.req
+++ b/qpid/java/test-profiles/test_resources/ssl/server_db/server.req
diff --git a/java/test-profiles/testprofile.defaults b/qpid/java/test-profiles/testprofile.defaults
index ccd31a5d1e..ccd31a5d1e 100644
--- a/java/test-profiles/testprofile.defaults
+++ b/qpid/java/test-profiles/testprofile.defaults
diff --git a/java/tools/README.txt b/qpid/java/tools/README.txt
index fdde734027..fdde734027 100644
--- a/java/tools/README.txt
+++ b/qpid/java/tools/README.txt
diff --git a/java/tools/bin/Profile-run-from-source b/qpid/java/tools/bin/Profile-run-from-source
index 179c365450..179c365450 100755
--- a/java/tools/bin/Profile-run-from-source
+++ b/qpid/java/tools/bin/Profile-run-from-source
diff --git a/java/tools/bin/check-qpid-java-env b/qpid/java/tools/bin/check-qpid-java-env
index da67e50a90..da67e50a90 100755
--- a/java/tools/bin/check-qpid-java-env
+++ b/qpid/java/tools/bin/check-qpid-java-env
diff --git a/java/tools/bin/jms-quick-perf-report b/qpid/java/tools/bin/jms-quick-perf-report
index 7de3f2b602..7de3f2b602 100755
--- a/java/tools/bin/jms-quick-perf-report
+++ b/qpid/java/tools/bin/jms-quick-perf-report
diff --git a/java/tools/bin/mercury-controller b/qpid/java/tools/bin/mercury-controller
index fab8614039..fab8614039 100755
--- a/java/tools/bin/mercury-controller
+++ b/qpid/java/tools/bin/mercury-controller
diff --git a/java/tools/bin/mercury-start-consumers b/qpid/java/tools/bin/mercury-start-consumers
index c71fc0c21f..c71fc0c21f 100755
--- a/java/tools/bin/mercury-start-consumers
+++ b/qpid/java/tools/bin/mercury-start-consumers
diff --git a/java/tools/bin/mercury-start-producers b/qpid/java/tools/bin/mercury-start-producers
index 7ba0286f7c..7ba0286f7c 100755
--- a/java/tools/bin/mercury-start-producers
+++ b/qpid/java/tools/bin/mercury-start-producers
diff --git a/java/tools/bin/qpid-bench b/qpid/java/tools/bin/qpid-bench
index 4773320b9e..4773320b9e 100755
--- a/java/tools/bin/qpid-bench
+++ b/qpid/java/tools/bin/qpid-bench
diff --git a/java/tools/bin/qpid-jms-benchmark b/qpid/java/tools/bin/qpid-jms-benchmark
index 3d712a27dc..3d712a27dc 100755
--- a/java/tools/bin/qpid-jms-benchmark
+++ b/qpid/java/tools/bin/qpid-jms-benchmark
diff --git a/java/tools/bin/qpid-jms-receive b/qpid/java/tools/bin/qpid-jms-receive
index 57abe874ff..57abe874ff 100755
--- a/java/tools/bin/qpid-jms-receive
+++ b/qpid/java/tools/bin/qpid-jms-receive
diff --git a/java/tools/bin/qpid-jms-send b/qpid/java/tools/bin/qpid-jms-send
index d7695924f0..d7695924f0 100755
--- a/java/tools/bin/qpid-jms-send
+++ b/qpid/java/tools/bin/qpid-jms-send
diff --git a/java/tools/bin/qpid-python-testkit b/qpid/java/tools/bin/qpid-python-testkit
index 20f72aca53..20f72aca53 100755
--- a/java/tools/bin/qpid-python-testkit
+++ b/qpid/java/tools/bin/qpid-python-testkit
diff --git a/java/tools/bin/run-pub b/qpid/java/tools/bin/run-pub
index 9efe58c4b8..9efe58c4b8 100755
--- a/java/tools/bin/run-pub
+++ b/qpid/java/tools/bin/run-pub
diff --git a/java/tools/bin/run-sub b/qpid/java/tools/bin/run-sub
index 8449563f7f..8449563f7f 100755
--- a/java/tools/bin/run-sub
+++ b/qpid/java/tools/bin/run-sub
diff --git a/java/tools/bin/testkit.py b/qpid/java/tools/bin/testkit.py
index 1c2ad598b8..1c2ad598b8 100755
--- a/java/tools/bin/testkit.py
+++ b/qpid/java/tools/bin/testkit.py
diff --git a/java/tools/build.xml b/qpid/java/tools/build.xml
index 99b0375e95..99b0375e95 100644
--- a/java/tools/build.xml
+++ b/qpid/java/tools/build.xml
diff --git a/java/tools/etc/perf-report.gnu b/qpid/java/tools/etc/perf-report.gnu
index b7662b0bfe..b7662b0bfe 100644
--- a/java/tools/etc/perf-report.gnu
+++ b/qpid/java/tools/etc/perf-report.gnu
diff --git a/java/tools/etc/test.log4j b/qpid/java/tools/etc/test.log4j
index b574a7b5b7..b574a7b5b7 100644
--- a/java/tools/etc/test.log4j
+++ b/qpid/java/tools/etc/test.log4j
diff --git a/java/tools/pom.xml b/qpid/java/tools/pom.xml
index edc800a172..edc800a172 100644
--- a/java/tools/pom.xml
+++ b/qpid/java/tools/pom.xml
diff --git a/java/tools/src/main/java/org/apache/qpid/testkit/Client.java b/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Client.java
index b10129d855..b10129d855 100644
--- a/java/tools/src/main/java/org/apache/qpid/testkit/Client.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Client.java
diff --git a/java/tools/src/main/java/org/apache/qpid/testkit/ErrorHandler.java b/qpid/java/tools/src/main/java/org/apache/qpid/testkit/ErrorHandler.java
index de7748acd6..de7748acd6 100644
--- a/java/tools/src/main/java/org/apache/qpid/testkit/ErrorHandler.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/testkit/ErrorHandler.java
diff --git a/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java b/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java
index 8dcf59e9c1..8dcf59e9c1 100644
--- a/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java
diff --git a/java/tools/src/main/java/org/apache/qpid/testkit/Sender.java b/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Sender.java
index 14b9b7302f..14b9b7302f 100644
--- a/java/tools/src/main/java/org/apache/qpid/testkit/Sender.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Sender.java
diff --git a/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java b/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java
index 72ca48e1c9..72ca48e1c9 100644
--- a/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/Clock.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/Clock.java
index 7eb83a520b..7eb83a520b 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/Clock.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/Clock.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java
index c604b24408..c604b24408 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/JVMArgConfiguration.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/JVMArgConfiguration.java
index e0e48519f3..e0e48519f3 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/JVMArgConfiguration.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/JVMArgConfiguration.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/MercuryBase.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryBase.java
index 097b021b3e..097b021b3e 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/MercuryBase.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryBase.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/MercuryConsumerController.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryConsumerController.java
index b35adc45d6..b35adc45d6 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/MercuryConsumerController.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryConsumerController.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/MercuryProducerController.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryProducerController.java
index 02377bb853..02377bb853 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/MercuryProducerController.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryProducerController.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/MercuryTestController.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryTestController.java
index 8c66a1e44d..8c66a1e44d 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/MercuryTestController.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryTestController.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/MessageFactory.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/MessageFactory.java
index a0ba928e1f..a0ba928e1f 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/MessageFactory.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/MessageFactory.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
index e2d179965b..e2d179965b 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/QpidReceive.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidReceive.java
index 6dd8b7e1ca..6dd8b7e1ca 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/QpidReceive.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidReceive.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/QpidSend.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidSend.java
index 3d321dcade..3d321dcade 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/QpidSend.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidSend.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/TestConfiguration.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/TestConfiguration.java
index 18870bac59..18870bac59 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/TestConfiguration.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/TestConfiguration.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/report/BasicReporter.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/report/BasicReporter.java
index a9896c1d4e..a9896c1d4e 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/report/BasicReporter.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/report/BasicReporter.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/report/MercuryReporter.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/report/MercuryReporter.java
index e9bf7100c1..e9bf7100c1 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/report/MercuryReporter.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/report/MercuryReporter.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/report/Reporter.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/report/Reporter.java
index 5e481458be..5e481458be 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/report/Reporter.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/report/Reporter.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/report/Statistics.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/report/Statistics.java
index db8b4ddcee..db8b4ddcee 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/report/Statistics.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/report/Statistics.java
diff --git a/packaging/windows/INSTALL_NOTES.html b/qpid/packaging/windows/INSTALL_NOTES.html
index 862e43c714..862e43c714 100644
--- a/packaging/windows/INSTALL_NOTES.html
+++ b/qpid/packaging/windows/INSTALL_NOTES.html
diff --git a/packaging/windows/LICENSE.rtf b/qpid/packaging/windows/LICENSE.rtf
index 04fddfe8b6..04fddfe8b6 100644
--- a/packaging/windows/LICENSE.rtf
+++ b/qpid/packaging/windows/LICENSE.rtf
diff --git a/packaging/windows/build_installer.bat b/qpid/packaging/windows/build_installer.bat
index addc33f32b..addc33f32b 100644
--- a/packaging/windows/build_installer.bat
+++ b/qpid/packaging/windows/build_installer.bat
diff --git a/packaging/windows/installer.proj b/qpid/packaging/windows/installer.proj
index 4c24f17bbc..4c24f17bbc 100644
--- a/packaging/windows/installer.proj
+++ b/qpid/packaging/windows/installer.proj
diff --git a/packaging/windows/qpid-icon.ico b/qpid/packaging/windows/qpid-icon.ico
index 112f5d8f1f..112f5d8f1f 100644
--- a/packaging/windows/qpid-icon.ico
+++ b/qpid/packaging/windows/qpid-icon.ico
diff --git a/packaging/windows/qpid-install-background.bmp b/qpid/packaging/windows/qpid-install-background.bmp
index 7a287f107f..7a287f107f 100644
--- a/packaging/windows/qpid-install-background.bmp
+++ b/qpid/packaging/windows/qpid-install-background.bmp
diff --git a/packaging/windows/qpid-install-banner.bmp b/qpid/packaging/windows/qpid-install-banner.bmp
index 73184a9235..73184a9235 100644
--- a/packaging/windows/qpid-install-banner.bmp
+++ b/qpid/packaging/windows/qpid-install-banner.bmp
diff --git a/packaging/windows/qpidc.wxs b/qpid/packaging/windows/qpidc.wxs
index d249423c99..d249423c99 100644
--- a/packaging/windows/qpidc.wxs
+++ b/qpid/packaging/windows/qpidc.wxs
diff --git a/python/LICENSE.txt b/qpid/python/LICENSE.txt
index 6b0b1270ff..6b0b1270ff 100644
--- a/python/LICENSE.txt
+++ b/qpid/python/LICENSE.txt
diff --git a/python/MANIFEST.in b/qpid/python/MANIFEST.in
index 19a9554a99..19a9554a99 100644
--- a/python/MANIFEST.in
+++ b/qpid/python/MANIFEST.in
diff --git a/python/NOTICE.txt b/qpid/python/NOTICE.txt
index 32ccdb70c4..32ccdb70c4 100644
--- a/python/NOTICE.txt
+++ b/qpid/python/NOTICE.txt
diff --git a/python/README.txt b/qpid/python/README.txt
index e076e2d216..e076e2d216 100644
--- a/python/README.txt
+++ b/qpid/python/README.txt
diff --git a/python/RELEASE_NOTES b/qpid/python/RELEASE_NOTES
index 59c93ac3c6..59c93ac3c6 100644
--- a/python/RELEASE_NOTES
+++ b/qpid/python/RELEASE_NOTES
diff --git a/python/doc/test-requirements.txt b/qpid/python/doc/test-requirements.txt
index 5089b49dbe..5089b49dbe 100644
--- a/python/doc/test-requirements.txt
+++ b/qpid/python/doc/test-requirements.txt
diff --git a/python/examples/README.txt b/qpid/python/examples/README.txt
index 4395160fec..4395160fec 100644
--- a/python/examples/README.txt
+++ b/qpid/python/examples/README.txt
diff --git a/python/examples/api/drain b/qpid/python/examples/api/drain
index 5e30153bc2..5e30153bc2 100755
--- a/python/examples/api/drain
+++ b/qpid/python/examples/api/drain
diff --git a/python/examples/api/hello b/qpid/python/examples/api/hello
index ad314da19e..ad314da19e 100755
--- a/python/examples/api/hello
+++ b/qpid/python/examples/api/hello
diff --git a/python/examples/api/hello_xml b/qpid/python/examples/api/hello_xml
index ab567ec5dd..ab567ec5dd 100755
--- a/python/examples/api/hello_xml
+++ b/qpid/python/examples/api/hello_xml
diff --git a/python/examples/api/server b/qpid/python/examples/api/server
index 78d812bfd2..78d812bfd2 100755
--- a/python/examples/api/server
+++ b/qpid/python/examples/api/server
diff --git a/python/examples/api/spout b/qpid/python/examples/api/spout
index 6584b853fc..6584b853fc 100755
--- a/python/examples/api/spout
+++ b/qpid/python/examples/api/spout
diff --git a/python/examples/api/statistics.py b/qpid/python/examples/api/statistics.py
index e095920e90..e095920e90 100644
--- a/python/examples/api/statistics.py
+++ b/qpid/python/examples/api/statistics.py
diff --git a/python/examples/reservations/common.py b/qpid/python/examples/reservations/common.py
index 12f07e1c92..12f07e1c92 100644
--- a/python/examples/reservations/common.py
+++ b/qpid/python/examples/reservations/common.py
diff --git a/python/examples/reservations/inventory b/qpid/python/examples/reservations/inventory
index 0a49643e5f..0a49643e5f 100755
--- a/python/examples/reservations/inventory
+++ b/qpid/python/examples/reservations/inventory
diff --git a/python/examples/reservations/machine-agent b/qpid/python/examples/reservations/machine-agent
index a221a8b6de..a221a8b6de 100755
--- a/python/examples/reservations/machine-agent
+++ b/qpid/python/examples/reservations/machine-agent
diff --git a/python/examples/reservations/reserve b/qpid/python/examples/reservations/reserve
index 68e7fee912..68e7fee912 100755
--- a/python/examples/reservations/reserve
+++ b/qpid/python/examples/reservations/reserve
diff --git a/python/mllib/__init__.py b/qpid/python/mllib/__init__.py
index 9aa1e56e66..9aa1e56e66 100644
--- a/python/mllib/__init__.py
+++ b/qpid/python/mllib/__init__.py
diff --git a/python/mllib/dom.py b/qpid/python/mllib/dom.py
index 486f7082e1..486f7082e1 100644
--- a/python/mllib/dom.py
+++ b/qpid/python/mllib/dom.py
diff --git a/python/mllib/parsers.py b/qpid/python/mllib/parsers.py
index 3e7cc10dc2..3e7cc10dc2 100644
--- a/python/mllib/parsers.py
+++ b/qpid/python/mllib/parsers.py
diff --git a/python/mllib/transforms.py b/qpid/python/mllib/transforms.py
index 69d99125e3..69d99125e3 100644
--- a/python/mllib/transforms.py
+++ b/qpid/python/mllib/transforms.py
diff --git a/python/qpid-python-test b/qpid/python/qpid-python-test
index 13f31fe78b..13f31fe78b 100755
--- a/python/qpid-python-test
+++ b/qpid/python/qpid-python-test
diff --git a/python/qpid-python-test-ant.xml b/qpid/python/qpid-python-test-ant.xml
index 15271a477b..15271a477b 100644
--- a/python/qpid-python-test-ant.xml
+++ b/qpid/python/qpid-python-test-ant.xml
diff --git a/python/qpid/__init__.py b/qpid/python/qpid/__init__.py
index 780cab46a0..780cab46a0 100644
--- a/python/qpid/__init__.py
+++ b/qpid/python/qpid/__init__.py
diff --git a/python/qpid/client.py b/qpid/python/qpid/client.py
index 4d42a8b20f..4d42a8b20f 100644
--- a/python/qpid/client.py
+++ b/qpid/python/qpid/client.py
diff --git a/python/qpid/codec.py b/qpid/python/qpid/codec.py
index 8026b209dc..8026b209dc 100644
--- a/python/qpid/codec.py
+++ b/qpid/python/qpid/codec.py
diff --git a/python/qpid/codec010.py b/qpid/python/qpid/codec010.py
index 94a1cd4263..94a1cd4263 100644
--- a/python/qpid/codec010.py
+++ b/qpid/python/qpid/codec010.py
diff --git a/python/qpid/compat.py b/qpid/python/qpid/compat.py
index 8b1f4b746b..8b1f4b746b 100644
--- a/python/qpid/compat.py
+++ b/qpid/python/qpid/compat.py
diff --git a/python/qpid/concurrency.py b/qpid/python/qpid/concurrency.py
index eefe0d445f..eefe0d445f 100644
--- a/python/qpid/concurrency.py
+++ b/qpid/python/qpid/concurrency.py
diff --git a/python/qpid/connection.py b/qpid/python/qpid/connection.py
index 2453f38c34..2453f38c34 100644
--- a/python/qpid/connection.py
+++ b/qpid/python/qpid/connection.py
diff --git a/python/qpid/connection08.py b/qpid/python/qpid/connection08.py
index e4762ff974..e4762ff974 100644
--- a/python/qpid/connection08.py
+++ b/qpid/python/qpid/connection08.py
diff --git a/python/qpid/content.py b/qpid/python/qpid/content.py
index 9391f4f1a8..9391f4f1a8 100644
--- a/python/qpid/content.py
+++ b/qpid/python/qpid/content.py
diff --git a/python/qpid/datatypes.py b/qpid/python/qpid/datatypes.py
index ca1466c261..ca1466c261 100644
--- a/python/qpid/datatypes.py
+++ b/qpid/python/qpid/datatypes.py
diff --git a/python/qpid/debug.py b/qpid/python/qpid/debug.py
index b5dbd4d9d9..b5dbd4d9d9 100644
--- a/python/qpid/debug.py
+++ b/qpid/python/qpid/debug.py
diff --git a/python/qpid/delegate.py b/qpid/python/qpid/delegate.py
index b447c4aa29..b447c4aa29 100644
--- a/python/qpid/delegate.py
+++ b/qpid/python/qpid/delegate.py
diff --git a/python/qpid/delegates.py b/qpid/python/qpid/delegates.py
index ae7ed7f988..ae7ed7f988 100644
--- a/python/qpid/delegates.py
+++ b/qpid/python/qpid/delegates.py
diff --git a/python/qpid/disp.py b/qpid/python/qpid/disp.py
index c29ea009de..c29ea009de 100644
--- a/python/qpid/disp.py
+++ b/qpid/python/qpid/disp.py
diff --git a/python/qpid/exceptions.py b/qpid/python/qpid/exceptions.py
index 2bd80b7ffe..2bd80b7ffe 100644
--- a/python/qpid/exceptions.py
+++ b/qpid/python/qpid/exceptions.py
diff --git a/python/qpid/framer.py b/qpid/python/qpid/framer.py
index 8e4ef014f1..8e4ef014f1 100644
--- a/python/qpid/framer.py
+++ b/qpid/python/qpid/framer.py
diff --git a/python/qpid/framing.py b/qpid/python/qpid/framing.py
index 62fd38dfcd..62fd38dfcd 100644
--- a/python/qpid/framing.py
+++ b/qpid/python/qpid/framing.py
diff --git a/python/qpid/generator.py b/qpid/python/qpid/generator.py
index 02d11e5005..02d11e5005 100644
--- a/python/qpid/generator.py
+++ b/qpid/python/qpid/generator.py
diff --git a/python/qpid/harness.py b/qpid/python/qpid/harness.py
index ce48481612..ce48481612 100644
--- a/python/qpid/harness.py
+++ b/qpid/python/qpid/harness.py
diff --git a/python/qpid/lexer.py b/qpid/python/qpid/lexer.py
index ec28bbb91a..ec28bbb91a 100644
--- a/python/qpid/lexer.py
+++ b/qpid/python/qpid/lexer.py
diff --git a/python/qpid/log.py b/qpid/python/qpid/log.py
index 1fd7d74136..1fd7d74136 100644
--- a/python/qpid/log.py
+++ b/qpid/python/qpid/log.py
diff --git a/python/qpid/management.py b/qpid/python/qpid/management.py
index 3de8da9d49..3de8da9d49 100644
--- a/python/qpid/management.py
+++ b/qpid/python/qpid/management.py
diff --git a/python/qpid/managementdata.py b/qpid/python/qpid/managementdata.py
index 61cb10c134..61cb10c134 100644
--- a/python/qpid/managementdata.py
+++ b/qpid/python/qpid/managementdata.py
diff --git a/python/qpid/message.py b/qpid/python/qpid/message.py
index 4d31da2846..4d31da2846 100644
--- a/python/qpid/message.py
+++ b/qpid/python/qpid/message.py
diff --git a/python/qpid/messaging/__init__.py b/qpid/python/qpid/messaging/__init__.py
index f9ddda2e80..f9ddda2e80 100644
--- a/python/qpid/messaging/__init__.py
+++ b/qpid/python/qpid/messaging/__init__.py
diff --git a/python/qpid/messaging/address.py b/qpid/python/qpid/messaging/address.py
index e423f09193..e423f09193 100644
--- a/python/qpid/messaging/address.py
+++ b/qpid/python/qpid/messaging/address.py
diff --git a/python/qpid/messaging/constants.py b/qpid/python/qpid/messaging/constants.py
index f230c4def8..f230c4def8 100644
--- a/python/qpid/messaging/constants.py
+++ b/qpid/python/qpid/messaging/constants.py
diff --git a/python/qpid/messaging/driver.py b/qpid/python/qpid/messaging/driver.py
index 06bbe610b8..06bbe610b8 100644
--- a/python/qpid/messaging/driver.py
+++ b/qpid/python/qpid/messaging/driver.py
diff --git a/python/qpid/messaging/endpoints.py b/qpid/python/qpid/messaging/endpoints.py
index e69d7a10ae..e69d7a10ae 100644
--- a/python/qpid/messaging/endpoints.py
+++ b/qpid/python/qpid/messaging/endpoints.py
diff --git a/python/qpid/messaging/exceptions.py b/qpid/python/qpid/messaging/exceptions.py
index b941565c51..b941565c51 100644
--- a/python/qpid/messaging/exceptions.py
+++ b/qpid/python/qpid/messaging/exceptions.py
diff --git a/python/qpid/messaging/message.py b/qpid/python/qpid/messaging/message.py
index b70b365c16..b70b365c16 100644
--- a/python/qpid/messaging/message.py
+++ b/qpid/python/qpid/messaging/message.py
diff --git a/python/qpid/messaging/transports.py b/qpid/python/qpid/messaging/transports.py
index c36d7891b3..c36d7891b3 100644
--- a/python/qpid/messaging/transports.py
+++ b/qpid/python/qpid/messaging/transports.py
diff --git a/python/qpid/messaging/util.py b/qpid/python/qpid/messaging/util.py
index 726cfd5172..726cfd5172 100644
--- a/python/qpid/messaging/util.py
+++ b/qpid/python/qpid/messaging/util.py
diff --git a/python/qpid/mimetype.py b/qpid/python/qpid/mimetype.py
index f512996b9f..f512996b9f 100644
--- a/python/qpid/mimetype.py
+++ b/qpid/python/qpid/mimetype.py
diff --git a/python/qpid/ops.py b/qpid/python/qpid/ops.py
index 390552be6d..390552be6d 100644
--- a/python/qpid/ops.py
+++ b/qpid/python/qpid/ops.py
diff --git a/python/qpid/packer.py b/qpid/python/qpid/packer.py
index 22c16918dc..22c16918dc 100644
--- a/python/qpid/packer.py
+++ b/qpid/python/qpid/packer.py
diff --git a/python/qpid/parser.py b/qpid/python/qpid/parser.py
index 233f0a8469..233f0a8469 100644
--- a/python/qpid/parser.py
+++ b/qpid/python/qpid/parser.py
diff --git a/python/qpid/peer.py b/qpid/python/qpid/peer.py
index 95055cc014..95055cc014 100644
--- a/python/qpid/peer.py
+++ b/qpid/python/qpid/peer.py
diff --git a/python/qpid/queue.py b/qpid/python/qpid/queue.py
index 63a7684843..63a7684843 100644
--- a/python/qpid/queue.py
+++ b/qpid/python/qpid/queue.py
diff --git a/python/qpid/reference.py b/qpid/python/qpid/reference.py
index 48ecb67656..48ecb67656 100644
--- a/python/qpid/reference.py
+++ b/qpid/python/qpid/reference.py
diff --git a/python/qpid/sasl.py b/qpid/python/qpid/sasl.py
index 25de6dec45..25de6dec45 100644
--- a/python/qpid/sasl.py
+++ b/qpid/python/qpid/sasl.py
diff --git a/python/qpid/selector.py b/qpid/python/qpid/selector.py
index ff94091da0..ff94091da0 100644
--- a/python/qpid/selector.py
+++ b/qpid/python/qpid/selector.py
diff --git a/python/qpid/session.py b/qpid/python/qpid/session.py
index 95714a128a..95714a128a 100644
--- a/python/qpid/session.py
+++ b/qpid/python/qpid/session.py
diff --git a/python/qpid/spec08.py b/qpid/python/qpid/spec08.py
index a0047e7107..a0047e7107 100644
--- a/python/qpid/spec08.py
+++ b/qpid/python/qpid/spec08.py
diff --git a/python/qpid/specs/amqp-0-10-qpid-errata-stripped.xml b/qpid/python/qpid/specs/amqp-0-10-qpid-errata-stripped.xml
index 83ddf709e9..83ddf709e9 100644
--- a/python/qpid/specs/amqp-0-10-qpid-errata-stripped.xml
+++ b/qpid/python/qpid/specs/amqp-0-10-qpid-errata-stripped.xml
diff --git a/python/qpid/specs/amqp-0-10-stripped.xml b/qpid/python/qpid/specs/amqp-0-10-stripped.xml
index 1c53608138..1c53608138 100644
--- a/python/qpid/specs/amqp-0-10-stripped.xml
+++ b/qpid/python/qpid/specs/amqp-0-10-stripped.xml
diff --git a/python/qpid/specs/amqp-0-10.dtd b/qpid/python/qpid/specs/amqp-0-10.dtd
index 2be198525a..2be198525a 100644
--- a/python/qpid/specs/amqp-0-10.dtd
+++ b/qpid/python/qpid/specs/amqp-0-10.dtd
diff --git a/python/qpid/specs/amqp-0-8-qpid-stripped.xml b/qpid/python/qpid/specs/amqp-0-8-qpid-stripped.xml
index 6975e17aa6..6975e17aa6 100644
--- a/python/qpid/specs/amqp-0-8-qpid-stripped.xml
+++ b/qpid/python/qpid/specs/amqp-0-8-qpid-stripped.xml
diff --git a/python/qpid/specs/amqp-0-9-1-stripped.xml b/qpid/python/qpid/specs/amqp-0-9-1-stripped.xml
index ec55c8dd7a..ec55c8dd7a 100644
--- a/python/qpid/specs/amqp-0-9-1-stripped.xml
+++ b/qpid/python/qpid/specs/amqp-0-9-1-stripped.xml
diff --git a/python/qpid/specs/amqp-0-9-qpid-stripped.xml b/qpid/python/qpid/specs/amqp-0-9-qpid-stripped.xml
index e0075870de..e0075870de 100644
--- a/python/qpid/specs/amqp-0-9-qpid-stripped.xml
+++ b/qpid/python/qpid/specs/amqp-0-9-qpid-stripped.xml
diff --git a/python/qpid/specs_config.py b/qpid/python/qpid/specs_config.py
index d991e8b084..d991e8b084 100644
--- a/python/qpid/specs_config.py
+++ b/qpid/python/qpid/specs_config.py
diff --git a/python/qpid/testlib.py b/qpid/python/qpid/testlib.py
index 2b283f3998..2b283f3998 100644
--- a/python/qpid/testlib.py
+++ b/qpid/python/qpid/testlib.py
diff --git a/python/qpid/tests/__init__.py b/qpid/python/qpid/tests/__init__.py
index dc9988515e..dc9988515e 100644
--- a/python/qpid/tests/__init__.py
+++ b/qpid/python/qpid/tests/__init__.py
diff --git a/python/qpid/tests/codec.py b/qpid/python/qpid/tests/codec.py
index 8fd0528636..8fd0528636 100644
--- a/python/qpid/tests/codec.py
+++ b/qpid/python/qpid/tests/codec.py
diff --git a/python/qpid/tests/codec010.py b/qpid/python/qpid/tests/codec010.py
index 787ebc146f..787ebc146f 100644
--- a/python/qpid/tests/codec010.py
+++ b/qpid/python/qpid/tests/codec010.py
diff --git a/python/qpid/tests/connection.py b/qpid/python/qpid/tests/connection.py
index 6847285f69..6847285f69 100644
--- a/python/qpid/tests/connection.py
+++ b/qpid/python/qpid/tests/connection.py
diff --git a/python/qpid/tests/datatypes.py b/qpid/python/qpid/tests/datatypes.py
index 00e649d6cf..00e649d6cf 100644
--- a/python/qpid/tests/datatypes.py
+++ b/qpid/python/qpid/tests/datatypes.py
diff --git a/python/qpid/tests/framing.py b/qpid/python/qpid/tests/framing.py
index 0b33df8b9a..0b33df8b9a 100644
--- a/python/qpid/tests/framing.py
+++ b/qpid/python/qpid/tests/framing.py
diff --git a/python/qpid/tests/messaging/__init__.py b/qpid/python/qpid/tests/messaging/__init__.py
index 38a5b066d6..38a5b066d6 100644
--- a/python/qpid/tests/messaging/__init__.py
+++ b/qpid/python/qpid/tests/messaging/__init__.py
diff --git a/python/qpid/tests/messaging/address.py b/qpid/python/qpid/tests/messaging/address.py
index aa9562a717..aa9562a717 100644
--- a/python/qpid/tests/messaging/address.py
+++ b/qpid/python/qpid/tests/messaging/address.py
diff --git a/python/qpid/tests/messaging/endpoints.py b/qpid/python/qpid/tests/messaging/endpoints.py
index 247d6e9a29..247d6e9a29 100644
--- a/python/qpid/tests/messaging/endpoints.py
+++ b/qpid/python/qpid/tests/messaging/endpoints.py
diff --git a/python/qpid/tests/messaging/implementation.py b/qpid/python/qpid/tests/messaging/implementation.py
index fce60c6f38..fce60c6f38 100644
--- a/python/qpid/tests/messaging/implementation.py
+++ b/qpid/python/qpid/tests/messaging/implementation.py
diff --git a/python/qpid/tests/messaging/message.py b/qpid/python/qpid/tests/messaging/message.py
index bfdd2c79e5..bfdd2c79e5 100644
--- a/python/qpid/tests/messaging/message.py
+++ b/qpid/python/qpid/tests/messaging/message.py
diff --git a/python/qpid/tests/mimetype.py b/qpid/python/qpid/tests/mimetype.py
index 22760316f0..22760316f0 100644
--- a/python/qpid/tests/mimetype.py
+++ b/qpid/python/qpid/tests/mimetype.py
diff --git a/python/qpid/tests/parser.py b/qpid/python/qpid/tests/parser.py
index a4865cc9fe..a4865cc9fe 100644
--- a/python/qpid/tests/parser.py
+++ b/qpid/python/qpid/tests/parser.py
diff --git a/python/qpid/tests/queue.py b/qpid/python/qpid/tests/queue.py
index e12354eb43..e12354eb43 100644
--- a/python/qpid/tests/queue.py
+++ b/qpid/python/qpid/tests/queue.py
diff --git a/python/qpid/tests/spec010.py b/qpid/python/qpid/tests/spec010.py
index ac04e1ee02..ac04e1ee02 100644
--- a/python/qpid/tests/spec010.py
+++ b/qpid/python/qpid/tests/spec010.py
diff --git a/python/qpid/tests/util.py b/qpid/python/qpid/tests/util.py
index 9777443720..9777443720 100644
--- a/python/qpid/tests/util.py
+++ b/qpid/python/qpid/tests/util.py
diff --git a/python/qpid/util.py b/qpid/python/qpid/util.py
index fcc126154a..fcc126154a 100644
--- a/python/qpid/util.py
+++ b/qpid/python/qpid/util.py
diff --git a/python/qpid/validator.py b/qpid/python/qpid/validator.py
index d234642b3e..d234642b3e 100644
--- a/python/qpid/validator.py
+++ b/qpid/python/qpid/validator.py
diff --git a/python/setup.py b/qpid/python/setup.py
index 67b6d25472..67b6d25472 100755
--- a/python/setup.py
+++ b/qpid/python/setup.py
diff --git a/python/todo.txt b/qpid/python/todo.txt
index 8dbe9c7cc4..8dbe9c7cc4 100644
--- a/python/todo.txt
+++ b/qpid/python/todo.txt
diff --git a/review/LICENSE b/qpid/review/LICENSE
index bc46b77047..bc46b77047 100644
--- a/review/LICENSE
+++ b/qpid/review/LICENSE
diff --git a/review/NOTICE b/qpid/review/NOTICE
index 54c534c30b..54c534c30b 100644
--- a/review/NOTICE
+++ b/qpid/review/NOTICE
diff --git a/review/agenda.py b/qpid/review/agenda.py
index 6ad20362cb..6ad20362cb 100755
--- a/review/agenda.py
+++ b/qpid/review/agenda.py
diff --git a/review/changeLogToWiki.py b/qpid/review/changeLogToWiki.py
index 4054b135df..4054b135df 100755
--- a/review/changeLogToWiki.py
+++ b/qpid/review/changeLogToWiki.py
diff --git a/review/jiraRSS2wiki.xsl b/qpid/review/jiraRSS2wiki.xsl
index bd4933cfb4..bd4933cfb4 100644
--- a/review/jiraRSS2wiki.xsl
+++ b/qpid/review/jiraRSS2wiki.xsl
diff --git a/review/svnlog2wiki.xsl b/qpid/review/svnlog2wiki.xsl
index 8fe2fbf033..8fe2fbf033 100644
--- a/review/svnlog2wiki.xsl
+++ b/qpid/review/svnlog2wiki.xsl
diff --git a/sandbox/models/fedsim/__init__.py b/qpid/sandbox/models/fedsim/__init__.py
index 63a3f41f28..63a3f41f28 100644
--- a/sandbox/models/fedsim/__init__.py
+++ b/qpid/sandbox/models/fedsim/__init__.py
diff --git a/sandbox/models/fedsim/fedsim.py b/qpid/sandbox/models/fedsim/fedsim.py
index edb6c4c8ed..edb6c4c8ed 100644
--- a/sandbox/models/fedsim/fedsim.py
+++ b/qpid/sandbox/models/fedsim/fedsim.py
diff --git a/sandbox/models/fedsim/testBig.py b/qpid/sandbox/models/fedsim/testBig.py
index 416a086983..416a086983 100644
--- a/sandbox/models/fedsim/testBig.py
+++ b/qpid/sandbox/models/fedsim/testBig.py
diff --git a/sandbox/models/fedsim/testRing.py b/qpid/sandbox/models/fedsim/testRing.py
index c883b54993..c883b54993 100644
--- a/sandbox/models/fedsim/testRing.py
+++ b/qpid/sandbox/models/fedsim/testRing.py
diff --git a/sandbox/models/fedsim/testStar.py b/qpid/sandbox/models/fedsim/testStar.py
index e6b801446f..e6b801446f 100644
--- a/sandbox/models/fedsim/testStar.py
+++ b/qpid/sandbox/models/fedsim/testStar.py
diff --git a/sandbox/models/fedsim/testStarAdd.py b/qpid/sandbox/models/fedsim/testStarAdd.py
index e0eb44952a..e0eb44952a 100644
--- a/sandbox/models/fedsim/testStarAdd.py
+++ b/qpid/sandbox/models/fedsim/testStarAdd.py
diff --git a/specs/LICENSE b/qpid/specs/LICENSE
index d645695673..d645695673 100644
--- a/specs/LICENSE
+++ b/qpid/specs/LICENSE
diff --git a/specs/MOVED_FILE b/qpid/specs/MOVED_FILE
index 91cf398302..91cf398302 100644
--- a/specs/MOVED_FILE
+++ b/qpid/specs/MOVED_FILE
diff --git a/specs/NOTICE b/qpid/specs/NOTICE
index 0e59eb3131..0e59eb3131 100644
--- a/specs/NOTICE
+++ b/qpid/specs/NOTICE
diff --git a/specs/amqp-dtx-preview.0-9.xml b/qpid/specs/amqp-dtx-preview.0-9.xml
index dd70e91d1d..dd70e91d1d 100644
--- a/specs/amqp-dtx-preview.0-9.xml
+++ b/qpid/specs/amqp-dtx-preview.0-9.xml
diff --git a/specs/amqp-errata.0-9.xml b/qpid/specs/amqp-errata.0-9.xml
index 8b9d818234..8b9d818234 100644
--- a/specs/amqp-errata.0-9.xml
+++ b/qpid/specs/amqp-errata.0-9.xml
diff --git a/specs/amqp-nogen.0-9.xml b/qpid/specs/amqp-nogen.0-9.xml
index bde9571540..bde9571540 100644
--- a/specs/amqp-nogen.0-9.xml
+++ b/qpid/specs/amqp-nogen.0-9.xml
diff --git a/specs/amqp.0-10-qpid-errata.stripped.xml b/qpid/specs/amqp.0-10-qpid-errata.stripped.xml
index 83ddf709e9..83ddf709e9 100644
--- a/specs/amqp.0-10-qpid-errata.stripped.xml
+++ b/qpid/specs/amqp.0-10-qpid-errata.stripped.xml
diff --git a/specs/amqp.0-10.dtd b/qpid/specs/amqp.0-10.dtd
index 2be198525a..2be198525a 100644
--- a/specs/amqp.0-10.dtd
+++ b/qpid/specs/amqp.0-10.dtd
diff --git a/specs/amqp.0-10.stripped.xml b/qpid/specs/amqp.0-10.stripped.xml
index 1c53608138..1c53608138 100644
--- a/specs/amqp.0-10.stripped.xml
+++ b/qpid/specs/amqp.0-10.stripped.xml
diff --git a/specs/amqp.xsl b/qpid/specs/amqp.xsl
index afe3bd5e65..afe3bd5e65 100644
--- a/specs/amqp.xsl
+++ b/qpid/specs/amqp.xsl
diff --git a/specs/amqp0-8-qpid.stripped.xml b/qpid/specs/amqp0-8-qpid.stripped.xml
index 6975e17aa6..6975e17aa6 100644
--- a/specs/amqp0-8-qpid.stripped.xml
+++ b/qpid/specs/amqp0-8-qpid.stripped.xml
diff --git a/specs/amqp0-8.stripped.xml b/qpid/specs/amqp0-8.stripped.xml
index c8497db07b..c8497db07b 100644
--- a/specs/amqp0-8.stripped.xml
+++ b/qpid/specs/amqp0-8.stripped.xml
diff --git a/specs/amqp0-9-1.stripped.xml b/qpid/specs/amqp0-9-1.stripped.xml
index ec55c8dd7a..ec55c8dd7a 100644
--- a/specs/amqp0-9-1.stripped.xml
+++ b/qpid/specs/amqp0-9-1.stripped.xml
diff --git a/specs/amqp0-9-qpid.stripped.xml b/qpid/specs/amqp0-9-qpid.stripped.xml
index e0075870de..e0075870de 100644
--- a/specs/amqp0-9-qpid.stripped.xml
+++ b/qpid/specs/amqp0-9-qpid.stripped.xml
diff --git a/specs/amqp0-9.stripped.xml b/qpid/specs/amqp0-9.stripped.xml
index 5233332b68..5233332b68 100644
--- a/specs/amqp0-9.stripped.xml
+++ b/qpid/specs/amqp0-9.stripped.xml
diff --git a/specs/apache-filters.xml b/qpid/specs/apache-filters.xml
index 644c796893..644c796893 100644
--- a/specs/apache-filters.xml
+++ b/qpid/specs/apache-filters.xml
diff --git a/specs/cluster.0-8.xml b/qpid/specs/cluster.0-8.xml
index d5b1e6cd5c..d5b1e6cd5c 100644
--- a/specs/cluster.0-8.xml
+++ b/qpid/specs/cluster.0-8.xml
diff --git a/tests/LICENSE.txt b/qpid/tests/LICENSE.txt
index 6b0b1270ff..6b0b1270ff 100644
--- a/tests/LICENSE.txt
+++ b/qpid/tests/LICENSE.txt
diff --git a/tests/NOTICE.txt b/qpid/tests/NOTICE.txt
index 32ccdb70c4..32ccdb70c4 100644
--- a/tests/NOTICE.txt
+++ b/qpid/tests/NOTICE.txt
diff --git a/tests/setup.py b/qpid/tests/setup.py
index 605a529d59..605a529d59 100755
--- a/tests/setup.py
+++ b/qpid/tests/setup.py
diff --git a/tests/src/py/qpid_tests/__init__.py b/qpid/tests/src/py/qpid_tests/__init__.py
index 7b522f59af..7b522f59af 100644
--- a/tests/src/py/qpid_tests/__init__.py
+++ b/qpid/tests/src/py/qpid_tests/__init__.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/__init__.py b/qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py
index 312dc22645..312dc22645 100644
--- a/tests/src/py/qpid_tests/broker_0_10/__init__.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py b/qpid/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py
index 2e2d5de13a..2e2d5de13a 100644
--- a/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/broker.py b/qpid/tests/src/py/qpid_tests/broker_0_10/broker.py
index 81d723e322..81d723e322 100644
--- a/tests/src/py/qpid_tests/broker_0_10/broker.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/broker.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/dtx.py b/qpid/tests/src/py/qpid_tests/broker_0_10/dtx.py
index f8d6533a78..f8d6533a78 100644
--- a/tests/src/py/qpid_tests/broker_0_10/dtx.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/dtx.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/example.py b/qpid/tests/src/py/qpid_tests/broker_0_10/example.py
index e36907d501..e36907d501 100644
--- a/tests/src/py/qpid_tests/broker_0_10/example.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/example.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/exchange.py b/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py
index 315991d585..315991d585 100644
--- a/tests/src/py/qpid_tests/broker_0_10/exchange.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/extensions.py b/qpid/tests/src/py/qpid_tests/broker_0_10/extensions.py
index 50c0aa3dd1..50c0aa3dd1 100644
--- a/tests/src/py/qpid_tests/broker_0_10/extensions.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/extensions.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/lvq.py b/qpid/tests/src/py/qpid_tests/broker_0_10/lvq.py
index 476b6ee052..476b6ee052 100644
--- a/tests/src/py/qpid_tests/broker_0_10/lvq.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/lvq.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/management.py b/qpid/tests/src/py/qpid_tests/broker_0_10/management.py
index 126b96853b..126b96853b 100644
--- a/tests/src/py/qpid_tests/broker_0_10/management.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/management.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/message.py b/qpid/tests/src/py/qpid_tests/broker_0_10/message.py
index c6095a0579..c6095a0579 100644
--- a/tests/src/py/qpid_tests/broker_0_10/message.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/message.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/msg_groups.py b/qpid/tests/src/py/qpid_tests/broker_0_10/msg_groups.py
index ec015e1be4..ec015e1be4 100644
--- a/tests/src/py/qpid_tests/broker_0_10/msg_groups.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/msg_groups.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/new_api.py b/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py
index 57da368ff5..57da368ff5 100644
--- a/tests/src/py/qpid_tests/broker_0_10/new_api.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/persistence.py b/qpid/tests/src/py/qpid_tests/broker_0_10/persistence.py
index e9cf9b7caa..e9cf9b7caa 100644
--- a/tests/src/py/qpid_tests/broker_0_10/persistence.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/persistence.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/priority.py b/qpid/tests/src/py/qpid_tests/broker_0_10/priority.py
index 47aae6dfd6..47aae6dfd6 100644
--- a/tests/src/py/qpid_tests/broker_0_10/priority.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/priority.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/qmf_events.py b/qpid/tests/src/py/qpid_tests/broker_0_10/qmf_events.py
index 7ab7b0a1ac..7ab7b0a1ac 100644
--- a/tests/src/py/qpid_tests/broker_0_10/qmf_events.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/qmf_events.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/query.py b/qpid/tests/src/py/qpid_tests/broker_0_10/query.py
index fd741821d5..fd741821d5 100644
--- a/tests/src/py/qpid_tests/broker_0_10/query.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/query.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/queue.py b/qpid/tests/src/py/qpid_tests/broker_0_10/queue.py
index 545bc8cc23..545bc8cc23 100644
--- a/tests/src/py/qpid_tests/broker_0_10/queue.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/queue.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/stats.py b/qpid/tests/src/py/qpid_tests/broker_0_10/stats.py
index 4f3931b78b..4f3931b78b 100644
--- a/tests/src/py/qpid_tests/broker_0_10/stats.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/stats.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/threshold.py b/qpid/tests/src/py/qpid_tests/broker_0_10/threshold.py
index fa172c66d2..fa172c66d2 100644
--- a/tests/src/py/qpid_tests/broker_0_10/threshold.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/threshold.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/tx.py b/qpid/tests/src/py/qpid_tests/broker_0_10/tx.py
index 8cdc539a08..8cdc539a08 100644
--- a/tests/src/py/qpid_tests/broker_0_10/tx.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/tx.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/__init__.py b/qpid/tests/src/py/qpid_tests/broker_0_8/__init__.py
index 526f2452f8..526f2452f8 100644
--- a/tests/src/py/qpid_tests/broker_0_8/__init__.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/__init__.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/basic.py b/qpid/tests/src/py/qpid_tests/broker_0_8/basic.py
index 606aad1293..606aad1293 100644
--- a/tests/src/py/qpid_tests/broker_0_8/basic.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/basic.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/broker.py b/qpid/tests/src/py/qpid_tests/broker_0_8/broker.py
index 7f3fe7530e..7f3fe7530e 100644
--- a/tests/src/py/qpid_tests/broker_0_8/broker.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/broker.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/example.py b/qpid/tests/src/py/qpid_tests/broker_0_8/example.py
index d82bad1f61..d82bad1f61 100644
--- a/tests/src/py/qpid_tests/broker_0_8/example.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/example.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/exchange.py b/qpid/tests/src/py/qpid_tests/broker_0_8/exchange.py
index 4c38d9fab9..4c38d9fab9 100644
--- a/tests/src/py/qpid_tests/broker_0_8/exchange.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/exchange.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/queue.py b/qpid/tests/src/py/qpid_tests/broker_0_8/queue.py
index b7a41736ab..b7a41736ab 100644
--- a/tests/src/py/qpid_tests/broker_0_8/queue.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/queue.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/testlib.py b/qpid/tests/src/py/qpid_tests/broker_0_8/testlib.py
index 76f7e964a2..76f7e964a2 100644
--- a/tests/src/py/qpid_tests/broker_0_8/testlib.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/testlib.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/tx.py b/qpid/tests/src/py/qpid_tests/broker_0_8/tx.py
index 9faddb1110..9faddb1110 100644
--- a/tests/src/py/qpid_tests/broker_0_8/tx.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/tx.py
diff --git a/tests/src/py/qpid_tests/broker_0_9/__init__.py b/qpid/tests/src/py/qpid_tests/broker_0_9/__init__.py
index 6b46b96b1d..6b46b96b1d 100644
--- a/tests/src/py/qpid_tests/broker_0_9/__init__.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_9/__init__.py
diff --git a/tests/src/py/qpid_tests/broker_0_9/messageheader.py b/qpid/tests/src/py/qpid_tests/broker_0_9/messageheader.py
index 3526cf37af..3526cf37af 100644
--- a/tests/src/py/qpid_tests/broker_0_9/messageheader.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_9/messageheader.py
diff --git a/tests/src/py/qpid_tests/broker_0_9/query.py b/qpid/tests/src/py/qpid_tests/broker_0_9/query.py
index cb66d079e5..cb66d079e5 100644
--- a/tests/src/py/qpid_tests/broker_0_9/query.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_9/query.py
diff --git a/tests/src/py/qpid_tests/broker_0_9/queue.py b/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
index de1153307c..de1153307c 100644
--- a/tests/src/py/qpid_tests/broker_0_9/queue.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
diff --git a/tests/src/py/qpid_tests/broker_1_0/__init__.py b/qpid/tests/src/py/qpid_tests/broker_1_0/__init__.py
index 5ebbb4c651..5ebbb4c651 100644
--- a/tests/src/py/qpid_tests/broker_1_0/__init__.py
+++ b/qpid/tests/src/py/qpid_tests/broker_1_0/__init__.py
diff --git a/tests/src/py/qpid_tests/broker_1_0/general.py b/qpid/tests/src/py/qpid_tests/broker_1_0/general.py
index 414d0b48f5..414d0b48f5 100644
--- a/tests/src/py/qpid_tests/broker_1_0/general.py
+++ b/qpid/tests/src/py/qpid_tests/broker_1_0/general.py
diff --git a/tests/src/py/qpid_tests/broker_1_0/legacy_exchanges.py b/qpid/tests/src/py/qpid_tests/broker_1_0/legacy_exchanges.py
index eefa49e817..eefa49e817 100644
--- a/tests/src/py/qpid_tests/broker_1_0/legacy_exchanges.py
+++ b/qpid/tests/src/py/qpid_tests/broker_1_0/legacy_exchanges.py
diff --git a/tests/src/py/qpid_tests/broker_1_0/selector.py b/qpid/tests/src/py/qpid_tests/broker_1_0/selector.py
index ac2bbd8db3..ac2bbd8db3 100644
--- a/tests/src/py/qpid_tests/broker_1_0/selector.py
+++ b/qpid/tests/src/py/qpid_tests/broker_1_0/selector.py
diff --git a/tests/src/py/qpid_tests/broker_1_0/translation.py b/qpid/tests/src/py/qpid_tests/broker_1_0/translation.py
index a6394fb8c5..a6394fb8c5 100644
--- a/tests/src/py/qpid_tests/broker_1_0/translation.py
+++ b/qpid/tests/src/py/qpid_tests/broker_1_0/translation.py
diff --git a/tests/src/py/qpid_tests/client/client-api-example-tests.py b/qpid/tests/src/py/qpid_tests/client/client-api-example-tests.py
index 43e0aada46..43e0aada46 100755
--- a/tests/src/py/qpid_tests/client/client-api-example-tests.py
+++ b/qpid/tests/src/py/qpid_tests/client/client-api-example-tests.py
diff --git a/tests/src/py/qpid_tests/client/log4j.conf b/qpid/tests/src/py/qpid_tests/client/log4j.conf
index 2c7bd74e29..2c7bd74e29 100644
--- a/tests/src/py/qpid_tests/client/log4j.conf
+++ b/qpid/tests/src/py/qpid_tests/client/log4j.conf
diff --git a/tools/.gitignore b/qpid/tools/.gitignore
index 846f2ac5b0..846f2ac5b0 100644
--- a/tools/.gitignore
+++ b/qpid/tools/.gitignore
diff --git a/tools/LICENSE.txt b/qpid/tools/LICENSE.txt
index 6b0b1270ff..6b0b1270ff 100644
--- a/tools/LICENSE.txt
+++ b/qpid/tools/LICENSE.txt
diff --git a/tools/NOTICE.txt b/qpid/tools/NOTICE.txt
index 32ccdb70c4..32ccdb70c4 100644
--- a/tools/NOTICE.txt
+++ b/qpid/tools/NOTICE.txt
diff --git a/tools/setup.py b/qpid/tools/setup.py
index 068af322d0..068af322d0 100755
--- a/tools/setup.py
+++ b/qpid/tools/setup.py
diff --git a/tools/src/java/README-Java-Broker.txt b/qpid/tools/src/java/README-Java-Broker.txt
index 992bfbeb95..992bfbeb95 100644
--- a/tools/src/java/README-Java-Broker.txt
+++ b/qpid/tools/src/java/README-Java-Broker.txt
diff --git a/tools/src/java/README.txt b/qpid/tools/src/java/README.txt
index 0755dcd885..0755dcd885 100644
--- a/tools/src/java/README.txt
+++ b/qpid/tools/src/java/README.txt
diff --git a/tools/src/java/bin/ConnectionAudit.sh b/qpid/tools/src/java/bin/ConnectionAudit.sh
index b2f494c025..b2f494c025 100755
--- a/tools/src/java/bin/ConnectionAudit.sh
+++ b/qpid/tools/src/java/bin/ConnectionAudit.sh
diff --git a/tools/src/java/bin/ConnectionLogger.sh b/qpid/tools/src/java/bin/ConnectionLogger.sh
index da4474d48e..da4474d48e 100755
--- a/tools/src/java/bin/ConnectionLogger.sh
+++ b/qpid/tools/src/java/bin/ConnectionLogger.sh
diff --git a/tools/src/java/bin/QpidConfig.sh b/qpid/tools/src/java/bin/QpidConfig.sh
index 16177aed24..16177aed24 100755
--- a/tools/src/java/bin/QpidConfig.sh
+++ b/qpid/tools/src/java/bin/QpidConfig.sh
diff --git a/tools/src/java/bin/QpidCtrl.sh b/qpid/tools/src/java/bin/QpidCtrl.sh
index e0086fb0cf..e0086fb0cf 100755
--- a/tools/src/java/bin/QpidCtrl.sh
+++ b/qpid/tools/src/java/bin/QpidCtrl.sh
diff --git a/tools/src/java/bin/QpidPrintEvents.sh b/qpid/tools/src/java/bin/QpidPrintEvents.sh
index c8f17e2906..c8f17e2906 100755
--- a/tools/src/java/bin/QpidPrintEvents.sh
+++ b/qpid/tools/src/java/bin/QpidPrintEvents.sh
diff --git a/tools/src/java/bin/QpidQueueStats.sh b/qpid/tools/src/java/bin/QpidQueueStats.sh
index a233d0ba49..a233d0ba49 100755
--- a/tools/src/java/bin/QpidQueueStats.sh
+++ b/qpid/tools/src/java/bin/QpidQueueStats.sh
diff --git a/tools/src/java/bin/QpidRestAPI.sh b/qpid/tools/src/java/bin/QpidRestAPI.sh
index e9cca15204..e9cca15204 100755
--- a/tools/src/java/bin/QpidRestAPI.sh
+++ b/qpid/tools/src/java/bin/QpidRestAPI.sh
diff --git a/tools/src/java/bin/QueueFuse.sh b/qpid/tools/src/java/bin/QueueFuse.sh
index 4e51731412..4e51731412 100755
--- a/tools/src/java/bin/QueueFuse.sh
+++ b/qpid/tools/src/java/bin/QueueFuse.sh
diff --git a/tools/src/java/bin/log4j.xml b/qpid/tools/src/java/bin/log4j.xml
index 434bb73259..434bb73259 100644
--- a/tools/src/java/bin/log4j.xml
+++ b/qpid/tools/src/java/bin/log4j.xml
diff --git a/tools/src/java/bin/qpid-web/authentication/account.properties b/qpid/tools/src/java/bin/qpid-web/authentication/account.properties
index ff30bdc55c..ff30bdc55c 100644
--- a/tools/src/java/bin/qpid-web/authentication/account.properties
+++ b/qpid/tools/src/java/bin/qpid-web/authentication/account.properties
diff --git a/tools/src/java/bin/qpid-web/web/apple-touch-icon.png b/qpid/tools/src/java/bin/qpid-web/web/apple-touch-icon.png
index ad4478ccac..ad4478ccac 100644
--- a/tools/src/java/bin/qpid-web/web/apple-touch-icon.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/apple-touch-icon.png
diff --git a/tools/src/java/bin/qpid-web/web/favicon.ico b/qpid/tools/src/java/bin/qpid-web/web/favicon.ico
index 1f61b0edd2..1f61b0edd2 100644
--- a/tools/src/java/bin/qpid-web/web/favicon.ico
+++ b/qpid/tools/src/java/bin/qpid-web/web/favicon.ico
diff --git a/tools/src/java/bin/qpid-web/web/index.html b/qpid/tools/src/java/bin/qpid-web/web/index.html
index e21871b59f..e21871b59f 100755
--- a/tools/src/java/bin/qpid-web/web/index.html
+++ b/qpid/tools/src/java/bin/qpid-web/web/index.html
diff --git a/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie6.css b/qpid/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie6.css
index 343192efd6..343192efd6 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie6.css
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie6.css
diff --git a/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie7.css b/qpid/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie7.css
index d8bd020662..d8bd020662 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie7.css
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie7.css
diff --git a/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie8.css b/qpid/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie8.css
index f2cb4d8126..f2cb4d8126 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie8.css
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie8.css
diff --git a/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie9.css b/qpid/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie9.css
index 3ad857559e..3ad857559e 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie9.css
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/css/itablet-ie9.css
diff --git a/tools/src/java/bin/qpid-web/web/itablet/css/itablet.css b/qpid/tools/src/java/bin/qpid-web/web/itablet/css/itablet.css
index 6ed4d3d7d3..6ed4d3d7d3 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/css/itablet.css
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/css/itablet.css
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/action.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/action.png
index af5e0378b0..af5e0378b0 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/action.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/action.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/add.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/add.png
index 700d9f100e..700d9f100e 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/add.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/add.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/bin.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/bin.png
index 90923898af..90923898af 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/bin.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/bin.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/blue-button-sprite.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/blue-button-sprite.png
index 9fedd12867..9fedd12867 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/blue-button-sprite.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/blue-button-sprite.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/blue-chevron.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/blue-chevron.png
index 41e539fc10..41e539fc10 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/blue-chevron.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/blue-chevron.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/blueball.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/blueball.png
index a7c4c68349..a7c4c68349 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/blueball.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/blueball.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/button-sprite.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/button-sprite.png
index c15b4ea217..c15b4ea217 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/button-sprite.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/button-sprite.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/chevron-active.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/chevron-active.png
index 86832ebc7b..86832ebc7b 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/chevron-active.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/chevron-active.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/chevron.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/chevron.png
index 6421a16762..6421a16762 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/chevron.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/chevron.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/delete.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/delete.png
index 74b1ff3ea1..74b1ff3ea1 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/delete.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/delete.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/flag.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/flag.png
index 0baf2a9986..0baf2a9986 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/flag.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/flag.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/home.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/home.png
index 4f359778a2..4f359778a2 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/home.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/home.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/active-gradient.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/active-gradient.png
index 6cd4404965..6cd4404965 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/active-gradient.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/active-gradient.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/blue-button-sprite.gif b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/blue-button-sprite.gif
index 8edaddedd8..8edaddedd8 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/blue-button-sprite.gif
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/blue-button-sprite.gif
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/blue-chevron.gif b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/blue-chevron.gif
index bb8f3d51d6..bb8f3d51d6 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/blue-chevron.gif
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/blue-chevron.gif
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/button-sprite.gif b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/button-sprite.gif
index 5e920511d1..5e920511d1 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/button-sprite.gif
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/button-sprite.gif
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/chevron-active.gif b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/chevron-active.gif
index f37329bb3b..f37329bb3b 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/chevron-active.gif
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/chevron-active.gif
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/chevron.gif b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/chevron.gif
index dce238269a..dce238269a 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/chevron.gif
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/chevron.gif
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/header-gradient.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/header-gradient.png
index d4e9a6c9f0..d4e9a6c9f0 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/header-gradient.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/header-gradient.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/radial-gradient.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/radial-gradient.png
index d9ab361add..d9ab361add 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/radial-gradient.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/radial-gradient.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/radius-10px-sprite.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/radius-10px-sprite.png
index ca91770e2f..ca91770e2f 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/radius-10px-sprite.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/radius-10px-sprite.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/radius-5px-sprite.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/radius-5px-sprite.png
index c00e2194db..c00e2194db 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/radius-5px-sprite.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/radius-5px-sprite.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/red6.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/red6.png
index c1c0ba1db9..c1c0ba1db9 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/red6.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/red6.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/smoked.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/smoked.png
index ea6b7c587f..ea6b7c587f 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/smoked.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/smoked.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/tick-active.gif b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/tick-active.gif
index 629f6f1eca..629f6f1eca 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/tick-active.gif
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/tick-active.gif
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/tick.gif b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/tick.gif
index fdbdc1eec2..fdbdc1eec2 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/tick.gif
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/tick.gif
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/transparent.gif b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/transparent.gif
index c5b2954ac6..c5b2954ac6 100755
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/transparent.gif
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/transparent.gif
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/ie/transparent.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/transparent.png
index 8ac7f64f1a..8ac7f64f1a 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/ie/transparent.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/ie/transparent.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/mask.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/mask.png
index f8be0e6f36..f8be0e6f36 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/mask.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/mask.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/move.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/move.png
index 80f77eeb72..80f77eeb72 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/move.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/move.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/on_off.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/on_off.png
index 89243bf27d..89243bf27d 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/on_off.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/on_off.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/tick-active.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/tick-active.png
index 16fa8ca71b..16fa8ca71b 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/tick-active.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/tick-active.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/tick.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/tick.png
index 783b60fe9a..783b60fe9a 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/tick.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/tick.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/toggle-off.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/toggle-off.png
index 474ad3cd63..474ad3cd63 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/toggle-off.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/toggle-off.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/toggle-on-border.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/toggle-on-border.png
index 7680cd7d0a..7680cd7d0a 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/toggle-on-border.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/toggle-on-border.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/toggle-on.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/toggle-on.png
index 275aa42114..275aa42114 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/toggle-on.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/toggle-on.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/images/write.png b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/write.png
index b7329dbf9f..b7329dbf9f 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/images/write.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/images/write.png
diff --git a/tools/src/java/bin/qpid-web/web/itablet/scripts/LICENCE b/qpid/tools/src/java/bin/qpid-web/web/itablet/scripts/LICENCE
index 7d95218a1e..7d95218a1e 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/scripts/LICENCE
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/scripts/LICENCE
diff --git a/tools/src/java/bin/qpid-web/web/itablet/scripts/iscroll.js b/qpid/tools/src/java/bin/qpid-web/web/itablet/scripts/iscroll.js
index 46330e51f7..46330e51f7 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/scripts/iscroll.js
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/scripts/iscroll.js
diff --git a/tools/src/java/bin/qpid-web/web/itablet/scripts/itablet.js b/qpid/tools/src/java/bin/qpid-web/web/itablet/scripts/itablet.js
index c6f84bcf53..c6f84bcf53 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/scripts/itablet.js
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/scripts/itablet.js
diff --git a/tools/src/java/bin/qpid-web/web/itablet/scripts/jquery.js b/qpid/tools/src/java/bin/qpid-web/web/itablet/scripts/jquery.js
index 198b3ff07d..198b3ff07d 100644
--- a/tools/src/java/bin/qpid-web/web/itablet/scripts/jquery.js
+++ b/qpid/tools/src/java/bin/qpid-web/web/itablet/scripts/jquery.js
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/css/index.css b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/css/index.css
index 0032bedca1..0032bedca1 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/css/index.css
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/css/index.css
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/css/qmf.css b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/css/qmf.css
index 11ca7fad12..11ca7fad12 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/css/qmf.css
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/css/qmf.css
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/images/brokers.png b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/brokers.png
index 72efa7ab11..72efa7ab11 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/images/brokers.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/brokers.png
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/images/connections.png b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/connections.png
index 2e1d422d0a..2e1d422d0a 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/images/connections.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/connections.png
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/images/events.png b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/events.png
index 1e5a7ee5ca..1e5a7ee5ca 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/images/events.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/events.png
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/images/exchanges.png b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/exchanges.png
index 5f15dbbfdc..5f15dbbfdc 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/images/exchanges.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/exchanges.png
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/images/gradient.png b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/gradient.png
index 260a05701f..260a05701f 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/images/gradient.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/gradient.png
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/images/links.png b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/links.png
index d8ad7af518..d8ad7af518 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/images/links.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/links.png
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/images/loading.gif b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/loading.gif
index 3288d1035d..3288d1035d 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/images/loading.gif
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/loading.gif
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/images/qpid-logo.png b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/qpid-logo.png
index d548b68245..d548b68245 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/images/qpid-logo.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/qpid-logo.png
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/images/queues.png b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/queues.png
index 4f72abfe50..4f72abfe50 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/images/queues.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/queues.png
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/images/route-topology.png b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/route-topology.png
index c1b36d4077..c1b36d4077 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/images/route-topology.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/route-topology.png
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/images/settings.png b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/settings.png
index 6994d4a0d4..6994d4a0d4 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/images/settings.png
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/images/settings.png
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/LICENCE b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/LICENCE
index e90b016701..e90b016701 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/LICENCE
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/LICENCE
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/excanvas.js b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/excanvas.js
index a6d9ddf5fa..a6d9ddf5fa 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/excanvas.js
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/excanvas.js
diff --git a/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
index b59099a797..b59099a797 100644
--- a/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
diff --git a/tools/src/java/bin/qpid-web/web/qpid/scripts/LICENCE b/qpid/tools/src/java/bin/qpid-web/web/qpid/scripts/LICENCE
index e62925ae88..e62925ae88 100644
--- a/tools/src/java/bin/qpid-web/web/qpid/scripts/LICENCE
+++ b/qpid/tools/src/java/bin/qpid-web/web/qpid/scripts/LICENCE
diff --git a/tools/src/java/bin/qpid-web/web/qpid/scripts/qpid.js b/qpid/tools/src/java/bin/qpid-web/web/qpid/scripts/qpid.js
index f1ad4711f2..f1ad4711f2 100644
--- a/tools/src/java/bin/qpid-web/web/qpid/scripts/qpid.js
+++ b/qpid/tools/src/java/bin/qpid-web/web/qpid/scripts/qpid.js
diff --git a/tools/src/java/bin/qpid-web/web/ui/config.js b/qpid/tools/src/java/bin/qpid-web/web/ui/config.js
index a37de988ca..a37de988ca 100644
--- a/tools/src/java/bin/qpid-web/web/ui/config.js
+++ b/qpid/tools/src/java/bin/qpid-web/web/ui/config.js
diff --git a/tools/src/java/bin/qpid-web/web/ui/qmf.html b/qpid/tools/src/java/bin/qpid-web/web/ui/qmf.html
index 4737294c70..4737294c70 100644
--- a/tools/src/java/bin/qpid-web/web/ui/qmf.html
+++ b/qpid/tools/src/java/bin/qpid-web/web/ui/qmf.html
diff --git a/tools/src/java/bin/whitelist.xml b/qpid/tools/src/java/bin/whitelist.xml
index 5c39c50d43..5c39c50d43 100644
--- a/tools/src/java/bin/whitelist.xml
+++ b/qpid/tools/src/java/bin/whitelist.xml
diff --git a/tools/src/java/build.xml b/qpid/tools/src/java/build.xml
index d1970604c1..d1970604c1 100644
--- a/tools/src/java/build.xml
+++ b/qpid/tools/src/java/build.xml
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/Agent.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/Agent.java
index ef94a306c3..ef94a306c3 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/Agent.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/Agent.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/AgentExternal.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/AgentExternal.java
index 2fff3fd41f..2fff3fd41f 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/AgentExternal.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/AgentExternal.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/MethodCallParams.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/MethodCallParams.java
index 1f69709225..1f69709225 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/MethodCallParams.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/MethodCallParams.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/MethodCallWorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/MethodCallWorkItem.java
index b83262d550..b83262d550 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/MethodCallWorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/MethodCallWorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/QmfAgentData.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/QmfAgentData.java
index 560ed9e975..560ed9e975 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/QmfAgentData.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/QmfAgentData.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/QueryWorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/QueryWorkItem.java
index c714720bc5..c714720bc5 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/QueryWorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/QueryWorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeParams.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeParams.java
index 475b378b75..475b378b75 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeParams.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeParams.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeRequestWorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeRequestWorkItem.java
index 298e499c1c..298e499c1c 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeRequestWorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeRequestWorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/SubscribableAgent.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/SubscribableAgent.java
index df9c92abca..df9c92abca 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/SubscribableAgent.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/SubscribableAgent.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/SubscribeRequestWorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/SubscribeRequestWorkItem.java
index a28faa8812..a28faa8812 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/SubscribeRequestWorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/SubscribeRequestWorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/Subscription.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/Subscription.java
index e6800a9a41..e6800a9a41 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/Subscription.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/Subscription.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/SubscriptionParams.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/SubscriptionParams.java
index 1cc2a9a5d1..1cc2a9a5d1 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/SubscriptionParams.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/SubscriptionParams.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/UnsubscribeRequestWorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/UnsubscribeRequestWorkItem.java
index fc8d973356..fc8d973356 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/UnsubscribeRequestWorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/UnsubscribeRequestWorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfData.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfData.png
index 2665803e39..2665803e39 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfData.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfData.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfEventListenerModel.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfEventListenerModel.png
index 26a5f71b56..26a5f71b56 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfEventListenerModel.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfEventListenerModel.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfQuery.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfQuery.png
index 9e471a08c0..9e471a08c0 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfQuery.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfQuery.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Schema.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Schema.png
index b0277f4fc5..b0277f4fc5 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Schema.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Schema.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Subscriptions.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Subscriptions.png
index d43370e4ef..d43370e4ef 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Subscriptions.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Subscriptions.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/WorkQueueEventModel.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/WorkQueueEventModel.png
index fc2a722985..fc2a722985 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/WorkQueueEventModel.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/doc-files/WorkQueueEventModel.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/AMQPMessage.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/AMQPMessage.java
index 94b539c0b3..94b539c0b3 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/AMQPMessage.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/AMQPMessage.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BlockingNotifier.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BlockingNotifier.java
index 634a5e60b0..634a5e60b0 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BlockingNotifier.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BlockingNotifier.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanEquals.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanEquals.java
index 2ab3e5c099..2ab3e5c099 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanEquals.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanEquals.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanExists.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanExists.java
index a9c355c7fb..a9c355c7fb 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanExists.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanExists.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanExpression.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanExpression.java
index 999dd6d222..999dd6d222 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanExpression.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanExpression.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanFalse.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanFalse.java
index 00080dfb10..00080dfb10 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanFalse.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanFalse.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterEqual.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterEqual.java
index c9593ffa33..c9593ffa33 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterEqual.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterEqual.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterThan.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterThan.java
index 65b7d82735..65b7d82735 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterThan.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterThan.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanLessEqual.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanLessEqual.java
index 729495ffc2..729495ffc2 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanLessEqual.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanLessEqual.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanLessThan.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanLessThan.java
index 540a292c4e..540a292c4e 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanLessThan.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanLessThan.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanNotEquals.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanNotEquals.java
index 50c5863e61..50c5863e61 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanNotEquals.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanNotEquals.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanRegexMatch.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanRegexMatch.java
index 9fe3f9733a..9fe3f9733a 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanRegexMatch.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanRegexMatch.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanTrue.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanTrue.java
index b092e7daaf..b092e7daaf 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanTrue.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/BooleanTrue.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/Expression.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/Expression.java
index 1d82b7857b..1d82b7857b 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/Expression.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/Expression.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/Handle.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/Handle.java
index 7f81b06900..7f81b06900 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/Handle.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/Handle.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalAnd.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalAnd.java
index 12b9f3d093..12b9f3d093 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalAnd.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalAnd.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalExpression.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalExpression.java
index 23a5ac3abd..23a5ac3abd 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalExpression.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalExpression.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalNot.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalNot.java
index 029ea00af9..029ea00af9 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalNot.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalNot.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalOr.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalOr.java
index 72c8c1ff15..72c8c1ff15 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalOr.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/LogicalOr.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/Notifier.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/Notifier.java
index 61b048832f..61b048832f 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/Notifier.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/Notifier.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/NotifierWrapper.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/NotifierWrapper.java
index 42bb9cc9d7..42bb9cc9d7 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/NotifierWrapper.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/NotifierWrapper.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/NullQmfEventListener.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/NullQmfEventListener.java
index 447adbe391..447adbe391 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/NullQmfEventListener.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/NullQmfEventListener.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/ObjectId.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/ObjectId.java
index b84822def7..b84822def7 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/ObjectId.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/ObjectId.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfCallback.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfCallback.java
index d57282b2e7..d57282b2e7 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfCallback.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfCallback.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfData.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfData.java
index 571db16064..571db16064 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfData.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfData.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfDescribed.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfDescribed.java
index c81f674d1f..c81f674d1f 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfDescribed.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfDescribed.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfEvent.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfEvent.java
index 06c19ca0ab..06c19ca0ab 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfEvent.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfEvent.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfEventListener.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfEventListener.java
index 2e5b98852b..2e5b98852b 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfEventListener.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfEventListener.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfException.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfException.java
index aa397e6116..aa397e6116 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfException.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfException.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfManaged.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfManaged.java
index 44dbcef9bf..44dbcef9bf 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfManaged.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfManaged.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfQuery.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfQuery.java
index 2ec69c9607..2ec69c9607 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfQuery.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfQuery.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfQueryTarget.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfQueryTarget.java
index 01aba88bfc..01aba88bfc 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfQueryTarget.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfQueryTarget.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfType.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfType.java
index a19ebcf393..a19ebcf393 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfType.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfType.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaClass.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaClass.java
index b15a1a5c96..b15a1a5c96 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaClass.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaClass.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaClassId.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaClassId.java
index 5ad4ba8249..5ad4ba8249 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaClassId.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaClassId.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaEventClass.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaEventClass.java
index 229f988dc7..229f988dc7 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaEventClass.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaEventClass.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaMethod.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaMethod.java
index d4568dcb6e..d4568dcb6e 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaMethod.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaMethod.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaObjectClass.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaObjectClass.java
index 54812fab71..54812fab71 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaObjectClass.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaObjectClass.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaProperty.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaProperty.java
index 2aca9ef1d3..2aca9ef1d3 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaProperty.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaProperty.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/WorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/WorkItem.java
index 750c4a2e45..750c4a2e45 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/WorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/WorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/WorkQueue.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/WorkQueue.java
index 75b4e5d855..75b4e5d855 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/WorkQueue.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/WorkQueue.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/Console.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/Console.png
index cb2a5ee800..cb2a5ee800 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/Console.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/Console.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfData.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfData.png
index 2665803e39..2665803e39 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfData.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfData.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfEventListenerModel.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfEventListenerModel.png
index 26a5f71b56..26a5f71b56 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfEventListenerModel.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfEventListenerModel.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfQuery.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfQuery.png
index 9e471a08c0..9e471a08c0 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfQuery.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfQuery.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/Schema.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/Schema.png
index b0277f4fc5..b0277f4fc5 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/Schema.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/Schema.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/Subscriptions.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/Subscriptions.png
index 977e222129..977e222129 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/Subscriptions.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/Subscriptions.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkItem.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkItem.png
index 14c8c56d28..14c8c56d28 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkItem.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkItem.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkQueueEventModel.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkQueueEventModel.png
index fc2a722985..fc2a722985 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkQueueEventModel.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkQueueEventModel.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/Agent.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/Agent.java
index 8fa2ae8f1f..8fa2ae8f1f 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/Agent.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/Agent.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentAccessWorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentAccessWorkItem.java
index ff5668fe2e..ff5668fe2e 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentAccessWorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentAccessWorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentAddedWorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentAddedWorkItem.java
index 0470b34e58..0470b34e58 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentAddedWorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentAddedWorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentDeletedWorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentDeletedWorkItem.java
index ef31b8105a..ef31b8105a 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentDeletedWorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentDeletedWorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentHeartbeatWorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentHeartbeatWorkItem.java
index bec432d8c2..bec432d8c2 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentHeartbeatWorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentHeartbeatWorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentProxy.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentProxy.java
index e43a242f51..e43a242f51 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentProxy.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentProxy.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentRestartedWorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentRestartedWorkItem.java
index 45bf67f034..45bf67f034 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentRestartedWorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentRestartedWorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/Console.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/Console.java
index d15e4ad58d..d15e4ad58d 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/Console.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/Console.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/EventReceivedWorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/EventReceivedWorkItem.java
index d392871cb6..d392871cb6 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/EventReceivedWorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/EventReceivedWorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/MethodResponseWorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/MethodResponseWorkItem.java
index 936af286c2..936af286c2 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/MethodResponseWorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/MethodResponseWorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/MethodResult.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/MethodResult.java
index 9f8df918fa..9f8df918fa 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/MethodResult.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/MethodResult.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/ObjectUpdateWorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/ObjectUpdateWorkItem.java
index 6b2bfc799e..6b2bfc799e 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/ObjectUpdateWorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/ObjectUpdateWorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/QmfConsoleData.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/QmfConsoleData.java
index 10d764d3d0..10d764d3d0 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/QmfConsoleData.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/QmfConsoleData.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscribeIndication.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscribeIndication.java
index 8277e3c0e1..8277e3c0e1 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscribeIndication.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscribeIndication.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscribeParams.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscribeParams.java
index 2e15a3153b..2e15a3153b 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscribeParams.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscribeParams.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscribeResponseWorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscribeResponseWorkItem.java
index 2f84dfcfdd..2f84dfcfdd 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscribeResponseWorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscribeResponseWorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscriptionIndicationWorkItem.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscriptionIndicationWorkItem.java
index 6d1e77595a..6d1e77595a 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscriptionIndicationWorkItem.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscriptionIndicationWorkItem.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscriptionManager.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscriptionManager.java
index 6e3e9e91b5..6e3e9e91b5 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscriptionManager.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscriptionManager.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/Console.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/Console.png
index cb2a5ee800..cb2a5ee800 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/Console.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/Console.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/QmfEventListenerModel.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/QmfEventListenerModel.png
index 26a5f71b56..26a5f71b56 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/QmfEventListenerModel.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/QmfEventListenerModel.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/Subscriptions.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/Subscriptions.png
index 01772c6d45..01772c6d45 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/Subscriptions.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/Subscriptions.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/WorkQueueEventModel.png b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/WorkQueueEventModel.png
index fc2a722985..fc2a722985 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/WorkQueueEventModel.png
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/doc-files/WorkQueueEventModel.png
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java
index 9912b2c228..9912b2c228 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java
index 6097c4a752..6097c4a752 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
index 8c9d41e199..8c9d41e199 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java
index 0e945a7ed1..0e945a7ed1 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java
index 52c8dcec27..52c8dcec27 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java
index 1d6f1d1bf5..1d6f1d1bf5 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java
index f60dbbf4f3..f60dbbf4f3 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/ConnectionHelper.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/ConnectionHelper.java
index c0df65ef1c..c0df65ef1c 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/ConnectionHelper.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/ConnectionHelper.java
diff --git a/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java
index a4436b0105..a4436b0105 100644
--- a/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java
diff --git a/tools/src/java/src/patch/java/AMQMessageDelegate_0_10.java b/qpid/tools/src/java/src/patch/java/AMQMessageDelegate_0_10.java
index 9f5217d5db..9f5217d5db 100644
--- a/tools/src/java/src/patch/java/AMQMessageDelegate_0_10.java
+++ b/qpid/tools/src/java/src/patch/java/AMQMessageDelegate_0_10.java
diff --git a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java
index 48c59ba476..48c59ba476 100644
--- a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java
+++ b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java
diff --git a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementFactory.java b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementFactory.java
index ec4ed37556..ec4ed37556 100644
--- a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementFactory.java
+++ b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementFactory.java
diff --git a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementPlugin.java b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementPlugin.java
index 5a923c19a2..5a923c19a2 100644
--- a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementPlugin.java
+++ b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementPlugin.java
diff --git a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Binding.java b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Binding.java
index 23d5ce5663..23d5ce5663 100644
--- a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Binding.java
+++ b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Binding.java
diff --git a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Broker.java b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Broker.java
index fda1b7ad84..fda1b7ad84 100644
--- a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Broker.java
+++ b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Broker.java
diff --git a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Connection.java b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Connection.java
index a2b03c7c20..a2b03c7c20 100644
--- a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Connection.java
+++ b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Connection.java
diff --git a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java
index 1f46daf99b..1f46daf99b 100644
--- a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java
+++ b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java
diff --git a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Queue.java b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Queue.java
index 5cbe873769..5cbe873769 100644
--- a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Queue.java
+++ b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Queue.java
diff --git a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Session.java b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Session.java
index cea6619bad..cea6619bad 100644
--- a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Session.java
+++ b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Session.java
diff --git a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Subscription.java b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Subscription.java
index 028059f64b..028059f64b 100644
--- a/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Subscription.java
+++ b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Subscription.java
diff --git a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/ConnectionProxy.java b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/ConnectionProxy.java
index 435372a0d6..435372a0d6 100644
--- a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/ConnectionProxy.java
+++ b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/ConnectionProxy.java
diff --git a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/ConnectionStore.java b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/ConnectionStore.java
index 79b85c9c42..79b85c9c42 100644
--- a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/ConnectionStore.java
+++ b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/ConnectionStore.java
diff --git a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/FileServer.java b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/FileServer.java
index 2cbb1140b1..2cbb1140b1 100644
--- a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/FileServer.java
+++ b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/FileServer.java
diff --git a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/HttpTransaction.java b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/HttpTransaction.java
index 323ba29861..323ba29861 100644
--- a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/HttpTransaction.java
+++ b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/HttpTransaction.java
diff --git a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/JSON.java b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/JSON.java
index dfc1e0c85d..dfc1e0c85d 100644
--- a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/JSON.java
+++ b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/JSON.java
diff --git a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/JSONMapParser.java b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/JSONMapParser.java
index 9a6354e099..9a6354e099 100644
--- a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/JSONMapParser.java
+++ b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/JSONMapParser.java
diff --git a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/QpidRestAPI.java b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/QpidRestAPI.java
index b796c12e98..b796c12e98 100644
--- a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/QpidRestAPI.java
+++ b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/QpidRestAPI.java
diff --git a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/QpidServer.java b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/QpidServer.java
index f1bdcf85bc..f1bdcf85bc 100644
--- a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/QpidServer.java
+++ b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/QpidServer.java
diff --git a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/Server.java b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/Server.java
index e7f5d61219..e7f5d61219 100644
--- a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/Server.java
+++ b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/Server.java
diff --git a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/httpserver/Authenticator.java b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/httpserver/Authenticator.java
index 1083cb48df..1083cb48df 100644
--- a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/httpserver/Authenticator.java
+++ b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/httpserver/Authenticator.java
diff --git a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/httpserver/Delegator.java b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/httpserver/Delegator.java
index 9dfd1fea0c..9dfd1fea0c 100644
--- a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/httpserver/Delegator.java
+++ b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/httpserver/Delegator.java
diff --git a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/httpserver/HttpExchangeTransaction.java b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/httpserver/HttpExchangeTransaction.java
index 78932ec399..78932ec399 100644
--- a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/httpserver/HttpExchangeTransaction.java
+++ b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/httpserver/HttpExchangeTransaction.java
diff --git a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/servlet/TODO b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/servlet/TODO
index 9da5ee871a..9da5ee871a 100644
--- a/tools/src/java/src/restapi/java/org/apache/qpid/restapi/servlet/TODO
+++ b/qpid/tools/src/java/src/restapi/java/org/apache/qpid/restapi/servlet/TODO
diff --git a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentExternalTest.java b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentExternalTest.java
index 3094ba406f..3094ba406f 100644
--- a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentExternalTest.java
+++ b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentExternalTest.java
diff --git a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentSubscriptionTestConsole.java b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentSubscriptionTestConsole.java
index 3bc84e1ee9..3bc84e1ee9 100644
--- a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentSubscriptionTestConsole.java
+++ b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentSubscriptionTestConsole.java
diff --git a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentTest.java b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentTest.java
index 8aebe76937..8aebe76937 100644
--- a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentTest.java
+++ b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentTest.java
diff --git a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentTestConsole.java b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentTestConsole.java
index edae41bcf4..edae41bcf4 100644
--- a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentTestConsole.java
+++ b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/AgentTestConsole.java
diff --git a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/BigPayloadAgentTest.java b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/BigPayloadAgentTest.java
index a6613464b5..a6613464b5 100644
--- a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/BigPayloadAgentTest.java
+++ b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/BigPayloadAgentTest.java
diff --git a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/BigPayloadAgentTestConsole.java b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/BigPayloadAgentTestConsole.java
index 4457dea5e5..4457dea5e5 100644
--- a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/BigPayloadAgentTestConsole.java
+++ b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/BigPayloadAgentTestConsole.java
diff --git a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/BrokerSubscriptionTestConsole.java b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/BrokerSubscriptionTestConsole.java
index 27eadbaac8..27eadbaac8 100644
--- a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/BrokerSubscriptionTestConsole.java
+++ b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/BrokerSubscriptionTestConsole.java
diff --git a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/InvokeMethodTest.java b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/InvokeMethodTest.java
index 8b175e3ca6..8b175e3ca6 100644
--- a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/InvokeMethodTest.java
+++ b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/InvokeMethodTest.java
diff --git a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/PartialGetObjectsTest.java b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/PartialGetObjectsTest.java
index e42879947b..e42879947b 100644
--- a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/PartialGetObjectsTest.java
+++ b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/PartialGetObjectsTest.java
diff --git a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/SchemaTest.java b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/SchemaTest.java
index f510bb201c..f510bb201c 100644
--- a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/SchemaTest.java
+++ b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/SchemaTest.java
diff --git a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test1.java b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test1.java
index f71f4cdf32..f71f4cdf32 100644
--- a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test1.java
+++ b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test1.java
diff --git a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test2.java b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test2.java
index 11924f824d..11924f824d 100644
--- a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test2.java
+++ b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test2.java
diff --git a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test3.java b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test3.java
index fdb9180d36..fdb9180d36 100644
--- a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test3.java
+++ b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test3.java
diff --git a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test4.java b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test4.java
index 29a8ba8f88..29a8ba8f88 100644
--- a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test4.java
+++ b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/Test4.java
diff --git a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/URLTest.java b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/URLTest.java
index 35bd9f537b..35bd9f537b 100644
--- a/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/URLTest.java
+++ b/qpid/tools/src/java/src/test/java/org/apache/qpid/qmf2/test/URLTest.java
diff --git a/tools/src/java/test/bin/AgentExternalTest.sh b/qpid/tools/src/java/test/bin/AgentExternalTest.sh
index de7778c9fe..de7778c9fe 100755
--- a/tools/src/java/test/bin/AgentExternalTest.sh
+++ b/qpid/tools/src/java/test/bin/AgentExternalTest.sh
diff --git a/tools/src/java/test/bin/AgentSubscriptionTestConsole.sh b/qpid/tools/src/java/test/bin/AgentSubscriptionTestConsole.sh
index e86860bfea..e86860bfea 100755
--- a/tools/src/java/test/bin/AgentSubscriptionTestConsole.sh
+++ b/qpid/tools/src/java/test/bin/AgentSubscriptionTestConsole.sh
diff --git a/tools/src/java/test/bin/AgentTest.sh b/qpid/tools/src/java/test/bin/AgentTest.sh
index 9a0038e073..9a0038e073 100755
--- a/tools/src/java/test/bin/AgentTest.sh
+++ b/qpid/tools/src/java/test/bin/AgentTest.sh
diff --git a/tools/src/java/test/bin/AgentTestConsole.sh b/qpid/tools/src/java/test/bin/AgentTestConsole.sh
index d5e958e385..d5e958e385 100755
--- a/tools/src/java/test/bin/AgentTestConsole.sh
+++ b/qpid/tools/src/java/test/bin/AgentTestConsole.sh
diff --git a/tools/src/java/test/bin/BigPayloadAgentTest.sh b/qpid/tools/src/java/test/bin/BigPayloadAgentTest.sh
index e97d99c37a..e97d99c37a 100755
--- a/tools/src/java/test/bin/BigPayloadAgentTest.sh
+++ b/qpid/tools/src/java/test/bin/BigPayloadAgentTest.sh
diff --git a/tools/src/java/test/bin/BigPayloadAgentTestConsole.sh b/qpid/tools/src/java/test/bin/BigPayloadAgentTestConsole.sh
index 92ad26966f..92ad26966f 100755
--- a/tools/src/java/test/bin/BigPayloadAgentTestConsole.sh
+++ b/qpid/tools/src/java/test/bin/BigPayloadAgentTestConsole.sh
diff --git a/tools/src/java/test/bin/BrokerSubscriptionTestConsole.sh b/qpid/tools/src/java/test/bin/BrokerSubscriptionTestConsole.sh
index 9db81c1ccd..9db81c1ccd 100755
--- a/tools/src/java/test/bin/BrokerSubscriptionTestConsole.sh
+++ b/qpid/tools/src/java/test/bin/BrokerSubscriptionTestConsole.sh
diff --git a/tools/src/java/test/bin/InvokeMethodTest.sh b/qpid/tools/src/java/test/bin/InvokeMethodTest.sh
index 520cf8361d..520cf8361d 100755
--- a/tools/src/java/test/bin/InvokeMethodTest.sh
+++ b/qpid/tools/src/java/test/bin/InvokeMethodTest.sh
diff --git a/tools/src/java/test/bin/PartialGetObjectsTest.sh b/qpid/tools/src/java/test/bin/PartialGetObjectsTest.sh
index 6a5b4c9ef8..6a5b4c9ef8 100755
--- a/tools/src/java/test/bin/PartialGetObjectsTest.sh
+++ b/qpid/tools/src/java/test/bin/PartialGetObjectsTest.sh
diff --git a/tools/src/java/test/bin/SchemaTest.sh b/qpid/tools/src/java/test/bin/SchemaTest.sh
index 2ce33a08ca..2ce33a08ca 100755
--- a/tools/src/java/test/bin/SchemaTest.sh
+++ b/qpid/tools/src/java/test/bin/SchemaTest.sh
diff --git a/tools/src/java/test/bin/Test1.sh b/qpid/tools/src/java/test/bin/Test1.sh
index 13bf0ae880..13bf0ae880 100755
--- a/tools/src/java/test/bin/Test1.sh
+++ b/qpid/tools/src/java/test/bin/Test1.sh
diff --git a/tools/src/java/test/bin/Test2.sh b/qpid/tools/src/java/test/bin/Test2.sh
index 877655b3d4..877655b3d4 100755
--- a/tools/src/java/test/bin/Test2.sh
+++ b/qpid/tools/src/java/test/bin/Test2.sh
diff --git a/tools/src/java/test/bin/Test3.sh b/qpid/tools/src/java/test/bin/Test3.sh
index 5e0e88ecc6..5e0e88ecc6 100755
--- a/tools/src/java/test/bin/Test3.sh
+++ b/qpid/tools/src/java/test/bin/Test3.sh
diff --git a/tools/src/java/test/bin/Test4.sh b/qpid/tools/src/java/test/bin/Test4.sh
index ff694e24fa..ff694e24fa 100755
--- a/tools/src/java/test/bin/Test4.sh
+++ b/qpid/tools/src/java/test/bin/Test4.sh
diff --git a/tools/src/java/test/bin/URLTest.sh b/qpid/tools/src/java/test/bin/URLTest.sh
index aac91eea53..aac91eea53 100755
--- a/tools/src/java/test/bin/URLTest.sh
+++ b/qpid/tools/src/java/test/bin/URLTest.sh
diff --git a/tools/src/java/test/bin/log4j.xml b/qpid/tools/src/java/test/bin/log4j.xml
index d5169932bc..d5169932bc 100644
--- a/tools/src/java/test/bin/log4j.xml
+++ b/qpid/tools/src/java/test/bin/log4j.xml
diff --git a/tools/src/py/.gitignore b/qpid/tools/src/py/.gitignore
index 628d81888c..628d81888c 100644
--- a/tools/src/py/.gitignore
+++ b/qpid/tools/src/py/.gitignore
diff --git a/tools/src/py/README.txt b/qpid/tools/src/py/README.txt
index cabeb1be02..cabeb1be02 100644
--- a/tools/src/py/README.txt
+++ b/qpid/tools/src/py/README.txt
diff --git a/tools/src/py/qmf-tool b/qpid/tools/src/py/qmf-tool
index 407ae74b10..407ae74b10 100755
--- a/tools/src/py/qmf-tool
+++ b/qpid/tools/src/py/qmf-tool
diff --git a/tools/src/py/qpid-config b/qpid/tools/src/py/qpid-config
index f3603ef742..f3603ef742 100755
--- a/tools/src/py/qpid-config
+++ b/qpid/tools/src/py/qpid-config
diff --git a/tools/src/py/qpid-ha b/qpid/tools/src/py/qpid-ha
index cf054409d8..cf054409d8 100755
--- a/tools/src/py/qpid-ha
+++ b/qpid/tools/src/py/qpid-ha
diff --git a/tools/src/py/qpid-printevents b/qpid/tools/src/py/qpid-printevents
index 1d123fd345..1d123fd345 100755
--- a/tools/src/py/qpid-printevents
+++ b/qpid/tools/src/py/qpid-printevents
diff --git a/tools/src/py/qpid-queue-stats b/qpid/tools/src/py/qpid-queue-stats
index 9d7d8d9bbf..9d7d8d9bbf 100755
--- a/tools/src/py/qpid-queue-stats
+++ b/qpid/tools/src/py/qpid-queue-stats
diff --git a/tools/src/py/qpid-receive b/qpid/tools/src/py/qpid-receive
index f14df277ac..f14df277ac 100755
--- a/tools/src/py/qpid-receive
+++ b/qpid/tools/src/py/qpid-receive
diff --git a/tools/src/py/qpid-route b/qpid/tools/src/py/qpid-route
index 21e5461664..21e5461664 100755
--- a/tools/src/py/qpid-route
+++ b/qpid/tools/src/py/qpid-route
diff --git a/tools/src/py/qpid-send b/qpid/tools/src/py/qpid-send
index b0105e41a6..b0105e41a6 100755
--- a/tools/src/py/qpid-send
+++ b/qpid/tools/src/py/qpid-send
diff --git a/tools/src/py/qpid-stat b/qpid/tools/src/py/qpid-stat
index d3c2820743..d3c2820743 100755
--- a/tools/src/py/qpid-stat
+++ b/qpid/tools/src/py/qpid-stat
diff --git a/tools/src/py/qpid-store-chk b/qpid/tools/src/py/qpid-store-chk
index f6d70cb3c6..f6d70cb3c6 100755
--- a/tools/src/py/qpid-store-chk
+++ b/qpid/tools/src/py/qpid-store-chk
diff --git a/tools/src/py/qpid-store-resize b/qpid/tools/src/py/qpid-store-resize
index 38d8eaf1ad..38d8eaf1ad 100755
--- a/tools/src/py/qpid-store-resize
+++ b/qpid/tools/src/py/qpid-store-resize
diff --git a/tools/src/py/qpid-tool b/qpid/tools/src/py/qpid-tool
index 8ceaafeef8..8ceaafeef8 100755
--- a/tools/src/py/qpid-tool
+++ b/qpid/tools/src/py/qpid-tool
diff --git a/tools/src/py/qpidstore/__init__.py b/qpid/tools/src/py/qpidstore/__init__.py
index d8a500d9d8..d8a500d9d8 100644
--- a/tools/src/py/qpidstore/__init__.py
+++ b/qpid/tools/src/py/qpidstore/__init__.py
diff --git a/tools/src/py/qpidstore/janal.py b/qpid/tools/src/py/qpidstore/janal.py
index 1f89207b4d..1f89207b4d 100644
--- a/tools/src/py/qpidstore/janal.py
+++ b/qpid/tools/src/py/qpidstore/janal.py
diff --git a/tools/src/py/qpidstore/jerr.py b/qpid/tools/src/py/qpidstore/jerr.py
index 448f881ce3..448f881ce3 100644
--- a/tools/src/py/qpidstore/jerr.py
+++ b/qpid/tools/src/py/qpidstore/jerr.py
diff --git a/tools/src/py/qpidstore/jrnl.py b/qpid/tools/src/py/qpidstore/jrnl.py
index 7c4d6de4a9..7c4d6de4a9 100644
--- a/tools/src/py/qpidstore/jrnl.py
+++ b/qpid/tools/src/py/qpidstore/jrnl.py
diff --git a/tools/src/py/qpidtoollibs/__init__.py b/qpid/tools/src/py/qpidtoollibs/__init__.py
index 2815bac22f..2815bac22f 100644
--- a/tools/src/py/qpidtoollibs/__init__.py
+++ b/qpid/tools/src/py/qpidtoollibs/__init__.py
diff --git a/tools/src/py/qpidtoollibs/broker.py b/qpid/tools/src/py/qpidtoollibs/broker.py
index e7be98c486..e7be98c486 100644
--- a/tools/src/py/qpidtoollibs/broker.py
+++ b/qpid/tools/src/py/qpidtoollibs/broker.py
diff --git a/tools/src/py/qpidtoollibs/disp.py b/qpid/tools/src/py/qpidtoollibs/disp.py
index 21e09f8d00..21e09f8d00 100644
--- a/tools/src/py/qpidtoollibs/disp.py
+++ b/qpid/tools/src/py/qpidtoollibs/disp.py
diff --git a/tools/src/ruby/qpid_management/.gitignore b/qpid/tools/src/ruby/qpid_management/.gitignore
index 6a65a36504..6a65a36504 100644
--- a/tools/src/ruby/qpid_management/.gitignore
+++ b/qpid/tools/src/ruby/qpid_management/.gitignore
diff --git a/tools/src/ruby/qpid_management/.rspec b/qpid/tools/src/ruby/qpid_management/.rspec
index 4e1e0d2f72..4e1e0d2f72 100644
--- a/tools/src/ruby/qpid_management/.rspec
+++ b/qpid/tools/src/ruby/qpid_management/.rspec
diff --git a/tools/src/ruby/qpid_management/Gemfile b/qpid/tools/src/ruby/qpid_management/Gemfile
index 1bd80c10c1..1bd80c10c1 100644
--- a/tools/src/ruby/qpid_management/Gemfile
+++ b/qpid/tools/src/ruby/qpid_management/Gemfile
diff --git a/tools/src/ruby/qpid_management/Gemfile.lock b/qpid/tools/src/ruby/qpid_management/Gemfile.lock
index bf35564e90..bf35564e90 100644
--- a/tools/src/ruby/qpid_management/Gemfile.lock
+++ b/qpid/tools/src/ruby/qpid_management/Gemfile.lock
diff --git a/tools/src/ruby/qpid_management/Rakefile b/qpid/tools/src/ruby/qpid_management/Rakefile
index 7f295eda5c..7f295eda5c 100644
--- a/tools/src/ruby/qpid_management/Rakefile
+++ b/qpid/tools/src/ruby/qpid_management/Rakefile
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management.rb
index 0529710693..0529710693 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/acl.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/acl.rb
index 589b11fa59..589b11fa59 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/acl.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/acl.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/binding.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/binding.rb
index cc46d84eeb..cc46d84eeb 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/binding.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/binding.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/bridge.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/bridge.rb
index cece0ba2ed..cece0ba2ed 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/bridge.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/bridge.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/broker.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/broker.rb
index 31171bdf35..31171bdf35 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/broker.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/broker.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/broker_agent.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/broker_agent.rb
index 800dcf26dc..800dcf26dc 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/broker_agent.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/broker_agent.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/broker_object.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/broker_object.rb
index fbbe5ff6e2..fbbe5ff6e2 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/broker_object.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/broker_object.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/cluster.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/cluster.rb
index 4fa7f146a7..4fa7f146a7 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/cluster.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/cluster.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/connection.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/connection.rb
index 153ccee684..153ccee684 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/connection.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/connection.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/errors.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/errors.rb
index b922cda680..b922cda680 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/errors.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/errors.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/exchange.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/exchange.rb
index 5a3223aba6..5a3223aba6 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/exchange.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/exchange.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/ha_broker.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/ha_broker.rb
index 1ac9ea7a17..1ac9ea7a17 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/ha_broker.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/ha_broker.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/link.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/link.rb
index 455b26a440..455b26a440 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/link.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/link.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/memory.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/memory.rb
index 39dd803c9a..39dd803c9a 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/memory.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/memory.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/queue.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/queue.rb
index c4fae3a53e..c4fae3a53e 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/queue.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/queue.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/session.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/session.rb
index b4fcc7da59..b4fcc7da59 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/session.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/session.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/subscription.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/subscription.rb
index fcff2831c0..fcff2831c0 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/subscription.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/subscription.rb
diff --git a/tools/src/ruby/qpid_management/qpid_management.gemspec b/qpid/tools/src/ruby/qpid_management/qpid_management.gemspec
index a6cc1b828e..a6cc1b828e 100644
--- a/tools/src/ruby/qpid_management/qpid_management.gemspec
+++ b/qpid/tools/src/ruby/qpid_management/qpid_management.gemspec
diff --git a/tools/src/ruby/qpid_management/spec/broker_agent_spec.rb b/qpid/tools/src/ruby/qpid_management/spec/broker_agent_spec.rb
index 7ffbf842e2..7ffbf842e2 100644
--- a/tools/src/ruby/qpid_management/spec/broker_agent_spec.rb
+++ b/qpid/tools/src/ruby/qpid_management/spec/broker_agent_spec.rb
diff --git a/tools/src/ruby/qpid_management/spec/broker_spec.rb b/qpid/tools/src/ruby/qpid_management/spec/broker_spec.rb
index 6d6e1106a4..6d6e1106a4 100644
--- a/tools/src/ruby/qpid_management/spec/broker_spec.rb
+++ b/qpid/tools/src/ruby/qpid_management/spec/broker_spec.rb
diff --git a/tools/src/ruby/qpid_management/spec/spec_helper.rb b/qpid/tools/src/ruby/qpid_management/spec/spec_helper.rb
index f552c55888..f552c55888 100644
--- a/tools/src/ruby/qpid_management/spec/spec_helper.rb
+++ b/qpid/tools/src/ruby/qpid_management/spec/spec_helper.rb
diff --git a/wcf/LICENSE.txt b/qpid/wcf/LICENSE.txt
index d645695673..d645695673 100644
--- a/wcf/LICENSE.txt
+++ b/qpid/wcf/LICENSE.txt
diff --git a/wcf/NOTICE.txt b/qpid/wcf/NOTICE.txt
index 5de355a56c..5de355a56c 100644
--- a/wcf/NOTICE.txt
+++ b/qpid/wcf/NOTICE.txt
diff --git a/wcf/QpidWcf.sln b/qpid/wcf/QpidWcf.sln
index 9e3cc5621e..9e3cc5621e 100644
--- a/wcf/QpidWcf.sln
+++ b/qpid/wcf/QpidWcf.sln
diff --git a/wcf/ReadMe.txt b/qpid/wcf/ReadMe.txt
index b49e1a37ee..b49e1a37ee 100644
--- a/wcf/ReadMe.txt
+++ b/qpid/wcf/ReadMe.txt
diff --git a/wcf/samples/Channel/AppConfig/ConfigDemo.cs b/qpid/wcf/samples/Channel/AppConfig/ConfigDemo.cs
index 3a7eaef57f..3a7eaef57f 100644
--- a/wcf/samples/Channel/AppConfig/ConfigDemo.cs
+++ b/qpid/wcf/samples/Channel/AppConfig/ConfigDemo.cs
diff --git a/wcf/samples/Channel/AppConfig/ConfigDemo.csproj b/qpid/wcf/samples/Channel/AppConfig/ConfigDemo.csproj
index 41ee6c4f0d..41ee6c4f0d 100644
--- a/wcf/samples/Channel/AppConfig/ConfigDemo.csproj
+++ b/qpid/wcf/samples/Channel/AppConfig/ConfigDemo.csproj
diff --git a/wcf/samples/Channel/HelloWorld/HelloWorld.cs b/qpid/wcf/samples/Channel/HelloWorld/HelloWorld.cs
index 88cb11038d..88cb11038d 100644
--- a/wcf/samples/Channel/HelloWorld/HelloWorld.cs
+++ b/qpid/wcf/samples/Channel/HelloWorld/HelloWorld.cs
diff --git a/wcf/samples/Channel/HelloWorld/HelloWorld.csproj b/qpid/wcf/samples/Channel/HelloWorld/HelloWorld.csproj
index 5d2a8a3e94..5d2a8a3e94 100644
--- a/wcf/samples/Channel/HelloWorld/HelloWorld.csproj
+++ b/qpid/wcf/samples/Channel/HelloWorld/HelloWorld.csproj
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Client/Client.cs b/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.cs
index 93ac97bc66..93ac97bc66 100644
--- a/wcf/samples/Channel/WCFToWCFDirect/Client/Client.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.cs
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Client/Client.csproj b/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.csproj
index a609ec9828..a609ec9828 100644
--- a/wcf/samples/Channel/WCFToWCFDirect/Client/Client.csproj
+++ b/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.csproj
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Client/Properties/AssemblyInfo.cs b/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Properties/AssemblyInfo.cs
index 414a3b5858..414a3b5858 100644
--- a/wcf/samples/Channel/WCFToWCFDirect/Client/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Properties/AssemblyInfo.cs
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Service/Properties/AssemblyInfo.cs b/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Properties/AssemblyInfo.cs
index 2b75210ce3..2b75210ce3 100644
--- a/wcf/samples/Channel/WCFToWCFDirect/Service/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Properties/AssemblyInfo.cs
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Service/Service.cs b/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.cs
index 0342097ed9..0342097ed9 100644
--- a/wcf/samples/Channel/WCFToWCFDirect/Service/Service.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.cs
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Service/Service.csproj b/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.csproj
index 09c7265a87..09c7265a87 100644
--- a/wcf/samples/Channel/WCFToWCFDirect/Service/Service.csproj
+++ b/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.csproj
diff --git a/wcf/samples/Channel/WCFToWCFDirect/WCFToWCFDirect.sln b/qpid/wcf/samples/Channel/WCFToWCFDirect/WCFToWCFDirect.sln
index 6f30a5e053..6f30a5e053 100644
--- a/wcf/samples/Channel/WCFToWCFDirect/WCFToWCFDirect.sln
+++ b/qpid/wcf/samples/Channel/WCFToWCFDirect/WCFToWCFDirect.sln
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.cs
index c1e3ebbc88..c1e3ebbc88 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.csproj b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.csproj
index 7031740601..7031740601 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.csproj
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.csproj
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/AssemblyInfo.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/AssemblyInfo.cs
index 8c22cb6d1f..8c22cb6d1f 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/AssemblyInfo.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/AssemblyInfo.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/AssemblyInfo.cs
index 19fea85618..19fea85618 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/AssemblyInfo.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.cs
index c4dd1e2256..c4dd1e2256 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.csproj b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.csproj
index 1d4ffd96bb..1d4ffd96bb 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.csproj
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.csproj
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/AssemblyInfo.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/AssemblyInfo.cs
index 87310bf92a..87310bf92a 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/AssemblyInfo.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.cs
index e3850eb4c0..e3850eb4c0 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.csproj b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.csproj
index cd7f79c581..cd7f79c581 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.csproj
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.csproj
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/WCFToWCFPubSub.sln b/qpid/wcf/samples/Channel/WCFToWCFPubSub/WCFToWCFPubSub.sln
index d8a56ea8db..d8a56ea8db 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/WCFToWCFPubSub.sln
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/WCFToWCFPubSub.sln
diff --git a/wcf/samples/Integration/Drain/Drain.cs b/qpid/wcf/samples/Integration/Drain/Drain.cs
index 7a88494458..7a88494458 100644
--- a/wcf/samples/Integration/Drain/Drain.cs
+++ b/qpid/wcf/samples/Integration/Drain/Drain.cs
diff --git a/wcf/samples/Integration/Drain/Drain.csproj b/qpid/wcf/samples/Integration/Drain/Drain.csproj
index 06c32f5064..06c32f5064 100644
--- a/wcf/samples/Integration/Drain/Drain.csproj
+++ b/qpid/wcf/samples/Integration/Drain/Drain.csproj
diff --git a/wcf/samples/Integration/Integration.sln b/qpid/wcf/samples/Integration/Integration.sln
index 59b228e92a..59b228e92a 100644
--- a/wcf/samples/Integration/Integration.sln
+++ b/qpid/wcf/samples/Integration/Integration.sln
diff --git a/wcf/samples/Integration/Spout/Spout.cs b/qpid/wcf/samples/Integration/Spout/Spout.cs
index 651566fbd6..651566fbd6 100644
--- a/wcf/samples/Integration/Spout/Spout.cs
+++ b/qpid/wcf/samples/Integration/Spout/Spout.cs
diff --git a/wcf/samples/Integration/Spout/Spout.csproj b/qpid/wcf/samples/Integration/Spout/Spout.csproj
index b104000ad2..b104000ad2 100644
--- a/wcf/samples/Integration/Spout/Spout.csproj
+++ b/qpid/wcf/samples/Integration/Spout/Spout.csproj
diff --git a/wcf/samples/Integration/Util/Options.cs b/qpid/wcf/samples/Integration/Util/Options.cs
index a929f8f2de..a929f8f2de 100644
--- a/wcf/samples/Integration/Util/Options.cs
+++ b/qpid/wcf/samples/Integration/Util/Options.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpBoolean.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpBoolean.cs
index 980ae78361..980ae78361 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/AmqpBoolean.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpBoolean.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpInt.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpInt.cs
index c114e98a71..c114e98a71 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/AmqpInt.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpInt.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpProperties.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpProperties.cs
index 4099571fe0..4099571fe0 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/AmqpProperties.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpProperties.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpString.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpString.cs
index 87cebe878c..87cebe878c 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/AmqpString.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpString.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpType.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpType.cs
index 8cd3ac9e4a..8cd3ac9e4a 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/AmqpType.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpType.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj
index 2a544cf6d0..2a544cf6d0 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpUbyte.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpUbyte.cs
index 5ec8a732cf..5ec8a732cf 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/AmqpUbyte.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpUbyte.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat b/qpid/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat
index d67e2119f9..d67e2119f9 100755
--- a/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/Properties/AssemblyInfo.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/Properties/AssemblyInfo.cs
index dffaee0d0d..dffaee0d0d 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/Properties/AssemblyInfo.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/PropertyName.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/PropertyName.cs
index b80f8b9e9e..b80f8b9e9e 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/PropertyName.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/PropertyName.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBinaryBinding.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBinding.cs
index d533fc212e..d533fc212e 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpBinaryBinding.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBinding.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingCollectionElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingCollectionElement.cs
index de263bc4ef..de263bc4ef 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingCollectionElement.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingCollectionElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingConfigurationElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingConfigurationElement.cs
index a537a6c6c3..a537a6c6c3 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingConfigurationElement.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingConfigurationElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBinding.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinding.cs
index be54f06b2f..be54f06b2f 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpBinding.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinding.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBindingCollectionElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingCollectionElement.cs
index e8d3b6fad4..e8d3b6fad4 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpBindingCollectionElement.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingCollectionElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBindingConfigurationElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingConfigurationElement.cs
index edc91e67c1..edc91e67c1 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpBindingConfigurationElement.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingConfigurationElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpChannelFactory.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelFactory.cs
index 9b27b00994..9b27b00994 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpChannelFactory.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelFactory.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpChannelHelpers.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelHelpers.cs
index b431689c4d..b431689c4d 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpChannelHelpers.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelHelpers.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpChannelListener.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelListener.cs
index 78655f2124..78655f2124 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpChannelListener.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelListener.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpCredential.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpCredential.cs
index e2da07c800..e2da07c800 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpCredential.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpCredential.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpCredentialType.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpCredentialType.cs
index 2bafbbb54e..2bafbbb54e 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpCredentialType.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpCredentialType.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpSecurity.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurity.cs
index 5d88afb88f..5d88afb88f 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpSecurity.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurity.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpSecurityElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurityElement.cs
index f7370e40f5..f7370e40f5 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpSecurityElement.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurityElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpSecurityMode.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurityMode.cs
index 88e7add054..88e7add054 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpSecurityMode.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurityMode.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpTransportBindingElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportBindingElement.cs
index a98f361d19..a98f361d19 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpTransportBindingElement.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportBindingElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpTransportChannel.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportChannel.cs
index 6f0ffd9815..6f0ffd9815 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpTransportChannel.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportChannel.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpTransportSecurity.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportSecurity.cs
index b722983ead..b722983ead 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpTransportSecurity.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportSecurity.cs
diff --git a/wcf/src/Apache/Qpid/Channel/Channel.csproj b/qpid/wcf/src/Apache/Qpid/Channel/Channel.csproj
index 1eb811b425..1eb811b425 100644
--- a/wcf/src/Apache/Qpid/Channel/Channel.csproj
+++ b/qpid/wcf/src/Apache/Qpid/Channel/Channel.csproj
diff --git a/wcf/src/Apache/Qpid/Channel/ConnectionManager.cs b/qpid/wcf/src/Apache/Qpid/Channel/ConnectionManager.cs
index 7238ff2120..7238ff2120 100644
--- a/wcf/src/Apache/Qpid/Channel/ConnectionManager.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/ConnectionManager.cs
diff --git a/wcf/src/Apache/Qpid/Channel/Properties/AssemblyInfo.cs b/qpid/wcf/src/Apache/Qpid/Channel/Properties/AssemblyInfo.cs
index edd9a056a7..edd9a056a7 100644
--- a/wcf/src/Apache/Qpid/Channel/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/Properties/AssemblyInfo.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawMessage.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawMessage.cs
index 5925fa47dc..5925fa47dc 100644
--- a/wcf/src/Apache/Qpid/Channel/RawMessage.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/RawMessage.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawMessageEncoder.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoder.cs
index 76dae6f6c7..76dae6f6c7 100644
--- a/wcf/src/Apache/Qpid/Channel/RawMessageEncoder.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoder.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawMessageEncoderFactory.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoderFactory.cs
index 5c015f9a1b..5c015f9a1b 100644
--- a/wcf/src/Apache/Qpid/Channel/RawMessageEncoderFactory.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoderFactory.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawMessageEncodingBindingElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncodingBindingElement.cs
index 5ec10a976d..5ec10a976d 100644
--- a/wcf/src/Apache/Qpid/Channel/RawMessageEncodingBindingElement.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncodingBindingElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawXmlReader.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawXmlReader.cs
index 8fadfce441..8fadfce441 100644
--- a/wcf/src/Apache/Qpid/Channel/RawXmlReader.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/RawXmlReader.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawXmlWriter.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawXmlWriter.cs
index 7d05b70807..7d05b70807 100644
--- a/wcf/src/Apache/Qpid/Channel/RawXmlWriter.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/RawXmlWriter.cs
diff --git a/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp b/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp
index ec98289923..ec98289923 100644
--- a/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp
+++ b/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpConnection.cpp b/qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.cpp
index 1bc9a15d92..1bc9a15d92 100644
--- a/wcf/src/Apache/Qpid/Interop/AmqpConnection.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpConnection.h b/qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.h
index ef4d0e3f37..ef4d0e3f37 100644
--- a/wcf/src/Apache/Qpid/Interop/AmqpConnection.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.h
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpMessage.cpp b/qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.cpp
index 5c333aff60..5c333aff60 100644
--- a/wcf/src/Apache/Qpid/Interop/AmqpMessage.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpMessage.h b/qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.h
index f0801d30dc..f0801d30dc 100644
--- a/wcf/src/Apache/Qpid/Interop/AmqpMessage.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.h
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpSession.cpp b/qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.cpp
index ac7c777d1f..ac7c777d1f 100644
--- a/wcf/src/Apache/Qpid/Interop/AmqpSession.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpSession.h b/qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.h
index 7a49496805..7a49496805 100644
--- a/wcf/src/Apache/Qpid/Interop/AmqpSession.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.h
diff --git a/wcf/src/Apache/Qpid/Interop/AssemblyInfo.cpp b/qpid/wcf/src/Apache/Qpid/Interop/AssemblyInfo.cpp
index 91c23ae30a..91c23ae30a 100644
--- a/wcf/src/Apache/Qpid/Interop/AssemblyInfo.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/AssemblyInfo.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/CompletionWaiter.cpp b/qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.cpp
index e39ee1b1ae..e39ee1b1ae 100644
--- a/wcf/src/Apache/Qpid/Interop/CompletionWaiter.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/CompletionWaiter.h b/qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.h
index 88880c3721..88880c3721 100644
--- a/wcf/src/Apache/Qpid/Interop/CompletionWaiter.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.h
diff --git a/wcf/src/Apache/Qpid/Interop/DtxResourceManager.cpp b/qpid/wcf/src/Apache/Qpid/Interop/DtxResourceManager.cpp
index 6ea31f8401..6ea31f8401 100644
--- a/wcf/src/Apache/Qpid/Interop/DtxResourceManager.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/DtxResourceManager.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/DtxResourceManager.h b/qpid/wcf/src/Apache/Qpid/Interop/DtxResourceManager.h
index 7df491eec2..7df491eec2 100644
--- a/wcf/src/Apache/Qpid/Interop/DtxResourceManager.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/DtxResourceManager.h
diff --git a/wcf/src/Apache/Qpid/Interop/InputLink.cpp b/qpid/wcf/src/Apache/Qpid/Interop/InputLink.cpp
index f8189df0dd..f8189df0dd 100644
--- a/wcf/src/Apache/Qpid/Interop/InputLink.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/InputLink.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/InputLink.h b/qpid/wcf/src/Apache/Qpid/Interop/InputLink.h
index 136d53d280..136d53d280 100644
--- a/wcf/src/Apache/Qpid/Interop/InputLink.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/InputLink.h
diff --git a/wcf/src/Apache/Qpid/Interop/Interop.vcproj b/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj
index fe288cbe76..fe288cbe76 100644
--- a/wcf/src/Apache/Qpid/Interop/Interop.vcproj
+++ b/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj
diff --git a/wcf/src/Apache/Qpid/Interop/MessageBodyStream.cpp b/qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.cpp
index f2cb5740d3..f2cb5740d3 100644
--- a/wcf/src/Apache/Qpid/Interop/MessageBodyStream.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/MessageBodyStream.h b/qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.h
index fa8e3f6bde..fa8e3f6bde 100644
--- a/wcf/src/Apache/Qpid/Interop/MessageBodyStream.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.h
diff --git a/wcf/src/Apache/Qpid/Interop/MessageWaiter.cpp b/qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.cpp
index f7a28b0692..f7a28b0692 100644
--- a/wcf/src/Apache/Qpid/Interop/MessageWaiter.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/MessageWaiter.h b/qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.h
index 3737430844..3737430844 100644
--- a/wcf/src/Apache/Qpid/Interop/MessageWaiter.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.h
diff --git a/wcf/src/Apache/Qpid/Interop/OutputLink.cpp b/qpid/wcf/src/Apache/Qpid/Interop/OutputLink.cpp
index de7141dadb..de7141dadb 100644
--- a/wcf/src/Apache/Qpid/Interop/OutputLink.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/OutputLink.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/OutputLink.h b/qpid/wcf/src/Apache/Qpid/Interop/OutputLink.h
index e30d1cc79f..e30d1cc79f 100644
--- a/wcf/src/Apache/Qpid/Interop/OutputLink.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/OutputLink.h
diff --git a/wcf/src/Apache/Qpid/Interop/QpidAddress.cpp b/qpid/wcf/src/Apache/Qpid/Interop/QpidAddress.cpp
index bfae1ab313..bfae1ab313 100644
--- a/wcf/src/Apache/Qpid/Interop/QpidAddress.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/QpidAddress.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/QpidAddress.h b/qpid/wcf/src/Apache/Qpid/Interop/QpidAddress.h
index d24317c2aa..d24317c2aa 100644
--- a/wcf/src/Apache/Qpid/Interop/QpidAddress.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/QpidAddress.h
diff --git a/wcf/src/Apache/Qpid/Interop/QpidException.h b/qpid/wcf/src/Apache/Qpid/Interop/QpidException.h
index 91677a5e73..91677a5e73 100644
--- a/wcf/src/Apache/Qpid/Interop/QpidException.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/QpidException.h
diff --git a/wcf/src/Apache/Qpid/Interop/QpidMarshal.h b/qpid/wcf/src/Apache/Qpid/Interop/QpidMarshal.h
index 3e22af7b39..3e22af7b39 100644
--- a/wcf/src/Apache/Qpid/Interop/QpidMarshal.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/QpidMarshal.h
diff --git a/wcf/src/Apache/Qpid/Interop/XaTransaction.cpp b/qpid/wcf/src/Apache/Qpid/Interop/XaTransaction.cpp
index 23743316ff..23743316ff 100644
--- a/wcf/src/Apache/Qpid/Interop/XaTransaction.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/XaTransaction.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/XaTransaction.h b/qpid/wcf/src/Apache/Qpid/Interop/XaTransaction.h
index 8ff9f99893..8ff9f99893 100644
--- a/wcf/src/Apache/Qpid/Interop/XaTransaction.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/XaTransaction.h
diff --git a/wcf/src/wcfnet.snk b/qpid/wcf/src/wcfnet.snk
index d6456c8cf3..d6456c8cf3 100644
--- a/wcf/src/wcfnet.snk
+++ b/qpid/wcf/src/wcfnet.snk
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/AsyncTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/AsyncTest.cs
index 23bed6c603..23bed6c603 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/AsyncTest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/AsyncTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/BasicTransactionTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/BasicTransactionTest.cs
index fa3b79d3a7..fa3b79d3a7 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/BasicTransactionTest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/BasicTransactionTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelAbortCommitTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelAbortCommitTest.cs
index 9c9a6c095e..9c9a6c095e 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelAbortCommitTest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelAbortCommitTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelContextParameters.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelContextParameters.cs
index 35e32ce25a..35e32ce25a 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelContextParameters.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelContextParameters.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelEntity.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelEntity.cs
index 9cabae3201..9cabae3201 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelEntity.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelEntity.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelReceiver.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelReceiver.cs
index 20af98fa64..20af98fa64 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelReceiver.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelReceiver.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelSender.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelSender.cs
index 78950dc0d5..78950dc0d5 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelSender.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelSender.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/CustomAmqpBindingTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/CustomAmqpBindingTest.cs
index 45a926ce4d..45a926ce4d 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/CustomAmqpBindingTest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/CustomAmqpBindingTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/FunctionalTests.csproj b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/FunctionalTests.csproj
index ab36222d6a..ab36222d6a 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/FunctionalTests.csproj
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/FunctionalTests.csproj
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IGenericObjectService.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IGenericObjectService.cs
index a1ffac50b3..a1ffac50b3 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/IGenericObjectService.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IGenericObjectService.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IInteropService.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IInteropService.cs
index 25f7010a89..25f7010a89 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/IInteropService.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IInteropService.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService1.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService1.cs
index 8abbe04874..8abbe04874 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService1.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService1.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService2.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService2.cs
index 7d056e9c82..7d056e9c82 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService2.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService2.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService3.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService3.cs
index 3ff2085557..3ff2085557 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService3.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService3.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTSRAttribute.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTSRAttribute.cs
index 49c42a25b6..49c42a25b6 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTSRAttribute.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTSRAttribute.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTransactionScope.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTransactionScope.cs
index eabceb5720..eabceb5720 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTransactionScope.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTransactionScope.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageBodyTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageBodyTest.cs
index a9555d190d..a9555d190d 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageBodyTest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageBodyTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageClient.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageClient.cs
index b623a0196b..b623a0196b 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageClient.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageClient.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageProperties.txt b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageProperties.txt
index bd6459ccb9..bd6459ccb9 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageProperties.txt
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageProperties.txt
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessagePropertiesTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessagePropertiesTest.cs
index 8e192e90f1..8e192e90f1 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessagePropertiesTest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessagePropertiesTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageService.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageService.cs
index 581464d25e..581464d25e 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageService.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageService.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MultipleEndpointsSameQueueTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MultipleEndpointsSameQueueTest.cs
index d09832757a..d09832757a 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/MultipleEndpointsSameQueueTest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MultipleEndpointsSameQueueTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/AssemblyInfo.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/AssemblyInfo.cs
index b47a25494f..b47a25494f 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/AssemblyInfo.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
index a5eed8839b..a5eed8839b 100755
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/Util.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Util.cs
index f08a6fbbfc..f08a6fbbfc 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/Util.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Util.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/RawBodyUtility.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/RawBodyUtility.cs
index 55a01c790c..55a01c790c 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/RawBodyUtility.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/RawBodyUtility.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.cs
index c97d3da27c..c97d3da27c 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.csproj b/qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.csproj
index 44ef998a24..44ef998a24 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.csproj
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.csproj
diff --git a/wcf/tools/QCreate/QCreate.cpp b/qpid/wcf/tools/QCreate/QCreate.cpp
index 7b0231f339..7b0231f339 100644
--- a/wcf/tools/QCreate/QCreate.cpp
+++ b/qpid/wcf/tools/QCreate/QCreate.cpp
diff --git a/wcf/tools/QCreate/QCreate.sln b/qpid/wcf/tools/QCreate/QCreate.sln
index c01675d53a..c01675d53a 100644
--- a/wcf/tools/QCreate/QCreate.sln
+++ b/qpid/wcf/tools/QCreate/QCreate.sln
diff --git a/wcf/tools/QCreate/QCreate.vcproj b/qpid/wcf/tools/QCreate/QCreate.vcproj
index ba77952966..ba77952966 100644
--- a/wcf/tools/QCreate/QCreate.vcproj
+++ b/qpid/wcf/tools/QCreate/QCreate.vcproj
diff --git a/wcf/tools/QCreate/ReadMe.txt b/qpid/wcf/tools/QCreate/ReadMe.txt
index b3efb84503..b3efb84503 100644
--- a/wcf/tools/QCreate/ReadMe.txt
+++ b/qpid/wcf/tools/QCreate/ReadMe.txt
diff --git a/wcf/tools/QCreate/stdafx.cpp b/qpid/wcf/tools/QCreate/stdafx.cpp
index 568cd3b7d6..568cd3b7d6 100644
--- a/wcf/tools/QCreate/stdafx.cpp
+++ b/qpid/wcf/tools/QCreate/stdafx.cpp
diff --git a/wcf/tools/QCreate/stdafx.h b/qpid/wcf/tools/QCreate/stdafx.h
index a516e19a10..a516e19a10 100644
--- a/wcf/tools/QCreate/stdafx.h
+++ b/qpid/wcf/tools/QCreate/stdafx.h
diff --git a/wcf/tools/QCreate/targetver.h b/qpid/wcf/tools/QCreate/targetver.h
index 9cfb78641b..9cfb78641b 100644
--- a/wcf/tools/QCreate/targetver.h
+++ b/qpid/wcf/tools/QCreate/targetver.h