Creating a branch for experimenting with some ideas for JMS client.rajith_jms_client

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

4977 files changed, 15441 insertions, 15320 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..09e658593c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,79 @@
+#
+# 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\.*
+configure
+.deps
+.libs
+autom4te.cache
+aclocal.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
+qpid/java/lib/cobertura
+qpid/java/lib/findbugs
+qpid/java/lib/ivy
+# 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/
diff --git a/cpp/bindings/qmf/python/Makefile.am b/cpp/bindings/qmf/python/Makefile.am
deleted file mode 100644
index 421590f189..0000000000
--- a/cpp/bindings/qmf/python/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# 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.
-#
-
-if HAVE_PYTHON_DEVEL
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_builddir)/src
-
-generated_file_list = \
-	qmfengine.cpp \
-	qmfengine.py
-
-EXTRA_DIST = python.i
-BUILT_SOURCES = $(generated_file_list)
-SWIG_FLAGS = -w362,401
-
-$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmfengine.i
-	swig -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o qmfengine.cpp $(srcdir)/python.i
-
-pylibdir = $(PYTHON_LIB)
-
-lib_LTLIBRARIES = _qmfengine.la
-
-#_qmfengine_la_LDFLAGS = -avoid-version -module -shrext "$(PYTHON_SO)"
-#_qmfengine_la_LDFLAGS = -avoid-version -module -shrext ".so"
-_qmfengine_la_LDFLAGS = -avoid-version -module -shared
-_qmfengine_la_LIBADD = $(PYTHON_LIBS) -L$(top_builddir)/src/.libs -lqpidclient $(top_builddir)/src/libqmf.la
-_qmfengine_la_CXXFLAGS = $(INCLUDES) -I$(srcdir)/qmf -I$(PYTHON_INC) -fno-strict-aliasing
-nodist__qmfengine_la_SOURCES = qmfengine.cpp
-
-CLEANFILES = $(generated_file_list)
-
-endif  # HAVE_PYTHON_DEVEL
-
diff --git a/cpp/bindings/qmf/ruby/Makefile.am b/cpp/bindings/qmf/ruby/Makefile.am
deleted file mode 100644
index 395d64ff90..0000000000
--- a/cpp/bindings/qmf/ruby/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# 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.
-#
-
-if HAVE_RUBY_DEVEL
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
-
-EXTRA_DIST = ruby.i
-BUILT_SOURCES = qmfengine.cpp
-SWIG_FLAGS = -w362,401
-
-rubylibdir = $(RUBY_LIB)
-
-dist_rubylib_DATA = qmf.rb
-
-qmfengine.cpp: $(srcdir)/ruby.i $(srcdir)/../qmfengine.i
-	$(SWIG) -ruby -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o qmfengine.cpp $(srcdir)/ruby.i
-
-rubylibarchdir = $(RUBY_LIB_ARCH)
-rubylibarch_LTLIBRARIES = qmfengine.la
-
-qmfengine_la_LDFLAGS = -avoid-version -module -shrext ".$(RUBY_DLEXT)"
-qmfengine_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lqpidclient $(top_builddir)/src/libqmfengine.la
-qmfengine_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH) -fno-strict-aliasing
-nodist_qmfengine_la_SOURCES = qmfengine.cpp
-
-CLEANFILES = qmfengine.cpp
-
-endif # HAVE_RUBY_DEVEL
diff --git a/cpp/bindings/qmf2/python/Makefile.am b/cpp/bindings/qmf2/python/Makefile.am
deleted file mode 100644
index 7adc62eddb..0000000000
--- a/cpp/bindings/qmf2/python/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# 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.
-#
-
-if HAVE_PYTHON_DEVEL
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src $(QMF_INCLUDES)
-
-generated_file_list = \
-	cqmf2.cpp \
-	cqmf2.py
-
-EXTRA_DIST = python.i
-BUILT_SOURCES = $(generated_file_list)
-SWIG_FLAGS = -w362,401
-
-$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmf2.i $(srcdir)/../../swig_python_typemaps.i
-	swig -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqmf2.cpp $(srcdir)/python.i
-
-pylibdir = $(PYTHON_LIB)
-
-lib_LTLIBRARIES = _cqmf2.la
-cqpiddir = $(pythondir)
-cqpid_PYTHON = qmf2.py cqmf2.py
-
-_cqmf2_la_LDFLAGS = -avoid-version -module -shared
-_cqmf2_la_LIBADD = $(PYTHON_LIBS) -L$(top_builddir)/src/.libs $(top_builddir)/src/libqmf2.la
-_cqmf2_la_CXXFLAGS = $(INCLUDES) -I$(srcdir)/qmf -I$(PYTHON_INC) -fno-strict-aliasing
-nodist__cqmf2_la_SOURCES = cqmf2.cpp
-
-CLEANFILES = $(generated_file_list)
-
-endif  # HAVE_PYTHON_DEVEL
-
diff --git a/cpp/bindings/qmf2/ruby/Makefile.am b/cpp/bindings/qmf2/ruby/Makefile.am
deleted file mode 100644
index 8e11a204b2..0000000000
--- a/cpp/bindings/qmf2/ruby/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# 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.
-#
-
-if HAVE_RUBY_DEVEL
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src $(QMF_INCLUDES)
-
-EXTRA_DIST = ruby.i
-BUILT_SOURCES = cqmf2.cpp
-SWIG_FLAGS = -w362,401
-
-rubylibdir = $(RUBY_LIB)
-
-cqmf2.cpp: $(srcdir)/ruby.i $(srcdir)/../qmf2.i $(srcdir)/../../swig_ruby_typemaps.i
-	$(SWIG) -ruby -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqmf2.cpp $(srcdir)/ruby.i
-
-rubylibarchdir = $(RUBY_LIB_ARCH)
-rubylibarch_LTLIBRARIES = cqmf2.la
-dist_rubylib_DATA = qmf2.rb
-
-cqmf2_la_LDFLAGS = -avoid-version -module -shrext ".$(RUBY_DLEXT)"
-cqmf2_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lqmf2 $(top_builddir)/src/libqmf2.la
-cqmf2_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH) -fno-strict-aliasing
-nodist_cqmf2_la_SOURCES = cqmf2.cpp
-
-CLEANFILES = cqmf2.cpp
-
-endif # HAVE_RUBY_DEVEL
diff --git a/cpp/bindings/qpid/python/Makefile.am b/cpp/bindings/qpid/python/Makefile.am
deleted file mode 100644
index 9aef179db7..0000000000
--- a/cpp/bindings/qpid/python/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# 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.
-#
-
-if HAVE_PYTHON_DEVEL
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_builddir)/src
-
-generated_file_list = \
-	cqpid.cpp \
-	cqpid.py
-
-EXTRA_DIST = CMakeLists.txt python.i
-BUILT_SOURCES = $(generated_file_list)
-SWIG_FLAGS = -w362,401
-
-$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qpid.i $(srcdir)/../../swig_python_typemaps.i
-	swig -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o cqpid.cpp $(srcdir)/python.i
-
-pylibdir = $(PYTHON_LIB)
-
-lib_LTLIBRARIES = _cqpid.la
-cqpiddir = $(pythondir)
-cqpid_PYTHON = cqpid.py
-
-_cqpid_la_LDFLAGS = -avoid-version -module -shared
-_cqpid_la_LIBADD = $(PYTHON_LIBS) -L$(top_builddir)/src/.libs -lqpidmessaging -lqpidtypes $(top_builddir)/src/libqpidmessaging.la $(top_builddir)/src/libqpidtypes.la
-_cqpid_la_CXXFLAGS = $(INCLUDES) -I$(PYTHON_INC) -fno-strict-aliasing
-nodist__cqpid_la_SOURCES = cqpid.cpp
-
-CLEANFILES = $(generated_file_list)
-
-endif  # HAVE_PYTHON_DEVEL
-
diff --git a/cpp/bindings/qpid/ruby/Makefile.am b/cpp/bindings/qpid/ruby/Makefile.am
deleted file mode 100644
index d92eb969de..0000000000
--- a/cpp/bindings/qpid/ruby/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# 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.
-#
-
-if HAVE_RUBY_DEVEL
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
-
-EXTRA_DIST = CMakeLists.txt ruby.i
-BUILT_SOURCES = cqpid.cpp
-SWIG_FLAGS = -w362,401
-
-rubylibdir = $(RUBY_LIB)
-
-cqpid.cpp: $(srcdir)/ruby.i $(srcdir)/../qpid.i $(srcdir)/../../swig_ruby_typemaps.i
-	$(SWIG) -ruby -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqpid.cpp $(srcdir)/ruby.i
-
-rubylibarchdir = $(RUBY_LIB_ARCH)
-rubylibarch_LTLIBRARIES = cqpid.la
-
-cqpid_la_LDFLAGS = -avoid-version -module -shrext ".$(RUBY_DLEXT)"
-cqpid_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lqpidmessaging -lqpidtypes \
-	$(top_builddir)/src/libqpidmessaging.la $(top_builddir)/src/libqpidtypes.la
-cqpid_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH) -fno-strict-aliasing
-nodist_cqpid_la_SOURCES = cqpid.cpp
-
-CLEANFILES = cqpid.cpp
-
-endif # HAVE_RUBY_DEVEL
diff --git a/cpp/managementgen/Makefile.am b/cpp/managementgen/Makefile.am
deleted file mode 100644
index 6c2024ccaa..0000000000
--- a/cpp/managementgen/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# 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.
-#
-qmfpythondir = $(pythondir)
-dist_bin_SCRIPTS = \
-	qmf-gen
-nobase_qmfpython_DATA = \
-	qmfgen/__init__.py \
-	qmfgen/generate.py \
-	qmfgen/schema.py \
-	qmfgen/templates/Args.h \
-	qmfgen/templates/Class.cpp \
-	qmfgen/templates/Class.h \
-	qmfgen/templates/Event.cpp \
-	qmfgen/templates/Event.h \
-	qmfgen/templates/Makefile.mk \
-	qmfgen/templates/Package.cpp \
-	qmfgen/templates/Package.h \
-	qmfgen/templates/V2Package.cpp \
-	qmfgen/templates/V2Package.h \
-	qmfgen/management-types.xml
-
-EXTRA_DIST = $(nobase_qmfpython_DATA) CMakeLists.txt
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
deleted file mode 100644
index 240766c443..0000000000
--- a/cpp/src/qpid/broker/Broker.cpp
+++ /dev/null
@@ -1,967 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/broker/Broker.h"
-#include "qpid/broker/ConnectionState.h"
-#include "qpid/broker/DirectExchange.h"
-#include "qpid/broker/FanOutExchange.h"
-#include "qpid/broker/HeadersExchange.h"
-#include "qpid/broker/MessageStoreModule.h"
-#include "qpid/broker/NullMessageStore.h"
-#include "qpid/broker/RecoveryManagerImpl.h"
-#include "qpid/broker/SaslAuthenticator.h"
-#include "qpid/broker/SecureConnectionFactory.h"
-#include "qpid/broker/TopicExchange.h"
-#include "qpid/broker/Link.h"
-#include "qpid/broker/ExpiryPolicy.h"
-#include "qpid/broker/QueueFlowLimit.h"
-
-#include "qmf/org/apache/qpid/broker/Package.h"
-#include "qmf/org/apache/qpid/broker/ArgsBrokerCreate.h"
-#include "qmf/org/apache/qpid/broker/ArgsBrokerDelete.h"
-#include "qmf/org/apache/qpid/broker/ArgsBrokerEcho.h"
-#include "qmf/org/apache/qpid/broker/ArgsBrokerGetLogLevel.h"
-#include "qmf/org/apache/qpid/broker/ArgsBrokerQueueMoveMessages.h"
-#include "qmf/org/apache/qpid/broker/ArgsBrokerSetLogLevel.h"
-#include "qmf/org/apache/qpid/broker/EventExchangeDeclare.h"
-#include "qmf/org/apache/qpid/broker/EventExchangeDelete.h"
-#include "qmf/org/apache/qpid/broker/EventQueueDeclare.h"
-#include "qmf/org/apache/qpid/broker/EventQueueDelete.h"
-#include "qmf/org/apache/qpid/broker/EventBind.h"
-#include "qmf/org/apache/qpid/broker/EventUnbind.h"
-#include "qpid/amqp_0_10/Codecs.h"
-#include "qpid/management/ManagementDirectExchange.h"
-#include "qpid/management/ManagementTopicExchange.h"
-#include "qpid/log/Logger.h"
-#include "qpid/log/Options.h"
-#include "qpid/log/Statement.h"
-#include "qpid/log/posix/SinkOptions.h"
-#include "qpid/framing/AMQFrame.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/framing/ProtocolInitiation.h"
-#include "qpid/framing/reply_exceptions.h"
-#include "qpid/framing/Uuid.h"
-#include "qpid/sys/ProtocolFactory.h"
-#include "qpid/sys/Poller.h"
-#include "qpid/sys/Dispatcher.h"
-#include "qpid/sys/Thread.h"
-#include "qpid/sys/Time.h"
-#include "qpid/sys/ConnectionInputHandler.h"
-#include "qpid/sys/ConnectionInputHandlerFactory.h"
-#include "qpid/sys/TimeoutHandler.h"
-#include "qpid/sys/SystemInfo.h"
-#include "qpid/Address.h"
-#include "qpid/StringUtils.h"
-#include "qpid/Url.h"
-#include "qpid/Version.h"
-
-#include <boost/bind.hpp>
-#include <boost/format.hpp>
-
-#include <iostream>
-#include <memory>
-
-using qpid::sys::ProtocolFactory;
-using qpid::sys::Poller;
-using qpid::sys::Dispatcher;
-using qpid::sys::Thread;
-using qpid::framing::FrameHandler;
-using qpid::framing::ChannelId;
-using qpid::management::ManagementAgent;
-using qpid::management::ManagementObject;
-using qpid::management::Manageable;
-using qpid::management::Args;
-using qpid::management::getManagementExecutionContext;
-using qpid::types::Variant;
-using std::string;
-using std::make_pair;
-
-namespace _qmf = qmf::org::apache::qpid::broker;
-
-namespace qpid {
-namespace broker {
-
-Broker::Options::Options(const std::string& name) :
-    qpid::Options(name),
-    noDataDir(0),
-    port(DEFAULT_PORT),
-    workerThreads(5),
-    maxConnections(500),
-    connectionBacklog(10),
-    enableMgmt(1),
-    mgmtPubInterval(10),
-    queueCleanInterval(60*10),//10 minutes
-    auth(SaslAuthenticator::available()),
-    realm("QPID"),
-    replayFlushLimit(0),
-    replayHardLimit(0),
-    queueLimit(100*1048576/*100M default limit*/),
-    tcpNoDelay(false),
-    requireEncrypted(false),
-    maxSessionRate(0),
-    asyncQueueEvents(false),     // Must be false in a cluster.
-    qmf2Support(true),
-    qmf1Support(true),
-    queueFlowStopRatio(80),
-    queueFlowResumeRatio(70),
-    queueThresholdEventRatio(80)
-{
-    int c = sys::SystemInfo::concurrency();
-    workerThreads=c+1;
-    std::string home = getHome();
-
-    if (home.length() == 0)
-        dataDir += DEFAULT_DATA_DIR_LOCATION;
-    else
-        dataDir += home;
-    dataDir += DEFAULT_DATA_DIR_NAME;
-
-    addOptions()
-        ("data-dir", optValue(dataDir,"DIR"), "Directory to contain persistent data generated by the broker")
-        ("no-data-dir", optValue(noDataDir), "Don't use a data directory.  No persistent configuration will be loaded or stored")
-        ("port,p", optValue(port,"PORT"), "Tells the broker to listen on PORT")
-        ("worker-threads", optValue(workerThreads, "N"), "Sets the broker thread pool size")
-        ("max-connections", optValue(maxConnections, "N"), "Sets the maximum allowed connections")
-        ("connection-backlog", optValue(connectionBacklog, "N"), "Sets the connection backlog limit for the server socket")
-        ("mgmt-enable,m", optValue(enableMgmt,"yes|no"), "Enable Management")
-        ("mgmt-qmf2", optValue(qmf2Support,"yes|no"), "Enable broadcast of management information over QMF v2")
-        ("mgmt-qmf1", optValue(qmf1Support,"yes|no"), "Enable broadcast of management information over QMF v1")
-        ("mgmt-pub-interval", optValue(mgmtPubInterval, "SECONDS"), "Management Publish Interval")
-        ("queue-purge-interval", optValue(queueCleanInterval, "SECONDS"),
-         "Interval between attempts to purge any expired messages from queues")
-        ("auth", optValue(auth, "yes|no"), "Enable authentication, if disabled all incoming connections will be trusted")
-        ("realm", optValue(realm, "REALM"), "Use the given realm when performing authentication")
-        ("default-queue-limit", optValue(queueLimit, "BYTES"), "Default maximum size for queues (in bytes)")
-        ("tcp-nodelay", optValue(tcpNoDelay), "Set TCP_NODELAY on TCP connections")
-        ("require-encryption", optValue(requireEncrypted), "Only accept connections that are encrypted")
-        ("known-hosts-url", optValue(knownHosts, "URL or 'none'"), "URL to send as 'known-hosts' to clients ('none' implies empty list)")
-        ("sasl-config", optValue(saslConfigPath, "DIR"), "gets sasl config info from nonstandard location")
-        ("max-session-rate", optValue(maxSessionRate, "MESSAGES/S"), "Sets the maximum message rate per session (0=unlimited)")
-        ("async-queue-events", optValue(asyncQueueEvents, "yes|no"), "Set Queue Events async, used for services like replication")
-        ("default-flow-stop-threshold", optValue(queueFlowStopRatio, "PERCENT"), "Percent of queue's maximum capacity at which flow control is activated.")
-        ("default-flow-resume-threshold", optValue(queueFlowResumeRatio, "PERCENT"), "Percent of queue's maximum capacity at which flow control is de-activated.")
-        ("default-event-threshold-ratio", optValue(queueThresholdEventRatio, "%age of limit"), "The ratio of any specified queue limit at which an event will be raised");
-}
-
-const std::string empty;
-const std::string amq_direct("amq.direct");
-const std::string amq_topic("amq.topic");
-const std::string amq_fanout("amq.fanout");
-const std::string amq_match("amq.match");
-const std::string qpid_management("qpid.management");
-const std::string knownHostsNone("none");
-
-Broker::Broker(const Broker::Options& conf) :
-    poller(new Poller),
-    config(conf),
-    managementAgent(conf.enableMgmt ? new ManagementAgent(conf.qmf1Support,
-                                                          conf.qmf2Support)
-                                    : 0),
-    store(new NullMessageStore),
-    acl(0),
-    dataDir(conf.noDataDir ? std::string() : conf.dataDir),
-    queues(this),
-    exchanges(this),
-    links(this),
-    factory(new SecureConnectionFactory(*this)),
-    dtxManager(timer),
-    sessionManager(
-        qpid::SessionState::Configuration(
-            conf.replayFlushLimit*1024, // convert kb to bytes.
-            conf.replayHardLimit*1024),
-        *this),
-    queueCleaner(queues, timer),
-    queueEvents(poller,!conf.asyncQueueEvents),
-    recovery(true),
-    inCluster(false),
-    clusterUpdatee(false),
-    expiryPolicy(new ExpiryPolicy),
-    connectionCounter(conf.maxConnections),
-    getKnownBrokers(boost::bind(&Broker::getKnownBrokersImpl, this)),
-    deferDelivery(boost::bind(&Broker::deferDeliveryImpl, this, _1, _2))
-{
-    try {
-    if (conf.enableMgmt) {
-        QPID_LOG(info, "Management enabled");
-        managementAgent->configure(dataDir.isEnabled() ? dataDir.getPath() : string(),
-                                   conf.mgmtPubInterval, this, conf.workerThreads + 3);
-        managementAgent->setName("apache.org", "qpidd");
-        _qmf::Package packageInitializer(managementAgent.get());
-
-        System* system = new System (dataDir.isEnabled() ? dataDir.getPath() : string(), this);
-        systemObject = System::shared_ptr(system);
-
-        mgmtObject = new _qmf::Broker(managementAgent.get(), this, system, "amqp-broker");
-        mgmtObject->set_systemRef(system->GetManagementObject()->getObjectId());
-        mgmtObject->set_port(conf.port);
-        mgmtObject->set_workerThreads(conf.workerThreads);
-        mgmtObject->set_maxConns(conf.maxConnections);
-        mgmtObject->set_connBacklog(conf.connectionBacklog);
-        mgmtObject->set_mgmtPubInterval(conf.mgmtPubInterval);
-        mgmtObject->set_version(qpid::version);
-        if (dataDir.isEnabled())
-            mgmtObject->set_dataDir(dataDir.getPath());
-        else
-            mgmtObject->clr_dataDir();
-
-        managementAgent->addObject(mgmtObject, 0, true);
-
-        // Since there is currently no support for virtual hosts, a placeholder object
-        // representing the implied single virtual host is added here to keep the
-        // management schema correct.
-        Vhost* vhost = new Vhost(this, this);
-        vhostObject = Vhost::shared_ptr(vhost);
-        framing::Uuid uuid(managementAgent->getUuid());
-        federationTag = uuid.str();
-        vhostObject->setFederationTag(federationTag);
-
-        queues.setParent(vhost);
-        exchanges.setParent(vhost);
-        links.setParent(vhost);
-    } else {
-        // Management is disabled so there is no broker management ID.
-        // Create a unique uuid to use as the federation tag.
-        framing::Uuid uuid(true);
-        federationTag = uuid.str();
-    }
-
-    QueuePolicy::setDefaultMaxSize(conf.queueLimit);
-
-    // Early-Initialize plugins
-    Plugin::earlyInitAll(*this);
-
-    QueueFlowLimit::setDefaults(conf.queueLimit, conf.queueFlowStopRatio, conf.queueFlowResumeRatio);
-
-    // If no plugin store module registered itself, set up the null store.
-    if (NullMessageStore::isNullStore(store.get()))
-        setStore();
-
-    exchanges.declare(empty, DirectExchange::typeName); // Default exchange.
-
-    if (store.get() != 0) {
-        // The cluster plug-in will setRecovery(false) on all but the first
-        // broker to join a cluster.
-        if (getRecovery()) {
-            RecoveryManagerImpl recoverer(queues, exchanges, links, dtxManager);
-            store->recover(recoverer);
-        }
-        else {
-            QPID_LOG(notice, "Cluster recovery: recovered journal data discarded and journal files pushed down");
-            store->truncateInit(true); // save old files in subdir
-        }
-    }
-
-    //ensure standard exchanges exist (done after recovery from store)
-    declareStandardExchange(amq_direct, DirectExchange::typeName);
-    declareStandardExchange(amq_topic, TopicExchange::typeName);
-    declareStandardExchange(amq_fanout, FanOutExchange::typeName);
-    declareStandardExchange(amq_match, HeadersExchange::typeName);
-
-    if(conf.enableMgmt) {
-        exchanges.declare(qpid_management, ManagementTopicExchange::typeName);
-        Exchange::shared_ptr mExchange = exchanges.get(qpid_management);
-        Exchange::shared_ptr dExchange = exchanges.get(amq_direct);
-        managementAgent->setExchange(mExchange, dExchange);
-        boost::dynamic_pointer_cast<ManagementTopicExchange>(mExchange)->setManagmentAgent(managementAgent.get(), 1);
-
-        std::string qmfTopic("qmf.default.topic");
-        std::string qmfDirect("qmf.default.direct");
-
-        std::pair<Exchange::shared_ptr, bool> topicPair(exchanges.declare(qmfTopic, ManagementTopicExchange::typeName));
-        std::pair<Exchange::shared_ptr, bool> directPair(exchanges.declare(qmfDirect, ManagementDirectExchange::typeName));
-
-        boost::dynamic_pointer_cast<ManagementDirectExchange>(directPair.first)->setManagmentAgent(managementAgent.get(), 2);
-        boost::dynamic_pointer_cast<ManagementTopicExchange>(topicPair.first)->setManagmentAgent(managementAgent.get(), 2);
-
-        managementAgent->setExchangeV2(topicPair.first, directPair.first);
-    }
-    else
-        QPID_LOG(info, "Management not enabled");
-
-    /**
-     * SASL setup, can fail and terminate startup
-     */
-    if (conf.auth) {
-        SaslAuthenticator::init(qpid::saslName, conf.saslConfigPath);
-        QPID_LOG(info, "SASL enabled");
-    } else {
-        QPID_LOG(notice, "SASL disabled: No Authentication Performed");
-    }
-
-    // Initialize plugins
-    Plugin::initializeAll(*this);
-
-    if (managementAgent.get()) managementAgent->pluginsInitialized();
-
-    if (conf.queueCleanInterval) {
-        queueCleaner.start(conf.queueCleanInterval * qpid::sys::TIME_SEC);
-    }
-
-    //initialize known broker urls (TODO: add support for urls for other transports (SSL, RDMA)):
-    if (conf.knownHosts.empty()) {
-        boost::shared_ptr<ProtocolFactory> factory = getProtocolFactory(TCP_TRANSPORT);
-        if (factory) {
-            knownBrokers.push_back ( qpid::Url::getIpAddressesUrl ( factory->getPort() ) );
-        }
-    } else if (conf.knownHosts != knownHostsNone) {
-        knownBrokers.push_back(Url(conf.knownHosts));
-    }
-    } catch (const std::exception& /*e*/) {
-        finalize();
-        throw;
-    }
-}
-
-void Broker::declareStandardExchange(const std::string& name, const std::string& type)
-{
-    bool storeEnabled = store.get() != NULL;
-    std::pair<Exchange::shared_ptr, bool> status = exchanges.declare(name, type, storeEnabled);
-    if (status.second && storeEnabled) {
-        store->create(*status.first, framing::FieldTable ());
-    }
-}
-
-
-boost::intrusive_ptr<Broker> Broker::create(int16_t port)
-{
-    Options config;
-    config.port=port;
-    return create(config);
-}
-
-boost::intrusive_ptr<Broker> Broker::create(const Options& opts)
-{
-    return boost::intrusive_ptr<Broker>(new Broker(opts));
-}
-
-void Broker::setStore (boost::shared_ptr<MessageStore>& _store)
-{
-    store.reset(new MessageStoreModule (_store));
-    setStore();
-}
-
-void Broker::setStore () {
-    queues.setStore     (store.get());
-    dtxManager.setStore (store.get());
-    links.setStore      (store.get());
-}
-
-void Broker::run() {
-    if (config.workerThreads > 0) {
-        QPID_LOG(notice, "Broker running");
-        Dispatcher d(poller);
-        int numIOThreads = config.workerThreads;
-        std::vector<Thread> t(numIOThreads-1);
-
-        // Run n-1 io threads
-        for (int i=0; i<numIOThreads-1; ++i)
-            t[i] = Thread(d);
-
-        // Run final thread
-        d.run();
-
-        // Now wait for n-1 io threads to exit
-        for (int i=0; i<numIOThreads-1; ++i) {
-            t[i].join();
-        }
-    } else {
-        throw Exception((boost::format("Invalid value for worker-threads: %1%") % config.workerThreads).str());
-    }
-}
-
-void Broker::shutdown() {
-    // NB: this function must be async-signal safe, it must not
-    // call any function that is not async-signal safe.
-    // Any unsafe shutdown actions should be done in the destructor.
-    poller->shutdown();
-}
-
-Broker::~Broker() {
-    shutdown();
-    queueEvents.shutdown();
-    finalize();                 // Finalize any plugins.
-    if (config.auth)
-        SaslAuthenticator::fini();
-    timer.stop();
-    QPID_LOG(notice, "Shut down");
-}
-
-ManagementObject* Broker::GetManagementObject(void) const
-{
-    return (ManagementObject*) mgmtObject;
-}
-
-Manageable* Broker::GetVhostObject(void) const
-{
-    return vhostObject.get();
-}
-
-Manageable::status_t Broker::ManagementMethod (uint32_t methodId,
-                                               Args&    args,
-                                               string&)
-{
-    Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD;
-
-    switch (methodId)
-    {
-    case _qmf::Broker::METHOD_ECHO :
-        QPID_LOG (debug, "Broker::echo("
-                  << dynamic_cast<_qmf::ArgsBrokerEcho&>(args).io_sequence
-                  << ", "
-                  << dynamic_cast<_qmf::ArgsBrokerEcho&>(args).io_body
-                  << ")");
-        status = Manageable::STATUS_OK;
-        break;
-    case _qmf::Broker::METHOD_CONNECT : {
-        _qmf::ArgsBrokerConnect& hp=
-            dynamic_cast<_qmf::ArgsBrokerConnect&>(args);
-
-        QPID_LOG (debug, "Broker::connect()");
-        string transport = hp.i_transport.empty() ? TCP_TRANSPORT : hp.i_transport;
-        if (!getProtocolFactory(transport)) {
-            QPID_LOG(error, "Transport '" << transport << "' not supported");
-            return  Manageable::STATUS_NOT_IMPLEMENTED;
-        }
-        std::pair<Link::shared_ptr, bool> response =
-            links.declare (hp.i_host, hp.i_port, transport, hp.i_durable,
-                           hp.i_authMechanism, hp.i_username, hp.i_password);
-        if (hp.i_durable && response.second)
-            store->create(*response.first);
-        status = Manageable::STATUS_OK;
-        break;
-      }
-    case _qmf::Broker::METHOD_QUEUEMOVEMESSAGES : {
-        _qmf::ArgsBrokerQueueMoveMessages& moveArgs=
-            dynamic_cast<_qmf::ArgsBrokerQueueMoveMessages&>(args);
-        QPID_LOG (debug, "Broker::queueMoveMessages()");
-	if (queueMoveMessages(moveArgs.i_srcQueue, moveArgs.i_destQueue, moveArgs.i_qty))
-            status = Manageable::STATUS_OK;
-	else
-            return Manageable::STATUS_PARAMETER_INVALID;
-        break;
-      }
-    case _qmf::Broker::METHOD_SETLOGLEVEL :
-        setLogLevel(dynamic_cast<_qmf::ArgsBrokerSetLogLevel&>(args).i_level);
-        QPID_LOG (debug, "Broker::setLogLevel()");
-        status = Manageable::STATUS_OK;
-        break;
-    case _qmf::Broker::METHOD_GETLOGLEVEL :
-        dynamic_cast<_qmf::ArgsBrokerGetLogLevel&>(args).o_level = getLogLevel();
-        QPID_LOG (debug, "Broker::getLogLevel()");
-        status = Manageable::STATUS_OK;
-        break;
-    case _qmf::Broker::METHOD_CREATE :
-      {
-          _qmf::ArgsBrokerCreate& a = dynamic_cast<_qmf::ArgsBrokerCreate&>(args);
-          createObject(a.i_type, a.i_name, a.i_properties, a.i_strict, getManagementExecutionContext());
-          status = Manageable::STATUS_OK;
-          break;
-      }
-    case _qmf::Broker::METHOD_DELETE :
-      {
-          _qmf::ArgsBrokerDelete& a = dynamic_cast<_qmf::ArgsBrokerDelete&>(args);
-          deleteObject(a.i_type, a.i_name, a.i_options, getManagementExecutionContext());
-          status = Manageable::STATUS_OK;
-          break;
-      }
-   default:
-        QPID_LOG (debug, "Broker ManagementMethod not implemented: id=" << methodId << "]");
-        status = Manageable::STATUS_NOT_IMPLEMENTED;
-        break;
-    }
-
-    return status;
-}
-
-namespace
-{
-const std::string TYPE_QUEUE("queue");
-const std::string TYPE_EXCHANGE("exchange");
-const std::string TYPE_TOPIC("topic");
-const std::string TYPE_BINDING("binding");
-const std::string DURABLE("durable");
-const std::string AUTO_DELETE("auto-delete");
-const std::string ALTERNATE_EXCHANGE("alternate-exchange");
-const std::string EXCHANGE_TYPE("exchange-type");
-const std::string QUEUE_NAME("queue");
-const std::string EXCHANGE_NAME("exchange");
-
-const std::string _TRUE("true");
-const std::string _FALSE("false");
-}
-
-struct InvalidBindingIdentifier : public qpid::Exception
-{
-    InvalidBindingIdentifier(const std::string& name) : qpid::Exception(name) {}
-    std::string getPrefix() const { return "invalid binding"; }
-};
-
-struct BindingIdentifier
-{
-    std::string exchange;
-    std::string queue;
-    std::string key;
-
-    BindingIdentifier(const std::string& name)
-    {
-        std::vector<std::string> path;
-        split(path, name, "/");
-        switch (path.size()) {
-          case 1:
-            queue = path[0];
-            break;
-          case 2:
-            exchange = path[0];
-            queue = path[1];
-            break;
-          case 3:
-            exchange = path[0];
-            queue = path[1];
-            key = path[2];
-            break;
-          default:
-            throw InvalidBindingIdentifier(name);
-        }
-    }
-};
-
-struct ObjectAlreadyExists : public qpid::Exception
-{
-    ObjectAlreadyExists(const std::string& name) : qpid::Exception(name) {}
-    std::string getPrefix() const { return "object already exists"; }
-};
-
-struct UnknownObjectType : public qpid::Exception
-{
-    UnknownObjectType(const std::string& type) : qpid::Exception(type) {}
-    std::string getPrefix() const { return "unknown object type"; }
-};
-
-void Broker::createObject(const std::string& type, const std::string& name,
-                          const Variant::Map& properties, bool /*strict*/, const ConnectionState* context)
-{
-    std::string userId;
-    std::string connectionId;
-    if (context) {
-        userId = context->getUserId();
-        connectionId = context->getUrl();
-    }
-    //TODO: implement 'strict' option (check there are no unrecognised properties)
-    QPID_LOG (debug, "Broker::create(" << type << ", " << name << "," << properties << ")");
-    if (type == TYPE_QUEUE) {
-        bool durable(false);
-        bool autodelete(false);
-        std::string alternateExchange;
-        Variant::Map extensions;
-        for (Variant::Map::const_iterator i = properties.begin(); i != properties.end(); ++i) {
-            // extract durable, auto-delete and alternate-exchange properties
-            if (i->first == DURABLE) durable = i->second;
-            else if (i->first == AUTO_DELETE) autodelete = i->second;
-            else if (i->first == ALTERNATE_EXCHANGE) alternateExchange = i->second.asString();
-            //treat everything else as extension properties
-            else extensions[i->first] = i->second;
-        }
-        framing::FieldTable arguments;
-        amqp_0_10::translate(extensions, arguments);
-
-        std::pair<boost::shared_ptr<Queue>, bool> result =
-            createQueue(name, durable, autodelete, 0, alternateExchange, arguments, userId, connectionId);
-        if (!result.second) {
-            throw ObjectAlreadyExists(name);
-        }
-    } else if (type == TYPE_EXCHANGE || type == TYPE_TOPIC) {
-        bool durable(false);
-        std::string exchangeType("topic");
-        std::string alternateExchange;
-        Variant::Map extensions;
-        for (Variant::Map::const_iterator i = properties.begin(); i != properties.end(); ++i) {
-            // extract durable, auto-delete and alternate-exchange properties
-            if (i->first == DURABLE) durable = i->second;
-            else if (i->first == EXCHANGE_TYPE) exchangeType = i->second.asString();
-            else if (i->first == ALTERNATE_EXCHANGE) alternateExchange = i->second.asString();
-            //treat everything else as extension properties
-            else extensions[i->first] = i->second;
-        }
-        framing::FieldTable arguments;
-        amqp_0_10::translate(extensions, arguments);
-
-        try {
-            std::pair<boost::shared_ptr<Exchange>, bool> result =
-                createExchange(name, exchangeType, durable, alternateExchange, arguments, userId, connectionId);
-            if (!result.second) {
-                throw ObjectAlreadyExists(name);
-            }
-        } catch (const UnknownExchangeTypeException&) {
-            throw Exception(QPID_MSG("Invalid exchange type: " << exchangeType));
-        }
-    } else if (type == TYPE_BINDING) {
-        BindingIdentifier binding(name);
-        std::string exchangeType("topic");
-        Variant::Map extensions;
-        for (Variant::Map::const_iterator i = properties.begin(); i != properties.end(); ++i) {
-            // extract durable, auto-delete and alternate-exchange properties
-            if (i->first == EXCHANGE_TYPE) exchangeType = i->second.asString();
-            //treat everything else as extension properties
-            else extensions[i->first] = i->second;
-        }
-        framing::FieldTable arguments;
-        amqp_0_10::translate(extensions, arguments);
-
-        bind(binding.queue, binding.exchange, binding.key, arguments, userId, connectionId);
-    } else {
-        throw UnknownObjectType(type);
-    }
-}
-
-void Broker::deleteObject(const std::string& type, const std::string& name,
-                          const Variant::Map& options, const ConnectionState* context)
-{
-    std::string userId;
-    std::string connectionId;
-    if (context) {
-        userId = context->getUserId();
-        connectionId = context->getUrl();
-    }
-    QPID_LOG (debug, "Broker::delete(" << type << ", " << name << "," << options << ")");
-    if (type == TYPE_QUEUE) {
-        deleteQueue(name, userId, connectionId);
-    } else if (type == TYPE_EXCHANGE || type == TYPE_TOPIC) {
-        deleteExchange(name, userId, connectionId);
-    } else if (type == TYPE_BINDING) {
-        BindingIdentifier binding(name);
-        unbind(binding.queue, binding.exchange, binding.key, userId, connectionId);
-    } else {
-        throw UnknownObjectType(type);
-    }
-
-}
-
-void Broker::setLogLevel(const std::string& level)
-{
-    QPID_LOG(notice, "Changing log level to " << level);
-    std::vector<std::string> selectors;
-    split(selectors, level, ", ");
-    qpid::log::Logger::instance().reconfigure(selectors);
-}
-
-std::string Broker::getLogLevel()
-{
-    std::string level;
-    const std::vector<std::string>& selectors = qpid::log::Logger::instance().getOptions().selectors;
-    for (std::vector<std::string>::const_iterator i = selectors.begin(); i != selectors.end(); ++i) {
-        if (i != selectors.begin()) level += std::string(",");
-        level += *i;
-    }
-    return level;
-}
-
-boost::shared_ptr<ProtocolFactory> Broker::getProtocolFactory(const std::string& name) const {
-    ProtocolFactoryMap::const_iterator i
-        = name.empty() ? protocolFactories.begin() : protocolFactories.find(name);
-    if (i == protocolFactories.end()) return boost::shared_ptr<ProtocolFactory>();
-    else return i->second;
-}
-
-uint16_t Broker::getPort(const std::string& name) const  {
-    boost::shared_ptr<ProtocolFactory> factory = getProtocolFactory(name);
-    if (factory) {
-        return factory->getPort();
-    } else {
-        throw NoSuchTransportException(QPID_MSG("No such transport: '" << name << "'"));
-    }
-}
-
-void Broker::registerProtocolFactory(const std::string& name, ProtocolFactory::shared_ptr protocolFactory) {
-    protocolFactories[name] = protocolFactory;
-    Url::addProtocol(name);
-}
-
-void Broker::accept() {
-    for (ProtocolFactoryMap::const_iterator i = protocolFactories.begin(); i != protocolFactories.end(); i++) {
-        i->second->accept(poller, factory.get());
-    }
-}
-
-void Broker::connect(
-    const std::string& host, uint16_t port, const std::string& transport,
-    boost::function2<void, int, std::string> failed,
-    sys::ConnectionCodec::Factory* f)
-{
-    boost::shared_ptr<ProtocolFactory> pf = getProtocolFactory(transport);
-    if (pf) pf->connect(poller, host, port, f ? f : factory.get(), failed);
-    else throw NoSuchTransportException(QPID_MSG("Unsupported transport type: " << transport));
-}
-
-void Broker::connect(
-    const Url& url,
-    boost::function2<void, int, std::string> failed,
-    sys::ConnectionCodec::Factory* f)
-{
-    url.throwIfEmpty();
-    const Address& addr=url[0];
-    connect(addr.host, addr.port, addr.protocol, failed, f);
-}
-
-uint32_t Broker::queueMoveMessages(
-     const std::string& srcQueue,
-     const std::string& destQueue,
-     uint32_t  qty)
-{
-  Queue::shared_ptr src_queue = queues.find(srcQueue);
-  if (!src_queue)
-    return 0;
-  Queue::shared_ptr dest_queue = queues.find(destQueue);
-  if (!dest_queue)
-    return 0;
-
-  return src_queue->move(dest_queue, qty);
-}
-
-
-boost::shared_ptr<sys::Poller> Broker::getPoller() { return poller; }
-
-std::vector<Url>
-Broker::getKnownBrokersImpl()
-{
-    return knownBrokers;
-}
-
-bool Broker::deferDeliveryImpl(const std::string& ,
-                               const boost::intrusive_ptr<Message>& )
-{ return false; }
-
-void Broker::setClusterTimer(std::auto_ptr<sys::Timer> t) {
-    clusterTimer = t;
-}
-
-const std::string Broker::TCP_TRANSPORT("tcp");
-
-
-std::pair<boost::shared_ptr<Queue>, bool> Broker::createQueue(
-    const std::string& name,
-    bool durable,
-    bool autodelete,
-    const OwnershipToken* owner,
-    const std::string& alternateExchange,
-    const qpid::framing::FieldTable& arguments,
-    const std::string& userId,
-    const std::string& connectionId)
-{
-    if (acl) {
-        std::map<acl::Property, std::string> params;
-        params.insert(make_pair(acl::PROP_ALTERNATE, alternateExchange));
-        params.insert(make_pair(acl::PROP_PASSIVE, _FALSE));
-        params.insert(make_pair(acl::PROP_DURABLE, durable ? _TRUE : _FALSE));
-        params.insert(make_pair(acl::PROP_EXCLUSIVE, owner ? _TRUE : _FALSE));
-        params.insert(make_pair(acl::PROP_AUTODELETE, autodelete ? _TRUE : _FALSE));
-        params.insert(make_pair(acl::PROP_POLICYTYPE, arguments.getAsString("qpid.policy_type")));
-        params.insert(make_pair(acl::PROP_MAXQUEUECOUNT, boost::lexical_cast<string>(arguments.getAsInt("qpid.max_count"))));
-        params.insert(make_pair(acl::PROP_MAXQUEUESIZE, boost::lexical_cast<string>(arguments.getAsInt64("qpid.max_size"))));
-
-        if (!acl->authorise(userId,acl::ACT_CREATE,acl::OBJ_QUEUE,name,&params) )
-            throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied queue create request from " << userId));
-    }
-
-    Exchange::shared_ptr alternate;
-    if (!alternateExchange.empty()) {
-        alternate = exchanges.get(alternateExchange);
-        if (!alternate) throw framing::NotFoundException(QPID_MSG("Alternate exchange does not exist: " << alternateExchange));
-    }
-
-    std::pair<Queue::shared_ptr, bool> result = queues.declare(name, durable, autodelete, owner, alternate, arguments);
-    if (result.second) {
-        //add default binding:
-        result.first->bind(exchanges.getDefault(), name);
-
-        if (managementAgent.get()) {
-            //TODO: debatable whether we should raise an event here for
-            //create when this is a 'declare' event; ideally add a create
-            //event instead?
-            managementAgent->raiseEvent(
-                _qmf::EventQueueDeclare(connectionId, userId, name,
-                                        durable, owner, autodelete,
-                                        ManagementAgent::toMap(arguments),
-                                        "created"));
-        }
-    }
-    return result;
-}
-
-void Broker::deleteQueue(const std::string& name, const std::string& userId,
-                         const std::string& connectionId, QueueFunctor check)
-{
-    if (acl && !acl->authorise(userId,acl::ACT_DELETE,acl::OBJ_QUEUE,name,NULL)) {
-        throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied queue delete request from " << userId));
-    }
-
-    Queue::shared_ptr queue = queues.find(name);
-    if (queue) {
-        if (check) check(queue);
-        queues.destroy(name);
-        queue->destroyed();
-    } else {
-        throw framing::NotFoundException(QPID_MSG("Delete failed. No such queue: " << name));
-    }
-
-    if (managementAgent.get())
-        managementAgent->raiseEvent(_qmf::EventQueueDelete(connectionId, userId, name));
-
-}
-
-std::pair<Exchange::shared_ptr, bool> Broker::createExchange(
-    const std::string& name,
-    const std::string& type,
-    bool durable,
-    const std::string& alternateExchange,
-    const qpid::framing::FieldTable& arguments,
-    const std::string& userId,
-    const std::string& connectionId)
-{
-    if (acl) {
-        std::map<acl::Property, std::string> params;
-        params.insert(make_pair(acl::PROP_TYPE, type));
-        params.insert(make_pair(acl::PROP_ALTERNATE, alternateExchange));
-        params.insert(make_pair(acl::PROP_PASSIVE, _FALSE));
-        params.insert(make_pair(acl::PROP_DURABLE, durable ? _TRUE : _FALSE));
-        if (!acl->authorise(userId,acl::ACT_CREATE,acl::OBJ_EXCHANGE,name,&params) )
-            throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied exchange create request from " << userId));
-    }
-
-    Exchange::shared_ptr alternate;
-    if (!alternateExchange.empty()) {
-        alternate = exchanges.get(alternateExchange);
-        if (!alternate) throw framing::NotFoundException(QPID_MSG("Alternate exchange does not exist: " << alternateExchange));
-    }
-
-    std::pair<Exchange::shared_ptr, bool> result;
-    result = exchanges.declare(name, type, durable, arguments);
-    if (result.second) {
-        if (alternate) {
-            result.first->setAlternate(alternate);
-            alternate->incAlternateUsers();
-        }
-        if (durable) {
-            store->create(*result.first, arguments);
-        }
-        if (managementAgent.get()) {
-            //TODO: debatable whether we should raise an event here for
-            //create when this is a 'declare' event; ideally add a create
-            //event instead?
-            managementAgent->raiseEvent(_qmf::EventExchangeDeclare(connectionId,
-                                                         userId,
-                                                         name,
-                                                         type,
-                                                         alternateExchange,
-                                                         durable,
-                                                         false,
-                                                         ManagementAgent::toMap(arguments),
-                                                         "created"));
-        }
-    }
-    return result;
-}
-
-void Broker::deleteExchange(const std::string& name, const std::string& userId,
-                           const std::string& connectionId)
-{
-    if (acl) {
-        if (!acl->authorise(userId,acl::ACT_DELETE,acl::OBJ_EXCHANGE,name,NULL) )
-            throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied exchange delete request from " << userId));
-    }
-
-    Exchange::shared_ptr exchange(exchanges.get(name));
-    if (!exchange) throw framing::NotFoundException(QPID_MSG("Delete failed. No such exchange: " << name));
-    if (exchange->inUseAsAlternate()) throw framing::NotAllowedException(QPID_MSG("Exchange in use as alternate-exchange."));
-    if (exchange->isDurable()) store->destroy(*exchange);
-    if (exchange->getAlternate()) exchange->getAlternate()->decAlternateUsers();
-    exchanges.destroy(name);
-
-    if (managementAgent.get())
-        managementAgent->raiseEvent(_qmf::EventExchangeDelete(connectionId, userId, name));
-
-}
-
-void Broker::bind(const std::string& queueName,
-                  const std::string& exchangeName,
-                  const std::string& key,
-                  const qpid::framing::FieldTable& arguments,
-                  const std::string& userId,
-                  const std::string& connectionId)
-{
-    if (acl) {
-        std::map<acl::Property, std::string> params;
-        params.insert(make_pair(acl::PROP_QUEUENAME, queueName));
-        params.insert(make_pair(acl::PROP_ROUTINGKEY, key));
-
-        if (!acl->authorise(userId,acl::ACT_BIND,acl::OBJ_EXCHANGE,exchangeName,&params))
-            throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied exchange bind request from " << userId));
-    }
-
-    Queue::shared_ptr queue = queues.find(queueName);
-    Exchange::shared_ptr exchange = exchanges.get(exchangeName);
-    if (!queue) {
-        throw framing::NotFoundException(QPID_MSG("Bind failed. No such queue: " << queueName));
-    } else if (!exchange) {
-        throw framing::NotFoundException(QPID_MSG("Bind failed. No such exchange: " << exchangeName));
-    } else {
-        if (queue->bind(exchange, key, arguments)) {
-            if (managementAgent.get()) {
-                managementAgent->raiseEvent(_qmf::EventBind(connectionId, userId, exchangeName,
-                                                  queueName, key, ManagementAgent::toMap(arguments)));
-            }
-        }
-    }
-}
-
-void Broker::unbind(const std::string& queueName,
-                    const std::string& exchangeName,
-                    const std::string& key,
-                    const std::string& userId,
-                    const std::string& connectionId)
-{
-    if (acl) {
-        std::map<acl::Property, std::string> params;
-        params.insert(make_pair(acl::PROP_QUEUENAME, queueName));
-        params.insert(make_pair(acl::PROP_ROUTINGKEY, key));
-        if (!acl->authorise(userId,acl::ACT_UNBIND,acl::OBJ_EXCHANGE,exchangeName,&params) )
-            throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied exchange unbind request from " << userId));
-    }
-
-    Queue::shared_ptr queue = queues.find(queueName);
-    Exchange::shared_ptr exchange = exchanges.get(exchangeName);
-    if (!queue) {
-        throw framing::NotFoundException(QPID_MSG("Bind failed. No such queue: " << queueName));
-    } else if (!exchange) {
-        throw framing::NotFoundException(QPID_MSG("Bind failed. No such exchange: " << exchangeName));
-    } else {
-        if (exchange->unbind(queue, key, 0)) {
-            if (exchange->isDurable() && queue->isDurable()) {
-                store->unbind(*exchange, *queue, key, qpid::framing::FieldTable());
-            }
-            if (managementAgent.get()) {
-                managementAgent->raiseEvent(_qmf::EventUnbind(connectionId, userId, exchangeName, queueName, key));
-            }
-        }
-    }
-}
-
-}} // namespace qpid::broker
-
diff --git a/cpp/src/qpid/broker/Broker.h b/cpp/src/qpid/broker/Broker.h
deleted file mode 100644
index 6d585bf614..0000000000
--- a/cpp/src/qpid/broker/Broker.h
+++ /dev/null
@@ -1,351 +0,0 @@
-#ifndef _Broker_
-#define _Broker_
-
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/broker/BrokerImportExport.h"
-#include "qpid/broker/ConnectionFactory.h"
-#include "qpid/broker/ConnectionToken.h"
-#include "qpid/broker/DirectExchange.h"
-#include "qpid/broker/DtxManager.h"
-#include "qpid/broker/ExchangeRegistry.h"
-#include "qpid/broker/MessageStore.h"
-#include "qpid/broker/QueueRegistry.h"
-#include "qpid/broker/LinkRegistry.h"
-#include "qpid/broker/SessionManager.h"
-#include "qpid/broker/QueueCleaner.h"
-#include "qpid/broker/QueueEvents.h"
-#include "qpid/broker/Vhost.h"
-#include "qpid/broker/System.h"
-#include "qpid/broker/ExpiryPolicy.h"
-#include "qpid/management/Manageable.h"
-#include "qpid/management/ManagementAgent.h"
-#include "qmf/org/apache/qpid/broker/Broker.h"
-#include "qmf/org/apache/qpid/broker/ArgsBrokerConnect.h"
-#include "qpid/Options.h"
-#include "qpid/Plugin.h"
-#include "qpid/DataDir.h"
-#include "qpid/framing/FrameHandler.h"
-#include "qpid/framing/OutputHandler.h"
-#include "qpid/framing/ProtocolInitiation.h"
-#include "qpid/sys/Runnable.h"
-#include "qpid/sys/Timer.h"
-#include "qpid/types/Variant.h"
-#include "qpid/RefCounted.h"
-#include "qpid/broker/AclModule.h"
-#include "qpid/sys/Mutex.h"
-
-#include <boost/intrusive_ptr.hpp>
-#include <string>
-#include <vector>
-
-namespace qpid {
-
-namespace sys {
-    class ProtocolFactory;
-    class Poller;
-}
-
-struct Url;
-
-namespace broker {
-
-class ConnectionState;
-class ExpiryPolicy;
-class Message;
-
-static const  uint16_t DEFAULT_PORT=5672;
-
-struct NoSuchTransportException : qpid::Exception
-{
-    NoSuchTransportException(const std::string& s) : Exception(s) {}
-    virtual ~NoSuchTransportException() throw() {}
-};
-
-/**
- * A broker instance.
- */
-class Broker : public sys::Runnable, public Plugin::Target,
-               public management::Manageable,
-               public RefCounted
-{
-public:
-
-    struct Options : public qpid::Options {
-        static const std::string DEFAULT_DATA_DIR_LOCATION;
-        static const std::string DEFAULT_DATA_DIR_NAME;
-
-        QPID_BROKER_EXTERN Options(const std::string& name="Broker Options");
-
-        bool noDataDir;
-        std::string dataDir;
-        uint16_t port;
-        int workerThreads;
-        int maxConnections;
-        int connectionBacklog;
-        bool enableMgmt;
-        uint16_t mgmtPubInterval;
-        uint16_t queueCleanInterval;
-        bool auth;
-        std::string realm;
-        size_t replayFlushLimit;
-        size_t replayHardLimit;
-        uint queueLimit;
-        bool tcpNoDelay;
-        bool requireEncrypted;
-        std::string knownHosts;
-        std::string saslConfigPath;
-        uint32_t maxSessionRate;
-        bool asyncQueueEvents;
-        bool qmf2Support;
-        bool qmf1Support;
-        uint queueFlowStopRatio;    // producer flow control: on
-        uint queueFlowResumeRatio;  // producer flow control: off
-        uint16_t queueThresholdEventRatio;
-
-      private:
-        std::string getHome();
-    };
-
-    class ConnectionCounter {
-            int maxConnections;
-            int connectionCount;
-            sys::Mutex connectionCountLock;
-        public:
-            ConnectionCounter(int mc): maxConnections(mc),connectionCount(0) {};
-            void inc_connectionCount() {
-                sys::ScopedLock<sys::Mutex> l(connectionCountLock);
-                connectionCount++;
-            }
-            void dec_connectionCount() {
-                sys::ScopedLock<sys::Mutex> l(connectionCountLock);
-                connectionCount--;
-            }
-            bool allowConnection() {
-                sys::ScopedLock<sys::Mutex> l(connectionCountLock);
-                return (maxConnections <= connectionCount);
-            }
-    };
-
-  private:
-    typedef std::map<std::string, boost::shared_ptr<sys::ProtocolFactory> > ProtocolFactoryMap;
-
-    void declareStandardExchange(const std::string& name, const std::string& type);
-    void setStore ();
-    void setLogLevel(const std::string& level);
-    std::string getLogLevel();
-    void createObject(const std::string& type, const std::string& name,
-                      const qpid::types::Variant::Map& properties, bool strict, const ConnectionState* context);
-    void deleteObject(const std::string& type, const std::string& name,
-                      const qpid::types::Variant::Map& options, const ConnectionState* context);
-
-    boost::shared_ptr<sys::Poller> poller;
-    sys::Timer timer;
-    std::auto_ptr<sys::Timer> clusterTimer;
-    Options config;
-    std::auto_ptr<management::ManagementAgent> managementAgent;
-    ProtocolFactoryMap protocolFactories;
-    std::auto_ptr<MessageStore> store;
-    AclModule* acl;
-    DataDir dataDir;
-
-    QueueRegistry queues;
-    ExchangeRegistry exchanges;
-    LinkRegistry links;
-    boost::shared_ptr<sys::ConnectionCodec::Factory> factory;
-    DtxManager dtxManager;
-    SessionManager sessionManager;
-    qmf::org::apache::qpid::broker::Broker* mgmtObject;
-    Vhost::shared_ptr            vhostObject;
-    System::shared_ptr           systemObject;
-    QueueCleaner queueCleaner;
-    QueueEvents queueEvents;
-    std::vector<Url> knownBrokers;
-    std::vector<Url> getKnownBrokersImpl();
-    bool deferDeliveryImpl(const std::string& queue,
-                           const boost::intrusive_ptr<Message>& msg);
-    std::string federationTag;
-    bool recovery;
-    bool inCluster, clusterUpdatee;
-    boost::intrusive_ptr<ExpiryPolicy> expiryPolicy;
-    ConnectionCounter connectionCounter;
-
-  public:
-    virtual ~Broker();
-
-    QPID_BROKER_EXTERN Broker(const Options& configuration);
-    static QPID_BROKER_EXTERN boost::intrusive_ptr<Broker> create(const Options& configuration);
-    static QPID_BROKER_EXTERN boost::intrusive_ptr<Broker> create(int16_t port = DEFAULT_PORT);
-
-    /**
-     * Return listening port. If called before bind this is
-     * the configured port. If called after it is the actual
-     * port, which will be different if the configured port is
-     * 0.
-     */
-    virtual uint16_t getPort(const std::string& name) const;
-
-    /**
-     * Run the broker. Implements Runnable::run() so the broker
-     * can be run in a separate thread.
-     */
-    virtual void run();
-
-    /** Shut down the broker */
-    virtual void shutdown();
-
-    QPID_BROKER_EXTERN void setStore (boost::shared_ptr<MessageStore>& store);
-    MessageStore& getStore() { return *store; }
-    void setAcl (AclModule* _acl) {acl = _acl;}
-    AclModule* getAcl() { return acl; }
-    QueueRegistry& getQueues() { return queues; }
-    ExchangeRegistry& getExchanges() { return exchanges; }
-    LinkRegistry& getLinks() { return links; }
-    DtxManager& getDtxManager() { return dtxManager; }
-    DataDir& getDataDir() { return dataDir; }
-    Options& getOptions() { return config; }
-    QueueEvents& getQueueEvents() { return queueEvents; }
-
-    void setExpiryPolicy(const boost::intrusive_ptr<ExpiryPolicy>& e) { expiryPolicy = e; }
-    boost::intrusive_ptr<ExpiryPolicy> getExpiryPolicy() { return expiryPolicy; }
-
-    SessionManager& getSessionManager() { return sessionManager; }
-    const std::string& getFederationTag() const { return federationTag; }
-
-    management::ManagementObject*     GetManagementObject (void) const;
-    management::Manageable*           GetVhostObject      (void) const;
-    management::Manageable::status_t  ManagementMethod (uint32_t methodId,
-                                                        management::Args& args,
-                                                        std::string& text);
-
-    /** Add to the broker's protocolFactorys */
-    void registerProtocolFactory(const std::string& name, boost::shared_ptr<sys::ProtocolFactory>);
-
-    /** Accept connections */
-    QPID_BROKER_EXTERN void accept();
-
-    /** Create a connection to another broker. */
-    void connect(const std::string& host, uint16_t port,
-                 const std::string& transport,
-                 boost::function2<void, int, std::string> failed,
-                 sys::ConnectionCodec::Factory* =0);
-    /** Create a connection to another broker. */
-    void connect(const Url& url,
-                 boost::function2<void, int, std::string> failed,
-                 sys::ConnectionCodec::Factory* =0);
-
-    /** Move messages from one queue to another.
-        A zero quantity means to move all messages
-    */
-    uint32_t queueMoveMessages( const std::string& srcQueue,
-			    const std::string& destQueue,
-			    uint32_t  qty);
-
-    boost::shared_ptr<sys::ProtocolFactory> getProtocolFactory(const std::string& name = TCP_TRANSPORT) const;
-
-    /** Expose poller so plugins can register their descriptors. */
-    boost::shared_ptr<sys::Poller> getPoller();
-
-    boost::shared_ptr<sys::ConnectionCodec::Factory> getConnectionFactory() { return factory; }
-    void setConnectionFactory(boost::shared_ptr<sys::ConnectionCodec::Factory> f) { factory = f; }
-
-    /** Timer for local tasks affecting only this broker */
-    sys::Timer& getTimer() { return timer; }
-
-    /** Timer for tasks that must be synchronized if we are in a cluster */
-    sys::Timer& getClusterTimer() { return clusterTimer.get() ? *clusterTimer : timer; }
-    void setClusterTimer(std::auto_ptr<sys::Timer>);
-
-    boost::function<std::vector<Url> ()> getKnownBrokers;
-
-    static QPID_BROKER_EXTERN const std::string TCP_TRANSPORT;
-
-    void setRecovery(bool set) { recovery = set; }
-    bool getRecovery() const { return recovery; }
-
-    /** True of this broker is part of a cluster.
-     * Only valid after early initialization of plugins is complete.
-     */
-    bool isInCluster() const { return inCluster; }
-    void setInCluster(bool set) { inCluster = set; }
-
-    /** True if this broker is joining a cluster and in the process of
-     * receiving a state update.
-     */
-    bool isClusterUpdatee() const { return clusterUpdatee; }
-    void setClusterUpdatee(bool set) { clusterUpdatee = set; }
-
-    management::ManagementAgent* getManagementAgent() { return managementAgent.get(); }
-
-    ConnectionCounter& getConnectionCounter() {return connectionCounter;}
-
-    /**
-     * Never true in a stand-alone broker. In a cluster, return true
-     * to defer delivery of messages deliveredg in a cluster-unsafe
-     * context.
-     *@return true if delivery of a message should be deferred.
-     */
-    boost::function<bool (const std::string& queue,
-                          const boost::intrusive_ptr<Message>& msg)> deferDelivery;
-
-    bool isAuthenticating ( ) { return config.auth; }
-
-    typedef boost::function1<void, boost::shared_ptr<Queue> > QueueFunctor;
-
-    std::pair<boost::shared_ptr<Queue>, bool> createQueue(
-        const std::string& name,
-        bool durable,
-        bool autodelete,
-        const OwnershipToken* owner,
-        const std::string& alternateExchange,
-        const qpid::framing::FieldTable& arguments,
-        const std::string& userId,
-        const std::string& connectionId);
-    void deleteQueue(const std::string& name,
-                     const std::string& userId,
-                     const std::string& connectionId,
-                     QueueFunctor check = QueueFunctor());
-    std::pair<Exchange::shared_ptr, bool> createExchange(
-        const std::string& name,
-        const std::string& type,
-        bool durable,
-        const std::string& alternateExchange,
-        const qpid::framing::FieldTable& args,
-        const std::string& userId, const std::string& connectionId);
-    void deleteExchange(const std::string& name, const std::string& userId,
-                        const std::string& connectionId);
-    void bind(const std::string& queue,
-              const std::string& exchange,
-              const std::string& key,
-              const qpid::framing::FieldTable& arguments,
-              const std::string& userId,
-              const std::string& connectionId);
-    void unbind(const std::string& queue,
-                const std::string& exchange,
-                const std::string& key,
-                const std::string& userId,
-                const std::string& connectionId);
-};
-
-}}
-
-#endif  /*!_Broker_*/
diff --git a/cpp/src/qpid/broker/Link.cpp b/cpp/src/qpid/broker/Link.cpp
deleted file mode 100644
index 91861ade3f..0000000000
--- a/cpp/src/qpid/broker/Link.cpp
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/broker/Link.h"
-#include "qpid/broker/LinkRegistry.h"
-#include "qpid/broker/Broker.h"
-#include "qpid/broker/Connection.h"
-#include "qmf/org/apache/qpid/broker/EventBrokerLinkUp.h"
-#include "qmf/org/apache/qpid/broker/EventBrokerLinkDown.h"
-#include "boost/bind.hpp"
-#include "qpid/log/Statement.h"
-#include "qpid/framing/enum.h"
-#include "qpid/framing/reply_exceptions.h"
-#include "qpid/broker/AclModule.h"
-
-using namespace qpid::broker;
-using qpid::framing::Buffer;
-using qpid::framing::FieldTable;
-using qpid::framing::UnauthorizedAccessException;
-using qpid::framing::connection::CLOSE_CODE_CONNECTION_FORCED;
-using qpid::management::ManagementAgent;
-using qpid::management::ManagementObject;
-using qpid::management::Manageable;
-using qpid::management::Args;
-using qpid::sys::Mutex;
-using std::stringstream;
-using std::string;
-namespace _qmf = qmf::org::apache::qpid::broker;
-
-Link::Link(LinkRegistry*  _links,
-           MessageStore*  _store,
-           string&        _host,
-           uint16_t       _port,
-           string&        _transport,
-           bool           _durable,
-           string&        _authMechanism,
-           string&        _username,
-           string&        _password,
-           Broker*        _broker,
-           Manageable*    parent)
-    : links(_links), store(_store), host(_host), port(_port),
-      transport(_transport),
-      durable(_durable),
-      authMechanism(_authMechanism), username(_username), password(_password),
-      persistenceId(0), mgmtObject(0), broker(_broker), state(0),
-      visitCount(0),
-      currentInterval(1),
-      closing(false),
-      updateUrls(false),
-      channelCounter(1),
-      connection(0),
-      agent(0)
-{
-    if (parent != 0 && broker != 0)
-    {
-        agent = broker->getManagementAgent();
-        if (agent != 0)
-        {
-            mgmtObject = new _qmf::Link(agent, this, parent, _host, _port, _transport, _durable);
-            agent->addObject(mgmtObject, 0, durable);
-        }
-    }
-    setStateLH(STATE_WAITING);
-}
-
-Link::~Link ()
-{
-    if (state == STATE_OPERATIONAL && connection != 0)
-        connection->close(CLOSE_CODE_CONNECTION_FORCED, "closed by management");
-
-    if (mgmtObject != 0)
-        mgmtObject->resourceDestroy ();
-}
-
-void Link::setStateLH (int newState)
-{
-    if (newState == state)
-        return;
-
-    state = newState;
-
-    if (hideManagement())
-        return;
-
-    switch (state)
-    {
-    case STATE_WAITING     : mgmtObject->set_state("Waiting");     break;
-    case STATE_CONNECTING  : mgmtObject->set_state("Connecting");  break;
-    case STATE_OPERATIONAL : mgmtObject->set_state("Operational"); break;
-    case STATE_FAILED      : mgmtObject->set_state("Failed");      break;
-    case STATE_CLOSED      : mgmtObject->set_state("Closed");      break;
-    case STATE_PASSIVE     : mgmtObject->set_state("Passive");      break;
-    }
-}
-
-void Link::startConnectionLH ()
-{
-    try {
-        // Set the state before calling connect.  It is possible that connect
-        // will fail synchronously and call Link::closed before returning.
-        setStateLH(STATE_CONNECTING);
-        broker->connect (host, port, transport,
-                         boost::bind (&Link::closed, this, _1, _2));
-        QPID_LOG (debug, "Inter-broker link connecting to " << host << ":" << port);
-    } catch(std::exception& e) {
-        setStateLH(STATE_WAITING);
-        if (!hideManagement())
-            mgmtObject->set_lastError (e.what());
-    }
-}
-
-void Link::established ()
-{
-    stringstream addr;
-    addr << host << ":" << port;
-    QPID_LOG (info, "Inter-broker link established to " << addr.str());
-
-    if (!hideManagement() && agent)
-        agent->raiseEvent(_qmf::EventBrokerLinkUp(addr.str()));
-
-    {
-        Mutex::ScopedLock mutex(lock);
-        setStateLH(STATE_OPERATIONAL);
-        currentInterval = 1;
-        visitCount      = 0;
-        if (closing)
-            destroy();
-    }
-}
-
-void Link::closed (int, std::string text)
-{
-    Mutex::ScopedLock mutex(lock);
-    QPID_LOG (info, "Inter-broker link disconnected from " << host << ":" << port << " " << text);
-
-    connection = 0;
-
-    if (state == STATE_OPERATIONAL) {
-        stringstream addr;
-        addr << host << ":" << port;
-        QPID_LOG (warning, "Inter-broker link disconnected from " << addr.str());
-        if (!hideManagement() && agent)
-            agent->raiseEvent(_qmf::EventBrokerLinkDown(addr.str()));
-    }
-
-    for (Bridges::iterator i = active.begin(); i != active.end(); i++) {
-        (*i)->closed();
-        created.push_back(*i);
-    }
-    active.clear();
-
-    if (state != STATE_FAILED)
-    {
-        setStateLH(STATE_WAITING);
-        if (!hideManagement())
-            mgmtObject->set_lastError (text);
-    }
-
-    if (closing)
-        destroy();
-}
-
-void Link::destroy ()
-{
-    Bridges toDelete;
-    {
-        Mutex::ScopedLock mutex(lock);
-
-        QPID_LOG (info, "Inter-broker link to " << host << ":" << port << " removed by management");
-        if (connection)
-            connection->close(CLOSE_CODE_CONNECTION_FORCED, "closed by management");
-
-        setStateLH(STATE_CLOSED);
-
-        // Move the bridges to be deleted into a local vector so there is no
-        // corruption of the iterator caused by bridge deletion.
-        for (Bridges::iterator i = active.begin(); i != active.end(); i++) {
-            (*i)->closed();
-            toDelete.push_back(*i);
-        }
-        active.clear();
-
-        for (Bridges::iterator i = created.begin(); i != created.end(); i++)
-            toDelete.push_back(*i);
-        created.clear();
-    }
-    // Now delete all bridges on this link (don't hold the lock for this).
-    for (Bridges::iterator i = toDelete.begin(); i != toDelete.end(); i++)
-        (*i)->destroy();
-    toDelete.clear();
-    links->destroy (host, port);
-}
-
-void Link::add(Bridge::shared_ptr bridge)
-{
-    Mutex::ScopedLock mutex(lock);
-    created.push_back (bridge);
-}
-
-void Link::cancel(Bridge::shared_ptr bridge)
-{
-    {
-        Mutex::ScopedLock mutex(lock);
-
-        for (Bridges::iterator i = created.begin(); i != created.end(); i++) {
-            if ((*i).get() == bridge.get()) {
-                created.erase(i);
-                break;
-            }
-        }
-        for (Bridges::iterator i = active.begin(); i != active.end(); i++) {
-            if ((*i).get() == bridge.get()) {
-                cancellations.push_back(bridge);
-                bridge->closed();
-                active.erase(i);
-                break;
-            }
-        }
-    }
-    if (!cancellations.empty()) {
-        connection->requestIOProcessing (boost::bind(&Link::ioThreadProcessing, this));
-    }
-}
-
-void Link::ioThreadProcessing()
-{
-    Mutex::ScopedLock mutex(lock);
-
-    if (state != STATE_OPERATIONAL)
-        return;
-    QPID_LOG(debug, "Link::ioThreadProcessing()");
-
-    //process any pending creates and/or cancellations
-    if (!created.empty()) {
-        for (Bridges::iterator i = created.begin(); i != created.end(); ++i) {
-            active.push_back(*i);
-            (*i)->create(*connection);
-        }
-        created.clear();
-    }
-    if (!cancellations.empty()) {
-        for (Bridges::iterator i = cancellations.begin(); i != cancellations.end(); ++i) {
-            (*i)->cancel(*connection);
-        }
-        cancellations.clear();
-    }
-}
-
-void Link::setConnection(Connection* c)
-{
-    Mutex::ScopedLock mutex(lock);
-    connection = c;
-    updateUrls = true;
-}
-
-void Link::maintenanceVisit ()
-{
-    Mutex::ScopedLock mutex(lock);
-
-    if (connection && updateUrls) {
-        urls.reset(connection->getKnownHosts());
-        QPID_LOG(debug, "Known hosts for peer of inter-broker link: " << urls);
-        updateUrls = false;
-    }
-
-    if (state == STATE_WAITING)
-    {
-        visitCount++;
-        if (visitCount >= currentInterval)
-        {
-            visitCount = 0;
-            //switch host and port to next in url list if possible
-            if (!tryFailover()) {
-                currentInterval *= 2;
-                if (currentInterval > MAX_INTERVAL)
-                    currentInterval = MAX_INTERVAL;
-                startConnectionLH();
-            }
-        }
-    }
-    else if (state == STATE_OPERATIONAL && (!created.empty() || !cancellations.empty()) && connection != 0)
-        connection->requestIOProcessing (boost::bind(&Link::ioThreadProcessing, this));
-}
-
-void Link::reconnect(const qpid::Address& a)
-{
-    Mutex::ScopedLock mutex(lock);
-    host = a.host;
-    port = a.port;
-    transport = a.protocol;
-    startConnectionLH();
-    if (!hideManagement()) {
-        stringstream errorString;
-        errorString << "Failed over to " << a;
-        mgmtObject->set_lastError(errorString.str());
-    }
-}
-
-bool Link::tryFailover()
-{
-    Address next;
-    if (urls.next(next) &&
-        (next.host != host || next.port != port || next.protocol != transport)) {
-        links->changeAddress(Address(transport, host, port), next);
-        QPID_LOG(debug, "Link failing over to " << host << ":" << port);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-// Management updates for a linke are inconsistent in a cluster, so they are
-// suppressed.
-bool Link::hideManagement() const {
-    return !mgmtObject || ( broker && broker->isInCluster());
-}
-
-uint Link::nextChannel()
-{
-    Mutex::ScopedLock mutex(lock);
-
-    return channelCounter++;
-}
-
-void Link::notifyConnectionForced(const string text)
-{
-    Mutex::ScopedLock mutex(lock);
-
-    setStateLH(STATE_FAILED);
-    if (!hideManagement())
-        mgmtObject->set_lastError(text);
-}
-
-void Link::setPersistenceId(uint64_t id) const
-{
-    persistenceId = id;
-}
-
-const string& Link::getName() const
-{
-    return host;
-}
-
-Link::shared_ptr Link::decode(LinkRegistry& links, Buffer& buffer)
-{
-    string   host;
-    uint16_t port;
-    string   transport;
-    string   authMechanism;
-    string   username;
-    string   password;
-
-    buffer.getShortString(host);
-    port = buffer.getShort();
-    buffer.getShortString(transport);
-    bool durable(buffer.getOctet());
-    buffer.getShortString(authMechanism);
-    buffer.getShortString(username);
-    buffer.getShortString(password);
-
-    return links.declare(host, port, transport, durable, authMechanism, username, password).first;
-}
-
-void Link::encode(Buffer& buffer) const
-{
-    buffer.putShortString(string("link"));
-    buffer.putShortString(host);
-    buffer.putShort(port);
-    buffer.putShortString(transport);
-    buffer.putOctet(durable ? 1 : 0);
-    buffer.putShortString(authMechanism);
-    buffer.putShortString(username);
-    buffer.putShortString(password);
-}
-
-uint32_t Link::encodedSize() const
-{
-    return host.size() + 1 // short-string (host)
-        + 5                // short-string ("link")
-        + 2                // port
-        + transport.size() + 1 // short-string(transport)
-        + 1                // durable
-        + authMechanism.size() + 1
-        + username.size() + 1
-        + password.size() + 1;
-}
-
-ManagementObject* Link::GetManagementObject (void) const
-{
-    return (ManagementObject*) mgmtObject;
-}
-
-Manageable::status_t Link::ManagementMethod (uint32_t op, Args& args, string& text)
-{
-    switch (op)
-    {
-    case _qmf::Link::METHOD_CLOSE :
-        if (!closing) {
-	    closing = true;
-	    if (state != STATE_CONNECTING && connection) {
-                //connection can only be closed on the connections own IO processing thread
-                connection->requestIOProcessing(boost::bind(&Link::destroy, this));
-	    }
-        }
-        return Manageable::STATUS_OK;
-
-    case _qmf::Link::METHOD_BRIDGE :
-        _qmf::ArgsLinkBridge& iargs = (_qmf::ArgsLinkBridge&) args;
-        QPID_LOG(debug, "Link::bridge() request received");
-
-        // Durable bridges are only valid on durable links
-        if (iargs.i_durable && !durable) {
-            text = "Can't create a durable route on a non-durable link";
-            return Manageable::STATUS_USER;
-        }
-
-        if (iargs.i_dynamic) {
-            Exchange::shared_ptr exchange = getBroker()->getExchanges().get(iargs.i_src);
-            if (exchange.get() == 0) {
-                text = "Exchange not found";
-                return Manageable::STATUS_USER;
-            }
-            if (!exchange->supportsDynamicBinding()) {
-                text = "Exchange type does not support dynamic routing";
-                return Manageable::STATUS_USER;
-            }
-        }
-
-        std::pair<Bridge::shared_ptr, bool> result =
-            links->declare (host, port, iargs.i_durable, iargs.i_src,
-                            iargs.i_dest, iargs.i_key, iargs.i_srcIsQueue,
-                            iargs.i_srcIsLocal, iargs.i_tag, iargs.i_excludes,
-                            iargs.i_dynamic, iargs.i_sync);
-
-        if (result.second && iargs.i_durable)
-            store->create(*result.first);
-
-        return Manageable::STATUS_OK;
-    }
-
-    return Manageable::STATUS_UNKNOWN_METHOD;
-}
-
-void Link::setPassive(bool passive)
-{
-    Mutex::ScopedLock mutex(lock);
-    if (passive) {
-        setStateLH(STATE_PASSIVE);
-    } else {
-        if (state == STATE_PASSIVE) {
-            setStateLH(STATE_WAITING);
-        } else {
-            QPID_LOG(warning, "Ignoring attempt to activate non-passive link");
-        }
-    }
-}
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
deleted file mode 100644
index 8efa8be3dc..0000000000
--- a/cpp/src/qpid/broker/Queue.cpp
+++ /dev/null
@@ -1,1225 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/broker/Broker.h"
-#include "qpid/broker/Queue.h"
-#include "qpid/broker/QueueEvents.h"
-#include "qpid/broker/Exchange.h"
-#include "qpid/broker/Fairshare.h"
-#include "qpid/broker/DeliverableMessage.h"
-#include "qpid/broker/LegacyLVQ.h"
-#include "qpid/broker/MessageDeque.h"
-#include "qpid/broker/MessageMap.h"
-#include "qpid/broker/MessageStore.h"
-#include "qpid/broker/NullMessageStore.h"
-#include "qpid/broker/QueueRegistry.h"
-#include "qpid/broker/QueueFlowLimit.h"
-#include "qpid/broker/ThresholdAlerts.h"
-
-#include "qpid/StringUtils.h"
-#include "qpid/log/Statement.h"
-#include "qpid/management/ManagementAgent.h"
-#include "qpid/framing/reply_exceptions.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/sys/ClusterSafe.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/sys/Time.h"
-#include "qmf/org/apache/qpid/broker/ArgsQueuePurge.h"
-#include "qmf/org/apache/qpid/broker/ArgsQueueReroute.h"
-
-#include <iostream>
-#include <algorithm>
-#include <functional>
-
-#include <boost/bind.hpp>
-#include <boost/intrusive_ptr.hpp>
-
-
-using namespace qpid::broker;
-using namespace qpid::sys;
-using namespace qpid::framing;
-using qpid::management::ManagementAgent;
-using qpid::management::ManagementObject;
-using qpid::management::Manageable;
-using qpid::management::Args;
-using std::for_each;
-using std::mem_fun;
-namespace _qmf = qmf::org::apache::qpid::broker;
-
-
-namespace 
-{
-const std::string qpidMaxSize("qpid.max_size");
-const std::string qpidMaxCount("qpid.max_count");
-const std::string qpidNoLocal("no-local");
-const std::string qpidTraceIdentity("qpid.trace.id");
-const std::string qpidTraceExclude("qpid.trace.exclude");
-const std::string qpidLastValueQueueKey("qpid.last_value_queue_key");
-const std::string qpidLastValueQueue("qpid.last_value_queue");
-const std::string qpidLastValueQueueNoBrowse("qpid.last_value_queue_no_browse");
-const std::string qpidPersistLastNode("qpid.persist_last_node");
-const std::string qpidVQMatchProperty("qpid.LVQ_key");
-const std::string qpidQueueEventGeneration("qpid.queue_event_generation");
-const std::string qpidAutoDeleteTimeout("qpid.auto_delete_timeout");
-//following feature is not ready for general use as it doesn't handle
-//the case where a message is enqueued on more than one queue well enough:
-const std::string qpidInsertSequenceNumbers("qpid.insert_sequence_numbers");
-
-const int ENQUEUE_ONLY=1;
-const int ENQUEUE_AND_DEQUEUE=2;
-}
-
-Queue::Queue(const string& _name, bool _autodelete, 
-             MessageStore* const _store,
-             const OwnershipToken* const _owner,
-             Manageable* parent,
-             Broker* b) :
-
-    name(_name), 
-    autodelete(_autodelete),
-    store(_store),
-    owner(_owner), 
-    consumerCount(0),
-    exclusive(0),
-    noLocal(false),
-    persistLastNode(false),
-    inLastNodeFailure(false),
-    messages(new MessageDeque()),
-    persistenceId(0),
-    policyExceeded(false),
-    mgmtObject(0),
-    eventMode(0),
-    insertSeqNo(0),
-    broker(b),
-    deleted(false),
-    barrier(*this),
-    autoDeleteTimeout(0)
-{
-    if (parent != 0 && broker != 0) {
-        ManagementAgent* agent = broker->getManagementAgent();
-
-        if (agent != 0) {
-            mgmtObject = new _qmf::Queue(agent, this, parent, _name, _store != 0, _autodelete, _owner != 0);
-            agent->addObject(mgmtObject, 0, store != 0);
-        }
-    }
-}
-
-Queue::~Queue()
-{
-    if (mgmtObject != 0)
-        mgmtObject->resourceDestroy();
-}
-
-bool isLocalTo(const OwnershipToken* token, boost::intrusive_ptr<Message>& msg)
-{
-    return token && token->isLocal(msg->getPublisher());
-}
-
-bool Queue::isLocal(boost::intrusive_ptr<Message>& msg)
-{
-    //message is considered local if it was published on the same
-    //connection as that of the session which declared this queue
-    //exclusive (owner) or which has an exclusive subscription
-    //(exclusive)
-    return noLocal && (isLocalTo(owner, msg) || isLocalTo(exclusive, msg));
-}
-
-bool Queue::isExcluded(boost::intrusive_ptr<Message>& msg)
-{
-    return traceExclude.size() && msg->isExcluded(traceExclude);
-}
-
-void Queue::deliver(boost::intrusive_ptr<Message> msg){
-    // Check for deferred delivery in a cluster.
-    if (broker && broker->deferDelivery(name, msg))
-        return;
-    if (msg->isImmediate() && getConsumerCount() == 0) {
-        if (alternateExchange) {
-            DeliverableMessage deliverable(msg);
-            alternateExchange->route(deliverable, msg->getRoutingKey(), msg->getApplicationHeaders());
-        }
-    } else if (isLocal(msg)) {
-        //drop message
-        QPID_LOG(info, "Dropping 'local' message from " << getName());
-    } else if (isExcluded(msg)) {
-        //drop message
-        QPID_LOG(info, "Dropping excluded message from " << getName());
-    } else {
-        enqueue(0, msg);
-        push(msg);
-        QPID_LOG(debug, "Message " << msg << " enqueued on " << name);
-    }
-}
-
-void Queue::recoverPrepared(boost::intrusive_ptr<Message>& msg)
-{
-    if (policy.get()) policy->recoverEnqueued(msg);
-}
-
-void Queue::recover(boost::intrusive_ptr<Message>& msg){
-    if (policy.get()) policy->recoverEnqueued(msg);
-
-    push(msg, true);
-    if (store){ 
-        // setup synclist for recovered messages, so they don't get re-stored on lastNodeFailure
-        msg->addToSyncList(shared_from_this(), store); 
-    }
-
-    if (store && (!msg->isContentLoaded() || msg->checkContentReleasable())) {
-        //content has not been loaded, need to ensure that lazy loading mode is set:
-        //TODO: find a nicer way to do this
-        msg->releaseContent(store);
-        // NOTE: The log message in this section are used for flow-to-disk testing (which checks the log for the
-        // presence of this message). Do not change this without also checking these tests.
-        QPID_LOG(debug, "Message id=\"" << msg->getProperties<MessageProperties>()->getMessageId() << "\"; pid=0x" <<
-                        std::hex << msg->getPersistenceId() << std::dec << ": Content released after recovery");
-    }
-}
-
-void Queue::process(boost::intrusive_ptr<Message>& msg){
-    push(msg);
-    if (mgmtObject != 0){
-        mgmtObject->inc_msgTxnEnqueues ();
-        mgmtObject->inc_byteTxnEnqueues (msg->contentSize ());
-    }
-}
-
-void Queue::requeue(const QueuedMessage& msg){
-    assertClusterSafe();
-    QueueListeners::NotificationSet copy;
-    {    
-        Mutex::ScopedLock locker(messageLock);
-        if (!isEnqueued(msg)) return;
-        messages->reinsert(msg);
-        listeners.populate(copy);
-
-        // for persistLastNode - don't force a message twice to disk, but force it if no force before 
-        if(inLastNodeFailure && persistLastNode && !msg.payload->isStoredOnQueue(shared_from_this())) {
-            msg.payload->forcePersistent();
-            if (msg.payload->isForcedPersistent() ){
-                boost::intrusive_ptr<Message> payload = msg.payload;
-            	enqueue(0, payload);
-            }
-        }
-    }
-    copy.notify();
-}
-
-bool Queue::acquireMessageAt(const SequenceNumber& position, QueuedMessage& message) 
-{
-    Mutex::ScopedLock locker(messageLock);
-    assertClusterSafe();
-    QPID_LOG(debug, "Attempting to acquire message at " << position);
-    if (messages->remove(position, message)) {
-        QPID_LOG(debug, "Acquired message at " << position << " from " << name);
-        return true;
-    } else {
-        QPID_LOG(debug, "Could not acquire message at " << position << " from " << name << "; no message at that position");
-        return false;
-    }
-}
-
-bool Queue::acquire(const QueuedMessage& msg) {
-    QueuedMessage copy = msg;
-    return acquireMessageAt(msg.position, copy);
-}
-
-void Queue::notifyListener()
-{
-    assertClusterSafe();
-    QueueListeners::NotificationSet set;
-    {
-        Mutex::ScopedLock locker(messageLock);
-        if (messages->size()) {
-            listeners.populate(set);
-        }
-    }
-    set.notify();
-}
-
-bool Queue::getNextMessage(QueuedMessage& m, Consumer::shared_ptr c)
-{
-    checkNotDeleted();
-    if (c->preAcquires()) {
-        switch (consumeNextMessage(m, c)) {
-          case CONSUMED:
-            return true;
-          case CANT_CONSUME:
-            notifyListener();//let someone else try
-          case NO_MESSAGES:
-          default:
-            return false;
-        }        
-    } else {
-        return browseNextMessage(m, c);
-    }
-}
-
-Queue::ConsumeCode Queue::consumeNextMessage(QueuedMessage& m, Consumer::shared_ptr c)
-{
-    while (true) {
-        Mutex::ScopedLock locker(messageLock);
-        if (messages->empty()) { 
-            QPID_LOG(debug, "No messages to dispatch on queue '" << name << "'");
-            listeners.addListener(c);
-            return NO_MESSAGES;
-        } else {
-            QueuedMessage msg = messages->front();
-            if (msg.payload->hasExpired()) {
-                QPID_LOG(debug, "Message expired from queue '" << name << "'");
-                popAndDequeue();
-                continue;
-            }
-
-            if (c->filter(msg.payload)) {
-                if (c->accept(msg.payload)) {            
-                    m = msg;
-                    pop();
-                    return CONSUMED;
-                } else {
-                    //message(s) are available but consumer hasn't got enough credit
-                    QPID_LOG(debug, "Consumer can't currently accept message from '" << name << "'");
-                    return CANT_CONSUME;
-                }
-            } else {
-                //consumer will never want this message
-                QPID_LOG(debug, "Consumer doesn't want message from '" << name << "'");
-                return CANT_CONSUME;
-            } 
-        }
-    }
-}
-
-
-bool Queue::browseNextMessage(QueuedMessage& m, Consumer::shared_ptr c)
-{
-    QueuedMessage msg(this);
-    while (seek(msg, c)) {
-        if (c->filter(msg.payload) && !msg.payload->hasExpired()) {
-            if (c->accept(msg.payload)) {
-                //consumer wants the message
-                c->position = msg.position;
-                m = msg;
-                return true;
-            } else {
-                //browser hasn't got enough credit for the message
-                QPID_LOG(debug, "Browser can't currently accept message from '" << name << "'");
-                return false;
-            }
-        } else {
-            //consumer will never want this message, continue seeking
-            c->position = msg.position;
-            QPID_LOG(debug, "Browser skipping message from '" << name << "'");
-        }
-    }
-    return false;
-}
-
-void Queue::removeListener(Consumer::shared_ptr c)
-{
-    QueueListeners::NotificationSet set;
-    {
-        Mutex::ScopedLock locker(messageLock);
-        listeners.removeListener(c);
-        if (messages->size()) {
-            listeners.populate(set);
-        }
-    }
-    set.notify();
-}
-
-bool Queue::dispatch(Consumer::shared_ptr c)
-{
-    QueuedMessage msg(this);
-    if (getNextMessage(msg, c)) {
-        c->deliver(msg);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-// Find the next message 
-bool Queue::seek(QueuedMessage& msg, Consumer::shared_ptr c) {
-    Mutex::ScopedLock locker(messageLock);
-    if (messages->next(c->position, msg)) {
-        return true;
-    } else {
-        listeners.addListener(c);
-        return false;
-    }
-}
-
-QueuedMessage Queue::find(SequenceNumber pos) const {
-
-    Mutex::ScopedLock locker(messageLock);
-    QueuedMessage msg;
-    messages->find(pos, msg);
-    return msg;
-}
-
-void Queue::consume(Consumer::shared_ptr c, bool requestExclusive){
-    assertClusterSafe();
-    Mutex::ScopedLock locker(consumerLock);
-    if(exclusive) {
-        throw ResourceLockedException(
-            QPID_MSG("Queue " << getName() << " has an exclusive consumer. No more consumers allowed."));
-    } else if(requestExclusive) {
-        if(consumerCount) {
-            throw ResourceLockedException(
-                QPID_MSG("Queue " << getName() << " already has consumers. Exclusive access denied."));
-        } else {
-            exclusive = c->getSession();
-        }
-    }
-    consumerCount++;
-    if (mgmtObject != 0)
-        mgmtObject->inc_consumerCount ();
-    //reset auto deletion timer if necessary
-    if (autoDeleteTimeout && autoDeleteTask) {
-        autoDeleteTask->cancel();
-    }
-}
-
-void Queue::cancel(Consumer::shared_ptr c){
-    removeListener(c);
-    Mutex::ScopedLock locker(consumerLock);
-    consumerCount--;
-    if(exclusive) exclusive = 0;
-    if (mgmtObject != 0)
-        mgmtObject->dec_consumerCount ();
-}
-
-QueuedMessage Queue::get(){
-    Mutex::ScopedLock locker(messageLock);
-    QueuedMessage msg(this);
-    messages->pop(msg);
-    return msg;
-}
-
-bool collect_if_expired(std::deque<QueuedMessage>& expired, QueuedMessage& message)
-{
-    if (message.payload->hasExpired()) {
-        expired.push_back(message);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-void Queue::purgeExpired()
-{
-    //As expired messages are discarded during dequeue also, only
-    //bother explicitly expiring if the rate of dequeues since last
-    //attempt is less than one per second.  
-
-    if (dequeueTracker.sampleRatePerSecond() < 1) {
-        std::deque<QueuedMessage> expired;
-        {
-            Mutex::ScopedLock locker(messageLock);
-            messages->removeIf(boost::bind(&collect_if_expired, expired, _1));
-        }
-        for_each(expired.begin(), expired.end(), boost::bind(&Queue::dequeue, this, (TransactionContext*) 0, _1));
-    }
-}
-
-/**
- * purge - for purging all or some messages on a queue
- *         depending on the purge_request
- *
- * purge_request == 0 then purge all messages
- *               == N then purge N messages from queue
- * Sometimes purge_request == 1 to unblock the top of queue
- *
- * The dest exchange may be supplied to re-route messages through the exchange.
- * It is safe to re-route messages such that they arrive back on the same queue,
- * even if the queue is ordered by priority.
- */
-uint32_t Queue::purge(const uint32_t purge_request, boost::shared_ptr<Exchange> dest)
-{
-    Mutex::ScopedLock locker(messageLock);
-    uint32_t purge_count = purge_request; // only comes into play if  >0 
-    std::deque<DeliverableMessage> rerouteQueue;
-
-    uint32_t count = 0;
-    // Either purge them all or just the some (purge_count) while the queue isn't empty.
-    while((!purge_request || purge_count--) && !messages->empty()) {
-        if (dest.get()) {
-            //
-            // If there is a destination exchange, stage the messages onto a reroute queue
-            // so they don't wind up getting purged more than once.
-            //
-            DeliverableMessage msg(messages->front().payload);
-            rerouteQueue.push_back(msg);
-        }
-        popAndDequeue();
-        count++;
-    }
-
-    //
-    // Re-route purged messages into the destination exchange.  Note that there's no need
-    // to test dest.get() here because if it is NULL, the rerouteQueue will be empty.
-    //
-    while (!rerouteQueue.empty()) {
-        DeliverableMessage msg(rerouteQueue.front());
-        rerouteQueue.pop_front();
-        dest->routeWithAlternate(msg);
-    }
-
-    return count;
-}
-
-uint32_t Queue::move(const Queue::shared_ptr destq, uint32_t qty) {
-    Mutex::ScopedLock locker(messageLock);
-    uint32_t move_count = qty; // only comes into play if  qty >0 
-    uint32_t count = 0; // count how many were moved for returning
-
-    while((!qty || move_count--) && !messages->empty()) {
-        QueuedMessage qmsg = messages->front();
-        boost::intrusive_ptr<Message> msg = qmsg.payload;
-        destq->deliver(msg); // deliver message to the destination queue
-        pop();
-        dequeue(0, qmsg);
-        count++;
-    }
-    return count;
-}
-
-void Queue::pop()
-{
-    assertClusterSafe();
-    messages->pop();
-    ++dequeueTracker;
-}
-
-void Queue::push(boost::intrusive_ptr<Message>& msg, bool isRecovery){
-    assertClusterSafe();
-    QueueListeners::NotificationSet copy;
-    QueuedMessage removed;
-    bool dequeueRequired = false;
-    {
-        Mutex::ScopedLock locker(messageLock);   
-        QueuedMessage qm(this, msg, ++sequence);
-        if (insertSeqNo) msg->getOrInsertHeaders().setInt64(seqNoKey, sequence);
-         
-        dequeueRequired = messages->push(qm, removed);
-        listeners.populate(copy);
-        enqueued(qm);
-    }
-    copy.notify();
-    if (dequeueRequired) {
-        if (isRecovery) {
-            //can't issue new requests for the store until
-            //recovery is complete
-            pendingDequeues.push_back(removed);
-        } else {
-            dequeue(0, removed);
-        }
-    }
-}
-
-void isEnqueueComplete(uint32_t* result, const QueuedMessage& message)
-{
-    if (message.payload->isIngressComplete()) (*result)++;
-}
-
-/** function only provided for unit tests, or code not in critical message path */
-uint32_t Queue::getEnqueueCompleteMessageCount() const
-{
-    Mutex::ScopedLock locker(messageLock);
-    uint32_t count = 0;
-    messages->foreach(boost::bind(&isEnqueueComplete, &count, _1));
-    return count;
-}
-
-uint32_t Queue::getMessageCount() const
-{
-    Mutex::ScopedLock locker(messageLock);
-    return messages->size();
-}
-
-uint32_t Queue::getConsumerCount() const
-{
-    Mutex::ScopedLock locker(consumerLock);
-    return consumerCount;
-}
-
-bool Queue::canAutoDelete() const
-{
-    Mutex::ScopedLock locker(consumerLock);
-    return autodelete && !consumerCount && !owner;
-}
-
-void Queue::clearLastNodeFailure()
-{
-    inLastNodeFailure = false;
-}
-
-void Queue::forcePersistent(QueuedMessage& message)
-{
-    if(!message.payload->isStoredOnQueue(shared_from_this())) {
-        message.payload->forcePersistent();
-        if (message.payload->isForcedPersistent() ){
-            enqueue(0, message.payload);
-        }
-    }
-}
-
-void Queue::setLastNodeFailure()
-{
-    if (persistLastNode){
-        Mutex::ScopedLock locker(messageLock);
-        try {
-            messages->foreach(boost::bind(&Queue::forcePersistent, this, _1));
-        } catch (const std::exception& e) {
-            // Could not go into last node standing (for example journal not large enough)
-            QPID_LOG(error, "Unable to fail to last node standing for queue: " << name << " : " << e.what());
-        }
-        inLastNodeFailure = true;
-    }
-}
-
-
-// return true if store exists, 
-bool Queue::enqueue(TransactionContext* ctxt, boost::intrusive_ptr<Message>& msg, bool suppressPolicyCheck)
-{
-    ScopedUse u(barrier);
-    if (!u.acquired) return false;
-
-    if (policy.get() && !suppressPolicyCheck) {
-        std::deque<QueuedMessage> dequeues;
-        {
-            Mutex::ScopedLock locker(messageLock);
-            policy->tryEnqueue(msg);
-            policy->getPendingDequeues(dequeues);
-        }
-        //depending on policy, may have some dequeues that need to performed without holding the lock
-        for_each(dequeues.begin(), dequeues.end(), boost::bind(&Queue::dequeue, this, (TransactionContext*) 0, _1));        
-    }
-
-    if (inLastNodeFailure && persistLastNode){
-        msg->forcePersistent();
-    }
-       
-    if (traceId.size()) {
-        //copy on write: take deep copy of message before modifying it
-        //as the frames may already be available for delivery on other
-        //threads
-        boost::intrusive_ptr<Message> copy(new Message(*msg));
-        msg = copy;
-        msg->addTraceId(traceId);
-    }
-
-    if ((msg->isPersistent() || msg->checkContentReleasable()) && store) {
-        // mark the message as being enqueued - the store MUST CALL msg->enqueueComplete()
-        // when it considers the message stored.
-        msg->enqueueAsync(shared_from_this(), store);
-        boost::intrusive_ptr<PersistableMessage> pmsg = boost::static_pointer_cast<PersistableMessage>(msg);
-        store->enqueue(ctxt, pmsg, *this);
-        return true;
-    }
-    if (!store) {
-        //Messages enqueued on a transient queue should be prevented
-        //from having their content released as it may not be
-        //recoverable by these queue for delivery
-        msg->blockContentRelease();
-    }
-    return false;
-}
-
-void Queue::enqueueAborted(boost::intrusive_ptr<Message> msg)
-{
-    Mutex::ScopedLock locker(messageLock);
-    if (policy.get()) policy->enqueueAborted(msg);       
-}
-
-// return true if store exists, 
-bool Queue::dequeue(TransactionContext* ctxt, const QueuedMessage& msg)
-{
-    ScopedUse u(barrier);
-    if (!u.acquired) return false;
-
-    {
-        Mutex::ScopedLock locker(messageLock);
-        if (!isEnqueued(msg)) return false;
-        if (!ctxt) { 
-            dequeued(msg);
-        }
-    }
-    // This check prevents messages which have been forced persistent on one queue from dequeuing
-    // from another on which no forcing has taken place and thus causing a store error.
-    bool fp = msg.payload->isForcedPersistent();
-    if (!fp || (fp && msg.payload->isStoredOnQueue(shared_from_this()))) {
-        if ((msg.payload->isPersistent() || msg.payload->checkContentReleasable()) && store) {
-            msg.payload->dequeueAsync(shared_from_this(), store); //increment to async counter -- for message sent to more than one queue
-            boost::intrusive_ptr<PersistableMessage> pmsg = boost::static_pointer_cast<PersistableMessage>(msg.payload);
-            store->dequeue(ctxt, pmsg, *this);
-            return true;
-        }
-    }
-    return false;
-}
-
-void Queue::dequeueCommitted(const QueuedMessage& msg)
-{
-    Mutex::ScopedLock locker(messageLock);
-    dequeued(msg);    
-    if (mgmtObject != 0) {
-        mgmtObject->inc_msgTxnDequeues();
-        mgmtObject->inc_byteTxnDequeues(msg.payload->contentSize());
-    }
-}
-
-/**
- * Removes a message from the in-memory delivery queue as well
- * dequeing it from the logical (and persistent if applicable) queue
- */
-void Queue::popAndDequeue()
-{
-    QueuedMessage msg = messages->front();
-    pop();
-    dequeue(0, msg);
-}
-
-/**
- * Updates policy and management when a message has been dequeued,
- * expects messageLock to be held
- */
-void Queue::dequeued(const QueuedMessage& msg)
-{
-    if (policy.get()) policy->dequeued(msg);
-    mgntDeqStats(msg.payload);
-    for (Observers::const_iterator i = observers.begin(); i != observers.end(); ++i) {
-        try{
-            (*i)->dequeued(msg);
-        } catch (const std::exception& e) {
-            QPID_LOG(warning, "Exception on notification of dequeue for queue " << getName() << ": " << e.what());
-        }
-    }
-}
-
-
-void Queue::create(const FieldTable& _settings)
-{
-    settings = _settings;
-    if (store) {
-        store->create(*this, _settings);
-    }
-    configureImpl(_settings);
-}
-
-
-int getIntegerSetting(const qpid::framing::FieldTable& settings, const std::string& key)
-{
-    qpid::framing::FieldTable::ValuePtr v = settings.get(key);
-    if (!v) {
-        return 0;
-    } else if (v->convertsTo<int>()) {
-        return v->get<int>();
-    } else if (v->convertsTo<std::string>()){
-        std::string s = v->get<std::string>();
-        try { 
-            return boost::lexical_cast<int>(s); 
-        } catch(const boost::bad_lexical_cast&) {
-            QPID_LOG(warning, "Ignoring invalid integer value for " << key << ": " << s);
-            return 0;
-        }
-    } else {
-        QPID_LOG(warning, "Ignoring invalid integer value for " << key << ": " << *v);
-        return 0;
-    }
-}
-
-void Queue::configure(const FieldTable& _settings)
-{
-    settings = _settings;
-    configureImpl(settings);
-}
-
-void Queue::configureImpl(const FieldTable& _settings)
-{
-    eventMode = _settings.getAsInt(qpidQueueEventGeneration);
-    if (eventMode && broker) {
-        broker->getQueueEvents().observe(*this, eventMode == ENQUEUE_ONLY);
-    }
-
-    if (QueuePolicy::getType(_settings) == QueuePolicy::FLOW_TO_DISK && 
-        (!store || NullMessageStore::isNullStore(store) || (broker && !(broker->getQueueEvents().isSync())) )) {
-        if ( NullMessageStore::isNullStore(store)) {
-            QPID_LOG(warning, "Flow to disk not valid for non-persisted queue:" << getName());
-        } else if (broker && !(broker->getQueueEvents().isSync()) ) {
-            QPID_LOG(warning, "Flow to disk not valid with async Queue Events:" << getName());
-        }
-        FieldTable copy(_settings);
-        copy.erase(QueuePolicy::typeKey);
-        setPolicy(QueuePolicy::createQueuePolicy(getName(), copy));
-    } else {
-        setPolicy(QueuePolicy::createQueuePolicy(getName(), _settings));
-    }
-    if (broker && broker->getManagementAgent()) {
-        ThresholdAlerts::observe(*this, *(broker->getManagementAgent()), _settings, broker->getOptions().queueThresholdEventRatio);
-    }
-
-    //set this regardless of owner to allow use of no-local with exclusive consumers also
-    noLocal = _settings.get(qpidNoLocal);
-    QPID_LOG(debug, "Configured queue " << getName() << " with no-local=" << noLocal);
-
-    std::string lvqKey = _settings.getAsString(qpidLastValueQueueKey);
-    if (lvqKey.size()) {
-        QPID_LOG(debug, "Configured queue " <<  getName() << " as Last Value Queue with key " << lvqKey);
-        messages = std::auto_ptr<Messages>(new MessageMap(lvqKey));
-    } else if (_settings.get(qpidLastValueQueueNoBrowse)) {
-        QPID_LOG(debug, "Configured queue " <<  getName() << " as Legacy Last Value Queue with 'no-browse' on");
-        messages = LegacyLVQ::updateOrReplace(messages, qpidVQMatchProperty, true, broker);
-    } else if (_settings.get(qpidLastValueQueue)) {
-        QPID_LOG(debug, "Configured queue " <<  getName() << " as Legacy Last Value Queue");
-        messages = LegacyLVQ::updateOrReplace(messages, qpidVQMatchProperty, false, broker);
-    } else {
-        std::auto_ptr<Messages> m = Fairshare::create(_settings);
-        if (m.get()) {
-            messages = m;
-            QPID_LOG(debug, "Configured queue " <<  getName() << " as priority queue.");
-        }
-    }
-    
-    persistLastNode= _settings.get(qpidPersistLastNode);
-    if (persistLastNode) QPID_LOG(debug, "Configured queue to Persist data if cluster fails to one node for: " << getName());
-
-    traceId = _settings.getAsString(qpidTraceIdentity);
-    std::string excludeList = _settings.getAsString(qpidTraceExclude);
-    if (excludeList.size()) {
-        split(traceExclude, excludeList, ", ");
-    }
-    QPID_LOG(debug, "Configured queue " << getName() << " with qpid.trace.id='" << traceId 
-             << "' and qpid.trace.exclude='"<< excludeList << "' i.e. " << traceExclude.size() << " elements");
-
-    FieldTable::ValuePtr p =_settings.get(qpidInsertSequenceNumbers);
-    if (p && p->convertsTo<std::string>()) insertSequenceNumbers(p->get<std::string>());
-
-    autoDeleteTimeout = getIntegerSetting(_settings, qpidAutoDeleteTimeout);
-    if (autoDeleteTimeout) 
-        QPID_LOG(debug, "Configured queue " << getName() << " with qpid.auto_delete_timeout=" << autoDeleteTimeout); 
-
-    if (mgmtObject != 0) {
-        mgmtObject->set_arguments(ManagementAgent::toMap(_settings));
-    }
-
-    QueueFlowLimit::observe(*this, _settings);
-}
-
-void Queue::destroyed()
-{
-    unbind(broker->getExchanges());
-    if (alternateExchange.get()) {
-        Mutex::ScopedLock locker(messageLock);
-        while(!messages->empty()){
-            DeliverableMessage msg(messages->front().payload);
-            alternateExchange->routeWithAlternate(msg);
-            popAndDequeue();
-        }
-        alternateExchange->decAlternateUsers();
-    }
-
-    if (store) {
-        barrier.destroy();
-        store->flush(*this);
-        store->destroy(*this);
-        store = 0;//ensure we make no more calls to the store for this queue
-    }
-    if (autoDeleteTask) autoDeleteTask = boost::intrusive_ptr<TimerTask>();
-    notifyDeleted();
-}
-
-void Queue::notifyDeleted()
-{
-    QueueListeners::ListenerSet set;
-    {
-        Mutex::ScopedLock locker(messageLock);
-        listeners.snapshot(set);
-        deleted = true;
-    }
-    set.notifyAll();
-}
-
-void Queue::bound(const string& exchange, const string& key,
-                  const FieldTable& args)
-{
-    bindings.add(exchange, key, args);
-}
-
-void Queue::unbind(ExchangeRegistry& exchanges)
-{
-    bindings.unbind(exchanges, shared_from_this());
-}
-
-void Queue::setPolicy(std::auto_ptr<QueuePolicy> _policy)
-{
-    policy = _policy;
-}
-
-const QueuePolicy* Queue::getPolicy()
-{
-    return policy.get();
-}
-
-uint64_t Queue::getPersistenceId() const 
-{ 
-    return persistenceId; 
-}
-
-void Queue::setPersistenceId(uint64_t _persistenceId) const
-{
-    if (mgmtObject != 0 && persistenceId == 0 && externalQueueStore)
-    {
-        ManagementObject* childObj = externalQueueStore->GetManagementObject();
-        if (childObj != 0)
-            childObj->setReference(mgmtObject->getObjectId());
-    }
-    persistenceId = _persistenceId;
-}
-
-void Queue::encode(Buffer& buffer) const 
-{
-    buffer.putShortString(name);
-    buffer.put(settings);
-    if (policy.get()) { 
-        buffer.put(*policy);
-    }
-    buffer.putShortString(alternateExchange.get() ? alternateExchange->getName() : std::string(""));
-}
-
-uint32_t Queue::encodedSize() const
-{
-    return name.size() + 1/*short string size octet*/
-        + (alternateExchange.get() ? alternateExchange->getName().size() : 0) + 1 /* short string */
-        + settings.encodedSize()
-        + (policy.get() ? (*policy).encodedSize() : 0);
-}
-
-Queue::shared_ptr Queue::restore( QueueRegistry& queues, Buffer& buffer )
-{
-    string name;
-    buffer.getShortString(name);
-    FieldTable settings;
-    buffer.get(settings);
-    boost::shared_ptr<Exchange> alternate;
-    std::pair<Queue::shared_ptr, bool> result = queues.declare(name, true, false, 0, alternate, settings, true);
-    if (result.first->policy.get() && buffer.available() >= result.first->policy->encodedSize()) {
-        buffer.get ( *(result.first->policy) );
-    }
-    if (buffer.available()) {
-        string altExch;
-        buffer.getShortString(altExch);
-        result.first->alternateExchangeName.assign(altExch);
-    }
-
-    return result.first;
-}
-
-
-void Queue::setAlternateExchange(boost::shared_ptr<Exchange> exchange)
-{
-    alternateExchange = exchange;
-    if (mgmtObject) {
-        if (exchange.get() != 0)
-            mgmtObject->set_altExchange(exchange->GetManagementObject()->getObjectId());
-        else
-            mgmtObject->clr_altExchange();
-    }
-}
-
-boost::shared_ptr<Exchange> Queue::getAlternateExchange()
-{
-    return alternateExchange;
-}
-
-void tryAutoDeleteImpl(Broker& broker, Queue::shared_ptr queue)
-{
-    if (broker.getQueues().destroyIf(queue->getName(), 
-                                     boost::bind(boost::mem_fn(&Queue::canAutoDelete), queue))) {
-        QPID_LOG(debug, "Auto-deleting " << queue->getName());
-        queue->destroyed();
-    }
-}
-
-struct AutoDeleteTask : qpid::sys::TimerTask
-{
-    Broker& broker;
-    Queue::shared_ptr queue;
-
-    AutoDeleteTask(Broker& b, Queue::shared_ptr q, AbsTime fireTime) 
-        : qpid::sys::TimerTask(fireTime, "DelayedAutoDeletion"), broker(b), queue(q) {}
-
-    void fire()
-    {
-        //need to detect case where queue was used after the task was
-        //created, but then became unused again before the task fired;
-        //in this case ignore this request as there will have already
-        //been a later task added
-        tryAutoDeleteImpl(broker, queue);
-    }
-};
-
-void Queue::tryAutoDelete(Broker& broker, Queue::shared_ptr queue)
-{
-    if (queue->autoDeleteTimeout && queue->canAutoDelete()) {
-        AbsTime time(now(), Duration(queue->autoDeleteTimeout * TIME_SEC));
-        queue->autoDeleteTask = boost::intrusive_ptr<qpid::sys::TimerTask>(new AutoDeleteTask(broker, queue, time));
-        broker.getClusterTimer().add(queue->autoDeleteTask);        
-        QPID_LOG(debug, "Timed auto-delete for " << queue->getName() << " initiated");
-    } else {
-        tryAutoDeleteImpl(broker, queue);
-    }
-}
-
-bool Queue::isExclusiveOwner(const OwnershipToken* const o) const 
-{ 
-    Mutex::ScopedLock locker(ownershipLock);
-    return o == owner; 
-}
-
-void Queue::releaseExclusiveOwnership() 
-{ 
-    Mutex::ScopedLock locker(ownershipLock);
-    owner = 0; 
-}
-
-bool Queue::setExclusiveOwner(const OwnershipToken* const o) 
-{ 
-    //reset auto deletion timer if necessary
-    if (autoDeleteTimeout && autoDeleteTask) {
-        autoDeleteTask->cancel();
-    }
-    Mutex::ScopedLock locker(ownershipLock);
-    if (owner) {
-        return false;
-    } else {
-        owner = o; 
-        return true;
-    }
-}
-
-bool Queue::hasExclusiveOwner() const 
-{ 
-    Mutex::ScopedLock locker(ownershipLock);
-    return owner != 0; 
-}
-
-bool Queue::hasExclusiveConsumer() const 
-{ 
-    return exclusive; 
-}
-
-void Queue::setExternalQueueStore(ExternalQueueStore* inst) {
-    if (externalQueueStore!=inst && externalQueueStore) 
-        delete externalQueueStore; 
-    externalQueueStore = inst;
-
-    if (inst) {
-        ManagementObject* childObj = inst->GetManagementObject();
-        if (childObj != 0 && mgmtObject != 0)
-            childObj->setReference(mgmtObject->getObjectId());
-    }
-}
-
-ManagementObject* Queue::GetManagementObject (void) const
-{
-    return (ManagementObject*) mgmtObject;
-}
-
-Manageable::status_t Queue::ManagementMethod (uint32_t methodId, Args& args, string& etext)
-{
-    Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD;
-
-    QPID_LOG (debug, "Queue::ManagementMethod [id=" << methodId << "]");
-
-    switch (methodId) {
-    case _qmf::Queue::METHOD_PURGE :
-        {
-            _qmf::ArgsQueuePurge& purgeArgs = (_qmf::ArgsQueuePurge&) args;
-            purge(purgeArgs.i_request);
-            status = Manageable::STATUS_OK;
-        }
-        break;
-
-    case _qmf::Queue::METHOD_REROUTE :
-        {
-            _qmf::ArgsQueueReroute& rerouteArgs = (_qmf::ArgsQueueReroute&) args;
-            boost::shared_ptr<Exchange> dest;
-            if (rerouteArgs.i_useAltExchange)
-                dest = alternateExchange;
-            else {
-                try {
-                    dest = broker->getExchanges().get(rerouteArgs.i_exchange);
-                } catch(const std::exception&) {
-                    status = Manageable::STATUS_PARAMETER_INVALID;
-                    etext = "Exchange not found";
-                    break;
-                }
-            }
-
-            purge(rerouteArgs.i_request, dest);
-            status = Manageable::STATUS_OK;
-        }
-        break;
-    }
-
-    return status;
-}
-
-void Queue::setPosition(SequenceNumber n) {
-    Mutex::ScopedLock locker(messageLock);
-    sequence = n;
-}
-
-SequenceNumber Queue::getPosition() {
-    return sequence;
-}
-
-int Queue::getEventMode() { return eventMode; }
-
-void Queue::recoveryComplete(ExchangeRegistry& exchanges)
-{
-    // set the alternate exchange
-    if (!alternateExchangeName.empty()) {
-        try {
-            Exchange::shared_ptr ae = exchanges.get(alternateExchangeName);
-            setAlternateExchange(ae);
-        } catch (const NotFoundException&) {
-            QPID_LOG(warning, "Could not set alternate exchange \"" << alternateExchangeName << "\" on queue \"" << name << "\": exchange does not exist.");
-        }
-    }
-    //process any pending dequeues
-    for_each(pendingDequeues.begin(), pendingDequeues.end(), boost::bind(&Queue::dequeue, this, (TransactionContext*) 0, _1));
-    pendingDequeues.clear();
-}
-
-void Queue::insertSequenceNumbers(const std::string& key)
-{
-    seqNoKey = key;
-    insertSeqNo = !seqNoKey.empty();
-    QPID_LOG(debug, "Inserting sequence numbers as " << key);
-}
-
-void Queue::enqueued(const QueuedMessage& m)
-{
-    for (Observers::iterator i = observers.begin(); i != observers.end(); ++i) {
-        try {
-            (*i)->enqueued(m);
-        } catch (const std::exception& e) {
-            QPID_LOG(warning, "Exception on notification of enqueue for queue " << getName() << ": " << e.what());
-        }
-    }
-    if (policy.get()) {
-        policy->enqueued(m);
-    }
-    mgntEnqStats(m.payload);
-}
-
-void Queue::updateEnqueued(const QueuedMessage& m)
-{
-    if (m.payload) {
-        boost::intrusive_ptr<Message> payload = m.payload;
-        enqueue ( 0, payload, true );
-        if (policy.get()) {
-            policy->recoverEnqueued(payload);
-        }
-        enqueued(m);
-    } else {
-        QPID_LOG(warning, "Queue informed of enqueued message that has no payload");
-    }
-}
-
-bool Queue::isEnqueued(const QueuedMessage& msg)
-{
-    return !policy.get() || policy->isEnqueued(msg);
-}
-
-QueueListeners& Queue::getListeners() { return listeners; }
-Messages& Queue::getMessages() { return *messages; }
-const Messages& Queue::getMessages() const { return *messages; }
-
-void Queue::checkNotDeleted()
-{
-    if (deleted) {
-        throw ResourceDeletedException(QPID_MSG("Queue " << getName() << " has been deleted."));
-    }
-}
-
-void Queue::addObserver(boost::shared_ptr<QueueObserver> observer)
-{
-    observers.insert(observer);
-}
-
-void Queue::flush()
-{
-    ScopedUse u(barrier);
-    if (u.acquired && store) store->flush(*this);
-}
-
-
-bool Queue::bind(boost::shared_ptr<Exchange> exchange, const std::string& key,
-                 const qpid::framing::FieldTable& arguments)
-{
-    if (exchange->bind(shared_from_this(), key, &arguments)) {
-        bound(exchange->getName(), key, arguments);
-        if (exchange->isDurable() && isDurable()) {
-            store->bind(*exchange, *this, key, arguments);
-        }
-        return true;
-    } else {
-        return false;
-    }
-}
-
-
-const Broker* Queue::getBroker()
-{
-    return broker;
-}
-
-
-Queue::UsageBarrier::UsageBarrier(Queue& q) : parent(q), count(0) {}
-
-bool Queue::UsageBarrier::acquire()
-{
-    Monitor::ScopedLock l(parent.messageLock);
-    if (parent.deleted) {
-        return false;
-    } else {
-        ++count;
-        return true;
-    }
-}
-
-void Queue::UsageBarrier::release()
-{
-    Monitor::ScopedLock l(parent.messageLock);
-    if (--count == 0) parent.messageLock.notifyAll();
-}
-
-void Queue::UsageBarrier::destroy()
-{
-    Monitor::ScopedLock l(parent.messageLock);
-    parent.deleted = true;
-    while (count) parent.messageLock.wait();
-}
diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp
deleted file mode 100644
index 957d5bd4d2..0000000000
--- a/cpp/src/qpid/broker/SessionState.cpp
+++ /dev/null
@@ -1,591 +0,0 @@
-/*
- *
- * 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.
- *
- */
-#include "qpid/broker/SessionState.h"
-#include "qpid/broker/Broker.h"
-#include "qpid/broker/ConnectionState.h"
-#include "qpid/broker/DeliveryRecord.h"
-#include "qpid/broker/SessionManager.h"
-#include "qpid/broker/SessionHandler.h"
-#include "qpid/broker/RateFlowcontrol.h"
-#include "qpid/sys/Timer.h"
-#include "qpid/framing/AMQContentBody.h"
-#include "qpid/framing/AMQHeaderBody.h"
-#include "qpid/framing/AMQMethodBody.h"
-#include "qpid/framing/reply_exceptions.h"
-#include "qpid/framing/ServerInvoker.h"
-#include "qpid/log/Statement.h"
-#include "qpid/management/ManagementAgent.h"
-#include "qpid/framing/AMQP_ClientProxy.h"
-
-#include <boost/bind.hpp>
-#include <boost/lexical_cast.hpp>
-
-namespace qpid {
-namespace broker {
-
-using namespace framing;
-using sys::Mutex;
-using boost::intrusive_ptr;
-using qpid::management::ManagementAgent;
-using qpid::management::ManagementObject;
-using qpid::management::Manageable;
-using qpid::management::Args;
-using qpid::sys::AbsTime;
-//using qpid::sys::Timer;
-namespace _qmf = qmf::org::apache::qpid::broker;
-
-SessionState::SessionState(
-    Broker& b, SessionHandler& h, const SessionId& id,
-    const SessionState::Configuration& config, bool delayManagement)
-    : qpid::SessionState(id, config),
-      broker(b), handler(&h),
-      semanticState(*this, *this),
-      adapter(semanticState),
-      msgBuilder(&broker.getStore()),
-      mgmtObject(0),
-      rateFlowcontrol(0),
-      asyncCommandCompleter(new AsyncCommandCompleter(this))
-{
-    uint32_t maxRate = broker.getOptions().maxSessionRate;
-    if (maxRate) {
-        if (handler->getConnection().getClientThrottling()) {
-            rateFlowcontrol.reset(new RateFlowcontrol(maxRate));
-        } else {
-            QPID_LOG(warning, getId() << ": Unable to flow control client - client doesn't support");
-        }
-    }
-    if (!delayManagement) addManagementObject();
-    attach(h);
-}
-
-void SessionState::addManagementObject() {
-    if (GetManagementObject()) return; // Already added.
-    Manageable* parent = broker.GetVhostObject ();
-    if (parent != 0) {
-        ManagementAgent* agent = getBroker().getManagementAgent();
-        if (agent != 0) {
-            mgmtObject = new _qmf::Session
-                (agent, this, parent, getId().getName());
-            mgmtObject->set_attached (0);
-            mgmtObject->set_detachedLifespan (0);
-            mgmtObject->clr_expireTime();
-            if (rateFlowcontrol)
-                mgmtObject->set_maxClientRate(rateFlowcontrol->getRate());
-            agent->addObject(mgmtObject);
-        }
-    }
-}
-
-SessionState::~SessionState() {
-    asyncCommandCompleter->cancel();
-    semanticState.closed();
-    if (mgmtObject != 0)
-        mgmtObject->resourceDestroy ();
-
-    if (flowControlTimer)
-        flowControlTimer->cancel();
-}
-
-AMQP_ClientProxy& SessionState::getProxy() {
-    assert(isAttached());
-    return handler->getProxy();
-}
-
-uint16_t SessionState::getChannel() const {
-    assert(isAttached());
-    return handler->getChannel();
-}
-
-ConnectionState& SessionState::getConnection() {
-    assert(isAttached());
-    return handler->getConnection();
-}
-
-bool SessionState::isLocal(const ConnectionToken* t) const
-{
-    return isAttached() && &(handler->getConnection()) == t;
-}
-
-void SessionState::detach() {
-    QPID_LOG(debug, getId() << ": detached on broker.");
-    asyncCommandCompleter->detached();
-    disableOutput();
-    handler = 0;
-    if (mgmtObject != 0)
-        mgmtObject->set_attached  (0);
-}
-
-void SessionState::disableOutput()
-{
-    semanticState.detached(); //prevents further activateOutput calls until reattached
-}
-
-void SessionState::attach(SessionHandler& h) {
-    QPID_LOG(debug, getId() << ": attached on broker.");
-    handler = &h;
-    if (mgmtObject != 0)
-    {
-        mgmtObject->set_attached (1);
-        mgmtObject->set_connectionRef (h.getConnection().GetManagementObject()->getObjectId());
-        mgmtObject->set_channelId (h.getChannel());
-    }
-    asyncCommandCompleter->attached();
-}
-
-void SessionState::abort() {
-    if (isAttached())
-        getConnection().outputTasks.abort();
-}
-
-void SessionState::activateOutput() {
-    if (isAttached())
-        getConnection().outputTasks.activateOutput();
-}
-
-void SessionState::giveReadCredit(int32_t credit) {
-    if (isAttached())
-        getConnection().outputTasks.giveReadCredit(credit);
-}
-
-ManagementObject* SessionState::GetManagementObject (void) const
-{
-    return (ManagementObject*) mgmtObject;
-}
-
-Manageable::status_t SessionState::ManagementMethod (uint32_t methodId,
-                                                     Args&    /*args*/,
-                                                     string&  /*text*/)
-{
-    Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD;
-
-    switch (methodId)
-    {
-    case _qmf::Session::METHOD_DETACH :
-        if (handler != 0) {
-            handler->sendDetach();
-        }
-        status = Manageable::STATUS_OK;
-        break;
-
-    case _qmf::Session::METHOD_CLOSE :
-        /*
-          if (handler != 0)
-          {
-          handler->getConnection().closeChannel(handler->getChannel());
-          }
-          status = Manageable::STATUS_OK;
-          break;
-        */
-
-    case _qmf::Session::METHOD_SOLICITACK :
-    case _qmf::Session::METHOD_RESETLIFESPAN :
-        status = Manageable::STATUS_NOT_IMPLEMENTED;
-        break;
-    }
-
-    return status;
-}
-
-void SessionState::handleCommand(framing::AMQMethodBody* method, const SequenceNumber& id) {
-    currentCommandComplete = true;      // assumed, can be overridden by invoker method (this sucks).
-    Invoker::Result invocation = invoke(adapter, *method);
-    if (currentCommandComplete) receiverCompleted(id);
-
-    if (!invocation.wasHandled()) {
-        throw NotImplementedException(QPID_MSG("Not implemented: " << *method));
-    } else if (invocation.hasResult()) {
-        getProxy().getExecution().result(id, invocation.getResult());
-    }
-
-    if (method->isSync() && currentCommandComplete) {
-        sendAcceptAndCompletion();
-    }
-}
-
-struct ScheduledCreditTask : public sys::TimerTask {
-    sys::Timer& timer;
-    SessionState& sessionState;
-    ScheduledCreditTask(const qpid::sys::Duration& d, sys::Timer& t,
-                        SessionState& s) :
-        TimerTask(d,"ScheduledCredit"),
-        timer(t),
-        sessionState(s)
-    {}
-
-    void fire() {
-        // This is the best we can currently do to avoid a destruction/fire race
-        sessionState.getConnection().requestIOProcessing(boost::bind(&ScheduledCreditTask::sendCredit, this));
-    }
-
-    void sendCredit() {
-        if ( !sessionState.processSendCredit(0) ) {
-            QPID_LOG(warning, sessionState.getId() << ": Reschedule sending credit");
-            setupNextFire();
-            timer.add(this);
-        }
-    }
-};
-
-void SessionState::handleContent(AMQFrame& frame, const SequenceNumber& id)
-{
-    if (frame.getBof() && frame.getBos()) //start of frameset
-        msgBuilder.start(id);
-    intrusive_ptr<Message> msg(msgBuilder.getMessage());
-    msgBuilder.handle(frame);
-    if (frame.getEof() && frame.getEos()) {//end of frameset
-        if (frame.getBof()) {
-            //i.e this is a just a command frame, add a dummy header
-            AMQFrame header((AMQHeaderBody()));
-            header.setBof(false);
-            header.setEof(false);
-            msg->getFrames().append(header);
-        }
-        msg->setPublisher(&getConnection());
-        msg->getIngressCompletion().begin();
-        semanticState.handle(msg);
-        msgBuilder.end();
-        IncompleteIngressMsgXfer xfer(this, msg);
-        msg->getIngressCompletion().end(xfer);  // allows msg to complete xfer
-    }
-
-    // Handle producer session flow control
-    if (rateFlowcontrol && frame.getBof() && frame.getBos()) {
-        if ( !processSendCredit(1) ) {
-            QPID_LOG(debug, getId() << ": Schedule sending credit");
-            sys::Timer& timer = getBroker().getTimer();
-            // Use heuristic for scheduled credit of time for 50 messages, but not longer than 500ms
-            sys::Duration d = std::min(sys::TIME_SEC * 50 / rateFlowcontrol->getRate(), 500 * sys::TIME_MSEC);
-            flowControlTimer = new ScheduledCreditTask(d, timer, *this);
-            timer.add(flowControlTimer);
-        }
-    }
-}
-
-bool SessionState::processSendCredit(uint32_t msgs)
-{
-    qpid::sys::ScopedLock<Mutex> l(rateLock);
-    // Check for violating flow control
-    if ( msgs > 0 && rateFlowcontrol->flowStopped() ) {
-        QPID_LOG(warning, getId() << ": producer throttling violation");
-        // TODO: Probably do message.stop("") first time then disconnect
-        // See comment on getClusterOrderProxy() in .h file
-        getClusterOrderProxy().getMessage().stop("");
-        return true;
-    }
-    AbsTime now = AbsTime::now();
-    uint32_t sendCredit = rateFlowcontrol->receivedMessage(now, msgs);
-    if (mgmtObject) mgmtObject->dec_clientCredit(msgs);
-    if ( sendCredit>0 ) {
-        QPID_LOG(debug, getId() << ": send producer credit " << sendCredit);
-        getClusterOrderProxy().getMessage().flow("", 0, sendCredit);
-        rateFlowcontrol->sentCredit(now, sendCredit);
-        if (mgmtObject) mgmtObject->inc_clientCredit(sendCredit);
-        return true;
-    } else {
-        return !rateFlowcontrol->flowStopped() ;
-    }
-}
-
-void SessionState::sendAcceptAndCompletion()
-{
-    if (!accepted.empty()) {
-        getProxy().getMessage().accept(accepted);
-        accepted.clear();
-    }
-    sendCompletion();
-}
-
-/** Invoked when the given inbound message is finished being processed
- * by all interested parties (eg. it is done being enqueued to all queues,
- * its credit has been accounted for, etc).  At this point, msg is considered
- * by this receiver as 'completed' (as defined by AMQP 0_10)
- */
-void SessionState::completeRcvMsg(SequenceNumber id,
-                                  bool requiresAccept,
-                                  bool requiresSync)
-{
-    bool callSendCompletion = false;
-    receiverCompleted(id);
-    if (requiresAccept)
-        // will cause msg's seq to appear in the next message.accept we send.
-        accepted.add(id);
-
-    // Are there any outstanding Execution.Sync commands pending the
-    // completion of this msg?  If so, complete them.
-    while (!pendingExecutionSyncs.empty() &&
-           receiverGetIncomplete().front() >= pendingExecutionSyncs.front()) {
-        const SequenceNumber id = pendingExecutionSyncs.front();
-        pendingExecutionSyncs.pop();
-        QPID_LOG(debug, getId() << ": delayed execution.sync " << id << " is completed.");
-        receiverCompleted(id);
-        callSendCompletion = true;   // likely peer is pending for this completion.
-    }
-
-    // if the sender has requested immediate notification of the completion...
-    if (requiresSync) {
-        sendAcceptAndCompletion();
-    } else if (callSendCompletion) {
-        sendCompletion();
-    }
-}
-
-void SessionState::handleIn(AMQFrame& frame) {
-    SequenceNumber commandId = receiverGetCurrent();
-    //TODO: make command handling more uniform, regardless of whether
-    //commands carry content.
-    AMQMethodBody* m = frame.getMethod();
-    if (m == 0 || m->isContentBearing()) {
-        handleContent(frame, commandId);
-    } else if (frame.getBof() && frame.getEof()) {
-        handleCommand(frame.getMethod(), commandId);
-    } else {
-        throw InternalErrorException("Cannot handle multi-frame command segments yet");
-    }
-}
-
-void SessionState::handleOut(AMQFrame& frame) {
-    assert(handler);
-    handler->out(frame);
-}
-
-void SessionState::deliver(DeliveryRecord& msg, bool sync)
-{
-    uint32_t maxFrameSize = getConnection().getFrameMax();
-    assert(senderGetCommandPoint().offset == 0);
-    SequenceNumber commandId = senderGetCommandPoint().command;
-    msg.deliver(getProxy().getHandler(), commandId, maxFrameSize);
-    assert(senderGetCommandPoint() == SessionPoint(commandId+1, 0)); // Delivery has moved sendPoint.
-    if (sync) {
-        AMQP_ClientProxy::Execution& p(getProxy().getExecution());
-        Proxy::ScopedSync s(p);
-        p.sync();
-    }
-}
-
-void SessionState::sendCompletion() {
-    handler->sendCompletion();
-}
-
-void SessionState::senderCompleted(const SequenceSet& commands) {
-    qpid::SessionState::senderCompleted(commands);
-    semanticState.completed(commands);
-}
-
-void SessionState::readyToSend() {
-    QPID_LOG(debug, getId() << ": ready to send, activating output.");
-    assert(handler);
-    semanticState.attached();
-    if (rateFlowcontrol) {
-        qpid::sys::ScopedLock<Mutex> l(rateLock);
-        // Issue initial credit - use a heuristic here issue min of 300 messages or 1 secs worth
-        uint32_t credit = std::min(rateFlowcontrol->getRate(), 300U);
-        QPID_LOG(debug, getId() << ": Issuing producer message credit " << credit);
-        // See comment on getClusterOrderProxy() in .h file
-        getClusterOrderProxy().getMessage().setFlowMode("", 0);
-        getClusterOrderProxy().getMessage().flow("", 0, credit);
-        rateFlowcontrol->sentCredit(AbsTime::now(), credit);
-        if (mgmtObject) mgmtObject->inc_clientCredit(credit);
-    }
-}
-
-Broker& SessionState::getBroker() { return broker; }
-
-// Session resume is not fully implemented so it is useless to set a
-// non-0 timeout. Moreover it creates problems in a cluster because
-// dead sessions are kept and interfere with failover.
-void SessionState::setTimeout(uint32_t) { }
-
-framing::AMQP_ClientProxy& SessionState::getClusterOrderProxy() {
-    return handler->getClusterOrderProxy();
-}
-
-
-// Current received command is an execution.sync command.
-// Complete this command only when all preceding commands have completed.
-// (called via the invoker() in handleCommand() above)
-void SessionState::addPendingExecutionSync()
-{
-    SequenceNumber syncCommandId = receiverGetCurrent();
-    if (receiverGetIncomplete().front() < syncCommandId) {
-        currentCommandComplete = false;
-        pendingExecutionSyncs.push(syncCommandId);
-        asyncCommandCompleter->flushPendingMessages();
-        QPID_LOG(debug, getId() << ": delaying completion of execution.sync " << syncCommandId);
-    }
-}
-
-
-/** factory for creating a reference-counted IncompleteIngressMsgXfer object
- * which will be attached to a message that will be completed asynchronously.
- */
-boost::intrusive_ptr<AsyncCompletion::Callback>
-SessionState::IncompleteIngressMsgXfer::clone()
-{
-    boost::intrusive_ptr<SessionState::IncompleteIngressMsgXfer> cb(new SessionState::IncompleteIngressMsgXfer(session, msg));
-
-    // Optimization: this routine is *only* invoked when the message needs to be asynchronously completed.
-    // If the client is pending the message.transfer completion, flush now to force immediate write to journal.
-    if (requiresSync)
-        msg->flush();
-    else {
-        // otherwise, we need to track this message in order to flush it if an execution.sync arrives
-        // before it has been completed (see flushPendingMessages())
-        pending = true;
-        completerContext->addPendingMessage(msg);
-    }
-    return cb;
-}
-
-
-/** Invoked by the asynchronous completer associated with a received
- * msg that is pending Completion.  May be invoked by the IO thread
- * (sync == true), or some external thread (!sync).
- */
-void SessionState::IncompleteIngressMsgXfer::completed(bool sync)
-{
-    if (pending) completerContext->deletePendingMessage(id);
-    if (!sync) {
-        /** note well: this path may execute in any thread.  It is safe to access
-         * the scheduledCompleterContext, since *this has a shared pointer to it.
-         * but not session!
-         */
-        session = 0;
-        QPID_LOG(debug, ": async completion callback scheduled for msg seq=" << id);
-        completerContext->scheduleMsgCompletion(id, requiresAccept, requiresSync);
-    } else {
-        // this path runs directly from the ac->end() call in handleContent() above,
-        // so *session is definately valid.
-        if (session->isAttached()) {
-            QPID_LOG(debug, ": receive completed for msg seq=" << id);
-            session->completeRcvMsg(id, requiresAccept, requiresSync);
-        }
-    }
-    completerContext = boost::intrusive_ptr<AsyncCommandCompleter>();
-}
-
-
-/** Scheduled from an asynchronous command's completed callback to run on
- * the IO thread.
- */
-void SessionState::AsyncCommandCompleter::schedule(boost::intrusive_ptr<AsyncCommandCompleter> ctxt)
-{
-    ctxt->completeCommands();
-}
-
-
-/** Track an ingress message that is pending completion */
-void SessionState::AsyncCommandCompleter::addPendingMessage(boost::intrusive_ptr<Message> msg)
-{
-    qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
-    std::pair<SequenceNumber, boost::intrusive_ptr<Message> > item(msg->getCommandId(), msg);
-    bool unique = pendingMsgs.insert(item).second;
-    assert(unique);
-}
-
-
-/** pending message has completed */
-void SessionState::AsyncCommandCompleter::deletePendingMessage(SequenceNumber id)
-{
-    qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
-    pendingMsgs.erase(id);
-}
-
-
-/** done when an execution.sync arrives */
-void SessionState::AsyncCommandCompleter::flushPendingMessages()
-{
-    std::map<SequenceNumber, boost::intrusive_ptr<Message> > copy;
-    {
-        qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
-        pendingMsgs.swap(copy);    // we've only tracked these in case a flush is needed, so nuke 'em now.
-    }
-    // drop lock, so it is safe to call "flush()"
-    for (std::map<SequenceNumber, boost::intrusive_ptr<Message> >::iterator i = copy.begin();
-         i != copy.end(); ++i) {
-        i->second->flush();
-    }
-}
-
-
-/** mark an ingress Message.Transfer command as completed.
- * This method must be thread safe - it may run on any thread.
- */
-void SessionState::AsyncCommandCompleter::scheduleMsgCompletion(SequenceNumber cmd,
-                                                                bool requiresAccept,
-                                                                bool requiresSync)
-{
-    qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
-
-    if (session && isAttached) {
-        MessageInfo msg(cmd, requiresAccept, requiresSync);
-        completedMsgs.push_back(msg);
-        if (completedMsgs.size() == 1) {
-            session->getConnection().requestIOProcessing(boost::bind(&schedule,
-                                                                     session->asyncCommandCompleter));
-        }
-    }
-}
-
-
-/** Cause the session to complete all completed commands.
- * Executes on the IO thread.
- */
-void SessionState::AsyncCommandCompleter::completeCommands()
-{
-    qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
-
-    // when session is destroyed, it clears the session pointer via cancel().
-    if (session && session->isAttached()) {
-        for (std::vector<MessageInfo>::iterator msg = completedMsgs.begin();
-             msg != completedMsgs.end(); ++msg) {
-            session->completeRcvMsg(msg->cmd, msg->requiresAccept, msg->requiresSync);
-        }
-    }
-    completedMsgs.clear();
-}
-
-
-/** cancel any pending calls to scheduleComplete */
-void SessionState::AsyncCommandCompleter::cancel()
-{
-    qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
-    session = 0;
-}
-
-
-/** inform the completer that the session has attached,
- * allows command completion scheduling from any thread */
-void SessionState::AsyncCommandCompleter::attached()
-{
-    qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
-    isAttached = true;
-}
-
-
-/** inform the completer that the session has detached,
- * disables command completion scheduling from any thread */
-void SessionState::AsyncCommandCompleter::detached()
-{
-    qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
-    isAttached = false;
-}
-
-}} // namespace qpid::broker
diff --git a/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp b/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
deleted file mode 100644
index fd0e537192..0000000000
--- a/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/ProtocolFactory.h"
-
-#include "qpid/Plugin.h"
-#include "qpid/broker/Broker.h"
-#include "qpid/log/Statement.h"
-#include "qpid/sys/AsynchIOHandler.h"
-#include "qpid/sys/ConnectionCodec.h"
-#include "qpid/sys/Socket.h"
-#include "qpid/sys/SystemInfo.h"
-#include "qpid/sys/windows/SslAsynchIO.h"
-#include <boost/bind.hpp>
-#include <memory>
-// security.h needs to see this to distinguish from kernel use.
-#define SECURITY_WIN32
-#include <security.h>
-#include <Schnlsp.h>
-#undef SECURITY_WIN32
-
-
-namespace qpid {
-namespace sys {
-namespace windows {
-
-struct SslServerOptions : qpid::Options
-{
-    std::string certStore;
-    std::string certName;
-    uint16_t port;
-    bool clientAuth;
-
-    SslServerOptions() : qpid::Options("SSL Options"),
-                         certStore("My"), port(5671), clientAuth(false)
-    {
-        qpid::Address me;
-        if (qpid::sys::SystemInfo::getLocalHostname(me))
-            certName = me.host;
-        else
-            certName = "localhost";
-
-        addOptions()
-            ("ssl-cert-store", optValue(certStore, "NAME"), "Local store name from which to obtain certificate")
-            ("ssl-cert-name", optValue(certName, "NAME"), "Name of the certificate to use")
-            ("ssl-port", optValue(port, "PORT"), "Port on which to listen for SSL connections")
-            ("ssl-require-client-authentication", optValue(clientAuth), 
-             "Forces clients to authenticate in order to establish an SSL connection");
-    }
-};
-
-class SslProtocolFactory : public qpid::sys::ProtocolFactory {
-    qpid::sys::Socket listener;
-    const bool tcpNoDelay;
-    const uint16_t listeningPort;
-    std::string brokerHost;
-    const bool clientAuthSelected;
-    std::auto_ptr<qpid::sys::AsynchAcceptor> acceptor;
-    ConnectFailedCallback connectFailedCallback;
-    CredHandle credHandle;
-
-  public:
-    SslProtocolFactory(const SslServerOptions&, int backlog, bool nodelay);
-    ~SslProtocolFactory();
-    void accept(sys::Poller::shared_ptr, sys::ConnectionCodec::Factory*);
-    void connect(sys::Poller::shared_ptr, const std::string& host, int16_t port,
-                 sys::ConnectionCodec::Factory*,
-                 ConnectFailedCallback failed);
-
-    uint16_t getPort() const;
-    std::string getHost() const;
-    bool supports(const std::string& capability);
-
-  private:
-    void connectFailed(const qpid::sys::Socket&,
-                       int err,
-                       const std::string& msg);
-    void established(sys::Poller::shared_ptr,
-                     const qpid::sys::Socket&,
-                     sys::ConnectionCodec::Factory*,
-                     bool isClient);
-};
-
-// Static instance to initialise plugin
-static struct SslPlugin : public Plugin {
-    SslServerOptions options;
-
-    Options* getOptions() { return &options; }
-
-    void earlyInitialize(Target&) {
-    }
-    
-    void initialize(Target& target) {
-        broker::Broker* broker = dynamic_cast<broker::Broker*>(&target);
-        // Only provide to a Broker
-        if (broker) {
-            try {
-                const broker::Broker::Options& opts = broker->getOptions();
-                ProtocolFactory::shared_ptr protocol(new SslProtocolFactory(options,
-                                                                            opts.connectionBacklog,
-                                                                            opts.tcpNoDelay));
-                QPID_LOG(notice, "Listening for SSL connections on TCP port " << protocol->getPort());
-                broker->registerProtocolFactory("ssl", protocol);
-            } catch (const std::exception& e) {
-                QPID_LOG(error, "Failed to initialise SSL listener: " << e.what());
-            }
-        }
-    }
-} sslPlugin;
-
-SslProtocolFactory::SslProtocolFactory(const SslServerOptions& options,
-                                       int backlog,
-                                       bool nodelay)
-    : tcpNoDelay(nodelay),
-      listeningPort(listener.listen(options.port, backlog)),
-      clientAuthSelected(options.clientAuth) {
-
-    SecInvalidateHandle(&credHandle);
-
-    // Get the certificate for this server.
-    HCERTSTORE certStoreHandle;
-    certStoreHandle = ::CertOpenStore(CERT_STORE_PROV_SYSTEM_A,
-                                      X509_ASN_ENCODING,
-                                      0,
-                                      CERT_SYSTEM_STORE_LOCAL_MACHINE,
-                                      options.certStore.c_str());
-    if (!certStoreHandle)
-        throw qpid::Exception(QPID_MSG("Opening store " << options.certStore << " " << qpid::sys::strError(GetLastError())));
-
-    PCCERT_CONTEXT certContext;
-    certContext = ::CertFindCertificateInStore(certStoreHandle,
-                                               X509_ASN_ENCODING,
-                                               0,
-                                               CERT_FIND_SUBJECT_STR_A,
-                                               options.certName.c_str(),
-                                               NULL);
-    if (certContext == NULL) {
-        int err = ::GetLastError();
-        ::CertCloseStore(certStoreHandle, 0);
-        throw qpid::Exception(QPID_MSG("Locating certificate " << options.certName << " in store " << options.certStore << " " << qpid::sys::strError(GetLastError())));
-        throw QPID_WINDOWS_ERROR(err);
-    }
-
-    SCHANNEL_CRED cred;
-    memset(&cred, 0, sizeof(cred));
-    cred.dwVersion = SCHANNEL_CRED_VERSION;
-    cred.cCreds = 1;
-    cred.paCred = &certContext;
-    SECURITY_STATUS status = ::AcquireCredentialsHandle(NULL,
-                                                        UNISP_NAME,
-                                                        SECPKG_CRED_INBOUND,
-                                                        NULL,
-                                                        &cred,
-                                                        NULL,
-                                                        NULL,
-                                                        &credHandle,
-                                                        NULL);
-    if (status != SEC_E_OK)
-        throw QPID_WINDOWS_ERROR(status);
-    ::CertFreeCertificateContext(certContext);
-    ::CertCloseStore(certStoreHandle, 0);
-}
-
-SslProtocolFactory::~SslProtocolFactory() {
-    ::FreeCredentialsHandle(&credHandle);
-}
-
-void SslProtocolFactory::connectFailed(const qpid::sys::Socket&,
-                                       int err,
-                                       const std::string& msg) {
-    if (connectFailedCallback)
-        connectFailedCallback(err, msg);
-}
-
-void SslProtocolFactory::established(sys::Poller::shared_ptr poller,
-                                     const qpid::sys::Socket& s,
-                                     sys::ConnectionCodec::Factory* f,
-                                     bool isClient) {
-    sys::AsynchIOHandler* async = new sys::AsynchIOHandler(s.getFullAddress(), f);
-
-    if (tcpNoDelay) {
-        s.setTcpNoDelay();
-        QPID_LOG(info,
-                 "Set TCP_NODELAY on connection to " << s.getPeerAddress());
-    }
-
-    SslAsynchIO *aio;
-    if (isClient) {
-        async->setClient();
-        aio =
-          new qpid::sys::windows::ClientSslAsynchIO(brokerHost,
-                                                    s,
-                                                    credHandle,
-                                                    boost::bind(&AsynchIOHandler::readbuff, async, _1, _2),
-                                                    boost::bind(&AsynchIOHandler::eof, async, _1),
-                                                    boost::bind(&AsynchIOHandler::disconnect, async, _1),
-                                                    boost::bind(&AsynchIOHandler::closedSocket, async, _1, _2),
-                                                    boost::bind(&AsynchIOHandler::nobuffs, async, _1),
-                                                    boost::bind(&AsynchIOHandler::idle, async, _1));
-    }
-    else {
-        aio =
-          new qpid::sys::windows::ServerSslAsynchIO(clientAuthSelected,
-                                                    s,
-                                                    credHandle,
-                                                    boost::bind(&AsynchIOHandler::readbuff, async, _1, _2),
-                                                    boost::bind(&AsynchIOHandler::eof, async, _1),
-                                                    boost::bind(&AsynchIOHandler::disconnect, async, _1),
-                                                    boost::bind(&AsynchIOHandler::closedSocket, async, _1, _2),
-                                                    boost::bind(&AsynchIOHandler::nobuffs, async, _1),
-                                                    boost::bind(&AsynchIOHandler::idle, async, _1));
-    }
-
-    async->init(aio, 4);
-    aio->start(poller);
-}
-
-uint16_t SslProtocolFactory::getPort() const {
-    return listeningPort; // Immutable no need for lock.
-}
-
-std::string SslProtocolFactory::getHost() const {
-    return listener.getSockname();
-}
-
-void SslProtocolFactory::accept(sys::Poller::shared_ptr poller,
-                                sys::ConnectionCodec::Factory* fact) {
-    acceptor.reset(
-        AsynchAcceptor::create(listener,
-                               boost::bind(&SslProtocolFactory::established, this, poller, _1, fact, false)));
-    acceptor->start(poller);
-}
-
-void SslProtocolFactory::connect(sys::Poller::shared_ptr poller,
-                                 const std::string& host,
-                                 int16_t port,
-                                 sys::ConnectionCodec::Factory* fact,
-                                 ConnectFailedCallback failed)
-{
-    SCHANNEL_CRED cred;
-    memset(&cred, 0, sizeof(cred));
-    cred.dwVersion = SCHANNEL_CRED_VERSION;
-    SECURITY_STATUS status = ::AcquireCredentialsHandle(NULL,
-                                                        UNISP_NAME,
-                                                        SECPKG_CRED_OUTBOUND,
-                                                        NULL,
-                                                        &cred,
-                                                        NULL,
-                                                        NULL,
-                                                        &credHandle,
-                                                        NULL);
-    if (status != SEC_E_OK)
-        throw QPID_WINDOWS_ERROR(status);
-
-    brokerHost = host;
-    // Note that the following logic does not cause a memory leak.
-    // The allocated Socket is freed either by the AsynchConnector
-    // upon connection failure or by the AsynchIO upon connection
-    // shutdown.  The allocated AsynchConnector frees itself when it
-    // is no longer needed.
-    qpid::sys::Socket* socket = new qpid::sys::Socket();
-    connectFailedCallback = failed;
-    AsynchConnector::create(*socket,
-                            host,
-                            port,
-                            boost::bind(&SslProtocolFactory::established,
-                                        this, poller, _1, fact, true),
-                            boost::bind(&SslProtocolFactory::connectFailed,
-                                        this, _1, _2, _3));
-}
-
-namespace
-{
-const std::string SSL = "ssl";
-}
-
-bool SslProtocolFactory::supports(const std::string& capability)
-{
-    std::string s = capability;
-    transform(s.begin(), s.end(), s.begin(), tolower);
-    return s == SSL;
-}
-
-}}} // namespace qpid::sys::windows
diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/cpp/src/qpid/client/ConnectionImpl.cpp
deleted file mode 100644
index 40c004f166..0000000000
--- a/cpp/src/qpid/client/ConnectionImpl.cpp
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/client/ConnectionImpl.h"
-
-#include "qpid/client/LoadPlugins.h"
-#include "qpid/client/Connector.h"
-#include "qpid/client/ConnectionSettings.h"
-#include "qpid/client/SessionImpl.h"
-
-#include "qpid/log/Statement.h"
-#include "qpid/Url.h"
-#include "qpid/framing/enum.h"
-#include "qpid/framing/reply_exceptions.h"
-#include "qpid/sys/Poller.h"
-#include "qpid/sys/SystemInfo.h"
-#include "qpid/Options.h"
-
-#include <boost/bind.hpp>
-#include <boost/format.hpp>
-#include <boost/shared_ptr.hpp>
-
-#include <limits>
-#include <vector>
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-namespace qpid {
-namespace client {
-
-using namespace qpid::framing;
-using namespace qpid::framing::connection;
-using namespace qpid::sys;
-using namespace qpid::framing::connection;//for connection error codes
-
-namespace {
-// Maybe should amalgamate the singletons into a single client singleton
-
-// Get timer singleton
-Timer& theTimer() {
-    static Mutex timerInitLock;
-    ScopedLock<Mutex> l(timerInitLock);
-
-    static qpid::sys::Timer t;
-    return t;
-}
-
-struct IOThreadOptions : public qpid::Options {
-    int maxIOThreads;
-
-    IOThreadOptions(int c) :
-        Options("IO threading options"),
-        maxIOThreads(c)
-    {
-        addOptions()
-            ("max-iothreads", optValue(maxIOThreads, "N"), "Maximum number of io threads to use");
-    }
-};
-
-// IO threads
-class IOThread {
-    int maxIOThreads;
-    int ioThreads;
-    int connections;
-    Mutex threadLock;
-    std::vector<Thread> t;
-    Poller::shared_ptr poller_;
-
-public:
-    void add() {
-        ScopedLock<Mutex> l(threadLock);
-        ++connections;
-        if (!poller_)
-            poller_.reset(new Poller);
-        if (ioThreads < connections && ioThreads < maxIOThreads) {
-            QPID_LOG(debug, "Created IO thread: " << ioThreads);
-            ++ioThreads;
-            t.push_back( Thread(poller_.get()) );
-        }
-    }
-
-    void sub() {
-        ScopedLock<Mutex> l(threadLock);
-        --connections;
-    }
-
-    Poller::shared_ptr poller() const {
-        assert(poller_);
-        return poller_;
-    }
-
-    // Here is where the maximum number of threads is set
-    IOThread(int c) :
-        ioThreads(0),
-        connections(0)
-    {
-        IOThreadOptions options(c);
-        options.parse(0, 0, QPIDC_CONF_FILE, true);
-        maxIOThreads = (options.maxIOThreads != -1) ?
-            options.maxIOThreads : 1;
-    }
-
-    // We can't destroy threads one-by-one as the only
-    // control we have is to shutdown the whole lot
-    // and we can't do that before we're unloaded as we can't
-    // restart the Poller after shutting it down
-    ~IOThread() {
-        std::vector<Thread> threads;
-        {
-            ScopedLock<Mutex> l(threadLock);
-            if (poller_)
-                poller_->shutdown();
-            t.swap(threads);
-        }
-        for (std::vector<Thread>::iterator i = threads.begin(); i != threads.end(); ++i) {
-            i->join();
-        }
-    }
-};
-
-IOThread& theIO() {
-    static IOThread io(SystemInfo::concurrency());
-    return io;
-}
-
-class HeartbeatTask : public TimerTask {
-    TimeoutHandler& timeout;
-
-    void fire() {
-        // If we ever get here then we have timed out
-        QPID_LOG(debug, "Traffic timeout");
-        timeout.idleIn();
-    }
-
-public:
-    HeartbeatTask(Duration p, TimeoutHandler& t) :
-        TimerTask(p,"Heartbeat"),
-        timeout(t)
-    {}
-};
-
-}
-
-void ConnectionImpl::init() {
-    // Ensure that the plugin modules have been loaded
-    // This will make sure that any plugin protocols are available
-    theModuleLoader();
-
-    // Ensure the IO threads exist:
-    // This needs to be called in the Connection constructor
-    // so that they will still exist at last connection destruction
-    (void) theIO();
-}
-
-boost::shared_ptr<ConnectionImpl> ConnectionImpl::create(framing::ProtocolVersion version, const ConnectionSettings& settings)
-{
-    boost::shared_ptr<ConnectionImpl> instance(new ConnectionImpl(version, settings), boost::bind(&ConnectionImpl::release, _1));
-    return instance;
-}
-
-ConnectionImpl::ConnectionImpl(framing::ProtocolVersion v, const ConnectionSettings& settings)
-    : Bounds(settings.maxFrameSize * settings.bounds),
-      handler(settings, v, *this),
-      version(v),
-      nextChannel(1),
-      shutdownComplete(false),
-      released(false)
-{
-    handler.in = boost::bind(&ConnectionImpl::incoming, this, _1);
-    handler.out = boost::bind(&Connector::send, boost::ref(connector), _1);
-    handler.onClose = boost::bind(&ConnectionImpl::closed, this,
-                                  CLOSE_CODE_NORMAL, std::string());
-    //only set error handler once  open
-    handler.onError = boost::bind(&ConnectionImpl::closed, this, _1, _2);
-    handler.getSecuritySettings = boost::bind(&Connector::getSecuritySettings, boost::ref(connector));
-}
-
-const uint16_t ConnectionImpl::NEXT_CHANNEL = std::numeric_limits<uint16_t>::max();
-
-ConnectionImpl::~ConnectionImpl() {
-    if (heartbeatTask) heartbeatTask->cancel();
-    theIO().sub();
-}
-
-void ConnectionImpl::addSession(const boost::shared_ptr<SessionImpl>& session, uint16_t channel)
-{
-    Mutex::ScopedLock l(lock);
-    for (uint16_t i = 0; i < NEXT_CHANNEL; i++) { //will at most search through channels once
-        uint16_t c = channel == NEXT_CHANNEL ? nextChannel++ : channel;
-        boost::weak_ptr<SessionImpl>& s = sessions[c];
-        boost::shared_ptr<SessionImpl> ss = s.lock();
-        if (!ss) {
-            //channel is free, we can assign it to this session
-            session->setChannel(c);
-            s = session;
-            return;
-        } else if (channel != NEXT_CHANNEL) {
-            //channel is taken and was requested explicitly so don't look for another
-            throw SessionBusyException(QPID_MSG("Channel " << ss->getChannel() << " attached to " << ss->getId()));
-        } //else channel is busy, but we can keep looking for a free one
-    }
-    // If we get here, we didn't find any available channel.
-    throw ResourceLimitExceededException("There are no channels available");
-}
-
-void ConnectionImpl::handle(framing::AMQFrame& frame)
-{
-    handler.outgoing(frame);
-}
-
-void ConnectionImpl::incoming(framing::AMQFrame& frame)
-{
-    boost::shared_ptr<SessionImpl> s;
-    {
-        Mutex::ScopedLock l(lock);
-        s = sessions[frame.getChannel()].lock();
-    }
-    if (!s) {
-        QPID_LOG(info, *this << " dropping frame received on invalid channel: " << frame);
-    } else {
-        s->in(frame);
-    }
-}
-
-bool ConnectionImpl::isOpen() const 
-{
-    return handler.isOpen();
-}
-
-void ConnectionImpl::open()
-{
-    const std::string& protocol = handler.protocol;
-    const std::string& host = handler.host;
-    int port = handler.port;
-
-    theIO().add();
-    connector.reset(Connector::create(protocol, theIO().poller(), version, handler, this));
-    connector->setInputHandler(&handler);
-    connector->setShutdownHandler(this);
-    try {
-        connector->connect(host, port);
-    
-    } catch (const std::exception& e) {
-        QPID_LOG(debug, "Failed to connect to " << protocol << ":" << host << ":" << port << " " << e.what());
-        connector.reset();
-        throw;
-    }
-    connector->init();
-    QPID_LOG(info, *this << " connected to " << protocol << ":" << host << ":" << port);
- 
-    // Enable heartbeat if requested
-    uint16_t heartbeat = static_cast<ConnectionSettings&>(handler).heartbeat;
-    if (heartbeat) {
-        // Set connection timeout to be 2x heart beat interval and setup timer
-        heartbeatTask = new HeartbeatTask(heartbeat * 2 * TIME_SEC, *this);
-        handler.setRcvTimeoutTask(heartbeatTask);
-        theTimer().add(heartbeatTask);
-    }
-
-    // If the connect fails then the connector is cleaned up either when we try to connect again
-    // - in that case in connector.reset() above;
-    // - or when we are deleted
-    handler.waitForOpen();
-
-    // If the SASL layer has provided an "operational" userId for the connection,
-    // put it in the negotiated settings.
-    const std::string& userId(handler.getUserId());
-    if (!userId.empty())
-        handler.username = userId;
-
-    //enable security layer if one has been negotiated:
-    std::auto_ptr<SecurityLayer> securityLayer = handler.getSecurityLayer();
-    if (securityLayer.get()) {
-        QPID_LOG(debug, *this << " activating security layer");
-        connector->activateSecurityLayer(securityLayer);
-    } else {
-        QPID_LOG(debug, *this << " no security layer in place");
-    }
-}
-
-void ConnectionImpl::idleIn()
-{
-    connector->abort();
-}
-
-void ConnectionImpl::idleOut()
-{
-    AMQFrame frame((AMQHeartbeatBody()));
-    connector->send(frame);
-}
-
-void ConnectionImpl::close()
-{
-    if (heartbeatTask) 
-        heartbeatTask->cancel();
-    // close() must be idempotent and no-throw as it will often be called in destructors.
-    if (handler.isOpen()) {
-        try {
-            handler.close();
-            closed(CLOSE_CODE_NORMAL, "Closed by client");
-        } catch (...) {}
-    }
-    assert(!handler.isOpen());
-}
-
-
-template <class F> void ConnectionImpl::closeInternal(const F& f) {
-    if (heartbeatTask) {
-        heartbeatTask->cancel();
-    }
-    {
-        Mutex::ScopedUnlock u(lock);
-        connector->close();
-    }
-    //notifying sessions of failure can result in those session being
-    //deleted which in turn results in a call to erase(); this can
-    //even happen on this thread, when 's' goes out of scope
-    //below. Using a copy prevents the map being modified as we
-    //iterate through.
-    SessionMap copy;
-    sessions.swap(copy);
-    for (SessionMap::iterator i = copy.begin(); i != copy.end(); ++i) {
-        boost::shared_ptr<SessionImpl> s = i->second.lock();
-        if (s) f(s);
-    }
-}
-
-void ConnectionImpl::closed(uint16_t code, const std::string& text) { 
-    Mutex::ScopedLock l(lock);
-    setException(new ConnectionException(ConnectionHandler::convert(code), text));
-    closeInternal(boost::bind(&SessionImpl::connectionClosed, _1, code, text));
-}
-
-void ConnectionImpl::shutdown() {
-    if (!handler.isClosed()) {
-        failedConnection();
-    }
-    bool canDelete;
-    {
-        Mutex::ScopedLock l(lock);
-        //association with IO thread is now ended
-        shutdownComplete = true;
-        //If we have already been released, we can now delete ourselves
-        canDelete = released;
-    }
-    if (canDelete) delete this;
-}
-
-void ConnectionImpl::release() {
-    bool isActive;
-    {
-        Mutex::ScopedLock l(lock);
-        isActive = connector && !shutdownComplete;
-    }
-    //If we are still active - i.e. associated with an IO thread -
-    //then we cannot delete ourselves yet, but must wait for the
-    //shutdown callback which we can trigger by calling
-    //connector.close()
-    if (isActive) {
-        connector->close();
-        bool canDelete;
-        {
-            Mutex::ScopedLock l(lock);
-            released = true;
-            canDelete = shutdownComplete;
-        }
-        if (canDelete) delete this;
-    } else { 
-        delete this;
-    }
-}
-
-static const std::string CONN_CLOSED("Connection closed");
-
-void ConnectionImpl::failedConnection() {
-    if ( failureCallback )
-      failureCallback();
-
-    if (handler.isClosed()) return;
-
-    bool isClosing = handler.isClosing();
-    bool isOpen = handler.isOpen();
-
-    std::ostringstream msg;
-    msg << *this << " closed";
-
-    // FIXME aconway 2008-06-06: exception use, amqp0-10 does not seem to have
-    // an appropriate close-code. connection-forced is not right.
-    handler.fail(msg.str());//ensure connection is marked as failed before notifying sessions
-
-    // At this point if the object isn't open and isn't closing it must have failed to open
-    // so we can't do the rest of the cleanup
-    if (!isClosing && !isOpen) return;
-
-    Mutex::ScopedLock l(lock);
-    closeInternal(boost::bind(&SessionImpl::connectionBroke, _1, msg.str()));
-    setException(new TransportFailure(msg.str()));
-}
-
-void ConnectionImpl::erase(uint16_t ch) {
-    Mutex::ScopedLock l(lock);
-    sessions.erase(ch);
-}
-
-const ConnectionSettings& ConnectionImpl::getNegotiatedSettings()
-{
-    return handler;
-}
-
-std::vector<qpid::Url> ConnectionImpl::getInitialBrokers() {
-    return handler.knownBrokersUrls;
-}
-
-boost::shared_ptr<SessionImpl>  ConnectionImpl::newSession(const std::string& name, uint32_t timeout, uint16_t channel) {
-    boost::shared_ptr<SessionImpl> simpl(new SessionImpl(name, shared_from_this()));
-    addSession(simpl, channel);
-    simpl->open(timeout);
-    return simpl;
-}
-
-std::ostream& operator<<(std::ostream& o, const ConnectionImpl& c) {
-    if (c.connector)
-        return o << "Connection " << c.connector->getIdentifier();
-    else
-        return o << "Connection <not connected>";
-}
-
-
-}} // namespace qpid::client
diff --git a/cpp/src/qpid/client/Connector.h b/cpp/src/qpid/client/Connector.h
deleted file mode 100644
index 586012f9d6..0000000000
--- a/cpp/src/qpid/client/Connector.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *
- * 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.
- *
- */
-#ifndef _Connector_
-#define _Connector_
-
-
-#include "qpid/framing/OutputHandler.h"
-#include "qpid/framing/ProtocolVersion.h"
-
-#include <boost/shared_ptr.hpp>
-
-#include <string>
-
-namespace qpid {
-
-namespace sys {
-class ShutdownHandler;
-class SecurityLayer;
-class Poller;
-struct SecuritySettings;
-}
-
-namespace framing {
-class InputHandler;
-class AMQFrame;
-}
-
-namespace client {
-
-struct ConnectionSettings;
-class ConnectionImpl;
-
-///@internal
-class Connector : public framing::OutputHandler
-{
-  public:
-    // Protocol connector factory related stuff (it might be better to separate this code from the TCP Connector in the future)
-    typedef Connector* Factory(boost::shared_ptr<qpid::sys::Poller>,
-                               framing::ProtocolVersion, const ConnectionSettings&, ConnectionImpl*);
-    static Connector* create(const std::string& proto,
-                             boost::shared_ptr<qpid::sys::Poller>,
-                             framing::ProtocolVersion, const ConnectionSettings&, ConnectionImpl*);
-    static void registerFactory(const std::string& proto, Factory* connectorFactory);
-
-    virtual ~Connector() {};
-    virtual void connect(const std::string& host, int port) = 0;
-    virtual void init() {};
-    virtual void close() = 0;
-    virtual void send(framing::AMQFrame& frame) = 0;
-    virtual void abort() = 0;
-
-    virtual void setInputHandler(framing::InputHandler* handler) = 0;
-    virtual void setShutdownHandler(sys::ShutdownHandler* handler) = 0;
-    virtual sys::ShutdownHandler* getShutdownHandler() const = 0;
-    virtual framing::OutputHandler* getOutputHandler() = 0;
-    virtual const std::string& getIdentifier() const = 0;
-
-    virtual void activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer>);
-
-    virtual const qpid::sys::SecuritySettings* getSecuritySettings() = 0;
-};
-
-}}
-
-
-#endif
diff --git a/cpp/src/qpid/client/RdmaConnector.cpp b/cpp/src/qpid/client/RdmaConnector.cpp
deleted file mode 100644
index 6af607198c..0000000000
--- a/cpp/src/qpid/client/RdmaConnector.cpp
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
- *
- * 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.
- *
- */
-#include "qpid/client/Connector.h"
-
-#include "qpid/client/Bounds.h"
-#include "qpid/client/ConnectionImpl.h"
-#include "qpid/client/ConnectionSettings.h"
-#include "qpid/log/Statement.h"
-#include "qpid/sys/Time.h"
-#include "qpid/framing/AMQFrame.h"
-#include "qpid/framing/InitiationHandler.h"
-#include "qpid/sys/rdma/RdmaIO.h"
-#include "qpid/sys/rdma/rdma_exception.h"
-#include "qpid/sys/Dispatcher.h"
-#include "qpid/sys/Poller.h"
-#include "qpid/sys/SecurityLayer.h"
-#include "qpid/Msg.h"
-
-#include <iostream>
-#include <boost/bind.hpp>
-#include <boost/format.hpp>
-#include <boost/lexical_cast.hpp>
-
-// This stuff needs to abstracted out of here to a platform specific file
-#include <netdb.h>
-
-namespace qpid {
-namespace client {
-
-using namespace qpid::sys;
-using namespace qpid::framing;
-using boost::format;
-using boost::str;
-
-class RdmaConnector : public Connector, public sys::Codec
-{
-    typedef std::deque<framing::AMQFrame> Frames;
-
-    const uint16_t maxFrameSize;
-    sys::Mutex lock;
-    Frames frames;
-    size_t lastEof; // Position after last EOF in frames
-    uint64_t currentSize;
-    Bounds* bounds;
-
-    framing::ProtocolVersion version;
-    bool initiated;
-
-    sys::Mutex dataConnectedLock;
-    bool dataConnected;
-
-    sys::ShutdownHandler* shutdownHandler;
-    framing::InputHandler* input;
-    framing::InitiationHandler* initialiser;
-    framing::OutputHandler* output;
-
-    Rdma::AsynchIO* aio;
-    Rdma::Connector* acon;
-    sys::Poller::shared_ptr poller;
-    std::auto_ptr<qpid::sys::SecurityLayer> securityLayer;
-
-    ~RdmaConnector();
-
-    // Callbacks
-    void connected(sys::Poller::shared_ptr, Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&);
-    void connectionError(sys::Poller::shared_ptr, Rdma::Connection::intrusive_ptr, Rdma::ErrorType);
-    void disconnected();
-    void rejected(sys::Poller::shared_ptr, Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&);
-
-    void readbuff(Rdma::AsynchIO&, Rdma::Buffer*);
-    void writebuff(Rdma::AsynchIO&);
-    void writeDataBlock(const framing::AMQDataBlock& data);
-    void dataError(Rdma::AsynchIO&);
-    void drained();
-    void connectionStopped(Rdma::Connector* acon, Rdma::AsynchIO* aio);
-    void dataStopped(Rdma::AsynchIO* aio);
-
-    std::string identifier;
-
-    void connect(const std::string& host, int port);
-    void close();
-    void send(framing::AMQFrame& frame);
-    void abort() {} // TODO: need to fix this for heartbeat timeouts to work
-
-    void setInputHandler(framing::InputHandler* handler);
-    void setShutdownHandler(sys::ShutdownHandler* handler);
-    sys::ShutdownHandler* getShutdownHandler() const;
-    framing::OutputHandler* getOutputHandler();
-    const std::string& getIdentifier() const;
-    void activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer>);
-    const qpid::sys::SecuritySettings* getSecuritySettings() { return 0; }
-
-    size_t decode(const char* buffer, size_t size);
-    size_t encode(const char* buffer, size_t size);
-    bool canEncode();
-
-public:
-    RdmaConnector(Poller::shared_ptr,
-              framing::ProtocolVersion pVersion,
-              const ConnectionSettings&, 
-              ConnectionImpl*);
-};
-
-// Static constructor which registers connector here
-namespace {
-    Connector* create(Poller::shared_ptr p, framing::ProtocolVersion v, const ConnectionSettings& s, ConnectionImpl* c) {
-        return new RdmaConnector(p, v, s, c);
-    }
-
-    struct StaticInit {
-        StaticInit() {
-            Connector::registerFactory("rdma", &create);
-            Connector::registerFactory("ib", &create);
-        };
-    } init;
-}
-
-
-RdmaConnector::RdmaConnector(Poller::shared_ptr p,
-                     ProtocolVersion ver,
-                     const ConnectionSettings& settings,
-                     ConnectionImpl* cimpl)
-    : maxFrameSize(settings.maxFrameSize),
-      lastEof(0),
-      currentSize(0),
-      bounds(cimpl),
-      version(ver), 
-      initiated(false),
-      dataConnected(false),
-      shutdownHandler(0),
-      aio(0),
-      acon(0),
-      poller(p)
-{
-    QPID_LOG(debug, "RdmaConnector created for " << version);
-}
-
-namespace {
-    void deleteAsynchIO(Rdma::AsynchIO& aio) {
-        delete &aio;
-    }
-
-    void deleteConnector(Rdma::ConnectionManager& con) {
-        delete &con;
-    }
-}
-
-RdmaConnector::~RdmaConnector() {
-    QPID_LOG(debug, "~RdmaConnector " << identifier);
-    if (aio) {
-        aio->stop(deleteAsynchIO);
-    }
-    if (acon) {
-        acon->stop(deleteConnector);
-    }
-}
-
-void RdmaConnector::connect(const std::string& host, int port){
-    Mutex::ScopedLock l(dataConnectedLock);
-    assert(!dataConnected);
-
-    acon = new Rdma::Connector(
-        Rdma::ConnectionParams(maxFrameSize, Rdma::DEFAULT_WR_ENTRIES),
-        boost::bind(&RdmaConnector::connected, this, poller, _1, _2),
-        boost::bind(&RdmaConnector::connectionError, this, poller, _1, _2),
-        boost::bind(&RdmaConnector::disconnected, this),
-        boost::bind(&RdmaConnector::rejected, this, poller, _1, _2));
-
-    SocketAddress sa(host, boost::lexical_cast<std::string>(port));
-    acon->start(poller, sa);
-}
-
-// The following only gets run when connected
-void RdmaConnector::connected(Poller::shared_ptr poller, Rdma::Connection::intrusive_ptr ci, const Rdma::ConnectionParams& cp) {
-    try {
-        Mutex::ScopedLock l(dataConnectedLock);
-        assert(!dataConnected);
-        Rdma::QueuePair::intrusive_ptr q = ci->getQueuePair();
-
-        aio = new Rdma::AsynchIO(ci->getQueuePair(),
-            cp.rdmaProtocolVersion,
-            cp.maxRecvBufferSize, cp.initialXmitCredit , Rdma::DEFAULT_WR_ENTRIES,
-            boost::bind(&RdmaConnector::readbuff, this, _1, _2),
-            boost::bind(&RdmaConnector::writebuff, this, _1),
-            0, // write buffers full
-            boost::bind(&RdmaConnector::dataError, this, _1));
-
-        identifier = str(format("[%1% %2%]") % ci->getLocalName() % ci->getPeerName());
-        ProtocolInitiation init(version);
-        writeDataBlock(init);
-
-        aio->start(poller);
-
-        dataConnected = true;
-
-        return;
-    } catch (const Rdma::Exception& e) {
-        QPID_LOG(error, "Rdma: Cannot create new connection (Rdma exception): " << e.what());
-    } catch (const std::exception& e) {
-        QPID_LOG(error, "Rdma: Cannot create new connection (unknown exception): " << e.what());
-    }
-    dataConnected = false;
-    connectionStopped(acon, aio);
-}
-
-void RdmaConnector::connectionError(sys::Poller::shared_ptr, Rdma::Connection::intrusive_ptr, Rdma::ErrorType) {
-    QPID_LOG(debug, "Connection Error " << identifier);
-    connectionStopped(acon, aio);
-}
-
-// Bizarrely we seem to get rejected events *after* we've already got a connected event for some peer disconnects
-// so we need to check whether the data connection is started or not in here
-void RdmaConnector::rejected(sys::Poller::shared_ptr, Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams& cp) {
-    QPID_LOG(debug, "Connection Rejected " << identifier << ": " << cp.maxRecvBufferSize);
-    if (dataConnected) {
-        disconnected();
-    } else {
-        connectionStopped(acon, aio);
-    }
-}
-
-void RdmaConnector::disconnected() {
-    QPID_LOG(debug, "Connection disconnected " << identifier);
-    {
-    Mutex::ScopedLock l(dataConnectedLock);
-    // If we're closed already then we'll get to drained() anyway
-    if (!dataConnected) return;
-    dataConnected = false;
-    }
-    // Make sure that all the disconnected actions take place on the data "thread"
-    aio->requestCallback(boost::bind(&RdmaConnector::drained, this));
-}
-
-void RdmaConnector::dataError(Rdma::AsynchIO&) {
-    QPID_LOG(debug, "Data Error " << identifier);
-    {
-    Mutex::ScopedLock l(dataConnectedLock);
-    // If we're closed already then we'll get to drained() anyway
-    if (!dataConnected) return;
-    dataConnected = false;
-    }
-    drained();
-}
-
-void RdmaConnector::close() {
-    QPID_LOG(debug, "RdmaConnector::close " << identifier);
-    {
-    Mutex::ScopedLock l(dataConnectedLock);
-    if (!dataConnected) return;
-    dataConnected = false;
-    }
-    aio->drainWriteQueue(boost::bind(&RdmaConnector::drained, this));
-}
-
-void RdmaConnector::drained() {
-    QPID_LOG(debug, "RdmaConnector::drained " << identifier);
-    assert(!dataConnected);
-    assert(aio);
-    Rdma::AsynchIO* a = aio;
-    aio = 0;
-    a->stop(boost::bind(&RdmaConnector::dataStopped, this, a));
-}
-
-void RdmaConnector::dataStopped(Rdma::AsynchIO* a) {
-    QPID_LOG(debug, "RdmaConnector::dataStopped " << identifier);
-    assert(!dataConnected);
-    assert(acon);
-    Rdma::Connector* c = acon;
-    acon = 0;
-    c->stop(boost::bind(&RdmaConnector::connectionStopped, this, c, a));
-}
-
-void RdmaConnector::connectionStopped(Rdma::Connector* c, Rdma::AsynchIO* a) {
-    QPID_LOG(debug, "RdmaConnector::connectionStopped " << identifier);
-    assert(!dataConnected);
-    aio = 0;
-    acon = 0;
-    delete a;
-    delete c;
-    if (shutdownHandler) {
-        ShutdownHandler* s = shutdownHandler;
-        shutdownHandler = 0;
-        s->shutdown();
-    }
-}
-
-void RdmaConnector::setInputHandler(InputHandler* handler){
-    input = handler;
-}
-
-void RdmaConnector::setShutdownHandler(ShutdownHandler* handler){
-    shutdownHandler = handler;
-}
-
-OutputHandler* RdmaConnector::getOutputHandler(){ 
-    return this; 
-}
-
-sys::ShutdownHandler* RdmaConnector::getShutdownHandler() const {
-    return shutdownHandler;
-}
-
-const std::string& RdmaConnector::getIdentifier() const { 
-    return identifier;
-}
-
-void RdmaConnector::send(AMQFrame& frame) {
-    // It is possible that we are called to write after we are already shutting down
-    Mutex::ScopedLock l(dataConnectedLock);
-    if (!dataConnected) return;
-
-    bool notifyWrite = false;
-    {
-    Mutex::ScopedLock l(lock);
-	frames.push_back(frame);
-	//only ask to write if this is the end of a frameset or if we
-	//already have a buffers worth of data
-	currentSize += frame.encodedSize();
-	if (frame.getEof()) {
-	    lastEof = frames.size();
-	    notifyWrite = true;
-	} else {
-	    notifyWrite = (currentSize >= maxFrameSize);
-	}
-    }
-    if (notifyWrite) aio->notifyPendingWrite();
-}
-
-// Called in IO thread. (write idle routine)
-// This is NOT only called in response to previously calling notifyPendingWrite
-void RdmaConnector::writebuff(Rdma::AsynchIO&) {
-    // It's possible to be disconnected and be writable
-    Mutex::ScopedLock l(dataConnectedLock);
-    if (!dataConnected) {
-        return;
-    }
-    Codec* codec = securityLayer.get() ? (Codec*) securityLayer.get() : (Codec*) this;
-    if (!codec->canEncode()) {
-        return;
-    }
-    Rdma::Buffer* buffer = aio->getSendBuffer();
-    if (buffer) {
-        size_t encoded = codec->encode(buffer->bytes(), buffer->byteCount());
-        buffer->dataCount(encoded);
-        aio->queueWrite(buffer);
-    }
-}
-
-bool RdmaConnector::canEncode()
-{
-    Mutex::ScopedLock l(lock);
-    //have at least one full frameset or a whole buffers worth of data
-    return aio->writable() && (lastEof || currentSize >= maxFrameSize);
-}
-
-size_t RdmaConnector::encode(const char* buffer, size_t size)
-{
-    framing::Buffer out(const_cast<char*>(buffer), size);
-    size_t bytesWritten(0);
-    {
-        Mutex::ScopedLock l(lock);
-        while (!frames.empty() && out.available() >= frames.front().encodedSize() ) {
-            frames.front().encode(out);
-            QPID_LOG(trace, "SENT " << identifier << ": " << frames.front());
-            frames.pop_front();
-            if (lastEof) --lastEof;
-        }
-        bytesWritten = size - out.available();
-        currentSize -= bytesWritten;
-    }
-    if (bounds) bounds->reduce(bytesWritten);
-    return bytesWritten;
-}
-
-void RdmaConnector::readbuff(Rdma::AsynchIO&, Rdma::Buffer* buff) {
-    Codec* codec = securityLayer.get() ? (Codec*) securityLayer.get() : (Codec*) this;
-    codec->decode(buff->bytes(), buff->dataCount());
-}
-
-size_t RdmaConnector::decode(const char* buffer, size_t size) 
-{
-    framing::Buffer in(const_cast<char*>(buffer), size);
-    if (!initiated) {
-        framing::ProtocolInitiation protocolInit;
-        if (protocolInit.decode(in)) {
-            //TODO: check the version is correct
-            QPID_LOG(debug, "RECV " << identifier << " INIT(" << protocolInit << ")");
-        }
-        initiated = true;
-    }
-    AMQFrame frame;
-    while(frame.decode(in)){
-        QPID_LOG(trace, "RECV " << identifier << ": " << frame);
-        input->received(frame);
-    }
-    return size - in.available();
-}
-
-void RdmaConnector::writeDataBlock(const AMQDataBlock& data) {
-    Rdma::Buffer* buff = aio->getSendBuffer();
-    framing::Buffer out(buff->bytes(), buff->byteCount());
-    data.encode(out);
-    buff->dataCount(data.encodedSize());
-    aio->queueWrite(buff);
-}
-
-void RdmaConnector::activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer> sl)
-{
-    securityLayer = sl;
-    securityLayer->init(this);
-}
-
-}} // namespace qpid::client
diff --git a/cpp/src/qpid/client/SslConnector.cpp b/cpp/src/qpid/client/SslConnector.cpp
deleted file mode 100644
index 35c7e6bdf6..0000000000
--- a/cpp/src/qpid/client/SslConnector.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- *
- * 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.
- *
- */
-#include "qpid/client/Connector.h"
-
-#include "config.h"
-#include "qpid/client/Bounds.h"
-#include "qpid/client/ConnectionImpl.h"
-#include "qpid/client/ConnectionSettings.h"
-#include "qpid/Options.h"
-#include "qpid/log/Statement.h"
-#include "qpid/sys/Time.h"
-#include "qpid/framing/AMQFrame.h"
-#include "qpid/framing/InitiationHandler.h"
-#include "qpid/sys/ssl/util.h"
-#include "qpid/sys/ssl/SslIo.h"
-#include "qpid/sys/ssl/SslSocket.h"
-#include "qpid/sys/Dispatcher.h"
-#include "qpid/sys/Poller.h"
-#include "qpid/sys/SecuritySettings.h"
-#include "qpid/Msg.h"
-
-#include <iostream>
-#include <map>
-#include <boost/bind.hpp>
-#include <boost/format.hpp>
-
-namespace qpid {
-namespace client {
-
-using namespace qpid::sys;
-using namespace qpid::sys::ssl;
-using namespace qpid::framing;
-using boost::format;
-using boost::str;
-
-
-class SslConnector : public Connector
-{
-    struct Buff;
-
-    /** Batch up frames for writing to aio. */
-    class Writer : public framing::FrameHandler {
-        typedef sys::ssl::SslIOBufferBase BufferBase;
-        typedef std::vector<framing::AMQFrame> Frames;
-
-        const uint16_t maxFrameSize;
-        sys::Mutex lock;
-        sys::ssl::SslIO* aio;
-        BufferBase* buffer;
-        Frames frames;
-        size_t lastEof; // Position after last EOF in frames
-        framing::Buffer encode;
-        size_t framesEncoded;
-        std::string identifier;
-        Bounds* bounds;
-
-        void writeOne();
-        void newBuffer();
-
-      public:
-
-        Writer(uint16_t maxFrameSize, Bounds*);
-        ~Writer();
-        void init(std::string id, sys::ssl::SslIO*);
-        void handle(framing::AMQFrame&);
-        void write(sys::ssl::SslIO&);
-    };
-
-    const uint16_t maxFrameSize;
-    framing::ProtocolVersion version;
-    bool initiated;
-    SecuritySettings securitySettings;
-
-    sys::Mutex closedLock;
-    bool closed;
-
-    sys::ShutdownHandler* shutdownHandler;
-    framing::InputHandler* input;
-    framing::InitiationHandler* initialiser;
-    framing::OutputHandler* output;
-
-    Writer writer;
-
-    sys::ssl::SslSocket socket;
-
-    sys::ssl::SslIO* aio;
-    Poller::shared_ptr poller;
-
-    ~SslConnector();
-
-    void readbuff(qpid::sys::ssl::SslIO&, qpid::sys::ssl::SslIOBufferBase*);
-    void writebuff(qpid::sys::ssl::SslIO&);
-    void writeDataBlock(const framing::AMQDataBlock& data);
-    void eof(qpid::sys::ssl::SslIO&);
-    void disconnected(qpid::sys::ssl::SslIO&);
-
-    std::string identifier;
-
-    void connect(const std::string& host, int port);
-    void init();
-    void close();
-    void send(framing::AMQFrame& frame);
-    void abort() {} // TODO: Need to fix for heartbeat timeouts to work
-
-    void setInputHandler(framing::InputHandler* handler);
-    void setShutdownHandler(sys::ShutdownHandler* handler);
-    sys::ShutdownHandler* getShutdownHandler() const;
-    framing::OutputHandler* getOutputHandler();
-    const std::string& getIdentifier() const;
-    const SecuritySettings* getSecuritySettings();
-    void socketClosed(qpid::sys::ssl::SslIO&, const qpid::sys::ssl::SslSocket&);
-
-public:
-    SslConnector(Poller::shared_ptr p, framing::ProtocolVersion pVersion,
-              const ConnectionSettings&,
-              ConnectionImpl*);
-};
-
-struct SslConnector::Buff : public SslIO::BufferBase {
-    Buff(size_t size) : SslIO::BufferBase(new char[size], size) {}
-    ~Buff() { delete [] bytes;}
-};
-
-// Static constructor which registers connector here
-namespace {
-    Connector* create(Poller::shared_ptr p, framing::ProtocolVersion v, const ConnectionSettings& s, ConnectionImpl* c) {
-        return new SslConnector(p, v, s, c);
-    }
-
-    struct StaticInit {
-        StaticInit() {
-            try {
-                SslOptions options;
-                options.parse (0, 0, QPIDC_CONF_FILE, true);
-                if (options.certDbPath.empty()) {
-                    QPID_LOG(info, "SSL connector not enabled, you must set QPID_SSL_CERT_DB to enable it.");
-                } else {
-                    initNSS(options);
-                    Connector::registerFactory("ssl", &create);
-                }
-            } catch (const std::exception& e) {
-                QPID_LOG(error, "Failed to initialise SSL connector: " << e.what());
-            }
-        };
-
-        ~StaticInit() { shutdownNSS(); }
-    } init;
-}
-
-SslConnector::SslConnector(Poller::shared_ptr p,
-                     ProtocolVersion ver,
-                     const ConnectionSettings& settings,
-                     ConnectionImpl* cimpl)
-    : maxFrameSize(settings.maxFrameSize),
-      version(ver),
-      initiated(false),
-      closed(true),
-      shutdownHandler(0),
-      writer(maxFrameSize, cimpl),
-      aio(0),
-      poller(p)
-{
-    QPID_LOG(debug, "SslConnector created for " << version.toString());
-
-    if (settings.sslCertName != "") {
-        QPID_LOG(debug, "ssl-cert-name = " << settings.sslCertName);
-        socket.setCertName(settings.sslCertName);
-    }
-}
-
-SslConnector::~SslConnector() {
-    close();
-}
-
-void SslConnector::connect(const std::string& host, int port){
-    Mutex::ScopedLock l(closedLock);
-    assert(closed);
-    try {
-        socket.connect(host, port);
-    } catch (const std::exception& e) {
-        socket.close();
-        throw ConnectionException(framing::connection::CLOSE_CODE_FRAMING_ERROR, e.what());
-    }
-
-    identifier = str(format("[%1% %2%]") % socket.getLocalPort() % socket.getPeerAddress());
-    closed = false;
-    aio = new SslIO(socket,
-                       boost::bind(&SslConnector::readbuff, this, _1, _2),
-                       boost::bind(&SslConnector::eof, this, _1),
-                       boost::bind(&SslConnector::disconnected, this, _1),
-                       boost::bind(&SslConnector::socketClosed, this, _1, _2),
-                       0, // nobuffs
-                       boost::bind(&SslConnector::writebuff, this, _1));
-    writer.init(identifier, aio);
-}
-
-void SslConnector::init(){
-    Mutex::ScopedLock l(closedLock);
-    ProtocolInitiation init(version);
-    writeDataBlock(init);
-    for (int i = 0; i < 32; i++) {
-        aio->queueReadBuffer(new Buff(maxFrameSize));
-    }
-    aio->start(poller);
-}
-
-void SslConnector::close() {
-    Mutex::ScopedLock l(closedLock);
-    if (!closed) {
-        closed = true;
-        if (aio)
-            aio->queueWriteClose();
-    }
-}
-
-void SslConnector::socketClosed(SslIO&, const SslSocket&) {
-    if (aio)
-        aio->queueForDeletion();
-    if (shutdownHandler)
-        shutdownHandler->shutdown();
-}
-
-void SslConnector::setInputHandler(InputHandler* handler){
-    input = handler;
-}
-
-void SslConnector::setShutdownHandler(ShutdownHandler* handler){
-    shutdownHandler = handler;
-}
-
-OutputHandler* SslConnector::getOutputHandler() {
-    return this;
-}
-
-sys::ShutdownHandler* SslConnector::getShutdownHandler() const {
-    return shutdownHandler;
-}
-
-const std::string& SslConnector::getIdentifier() const {
-    return identifier;
-}
-
-void SslConnector::send(AMQFrame& frame) {
-    writer.handle(frame);
-}
-
-SslConnector::Writer::Writer(uint16_t s, Bounds* b) : maxFrameSize(s), aio(0), buffer(0), lastEof(0), bounds(b)
-{
-}
-
-SslConnector::Writer::~Writer() { delete buffer; }
-
-void SslConnector::Writer::init(std::string id, sys::ssl::SslIO* a) {
-    Mutex::ScopedLock l(lock);
-    identifier = id;
-    aio = a;
-    newBuffer();
-}
-void SslConnector::Writer::handle(framing::AMQFrame& frame) {
-    Mutex::ScopedLock l(lock);
-    frames.push_back(frame);
-    if (frame.getEof() || (bounds && bounds->getCurrentSize() >= maxFrameSize)) {
-        lastEof = frames.size();
-        aio->notifyPendingWrite();
-    }
-    QPID_LOG(trace, "SENT " << identifier << ": " << frame);
-}
-
-void SslConnector::Writer::writeOne() {
-    assert(buffer);
-    framesEncoded = 0;
-
-    buffer->dataStart = 0;
-    buffer->dataCount = encode.getPosition();
-    aio->queueWrite(buffer);
-    newBuffer();
-}
-
-void SslConnector::Writer::newBuffer() {
-    buffer = aio->getQueuedBuffer();
-    if (!buffer) buffer = new Buff(maxFrameSize);
-    encode = framing::Buffer(buffer->bytes, buffer->byteCount);
-    framesEncoded = 0;
-}
-
-// Called in IO thread.
-void SslConnector::Writer::write(sys::ssl::SslIO&) {
-    Mutex::ScopedLock l(lock);
-    assert(buffer);
-    size_t bytesWritten(0);
-    for (size_t i = 0; i < lastEof; ++i) {
-        AMQFrame& frame = frames[i];
-        uint32_t size = frame.encodedSize();
-        if (size > encode.available()) writeOne();
-        assert(size <= encode.available());
-        frame.encode(encode);
-        ++framesEncoded;
-        bytesWritten += size;
-    }
-    frames.erase(frames.begin(), frames.begin()+lastEof);
-    lastEof = 0;
-    if (bounds) bounds->reduce(bytesWritten);
-    if (encode.getPosition() > 0) writeOne();
-}
-
-void SslConnector::readbuff(SslIO& aio, SslIO::BufferBase* buff) {
-    framing::Buffer in(buff->bytes+buff->dataStart, buff->dataCount);
-
-    if (!initiated) {
-        framing::ProtocolInitiation protocolInit;
-        if (protocolInit.decode(in)) {
-            //TODO: check the version is correct
-            QPID_LOG(debug, "RECV " << identifier << " INIT(" << protocolInit << ")");
-        }
-        initiated = true;
-    }
-    AMQFrame frame;
-    while(frame.decode(in)){
-        QPID_LOG(trace, "RECV " << identifier << ": " << frame);
-        input->received(frame);
-    }
-    // TODO: unreading needs to go away, and when we can cope
-    // with multiple sub-buffers in the general buffer scheme, it will
-    if (in.available() != 0) {
-        // Adjust buffer for used bytes and then "unread them"
-        buff->dataStart += buff->dataCount-in.available();
-        buff->dataCount = in.available();
-        aio.unread(buff);
-    } else {
-        // Give whole buffer back to aio subsystem
-        aio.queueReadBuffer(buff);
-    }
-}
-
-void SslConnector::writebuff(SslIO& aio_) {
-    writer.write(aio_);
-}
-
-void SslConnector::writeDataBlock(const AMQDataBlock& data) {
-    SslIO::BufferBase* buff = new Buff(maxFrameSize);
-    framing::Buffer out(buff->bytes, buff->byteCount);
-    data.encode(out);
-    buff->dataCount = data.encodedSize();
-    aio->queueWrite(buff);
-}
-
-void SslConnector::eof(SslIO&) {
-    close();
-}
-
-void SslConnector::disconnected(SslIO&) {
-    close();
-    socketClosed(*aio, socket);
-}
-
-const SecuritySettings* SslConnector::getSecuritySettings()
-{
-    securitySettings.ssf = socket.getKeyLen();
-    securitySettings.authid = "dummy";//set to non-empty string to enable external authentication
-    return &securitySettings;
-}
-
-}} // namespace qpid::client
diff --git a/cpp/src/qpid/client/TCPConnector.cpp b/cpp/src/qpid/client/TCPConnector.cpp
deleted file mode 100644
index d90781b365..0000000000
--- a/cpp/src/qpid/client/TCPConnector.cpp
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/client/TCPConnector.h"
-
-#include "qpid/client/ConnectionImpl.h"
-#include "qpid/client/ConnectionSettings.h"
-#include "qpid/log/Statement.h"
-#include "qpid/sys/Codec.h"
-#include "qpid/sys/Time.h"
-#include "qpid/framing/AMQFrame.h"
-#include "qpid/framing/InitiationHandler.h"
-#include "qpid/sys/AsynchIO.h"
-#include "qpid/sys/Dispatcher.h"
-#include "qpid/sys/Poller.h"
-#include "qpid/sys/SecurityLayer.h"
-#include "qpid/Msg.h"
-
-#include <iostream>
-#include <boost/bind.hpp>
-#include <boost/format.hpp>
-
-namespace qpid {
-namespace client {
-
-using namespace qpid::sys;
-using namespace qpid::framing;
-using boost::format;
-using boost::str;
-
-struct TCPConnector::Buff : public AsynchIO::BufferBase {
-    Buff(size_t size) : AsynchIO::BufferBase(new char[size], size) {}
-    ~Buff() { delete [] bytes;}
-};
-
-// Static constructor which registers connector here
-namespace {
-    Connector* create(Poller::shared_ptr p, framing::ProtocolVersion v, const ConnectionSettings& s, ConnectionImpl* c) {
-        return new TCPConnector(p, v, s, c);
-    }
-
-    struct StaticInit {
-        StaticInit() {
-            Connector::registerFactory("tcp", &create);
-        };
-    } init;
-}
-
-TCPConnector::TCPConnector(Poller::shared_ptr p,
-                     ProtocolVersion ver,
-                     const ConnectionSettings& settings,
-                     ConnectionImpl* cimpl)
-    : maxFrameSize(settings.maxFrameSize),
-      lastEof(0),
-      currentSize(0),
-      bounds(cimpl),
-      version(ver),
-      initiated(false),
-      closed(true),
-      shutdownHandler(0),
-      connector(0),
-      aio(0),
-      poller(p)
-{
-    QPID_LOG(debug, "TCPConnector created for " << version);
-    settings.configureSocket(socket);
-}
-
-TCPConnector::~TCPConnector() {
-    close();
-}
-
-void TCPConnector::connect(const std::string& host, int port) {
-    Mutex::ScopedLock l(lock);
-    assert(closed);
-    connector = AsynchConnector::create(
-        socket,
-        host, port,
-        boost::bind(&TCPConnector::connected, this, _1),
-        boost::bind(&TCPConnector::connectFailed, this, _3));
-    closed = false;
-
-    connector->start(poller);
-}
-
-void TCPConnector::connected(const Socket&) {
-    connector = 0;
-    aio = AsynchIO::create(socket,
-                       boost::bind(&TCPConnector::readbuff, this, _1, _2),
-                       boost::bind(&TCPConnector::eof, this, _1),
-                       boost::bind(&TCPConnector::disconnected, this, _1),
-                       boost::bind(&TCPConnector::socketClosed, this, _1, _2),
-                       0, // nobuffs
-                       boost::bind(&TCPConnector::writebuff, this, _1));
-    start(aio);
-    initAmqp();
-    aio->start(poller);
-}
-
-void TCPConnector::start(sys::AsynchIO* aio_) {
-    aio = aio_;
-    for (int i = 0; i < 4; i++) {
-        aio->queueReadBuffer(new Buff(maxFrameSize));
-    }
-
-    identifier = str(format("[%1% %2%]") % socket.getLocalPort() % socket.getPeerAddress());
-}
-
-void TCPConnector::initAmqp() {
-    ProtocolInitiation init(version);
-    writeDataBlock(init);
-}
-
-void TCPConnector::connectFailed(const std::string& msg) {
-    connector = 0;
-    QPID_LOG(warning, "Connect failed: " << msg);
-    socket.close();
-    if (!closed)
-        closed = true;
-    if (shutdownHandler)
-        shutdownHandler->shutdown();
-}
-
-void TCPConnector::close() {
-    Mutex::ScopedLock l(lock);
-    if (!closed) {
-        closed = true;
-        if (aio)
-            aio->queueWriteClose();
-    }
-}
-
-void TCPConnector::socketClosed(AsynchIO&, const Socket&) {
-    if (aio)
-        aio->queueForDeletion();
-    if (shutdownHandler)
-        shutdownHandler->shutdown();
-}
-
-void TCPConnector::abort() {
-    // Can't abort a closed connection
-    if (!closed) {
-        if (aio) {
-            // Established connection
-            aio->requestCallback(boost::bind(&TCPConnector::eof, this, _1));
-        } else if (connector) {
-            // We're still connecting
-            connector->stop();
-            connectFailed("Connection timedout");
-        }
-    }
-}
-
-void TCPConnector::setInputHandler(InputHandler* handler){
-    input = handler;
-}
-
-void TCPConnector::setShutdownHandler(ShutdownHandler* handler){
-    shutdownHandler = handler;
-}
-
-OutputHandler* TCPConnector::getOutputHandler() {
-    return this; 
-}
-
-sys::ShutdownHandler* TCPConnector::getShutdownHandler() const {
-    return shutdownHandler;
-}
-
-const std::string& TCPConnector::getIdentifier() const { 
-    return identifier;
-}
-
-void TCPConnector::send(AMQFrame& frame) {
-    bool notifyWrite = false;
-    {
-    Mutex::ScopedLock l(lock);
-    frames.push_back(frame);
-    //only ask to write if this is the end of a frameset or if we
-    //already have a buffers worth of data
-    currentSize += frame.encodedSize();
-    if (frame.getEof()) {
-        lastEof = frames.size();
-        notifyWrite = true;
-    } else {
-        notifyWrite = (currentSize >= maxFrameSize);
-    }
-    /*
-      NOTE: Moving the following line into this mutex block
-            is a workaround for BZ 570168, in which the test
-            testConcurrentSenders causes a hang about 1.5%
-            of the time.  ( To see the hang much more frequently
-            leave this line out of the mutex block, and put a 
-            small usleep just before it.)
-
-            TODO mgoulish - fix the underlying cause and then
-                            move this call back outside the mutex.
-    */
-    if (notifyWrite && !closed) aio->notifyPendingWrite();
-    }
-}
-
-void TCPConnector::writebuff(AsynchIO& /*aio*/) 
-{
-    // It's possible to be disconnected and be writable
-    if (closed)
-        return;
-
-    Codec* codec = securityLayer.get() ? (Codec*) securityLayer.get() : (Codec*) this;
-    if (codec->canEncode()) {
-        std::auto_ptr<AsynchIO::BufferBase> buffer = std::auto_ptr<AsynchIO::BufferBase>(aio->getQueuedBuffer());
-        if (!buffer.get()) buffer = std::auto_ptr<AsynchIO::BufferBase>(new Buff(maxFrameSize));
-
-        size_t encoded = codec->encode(buffer->bytes, buffer->byteCount);
-
-        buffer->dataStart = 0;
-        buffer->dataCount = encoded;
-        aio->queueWrite(buffer.release());
-    }
-}
-
-// Called in IO thread.
-bool TCPConnector::canEncode()
-{
-    Mutex::ScopedLock l(lock);
-    //have at least one full frameset or a whole buffers worth of data
-    return lastEof || currentSize >= maxFrameSize;
-}
-
-// Called in IO thread.
-size_t TCPConnector::encode(const char* buffer, size_t size)
-{
-    framing::Buffer out(const_cast<char*>(buffer), size);
-    size_t bytesWritten(0);
-    {
-        Mutex::ScopedLock l(lock);
-        while (!frames.empty() && out.available() >= frames.front().encodedSize() ) {
-            frames.front().encode(out);
-            QPID_LOG(trace, "SENT " << identifier << ": " << frames.front());
-            frames.pop_front();
-            if (lastEof) --lastEof;
-        }
-        bytesWritten = size - out.available();
-        currentSize -= bytesWritten;
-    }
-    if (bounds) bounds->reduce(bytesWritten);
-    return bytesWritten;
-}
-
-bool TCPConnector::readbuff(AsynchIO& aio, AsynchIO::BufferBase* buff) 
-{
-    Codec* codec = securityLayer.get() ? (Codec*) securityLayer.get() : (Codec*) this;
-    int32_t decoded = codec->decode(buff->bytes+buff->dataStart, buff->dataCount);
-    // TODO: unreading needs to go away, and when we can cope
-    // with multiple sub-buffers in the general buffer scheme, it will
-    if (decoded < buff->dataCount) {
-        // Adjust buffer for used bytes and then "unread them"
-        buff->dataStart += decoded;
-        buff->dataCount -= decoded;
-        aio.unread(buff);
-    } else {
-        // Give whole buffer back to aio subsystem
-        aio.queueReadBuffer(buff);
-    }
-    return true;
-}
-
-size_t TCPConnector::decode(const char* buffer, size_t size) 
-{
-    framing::Buffer in(const_cast<char*>(buffer), size);
-    if (!initiated) {
-        framing::ProtocolInitiation protocolInit;
-        if (protocolInit.decode(in)) {
-            QPID_LOG(debug, "RECV " << identifier << " INIT(" << protocolInit << ")");
-            if(!(protocolInit==version)){
-                throw Exception(QPID_MSG("Unsupported version: " << protocolInit
-                                         << " supported version " << version));
-            }
-        }
-        initiated = true;
-    }
-    AMQFrame frame;
-    while(frame.decode(in)){
-        QPID_LOG(trace, "RECV " << identifier << ": " << frame);
-        input->received(frame);
-    }
-    return size - in.available();
-}
-
-void TCPConnector::writeDataBlock(const AMQDataBlock& data) {
-    AsynchIO::BufferBase* buff = aio->getQueuedBuffer();
-    framing::Buffer out(buff->bytes, buff->byteCount);
-    data.encode(out);
-    buff->dataCount = data.encodedSize();
-    aio->queueWrite(buff);
-}
-
-void TCPConnector::eof(AsynchIO&) {
-    close();
-}
-
-void TCPConnector::disconnected(AsynchIO&) {
-    close();
-    socketClosed(*aio, socket);
-}
-
-void TCPConnector::activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer> sl)
-{
-    securityLayer = sl;
-    securityLayer->init(this);
-}
-
-}} // namespace qpid::client
diff --git a/cpp/src/qpid/client/TCPConnector.h b/cpp/src/qpid/client/TCPConnector.h
deleted file mode 100644
index c756469182..0000000000
--- a/cpp/src/qpid/client/TCPConnector.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#ifndef _TCPConnector_
-#define _TCPConnector_
-
-#include "Connector.h"
-#include "qpid/client/Bounds.h"
-#include "qpid/framing/AMQFrame.h"
-#include "qpid/sys/AsynchIO.h"
-#include "qpid/sys/Codec.h"
-#include "qpid/sys/IntegerTypes.h"
-#include "qpid/sys/Mutex.h"
-#include "qpid/sys/Runnable.h"
-#include "qpid/sys/SecurityLayer.h"
-#include "qpid/sys/Socket.h"
-#include "qpid/sys/Thread.h"
-
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-#include <deque>
-#include <string>
-
-namespace qpid {
-
-namespace framing {
-    class InitiationHandler;
-}
-
-namespace client {
-
-class TCPConnector : public Connector, public sys::Codec
-{
-    typedef std::deque<framing::AMQFrame> Frames;
-    struct Buff;
-
-    const uint16_t maxFrameSize;
-
-    sys::Mutex lock;
-    Frames frames; // Outgoing frame queue
-    size_t lastEof; // Position after last EOF in frames
-    uint64_t currentSize;
-    Bounds* bounds;
-
-    framing::ProtocolVersion version;
-    bool initiated;
-    bool closed;
-
-    sys::ShutdownHandler* shutdownHandler;
-    framing::InputHandler* input;
-    framing::InitiationHandler* initialiser;
-    framing::OutputHandler* output;
-
-    sys::Socket socket;
-
-    sys::AsynchConnector* connector;
-    sys::AsynchIO* aio;
-    std::string identifier;
-    boost::shared_ptr<sys::Poller> poller;
-    std::auto_ptr<qpid::sys::SecurityLayer> securityLayer;
-
-    virtual void connected(const sys::Socket&);
-    void writeDataBlock(const framing::AMQDataBlock& data);
-
-    void close();
-    void send(framing::AMQFrame& frame);
-    void abort();
-
-    void setInputHandler(framing::InputHandler* handler);
-    void setShutdownHandler(sys::ShutdownHandler* handler);
-    sys::ShutdownHandler* getShutdownHandler() const;
-    framing::OutputHandler* getOutputHandler();
-    const std::string& getIdentifier() const;
-    void activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer>);
-    const qpid::sys::SecuritySettings* getSecuritySettings() { return 0; }
-
-    size_t decode(const char* buffer, size_t size);
-    size_t encode(const char* buffer, size_t size);
-    bool canEncode();
-
-protected:
-    virtual ~TCPConnector();
-    void connect(const std::string& host, int port);
-    void start(sys::AsynchIO* aio_);
-    void initAmqp();
-    virtual void connectFailed(const std::string& msg);
-    bool readbuff(qpid::sys::AsynchIO&, qpid::sys::AsynchIOBufferBase*);
-    void writebuff(qpid::sys::AsynchIO&);
-    void eof(qpid::sys::AsynchIO&);
-    void disconnected(qpid::sys::AsynchIO&);
-    void socketClosed(qpid::sys::AsynchIO&, const qpid::sys::Socket&);
-
-public:
-    TCPConnector(boost::shared_ptr<sys::Poller>,
-              framing::ProtocolVersion pVersion,
-              const ConnectionSettings&,
-              ConnectionImpl*);
-};
-
-}}   // namespace qpid::client
-
-#endif  /* _TCPConnector_ */
diff --git a/cpp/src/qpid/client/windows/SslConnector.cpp b/cpp/src/qpid/client/windows/SslConnector.cpp
deleted file mode 100644
index a33713e1a8..0000000000
--- a/cpp/src/qpid/client/windows/SslConnector.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/client/TCPConnector.h"
-
-#include "config.h"
-#include "qpid/Msg.h"
-#include "qpid/client/ConnectionImpl.h"
-#include "qpid/client/ConnectionSettings.h"
-#include "qpid/log/Statement.h"
-#include "qpid/sys/Dispatcher.h"
-#include "qpid/sys/Poller.h"
-#include "qpid/sys/Time.h"
-#include "qpid/sys/windows/check.h"
-#include "qpid/sys/windows/SslAsynchIO.h"
-
-#include <iostream>
-#include <boost/bind.hpp>
-#include <boost/format.hpp>
-
-#include <memory.h>
-// security.h needs to see this to distinguish from kernel use.
-#define SECURITY_WIN32
-#include <security.h>
-#include <Schnlsp.h>
-#undef SECURITY_WIN32
-#include <winsock2.h>
-
-namespace qpid {
-namespace client {
-namespace windows {
-
-using namespace qpid::sys;
-using boost::format;
-using boost::str;
-
-
-class SslConnector : public qpid::client::TCPConnector
-{
-    qpid::sys::windows::ClientSslAsynchIO *shim;
-	boost::shared_ptr<qpid::sys::Poller> poller;
-    std::string brokerHost;
-    SCHANNEL_CRED cred;
-    CredHandle credHandle;
-    TimeStamp credExpiry;
-
-    virtual ~SslConnector();
-    void negotiationDone(SECURITY_STATUS status);
-
-    // A number of AsynchIO callbacks go right through to TCPConnector, but
-    // we can't boost::bind to a protected ancestor, so these methods redirect
-    // to those TCPConnector methods.
-    bool redirectReadbuff(qpid::sys::AsynchIO&, qpid::sys::AsynchIOBufferBase*);
-    void redirectWritebuff(qpid::sys::AsynchIO&);
-    void redirectEof(qpid::sys::AsynchIO&);
-
-public:
-    SslConnector(boost::shared_ptr<qpid::sys::Poller>,
-                 framing::ProtocolVersion pVersion,
-                 const ConnectionSettings&, 
-                 ConnectionImpl*);
-    virtual void connect(const std::string& host, int port);
-    virtual void connected(const Socket&);
-    unsigned int getSSF();
-};
-
-// Static constructor which registers connector here
-namespace {
-    Connector* create(boost::shared_ptr<qpid::sys::Poller> p,
-                      framing::ProtocolVersion v,
-                      const ConnectionSettings& s,
-                      ConnectionImpl* c) {
-        return new SslConnector(p, v, s, c);
-    }
-
-    struct StaticInit {
-        StaticInit() {
-            try {
-                Connector::registerFactory("ssl", &create);
-            } catch (const std::exception& e) {
-                QPID_LOG(error, "Failed to initialise SSL connector: " << e.what());
-            }
-        };
-        ~StaticInit() { }
-    } init;
-}
-
-void SslConnector::negotiationDone(SECURITY_STATUS status)
-{
-    if (status == SEC_E_OK)
-        initAmqp();
-    else
-        connectFailed(QPID_MSG(qpid::sys::strError(status)));
-}
-
-bool SslConnector::redirectReadbuff(qpid::sys::AsynchIO& a,
-                                    qpid::sys::AsynchIOBufferBase* b) {
-    return readbuff(a, b);
-}
-
-void SslConnector::redirectWritebuff(qpid::sys::AsynchIO& a) {
-    writebuff(a);
-}
-
-void SslConnector::redirectEof(qpid::sys::AsynchIO& a) {
-    eof(a);
-}
-
-SslConnector::SslConnector(boost::shared_ptr<qpid::sys::Poller> p,
-                           framing::ProtocolVersion ver,
-                           const ConnectionSettings& settings,
-                           ConnectionImpl* cimpl)
-    : TCPConnector(p, ver, settings, cimpl), shim(0), poller(p)
-{
-    memset(&cred, 0, sizeof(cred));
-    cred.dwVersion = SCHANNEL_CRED_VERSION;
-    SECURITY_STATUS status = ::AcquireCredentialsHandle(NULL,
-                                                        UNISP_NAME,
-                                                        SECPKG_CRED_OUTBOUND,
-                                                        NULL,
-                                                        &cred,
-                                                        NULL,
-                                                        NULL,
-                                                        &credHandle,
-                                                        &credExpiry);
-    if (status != SEC_E_OK)
-        throw QPID_WINDOWS_ERROR(status);
-    QPID_LOG(debug, "SslConnector created for " << ver.toString());
-}
-
-SslConnector::~SslConnector()
-{
-    ::FreeCredentialsHandle(&credHandle);
-}
-
-  // Will this get reach via virtual method via boost::bind????
-
-void SslConnector::connect(const std::string& host, int port) {
-    brokerHost = host;
-    TCPConnector::connect(host, port);
-}
-
-void SslConnector::connected(const Socket& s) {
-    shim = new qpid::sys::windows::ClientSslAsynchIO(brokerHost,
-                                                     s,
-                                                     credHandle,
-                                                     boost::bind(&SslConnector::redirectReadbuff, this, _1, _2),
-                                                     boost::bind(&SslConnector::redirectEof, this, _1),
-                                                     boost::bind(&SslConnector::redirectEof, this, _1),
-                                                     0, // closed
-                                                     0, // nobuffs
-                                                     boost::bind(&SslConnector::redirectWritebuff, this, _1),
-                                                     boost::bind(&SslConnector::negotiationDone, this, _1));
-    start(shim);
-	shim->start(poller);
-}
-
-unsigned int SslConnector::getSSF()
-{
-    return shim->getSslKeySize();
-}
-
-}}} // namespace qpid::client::windows
diff --git a/cpp/src/qpid/sys/AsynchIO.h b/cpp/src/qpid/sys/AsynchIO.h
deleted file mode 100644
index 50da8fa4fc..0000000000
--- a/cpp/src/qpid/sys/AsynchIO.h
+++ /dev/null
@@ -1,160 +0,0 @@
-#ifndef _sys_AsynchIO
-#define _sys_AsynchIO
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/IntegerTypes.h"
-#include "qpid/CommonImportExport.h"
-
-#include <string.h>
-
-#include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
-
-namespace qpid {
-namespace sys {
-    
-class Socket;
-class Poller;
-
-/*
- * Asynchronous acceptor: accepts connections then does a callback with the
- * accepted fd
- */
-class AsynchAcceptor {
-public:
-    typedef boost::function1<void, const Socket&> Callback;
-
-    QPID_COMMON_EXTERN static AsynchAcceptor* create(const Socket& s, Callback callback);
-    virtual ~AsynchAcceptor() {};
-    virtual void start(boost::shared_ptr<Poller> poller) = 0;
-};
-
-/*
- * Asynchronous connector: starts the process of initiating a connection and
- * invokes a callback when completed or failed.
- */
-class AsynchConnector {
-public:
-    typedef boost::function1<void, const Socket&> ConnectedCallback;
-    typedef boost::function3<void, const Socket&, int, const std::string&> FailedCallback;
-
-    // Call create() to allocate a new AsynchConnector object with the
-    // specified poller, addressing, and callbacks.
-    // This method is implemented in platform-specific code to
-    // create a correctly typed object. The platform code also manages
-    // deletes. To correctly manage heaps when needed, the allocate and
-    // delete should both be done from the same class/library.
-    QPID_COMMON_EXTERN static AsynchConnector* create(const Socket& s,
-                                   std::string hostname,
-                                   uint16_t port,
-                                   ConnectedCallback connCb,
-                                   FailedCallback failCb);
-    virtual void start(boost::shared_ptr<Poller> poller) = 0;
-    virtual void stop() {};
-protected:
-    AsynchConnector() {}
-    virtual ~AsynchConnector() {}
-};
-
-struct AsynchIOBufferBase {
-    char* const bytes;
-    const int32_t byteCount;
-    int32_t dataStart;
-    int32_t dataCount;
-    
-    AsynchIOBufferBase(char* const b, const int32_t s) :
-        bytes(b),
-        byteCount(s),
-        dataStart(0),
-        dataCount(0)
-    {}
-    
-    virtual ~AsynchIOBufferBase()
-    {}
-
-    void squish() {
-        if (dataStart != 0) {
-            ::memmove(bytes, bytes + dataStart, dataCount);
-            dataStart = 0;
-        }
-    }
-};
-
-/*
- * Asychronous reader/writer: 
- * Reader accepts buffers to read into; reads into the provided buffers
- * and then does a callback with the buffer and amount read. Optionally it
- * can callback when there is something to read but no buffer to read it into.
- * 
- * Writer accepts a buffer and queues it for writing; can also be given
- * a callback for when writing is "idle" (ie fd is writable, but nothing
- * to write).
- */
-class AsynchIO {
-public:
-    typedef AsynchIOBufferBase BufferBase;
-
-    typedef boost::function2<void, AsynchIO&, BufferBase*> ReadCallback;
-    typedef boost::function1<void, AsynchIO&> EofCallback;
-    typedef boost::function1<void, AsynchIO&> DisconnectCallback;
-    typedef boost::function2<void, AsynchIO&, const Socket&> ClosedCallback;
-    typedef boost::function1<void, AsynchIO&> BuffersEmptyCallback;
-    typedef boost::function1<void, AsynchIO&> IdleCallback;
-    typedef boost::function1<void, AsynchIO&> RequestCallback;
-
-    // Call create() to allocate a new AsynchIO object with the specified
-    // callbacks. This method is implemented in platform-specific code to
-    // create a correctly typed object. The platform code also manages
-    // deletes. To correctly manage heaps when needed, the allocate and
-    // delete should both be done from the same class/library.
-    QPID_COMMON_EXTERN static AsynchIO* create(const Socket& s,
-                            ReadCallback rCb,
-                            EofCallback eofCb,
-                            DisconnectCallback disCb,
-                            ClosedCallback cCb = 0,
-                            BuffersEmptyCallback eCb = 0,
-                            IdleCallback iCb = 0);
-public:
-    virtual void queueForDeletion() = 0;
-
-    virtual void start(boost::shared_ptr<Poller> poller) = 0;
-    virtual void queueReadBuffer(BufferBase* buff) = 0;
-    virtual void unread(BufferBase* buff) = 0;
-    virtual void queueWrite(BufferBase* buff) = 0;
-    virtual void notifyPendingWrite() = 0;
-    virtual void queueWriteClose() = 0;
-    virtual bool writeQueueEmpty() = 0;
-    virtual void startReading() = 0;
-    virtual void stopReading() = 0;
-    virtual void requestCallback(RequestCallback) = 0;
-    virtual BufferBase* getQueuedBuffer() = 0;
-
-protected:
-    // Derived class manages lifetime; must be constructed using the
-    // static create() method. Deletes not allowed from outside.
-    AsynchIO() {}
-    virtual ~AsynchIO() {}
-};
-
-}}
-
-#endif // _sys_AsynchIO
diff --git a/cpp/src/qpid/sys/ProtocolFactory.h b/cpp/src/qpid/sys/ProtocolFactory.h
deleted file mode 100644
index b233b2da1a..0000000000
--- a/cpp/src/qpid/sys/ProtocolFactory.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef _sys_ProtocolFactory_h
-#define _sys_ProtocolFactory_h
-
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/IntegerTypes.h"
-#include "qpid/SharedObject.h"
-#include "qpid/sys/ConnectionCodec.h"
-#include <boost/function.hpp>
-
-namespace qpid {
-namespace sys {
-
-class Poller;
-
-class ProtocolFactory : public qpid::SharedObject<ProtocolFactory>
-{
-  public:
-    typedef boost::function2<void, int, std::string> ConnectFailedCallback;
-
-    virtual ~ProtocolFactory() = 0;
-    virtual uint16_t getPort() const = 0;
-    virtual std::string getHost() const = 0;
-    virtual void accept(boost::shared_ptr<Poller>, ConnectionCodec::Factory*) = 0;
-    virtual void connect(
-        boost::shared_ptr<Poller>,
-        const std::string& host, int16_t port,
-        ConnectionCodec::Factory* codec,
-        ConnectFailedCallback failed) = 0;
-    virtual bool supports(const std::string& /*capability*/) { return false; }
-};
-
-inline ProtocolFactory::~ProtocolFactory() {}
-
-}}
-
-
-    
-#endif  //!_sys_ProtocolFactory_h
diff --git a/cpp/src/qpid/sys/RdmaIOPlugin.cpp b/cpp/src/qpid/sys/RdmaIOPlugin.cpp
deleted file mode 100644
index d53db20598..0000000000
--- a/cpp/src/qpid/sys/RdmaIOPlugin.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/ProtocolFactory.h"
-
-#include "qpid/Plugin.h"
-#include "qpid/broker/Broker.h"
-#include "qpid/framing/AMQP_HighestVersion.h"
-#include "qpid/log/Statement.h"
-#include "qpid/sys/rdma/RdmaIO.h"
-#include "qpid/sys/rdma/rdma_exception.h"
-#include "qpid/sys/OutputControl.h"
-#include "qpid/sys/SecuritySettings.h"
-
-#include <boost/bind.hpp>
-#include <boost/lexical_cast.hpp>
-#include <memory>
-
-#include <netdb.h>
-
-using std::auto_ptr;
-using std::string;
-using std::stringstream;
-
-namespace qpid {
-namespace sys {
-
-class RdmaIOHandler : public OutputControl {
-    std::string identifier;
-    ConnectionCodec::Factory* factory;
-    ConnectionCodec* codec;
-    bool readError;
-
-    sys::Mutex pollingLock;
-    bool polling;
-
-    Rdma::AsynchIO* aio;
-    Rdma::Connection::intrusive_ptr connection;
-
-    void write(const framing::ProtocolInitiation&);
-    void disconnectAction();
-
-  public:
-    RdmaIOHandler(Rdma::Connection::intrusive_ptr c, ConnectionCodec::Factory* f);
-    ~RdmaIOHandler();
-    void init(Rdma::AsynchIO* a);
-    void start(Poller::shared_ptr poller);
-
-    // Output side
-    void close();
-    void abort();
-    void activateOutput();
-    void giveReadCredit(int32_t credit);
-    void initProtocolOut();
-
-    // Input side
-    void readbuff(Rdma::AsynchIO& aio, Rdma::Buffer* buff);
-    void initProtocolIn(Rdma::Buffer* buff);
-
-    // Notifications
-    void full(Rdma::AsynchIO& aio);
-    void idle(Rdma::AsynchIO& aio);
-    void error(Rdma::AsynchIO& aio);
-    void disconnected();
-    void drained();
-};
-
-RdmaIOHandler::RdmaIOHandler(Rdma::Connection::intrusive_ptr c, qpid::sys::ConnectionCodec::Factory* f) :
-    identifier(c->getFullName()),
-    factory(f),
-    codec(0),
-    readError(false),
-    polling(false),
-    connection(c)
-{
-}
-
-RdmaIOHandler::~RdmaIOHandler() {
-    if (codec)
-        codec->closed();
-    delete codec;
-    delete aio;
-}
-
-void RdmaIOHandler::init(Rdma::AsynchIO* a) {
-    aio = a;
-}
-
-void RdmaIOHandler::start(Poller::shared_ptr poller) {
-    Mutex::ScopedLock l(pollingLock);
-    assert(!polling);
-
-    polling = true;
-
-    aio->start(poller);
-}
-
-void RdmaIOHandler::write(const framing::ProtocolInitiation& data)
-{
-    QPID_LOG(debug, "Rdma: SENT [" << identifier << "] INIT(" << data << ")");
-    Rdma::Buffer* buff = aio->getSendBuffer();
-    assert(buff);
-    framing::Buffer out(buff->bytes(), buff->byteCount());
-    data.encode(out);
-    buff->dataCount(data.encodedSize());
-    aio->queueWrite(buff);
-}
-
-void RdmaIOHandler::close() {
-    aio->drainWriteQueue(boost::bind(&RdmaIOHandler::drained, this));
-}
-
-// TODO: Dummy implementation, need to fill this in for heartbeat timeout to work
-void RdmaIOHandler::abort() {
-}
-
-void RdmaIOHandler::activateOutput() {
-    aio->notifyPendingWrite();
-}
-
-void RdmaIOHandler::idle(Rdma::AsynchIO&) {
-    // TODO: Shouldn't need this test as idle() should only ever be called when
-    // the connection is writable anyway
-    if ( !aio->writable() ) {
-        return;
-    }
-    if (codec == 0) return;
-    if (!codec->canEncode()) {
-        return;
-    }
-    Rdma::Buffer* buff = aio->getSendBuffer();
-    if (buff) {
-        size_t encoded=codec->encode(buff->bytes(), buff->byteCount());
-        buff->dataCount(encoded);
-        aio->queueWrite(buff);
-        if (codec->isClosed()) {
-            close();
-        }
-    }
-}
-
-void RdmaIOHandler::initProtocolOut() {
-    // We mustn't have already started the conversation
-    // but we must be able to send
-    assert( codec == 0 );
-    assert( aio->writable() );
-    codec = factory->create(*this, identifier, SecuritySettings());
-    write(framing::ProtocolInitiation(codec->getVersion()));
-}
-
-void RdmaIOHandler::error(Rdma::AsynchIO&) {
-    disconnected();
-}
-
-namespace {
-    void stopped(RdmaIOHandler* async) {
-        delete async;
-    }
-}
-
-void RdmaIOHandler::disconnectAction() {
-    {
-    Mutex::ScopedLock l(pollingLock);
-    // If we're closed already then we'll get to drained() anyway
-    if (!polling) return;
-    polling = false;
-    }
-    aio->stop(boost::bind(&stopped, this));
-}
-
-void RdmaIOHandler::disconnected() {
-    aio->requestCallback(boost::bind(&RdmaIOHandler::disconnectAction, this));
-}
-
-void RdmaIOHandler::drained() {
-    // We know we've drained the write queue now, but we don't have to do anything
-    // because we can rely on the client to disconnect to trigger the connection
-    // cleanup.
-}
-
-void RdmaIOHandler::full(Rdma::AsynchIO&) {
-    QPID_LOG(debug, "Rdma: buffer full [" << identifier << "]");
-}
-
-// TODO: Dummy implementation of read throttling
-void RdmaIOHandler::giveReadCredit(int32_t) {
-}
-
-// The logic here is subtly different from TCP as RDMA is message oriented
-// so we define that an RDMA message is a frame - in this case there is no putting back
-// of any message remainder - there shouldn't be any. And what we read here can't be
-// smaller than a frame
-void RdmaIOHandler::readbuff(Rdma::AsynchIO&, Rdma::Buffer* buff) {
-    if (readError) {
-        return;
-    }
-    size_t decoded = 0;
-    try {
-        if (codec) {
-            decoded = codec->decode(buff->bytes(), buff->dataCount());
-        }else{
-            // Need to start protocol processing
-            initProtocolIn(buff);
-        }
-    }catch(const std::exception& e){
-        QPID_LOG(error, e.what());
-        readError = true;
-        close();
-    }
-}
-
-void RdmaIOHandler::initProtocolIn(Rdma::Buffer* buff) {
-    framing::Buffer in(buff->bytes(), buff->dataCount());
-    framing::ProtocolInitiation protocolInit;
-    size_t decoded = 0;
-    if (protocolInit.decode(in)) {
-        decoded = in.getPosition();
-        QPID_LOG(debug, "Rdma: RECV [" << identifier << "] INIT(" << protocolInit << ")");
-
-        codec = factory->create(protocolInit.getVersion(), *this, identifier, SecuritySettings());
-
-        // If we failed to create the codec then we don't understand the offered protocol version
-        if (!codec) {
-            // send valid version header & close connection.
-            write(framing::ProtocolInitiation(framing::highestProtocolVersion));
-            readError = true;
-            close();
-        }
-    }
-}
-
-class RdmaIOProtocolFactory : public ProtocolFactory {
-    auto_ptr<Rdma::Listener> listener;
-    const uint16_t listeningPort;
-
-  public:
-    RdmaIOProtocolFactory(int16_t port, int backlog);
-    void accept(Poller::shared_ptr, ConnectionCodec::Factory*);
-    void connect(Poller::shared_ptr, const string& host, int16_t port, ConnectionCodec::Factory*, ConnectFailedCallback);
-
-    uint16_t getPort() const;
-    string getHost() const;
-
-  private:
-    bool request(Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&, ConnectionCodec::Factory*);
-    void established(Poller::shared_ptr, Rdma::Connection::intrusive_ptr);
-    void connected(Poller::shared_ptr, Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&, ConnectionCodec::Factory*);
-    void connectionError(Rdma::Connection::intrusive_ptr, Rdma::ErrorType);
-    void disconnected(Rdma::Connection::intrusive_ptr);
-    void rejected(Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&, ConnectFailedCallback);
-};
-
-// Static instance to initialise plugin
-static class RdmaIOPlugin : public Plugin {
-    void earlyInitialize(Target&) {
-    }
-
-    void initialize(Target& target) {
-        // Check whether we actually have any rdma devices
-        if ( Rdma::deviceCount() == 0 ) {
-            QPID_LOG(info, "Rdma: Disabled: no rdma devices found");
-            return;
-        }
-
-        broker::Broker* broker = dynamic_cast<broker::Broker*>(&target);
-        // Only provide to a Broker
-        if (broker) {
-            const broker::Broker::Options& opts = broker->getOptions();
-            ProtocolFactory::shared_ptr protocol(new RdmaIOProtocolFactory(opts.port, opts.connectionBacklog));
-            QPID_LOG(notice, "Rdma: Listening on RDMA port " << protocol->getPort());
-            broker->registerProtocolFactory("rdma", protocol);
-        }
-    }
-} rdmaPlugin;
-
-RdmaIOProtocolFactory::RdmaIOProtocolFactory(int16_t port, int /*backlog*/) :
-    listeningPort(port)
-{}
-
-void RdmaIOProtocolFactory::established(Poller::shared_ptr poller, Rdma::Connection::intrusive_ptr ci) {
-    RdmaIOHandler* async = ci->getContext<RdmaIOHandler>();
-    async->start(poller);
-}
-
-bool RdmaIOProtocolFactory::request(Rdma::Connection::intrusive_ptr ci, const Rdma::ConnectionParams& cp,
-        ConnectionCodec::Factory* f) {
-    try {
-        if (cp.rdmaProtocolVersion == 0) {
-            QPID_LOG(warning, "Rdma: connection from protocol version 0 client");
-        }
-        RdmaIOHandler* async = new RdmaIOHandler(ci, f);
-        Rdma::AsynchIO* aio =
-            new Rdma::AsynchIO(ci->getQueuePair(),
-                cp.rdmaProtocolVersion,
-                cp.maxRecvBufferSize, cp.initialXmitCredit, Rdma::DEFAULT_WR_ENTRIES,
-                boost::bind(&RdmaIOHandler::readbuff, async, _1, _2),
-                boost::bind(&RdmaIOHandler::idle, async, _1),
-                0, // boost::bind(&RdmaIOHandler::full, async, _1),
-                boost::bind(&RdmaIOHandler::error, async, _1));
-        async->init(aio);
-
-        // Record aio so we can get it back from a connection
-        ci->addContext(async);
-        return true;
-    } catch (const Rdma::Exception& e) {
-        QPID_LOG(error, "Rdma: Cannot accept new connection (Rdma exception): " << e.what());
-    } catch (const std::exception& e) {
-        QPID_LOG(error, "Rdma: Cannot accept new connection (unknown exception): " << e.what());
-    }
-
-    // If we get here we caught an exception so reject connection
-    return false;
-}
-
-void RdmaIOProtocolFactory::connectionError(Rdma::Connection::intrusive_ptr, Rdma::ErrorType) {
-}
-
-void RdmaIOProtocolFactory::disconnected(Rdma::Connection::intrusive_ptr ci) {
-    // If we've got a connection already tear it down, otherwise ignore
-    RdmaIOHandler* async =  ci->getContext<RdmaIOHandler>();
-    if (async) {
-        // Make sure we don't disconnect more than once
-        ci->removeContext();
-        async->disconnected();
-    }
-}
-
-uint16_t RdmaIOProtocolFactory::getPort() const {
-    return listeningPort; // Immutable no need for lock.
-}
-
-string RdmaIOProtocolFactory::getHost() const {
-    //return listener.getSockname();
-    return "";
-}
-
-void RdmaIOProtocolFactory::accept(Poller::shared_ptr poller, ConnectionCodec::Factory* fact) {
-    ::sockaddr_in sin;
-
-    sin.sin_family = AF_INET;
-    sin.sin_port = htons(listeningPort);
-    sin.sin_addr.s_addr = INADDR_ANY;
-
-    listener.reset(
-        new Rdma::Listener(
-            Rdma::ConnectionParams(65536, Rdma::DEFAULT_WR_ENTRIES),
-            boost::bind(&RdmaIOProtocolFactory::established, this, poller, _1),
-            boost::bind(&RdmaIOProtocolFactory::connectionError, this, _1, _2),
-            boost::bind(&RdmaIOProtocolFactory::disconnected, this, _1),
-            boost::bind(&RdmaIOProtocolFactory::request, this, _1, _2, fact)));
-
-    SocketAddress sa("",boost::lexical_cast<std::string>(listeningPort));
-    listener->start(poller, sa);
-}
-
-// Only used for outgoing connections (in federation)
-void RdmaIOProtocolFactory::rejected(Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&, ConnectFailedCallback failed) {
-    failed(-1, "Connection rejected");
-}
-
-// Do the same as connection request and established but mark a client too
-void RdmaIOProtocolFactory::connected(Poller::shared_ptr poller, Rdma::Connection::intrusive_ptr ci, const Rdma::ConnectionParams& cp,
-        ConnectionCodec::Factory* f) {
-    (void) request(ci, cp, f);
-    established(poller, ci);
-    RdmaIOHandler* async =  ci->getContext<RdmaIOHandler>();
-    async->initProtocolOut();
-}
-
-void RdmaIOProtocolFactory::connect(
-    Poller::shared_ptr poller,
-    const std::string& host, int16_t port,
-    ConnectionCodec::Factory* f,
-    ConnectFailedCallback failed)
-{
-    Rdma::Connector* c =
-        new Rdma::Connector(
-            Rdma::ConnectionParams(8000, Rdma::DEFAULT_WR_ENTRIES),
-            boost::bind(&RdmaIOProtocolFactory::connected, this, poller, _1, _2, f),
-            boost::bind(&RdmaIOProtocolFactory::connectionError, this, _1, _2),
-            boost::bind(&RdmaIOProtocolFactory::disconnected, this, _1),
-            boost::bind(&RdmaIOProtocolFactory::rejected, this, _1, _2, failed));
-
-    SocketAddress sa(host, boost::lexical_cast<std::string>(port));
-    c->start(poller, sa);
-}
-
-}} // namespace qpid::sys
diff --git a/cpp/src/qpid/sys/Socket.h b/cpp/src/qpid/sys/Socket.h
deleted file mode 100644
index b1cded1aa1..0000000000
--- a/cpp/src/qpid/sys/Socket.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _sys_Socket_h
-#define _sys_Socket_h
-
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/IOHandle.h"
-#include "qpid/sys/IntegerTypes.h"
-#include "qpid/CommonImportExport.h"
-#include <string>
-
-namespace qpid {
-namespace sys {
-
-class Duration;
-class SocketAddress;
-
-class QPID_COMMON_CLASS_EXTERN Socket : public IOHandle
-{
-public:
-    /** Create a socket wrapper for descriptor. */
-    QPID_COMMON_EXTERN Socket();
-
-    /** Set timeout for read and write */
-    void setTimeout(const Duration& interval) const;
-
-    /** Set socket non blocking */
-    void setNonblocking() const;
-
-    QPID_COMMON_EXTERN void setTcpNoDelay() const;
-
-    QPID_COMMON_EXTERN void connect(const std::string& host, uint16_t port) const;
-    QPID_COMMON_EXTERN void connect(const SocketAddress&) const;
-
-    QPID_COMMON_EXTERN void close() const;
-
-    /** Bind to a port and start listening.
-     *@param port 0 means choose an available port.
-     *@param backlog maximum number of pending connections.
-     *@return The bound port.
-     */
-    QPID_COMMON_EXTERN int listen(uint16_t port = 0, int backlog = 10) const;
-    QPID_COMMON_EXTERN int listen(const SocketAddress&, int backlog = 10) const;
-
-    /** Returns the "socket name" ie the address bound to
-     * the near end of the socket
-     */
-    QPID_COMMON_EXTERN std::string getSockname() const;
-
-    /** Returns the "peer name" ie the address bound to
-     * the remote end of the socket
-     */
-    std::string getPeername() const;
-
-    /**
-     * Returns an address (host and port) for the remote end of the
-     * socket
-     */
-    QPID_COMMON_EXTERN std::string getPeerAddress() const;
-    /**
-     * Returns an address (host and port) for the local end of the
-     * socket
-     */
-    QPID_COMMON_EXTERN std::string getLocalAddress() const;
-
-    /**
-     * Returns the full address of the connection: local and remote host and port.
-     */
-    QPID_COMMON_INLINE_EXTERN std::string getFullAddress() const { return getLocalAddress()+"-"+getPeerAddress(); }
-
-    QPID_COMMON_EXTERN uint16_t getLocalPort() const;
-    uint16_t getRemotePort() const;
-
-    /**
-     * Returns the error code stored in the socket.  This may be used
-     * to determine the result of a non-blocking connect.
-     */
-    int getError() const;
-
-    /** Accept a connection from a socket that is already listening
-     * and has an incoming connection
-     */
-    QPID_COMMON_EXTERN Socket* accept() const;
-
-    // TODO The following are raw operations, maybe they need better wrapping?
-    QPID_COMMON_EXTERN int read(void *buf, size_t count) const;
-    QPID_COMMON_EXTERN int write(const void *buf, size_t count) const;
-
-private:
-    /** Create socket */
-    void createSocket(const SocketAddress&) const;
-
-    Socket(IOHandlePrivate*);
-    mutable std::string connectname;
-    mutable bool nonblocking;
-    mutable bool nodelay;
-};
-
-}}
-#endif  /*!_sys_Socket_h*/
diff --git a/cpp/src/qpid/sys/SocketAddress.h b/cpp/src/qpid/sys/SocketAddress.h
deleted file mode 100644
index 27b9642f2c..0000000000
--- a/cpp/src/qpid/sys/SocketAddress.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef _sys_SocketAddress_h
-#define _sys_SocketAddress_h
-
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/IntegerTypes.h"
-#include "qpid/CommonImportExport.h"
-#include <string>
-
-struct addrinfo;
-
-namespace qpid {
-namespace sys {
-
-class SocketAddress {
-    friend const ::addrinfo& getAddrInfo(const SocketAddress&);
-
-public:
-    /** Create a SocketAddress from hostname and port*/
-    QPID_COMMON_EXTERN SocketAddress(const std::string& host, const std::string& port);
-    QPID_COMMON_EXTERN SocketAddress(const SocketAddress&);
-    QPID_COMMON_EXTERN SocketAddress& operator=(const SocketAddress&);
-    QPID_COMMON_EXTERN ~SocketAddress();
-
-    std::string asString() const;
-
-private:
-    std::string host;
-    std::string port;
-    mutable ::addrinfo* addrInfo;
-};
-
-}}
-#endif  /*!_sys_SocketAddress_h*/
diff --git a/cpp/src/qpid/sys/SslPlugin.cpp b/cpp/src/qpid/sys/SslPlugin.cpp
deleted file mode 100644
index 0ec051caab..0000000000
--- a/cpp/src/qpid/sys/SslPlugin.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/ProtocolFactory.h"
-
-#include "qpid/Plugin.h"
-#include "qpid/sys/ssl/check.h"
-#include "qpid/sys/ssl/util.h"
-#include "qpid/sys/ssl/SslHandler.h"
-#include "qpid/sys/ssl/SslIo.h"
-#include "qpid/sys/ssl/SslSocket.h"
-#include "qpid/broker/Broker.h"
-#include "qpid/log/Statement.h"
-
-#include <boost/bind.hpp>
-#include <memory>
-
-
-namespace qpid {
-namespace sys {
-
-struct SslServerOptions : ssl::SslOptions
-{
-    uint16_t port;
-    bool clientAuth;
-    bool nodict;
-
-    SslServerOptions() : port(5671),
-                         clientAuth(false),
-                         nodict(false)
-    {
-        addOptions()
-            ("ssl-port", optValue(port, "PORT"), "Port on which to listen for SSL connections")
-            ("ssl-require-client-authentication", optValue(clientAuth), 
-             "Forces clients to authenticate in order to establish an SSL connection")
-            ("ssl-sasl-no-dict", optValue(nodict), 
-             "Disables SASL mechanisms that are vulnerable to passive dictionary-based password attacks");
-    }
-};
-
-class SslProtocolFactory : public ProtocolFactory {
-    const bool tcpNoDelay;
-    qpid::sys::ssl::SslSocket listener;
-    const uint16_t listeningPort;
-    std::auto_ptr<qpid::sys::ssl::SslAcceptor> acceptor;
-    bool nodict;
-
-  public:
-    SslProtocolFactory(const SslServerOptions&, int backlog, bool nodelay);
-    void accept(Poller::shared_ptr, ConnectionCodec::Factory*);
-    void connect(Poller::shared_ptr, const std::string& host, int16_t port,
-                 ConnectionCodec::Factory*,
-                 boost::function2<void, int, std::string> failed);
-
-    uint16_t getPort() const;
-    std::string getHost() const;
-    bool supports(const std::string& capability);
-
-  private:
-    void established(Poller::shared_ptr, const qpid::sys::ssl::SslSocket&, ConnectionCodec::Factory*,
-                     bool isClient);
-};
-
-// Static instance to initialise plugin
-static struct SslPlugin : public Plugin {
-    SslServerOptions options;
-
-    Options* getOptions() { return &options; }
-
-    ~SslPlugin() { ssl::shutdownNSS(); }
-
-    void earlyInitialize(Target&) {
-    }
-    
-    void initialize(Target& target) {
-        broker::Broker* broker = dynamic_cast<broker::Broker*>(&target);
-        // Only provide to a Broker
-        if (broker) {
-            if (options.certDbPath.empty()) {
-                QPID_LOG(notice, "SSL plugin not enabled, you must set --ssl-cert-db to enable it.");
-            } else {
-                try {
-                    ssl::initNSS(options, true);
-                    
-                    const broker::Broker::Options& opts = broker->getOptions();
-                    ProtocolFactory::shared_ptr protocol(new SslProtocolFactory(options,
-                                                                                opts.connectionBacklog,
-                                                                                opts.tcpNoDelay));
-                    QPID_LOG(notice, "Listening for SSL connections on TCP port " << protocol->getPort());
-                    broker->registerProtocolFactory("ssl", protocol);
-                } catch (const std::exception& e) {
-                    QPID_LOG(error, "Failed to initialise SSL plugin: " << e.what());
-                }
-            }
-        }
-    }
-} sslPlugin;
-
-SslProtocolFactory::SslProtocolFactory(const SslServerOptions& options, int backlog, bool nodelay) :
-    tcpNoDelay(nodelay), listeningPort(listener.listen(options.port, backlog, options.certName, options.clientAuth)),
-    nodict(options.nodict)
-{}
-
-void SslProtocolFactory::established(Poller::shared_ptr poller, const qpid::sys::ssl::SslSocket& s,
-                                          ConnectionCodec::Factory* f, bool isClient) {
-    qpid::sys::ssl::SslHandler* async = new qpid::sys::ssl::SslHandler(s.getFullAddress(), f, nodict);
-
-    if (tcpNoDelay) {
-        s.setTcpNoDelay(tcpNoDelay);
-        QPID_LOG(info, "Set TCP_NODELAY on connection to " << s.getPeerAddress());
-    }
-
-    if (isClient)
-        async->setClient();
-    qpid::sys::ssl::SslIO* aio = new qpid::sys::ssl::SslIO(s,
-                                 boost::bind(&qpid::sys::ssl::SslHandler::readbuff, async, _1, _2),
-                                 boost::bind(&qpid::sys::ssl::SslHandler::eof, async, _1),
-                                 boost::bind(&qpid::sys::ssl::SslHandler::disconnect, async, _1),
-                                 boost::bind(&qpid::sys::ssl::SslHandler::closedSocket, async, _1, _2),
-                                 boost::bind(&qpid::sys::ssl::SslHandler::nobuffs, async, _1),
-                                 boost::bind(&qpid::sys::ssl::SslHandler::idle, async, _1));
-
-    async->init(aio, 4);
-    aio->start(poller);
-}
-
-uint16_t SslProtocolFactory::getPort() const {
-    return listeningPort; // Immutable no need for lock.
-}
-
-std::string SslProtocolFactory::getHost() const {
-    return listener.getSockname();
-}
-
-void SslProtocolFactory::accept(Poller::shared_ptr poller,
-                                     ConnectionCodec::Factory* fact) {
-    acceptor.reset(
-        new qpid::sys::ssl::SslAcceptor(listener,
-                           boost::bind(&SslProtocolFactory::established, this, poller, _1, fact, false)));
-    acceptor->start(poller);
-}
-
-void SslProtocolFactory::connect(
-    Poller::shared_ptr poller,
-    const std::string& host, int16_t port,
-    ConnectionCodec::Factory* fact,
-    ConnectFailedCallback failed)
-{
-    // Note that the following logic does not cause a memory leak.
-    // The allocated Socket is freed either by the SslConnector
-    // upon connection failure or by the SslIoHandle upon connection
-    // shutdown.  The allocated SslConnector frees itself when it
-    // is no longer needed.
-
-    qpid::sys::ssl::SslSocket* socket = new qpid::sys::ssl::SslSocket();
-    new qpid::sys::ssl::SslConnector (*socket, poller, host, port,
-                         boost::bind(&SslProtocolFactory::established, this, poller, _1, fact, true),
-                         failed);
-}
-
-namespace
-{
-const std::string SSL = "ssl";
-}
-
-bool SslProtocolFactory::supports(const std::string& capability)
-{
-    std::string s = capability;
-    transform(s.begin(), s.end(), s.begin(), tolower);
-    return s == SSL;
-}
-
-}} // namespace qpid::sys
diff --git a/cpp/src/qpid/sys/TCPIOPlugin.cpp b/cpp/src/qpid/sys/TCPIOPlugin.cpp
deleted file mode 100644
index a6528f9ad9..0000000000
--- a/cpp/src/qpid/sys/TCPIOPlugin.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/ProtocolFactory.h"
-#include "qpid/sys/AsynchIOHandler.h"
-#include "qpid/sys/AsynchIO.h"
-
-#include "qpid/Plugin.h"
-#include "qpid/sys/Socket.h"
-#include "qpid/sys/Poller.h"
-#include "qpid/broker/Broker.h"
-#include "qpid/log/Statement.h"
-
-#include <boost/bind.hpp>
-#include <memory>
-
-namespace qpid {
-namespace sys {
-
-class AsynchIOProtocolFactory : public ProtocolFactory {
-    const bool tcpNoDelay;
-    Socket listener;
-    const uint16_t listeningPort;
-    std::auto_ptr<AsynchAcceptor> acceptor;
-
-  public:
-    AsynchIOProtocolFactory(int16_t port, int backlog, bool nodelay);
-    void accept(Poller::shared_ptr, ConnectionCodec::Factory*);
-    void connect(Poller::shared_ptr, const std::string& host, int16_t port,
-                 ConnectionCodec::Factory*,
-                 ConnectFailedCallback);
-
-    uint16_t getPort() const;
-    std::string getHost() const;
-
-  private:
-    void established(Poller::shared_ptr, const Socket&, ConnectionCodec::Factory*,
-                     bool isClient);
-    void connectFailed(const Socket&, int, const std::string&, ConnectFailedCallback);
-};
-
-// Static instance to initialise plugin
-static class TCPIOPlugin : public Plugin {
-    void earlyInitialize(Target&) {
-    }
-    
-    void initialize(Target& target) {
-        broker::Broker* broker = dynamic_cast<broker::Broker*>(&target);
-        // Only provide to a Broker
-        if (broker) {
-            const broker::Broker::Options& opts = broker->getOptions();
-            ProtocolFactory::shared_ptr protocol(new AsynchIOProtocolFactory(opts.port, opts.connectionBacklog, 
-                                                                             opts.tcpNoDelay));
-            QPID_LOG(notice, "Listening on TCP port " << protocol->getPort());
-            broker->registerProtocolFactory("tcp", protocol);
-        }
-    }
-} tcpPlugin;
-
-AsynchIOProtocolFactory::AsynchIOProtocolFactory(int16_t port, int backlog, bool nodelay) :
-    tcpNoDelay(nodelay), listeningPort(listener.listen(port, backlog))
-{}
-
-void AsynchIOProtocolFactory::established(Poller::shared_ptr poller, const Socket& s,
-                                          ConnectionCodec::Factory* f, bool isClient) {
-    AsynchIOHandler* async = new AsynchIOHandler(s.getFullAddress(), f);
-
-    if (tcpNoDelay) {
-        s.setTcpNoDelay();
-        QPID_LOG(info, "Set TCP_NODELAY on connection to " << s.getPeerAddress());
-    }
-
-    if (isClient)
-        async->setClient();
-    AsynchIO* aio = AsynchIO::create
-      (s,
-       boost::bind(&AsynchIOHandler::readbuff, async, _1, _2),
-       boost::bind(&AsynchIOHandler::eof, async, _1),
-       boost::bind(&AsynchIOHandler::disconnect, async, _1),
-       boost::bind(&AsynchIOHandler::closedSocket, async, _1, _2),
-       boost::bind(&AsynchIOHandler::nobuffs, async, _1),
-       boost::bind(&AsynchIOHandler::idle, async, _1));
-
-    async->init(aio, 4);
-    aio->start(poller);
-}
-
-uint16_t AsynchIOProtocolFactory::getPort() const {
-    return listeningPort; // Immutable no need for lock.
-}
-
-std::string AsynchIOProtocolFactory::getHost() const {
-    return listener.getSockname();
-}
-
-void AsynchIOProtocolFactory::accept(Poller::shared_ptr poller,
-                                     ConnectionCodec::Factory* fact) {
-    acceptor.reset(
-        AsynchAcceptor::create(listener,
-                           boost::bind(&AsynchIOProtocolFactory::established, this, poller, _1, fact, false)));
-    acceptor->start(poller);
-}
-
-void AsynchIOProtocolFactory::connectFailed(
-    const Socket& s, int ec, const std::string& emsg,
-    ConnectFailedCallback failedCb)
-{
-    failedCb(ec, emsg);
-    s.close();
-    delete &s;
-}
-
-void AsynchIOProtocolFactory::connect(
-    Poller::shared_ptr poller,
-    const std::string& host, int16_t port,
-    ConnectionCodec::Factory* fact,
-    ConnectFailedCallback failed)
-{
-    // Note that the following logic does not cause a memory leak.
-    // The allocated Socket is freed either by the AsynchConnector
-    // upon connection failure or by the AsynchIO upon connection
-    // shutdown.  The allocated AsynchConnector frees itself when it
-    // is no longer needed.
-
-    Socket* socket = new Socket();
-    AsynchConnector* c = AsynchConnector::create(
-        *socket,
-        host,
-        port,
-        boost::bind(&AsynchIOProtocolFactory::established,
-                    this, poller, _1, fact, true),
-        boost::bind(&AsynchIOProtocolFactory::connectFailed,
-                    this, _1, _2, _3, failed));
-    c->start(poller);
-}
-
-}} // namespace qpid::sys
diff --git a/cpp/src/qpid/sys/posix/AsynchIO.cpp b/cpp/src/qpid/sys/posix/AsynchIO.cpp
deleted file mode 100644
index 119a6aa8a4..0000000000
--- a/cpp/src/qpid/sys/posix/AsynchIO.cpp
+++ /dev/null
@@ -1,611 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/AsynchIO.h"
-#include "qpid/sys/Socket.h"
-#include "qpid/sys/SocketAddress.h"
-#include "qpid/sys/Poller.h"
-#include "qpid/sys/DispatchHandle.h"
-#include "qpid/sys/Time.h"
-#include "qpid/log/Statement.h"
-
-#include "qpid/sys/posix/check.h"
-
-// TODO The basic algorithm here is not really POSIX specific and with a
-// bit more abstraction could (should) be promoted to be platform portable
-#include <unistd.h>
-#include <sys/socket.h>
-#include <signal.h>
-#include <errno.h>
-#include <string.h>
-
-#include <boost/bind.hpp>
-#include <boost/lexical_cast.hpp>
-
-using namespace qpid::sys;
-
-namespace {
-
-struct StaticInit {
-    StaticInit() {
-        /**
-         * Make *process* not generate SIGPIPE when writing to closed
-         * pipe/socket (necessary as default action is to terminate process)
-         */
-        ::signal(SIGPIPE, SIG_IGN);
-    };
-} init;
-
-/*
- * We keep per thread state to avoid locking overhead. The assumption is that
- * on average all the connections are serviced by all the threads so the state
- * recorded in each thread is about the same. If this turns out not to be the
- * case we could rebalance the info occasionally.  
- */
-__thread int threadReadTotal = 0;
-__thread int threadMaxRead = 0;
-__thread int threadReadCount = 0;
-__thread int threadWriteTotal = 0;
-__thread int threadWriteCount = 0;
-__thread int64_t threadMaxReadTimeNs = 2 * 1000000; // start at 2ms
-}
-
-/*
- * Asynch Acceptor
- */
-namespace qpid {
-namespace sys {
-namespace posix {
-
-class AsynchAcceptor : public qpid::sys::AsynchAcceptor {
-public:
-    AsynchAcceptor(const Socket& s, AsynchAcceptor::Callback callback);
-    ~AsynchAcceptor();
-    void start(Poller::shared_ptr poller);
-
-private:
-    void readable(DispatchHandle& handle);
-
-private:
-    AsynchAcceptor::Callback acceptedCallback;
-    DispatchHandle handle;
-    const Socket& socket;
-
-};
-
-AsynchAcceptor::AsynchAcceptor(const Socket& s,
-                               AsynchAcceptor::Callback callback) :
-    acceptedCallback(callback),
-    handle(s, boost::bind(&AsynchAcceptor::readable, this, _1), 0, 0),
-    socket(s) {
-
-    s.setNonblocking();
-}
-
-AsynchAcceptor::~AsynchAcceptor() {
-    handle.stopWatch();
-}
-
-void AsynchAcceptor::start(Poller::shared_ptr poller) {
-    handle.startWatch(poller);
-}
-
-/*
- * We keep on accepting as long as there is something to accept
- */
-void AsynchAcceptor::readable(DispatchHandle& h) {
-    Socket* s;
-    do {
-        errno = 0;
-        // TODO: Currently we ignore the peers address, perhaps we should
-        // log it or use it for connection acceptance.
-        try {
-            s = socket.accept();
-            if (s) {
-                acceptedCallback(*s);
-            } else {
-                break;
-            }
-        } catch (const std::exception& e) {
-            QPID_LOG(error, "Could not accept socket: " << e.what());
-            break;
-        }
-    } while (true);
-
-    h.rewatch();
-}
-
-/*
- * POSIX version of AsynchIO TCP socket connector.
- *
- * The class is implemented in terms of DispatchHandle to allow it to be
- * deleted by deleting the contained DispatchHandle.
- */
-class AsynchConnector : public qpid::sys::AsynchConnector,
-                        private DispatchHandle {
-
-private:
-    void connComplete(DispatchHandle& handle);
-
-private:
-    ConnectedCallback connCallback;
-    FailedCallback failCallback;
-    const Socket& socket;
-
-public:
-    AsynchConnector(const Socket& socket,
-                    std::string hostname,
-                    uint16_t port,
-                    ConnectedCallback connCb,
-                    FailedCallback failCb);
-    void start(Poller::shared_ptr poller);
-    void stop();
-};
-
-AsynchConnector::AsynchConnector(const Socket& s,
-                                 std::string hostname,
-                                 uint16_t port,
-                                 ConnectedCallback connCb,
-                                 FailedCallback failCb) :
-    DispatchHandle(s,
-                   0,
-                   boost::bind(&AsynchConnector::connComplete, this, _1),
-                   boost::bind(&AsynchConnector::connComplete, this, _1)),
-    connCallback(connCb),
-    failCallback(failCb),
-    socket(s)
-{
-    socket.setNonblocking();
-    SocketAddress sa(hostname, boost::lexical_cast<std::string>(port));
-    // Note, not catching any exceptions here, also has effect of destructing
-    socket.connect(sa);
-}
-
-void AsynchConnector::start(Poller::shared_ptr poller)
-{
-    startWatch(poller);
-}
-
-void AsynchConnector::stop()
-{
-    stopWatch();
-}
-
-void AsynchConnector::connComplete(DispatchHandle& h)
-{
-    h.stopWatch();
-    int errCode = socket.getError();
-    if (errCode == 0) {
-        connCallback(socket);
-    } else {
-        failCallback(socket, errCode, strError(errCode));
-    }
-    DispatchHandle::doDelete();
-}
-
-/*
- * POSIX version of AsynchIO reader/writer
- *
- * The class is implemented in terms of DispatchHandle to allow it to be
- * deleted by deleting the contained DispatchHandle.
- */
-class AsynchIO : public qpid::sys::AsynchIO, private DispatchHandle {
-
-public:
-    AsynchIO(const Socket& s,
-             ReadCallback rCb,
-             EofCallback eofCb,
-             DisconnectCallback disCb,
-             ClosedCallback cCb = 0,
-             BuffersEmptyCallback eCb = 0,
-             IdleCallback iCb = 0);
-
-    // Methods inherited from qpid::sys::AsynchIO
-
-    virtual void queueForDeletion();
-
-    virtual void start(Poller::shared_ptr poller);
-    virtual void queueReadBuffer(BufferBase* buff);
-    virtual void unread(BufferBase* buff);
-    virtual void queueWrite(BufferBase* buff);
-    virtual void notifyPendingWrite();
-    virtual void queueWriteClose();
-    virtual bool writeQueueEmpty();
-    virtual void startReading();
-    virtual void stopReading();
-    virtual void requestCallback(RequestCallback);
-    virtual BufferBase* getQueuedBuffer();
-
-private:
-    ~AsynchIO();
-
-    // Methods that are callback targets from Dispatcher.
-    void readable(DispatchHandle& handle);
-    void writeable(DispatchHandle& handle);
-    void disconnected(DispatchHandle& handle);
-    void requestedCall(RequestCallback);
-    void close(DispatchHandle& handle);
-
-private:
-    ReadCallback readCallback;
-    EofCallback eofCallback;
-    DisconnectCallback disCallback;
-    ClosedCallback closedCallback;
-    BuffersEmptyCallback emptyCallback;
-    IdleCallback idleCallback;
-    const Socket& socket;
-    std::deque<BufferBase*> bufferQueue;
-    std::deque<BufferBase*> writeQueue;
-    bool queuedClose;
-    /**
-     * This flag is used to detect and handle concurrency between
-     * calls to notifyPendingWrite() (which can be made from any thread) and
-     * the execution of the writeable() method (which is always on the
-     * thread processing this handle.
-     */
-    volatile bool writePending;
-    /**
-     * This records whether we've been reading is flow controlled:
-     * it's safe as a simple boolean as the only way to be stopped
-     * is in calls only allowed in the callback context, the only calls
-     * checking it are also in calls only allowed in callback context.
-     */
-    volatile bool readingStopped;
-};
-
-AsynchIO::AsynchIO(const Socket& s,
-                   ReadCallback rCb, EofCallback eofCb, DisconnectCallback disCb,
-                   ClosedCallback cCb, BuffersEmptyCallback eCb, IdleCallback iCb) :
-
-    DispatchHandle(s, 
-                   boost::bind(&AsynchIO::readable, this, _1),
-                   boost::bind(&AsynchIO::writeable, this, _1),
-                   boost::bind(&AsynchIO::disconnected, this, _1)),
-    readCallback(rCb),
-    eofCallback(eofCb),
-    disCallback(disCb),
-    closedCallback(cCb),
-    emptyCallback(eCb),
-    idleCallback(iCb),
-    socket(s),
-    queuedClose(false),
-    writePending(false),
-    readingStopped(false) {
-
-    s.setNonblocking();
-}
-
-struct deleter
-{
-    template <typename T>
-    void operator()(T *ptr){ delete ptr;}
-};
-
-AsynchIO::~AsynchIO() {
-    std::for_each( bufferQueue.begin(), bufferQueue.end(), deleter());
-    std::for_each( writeQueue.begin(), writeQueue.end(), deleter());
-}
-
-void AsynchIO::queueForDeletion() {
-    DispatchHandle::doDelete();
-}
-
-void AsynchIO::start(Poller::shared_ptr poller) {
-    DispatchHandle::startWatch(poller);
-}
-
-void AsynchIO::queueReadBuffer(BufferBase* buff) {
-    assert(buff);
-    buff->dataStart = 0;
-    buff->dataCount = 0;
-
-    bool queueWasEmpty = bufferQueue.empty();
-    bufferQueue.push_back(buff);
-    if (queueWasEmpty && !readingStopped)
-        DispatchHandle::rewatchRead();
-}
-
-void AsynchIO::unread(BufferBase* buff) {
-    assert(buff);
-    buff->squish();
-
-    bool queueWasEmpty = bufferQueue.empty();
-    bufferQueue.push_front(buff);
-    if (queueWasEmpty && !readingStopped)
-        DispatchHandle::rewatchRead();
-}
-
-void AsynchIO::queueWrite(BufferBase* buff) {
-    assert(buff);
-    // If we've already closed the socket then throw the write away
-    if (queuedClose) {
-        queueReadBuffer(buff);
-        return;
-    } else {
-        writeQueue.push_front(buff);
-    }
-    writePending = false;
-    DispatchHandle::rewatchWrite();
-}
-
-// This can happen outside the callback context
-void AsynchIO::notifyPendingWrite() {
-    writePending = true;
-    DispatchHandle::rewatchWrite();
-}
-
-void AsynchIO::queueWriteClose() {
-    queuedClose = true;
-    DispatchHandle::rewatchWrite();
-}
-
-bool AsynchIO::writeQueueEmpty() {
-    return writeQueue.empty();
-}
-
-// This can happen outside the callback context
-void AsynchIO::startReading() {
-    readingStopped = false;
-    DispatchHandle::rewatchRead();
-}
-
-void AsynchIO::stopReading() {
-    readingStopped = true;
-    DispatchHandle::unwatchRead();
-}
-
-void AsynchIO::requestCallback(RequestCallback callback) {
-    // TODO creating a function object every time isn't all that
-    // efficient - if this becomes heavily used do something better (what?)
-    assert(callback);
-    DispatchHandle::call(boost::bind(&AsynchIO::requestedCall, this, callback));
-}
-
-void AsynchIO::requestedCall(RequestCallback callback) {
-    assert(callback);
-    callback(*this);
-}
-
-/** Return a queued buffer if there are enough
- * to spare
- */
-AsynchIO::BufferBase* AsynchIO::getQueuedBuffer() {
-    // Always keep at least one buffer (it might have data that was "unread" in it)
-    if (bufferQueue.size()<=1)
-        return 0;
-    BufferBase* buff = bufferQueue.back();
-    assert(buff);
-    buff->dataStart = 0;
-    buff->dataCount = 0;
-    bufferQueue.pop_back();
-    return buff;
-}
-
-/*
- * We keep on reading as long as we have something to read, a buffer
- * to put it in and reading is not stopped by flow control.
- */
-void AsynchIO::readable(DispatchHandle& h) {
-    if (readingStopped) {
-        // We have been flow controlled.
-        return;
-    }
-    int readTotal = 0;
-    AbsTime readStartTime = AbsTime::now();
-    do {
-        // (Try to) get a buffer
-        if (!bufferQueue.empty()) {
-            // Read into buffer
-            BufferBase* buff = bufferQueue.front();
-            assert(buff);
-            bufferQueue.pop_front();
-            errno = 0;
-            int readCount = buff->byteCount-buff->dataCount;
-            int rc = socket.read(buff->bytes + buff->dataCount, readCount);
-            if (rc > 0) {
-                buff->dataCount += rc;
-                threadReadTotal += rc;
-                readTotal += rc;
-
-                readCallback(*this, buff);
-                if (readingStopped) {
-                    // We have been flow controlled.
-                    break;
-                }
-
-                if (rc != readCount) {
-                    // If we didn't fill the read buffer then time to stop reading
-                    break;
-                }
-                
-                // Stop reading if we've overrun our timeslot
-                if (Duration(readStartTime, AbsTime::now()) > threadMaxReadTimeNs) {
-                    break;
-                }
-                
-            } else {
-                // Put buffer back (at front so it doesn't interfere with unread buffers)
-                bufferQueue.push_front(buff);
-                assert(buff);
-                
-                // Eof or other side has gone away
-                if (rc == 0 || errno == ECONNRESET) {
-                    eofCallback(*this);
-                    h.unwatchRead();
-                    break;
-                } else if (errno == EAGAIN) {
-                    // We have just put a buffer back so we know
-                    // we can carry on watching for reads
-                    break;
-                } else {
-                    // Report error then just treat as a socket disconnect
-                    QPID_LOG(error, "Error reading socket: " << qpid::sys::strError(errno) << "(" << errno << ")" );
-                    eofCallback(*this);
-                    h.unwatchRead();
-                    break;
-                }
-            }
-        } else {
-            // Something to read but no buffer
-            if (emptyCallback) {
-                emptyCallback(*this);
-            }
-            // If we still have no buffers we can't do anything more
-            if (bufferQueue.empty()) {
-                h.unwatchRead();
-                break;
-            }
-            
-        }
-    } while (true);
-
-    ++threadReadCount;
-    threadMaxRead = std::max(threadMaxRead, readTotal);
-    return;
-}
-
-/*
- * We carry on writing whilst we have data to write and we can write
- */
-void AsynchIO::writeable(DispatchHandle& h) {
-    int writeTotal = 0;
-    do {
-        // See if we've got something to write
-        if (!writeQueue.empty()) {
-            // Write buffer
-            BufferBase* buff = writeQueue.back();
-            writeQueue.pop_back();
-            errno = 0;
-            assert(buff->dataStart+buff->dataCount <= buff->byteCount);
-            int rc = socket.write(buff->bytes+buff->dataStart, buff->dataCount);
-            if (rc >= 0) {
-                threadWriteTotal += rc;
-                writeTotal += rc;
-
-                // If we didn't write full buffer put rest back
-                if (rc != buff->dataCount) {
-                    buff->dataStart += rc;
-                    buff->dataCount -= rc;
-                    writeQueue.push_back(buff);
-                    break;
-                }
-                
-                // Recycle the buffer
-                queueReadBuffer(buff);
-                
-                // If we've already written more than the max for reading then stop
-                // (this is to stop writes dominating reads) 
-                if (writeTotal > threadMaxRead)
-                    break;
-            } else {
-                // Put buffer back
-                writeQueue.push_back(buff);
-                if (errno == ECONNRESET || errno == EPIPE) {
-                    // Just stop watching for write here - we'll get a
-                    // disconnect callback soon enough
-                    h.unwatchWrite();
-                    break;
-                } else if (errno == EAGAIN) {
-                    // We have just put a buffer back so we know
-                    // we can carry on watching for writes
-                    break;
-                } else {
-                    // Report error then just treat as a socket disconnect
-                    QPID_LOG(error, "Error writing socket: " << qpid::sys::strError(errno) << "(" << errno << ")" );
-                    h.unwatchWrite();
-                    break;
-                }
-            }
-        } else {
-            // If we're waiting to close the socket then can do it now as there is nothing to write
-            if (queuedClose) {
-                close(h);
-                break;
-            }
-            // Fd is writable, but nothing to write
-            if (idleCallback) {
-                writePending = false;
-                idleCallback(*this);
-            }
-            // If we still have no buffers to write we can't do anything more
-            if (writeQueue.empty() && !writePending && !queuedClose) {
-                h.unwatchWrite();
-                // The following handles the case where writePending is
-                // set to true after the test above; in this case its
-                // possible that the unwatchWrite overwrites the
-                // desired rewatchWrite so we correct that here
-                if (writePending)
-                    h.rewatchWrite();
-                break;
-            }
-        }
-    } while (true);
-
-    ++threadWriteCount;
-    return;
-}
-        
-void AsynchIO::disconnected(DispatchHandle& h) {
-    // If we have not already queued close then call disconnected callback before closing
-    if (!queuedClose && disCallback) disCallback(*this);
-    close(h);
-}
-
-/*
- * Close the socket and callback to say we've done it
- */
-void AsynchIO::close(DispatchHandle& h) {
-    h.stopWatch();
-    socket.close();
-    if (closedCallback) {
-        closedCallback(*this, socket);
-    }
-}
-
-} // namespace posix
-
-AsynchAcceptor* AsynchAcceptor::create(const Socket& s, 
-                                       Callback callback)
-{
-    return new posix::AsynchAcceptor(s, callback);
-}
-
-AsynchConnector* AsynchConnector::create(const Socket& s,
-                                         std::string hostname,
-                                         uint16_t port,
-                                         ConnectedCallback connCb,
-                                         FailedCallback failCb)
-{
-    return new posix::AsynchConnector(s, hostname, port, connCb, failCb);
-}
-
-AsynchIO* AsynchIO::create(const Socket& s,
-                           AsynchIO::ReadCallback rCb,
-                           AsynchIO::EofCallback eofCb,
-                           AsynchIO::DisconnectCallback disCb,
-                           AsynchIO::ClosedCallback cCb,
-                           AsynchIO::BuffersEmptyCallback eCb,
-                           AsynchIO::IdleCallback iCb)
-{
-    return new posix::AsynchIO(s, rCb, eofCb, disCb, cCb, eCb, iCb);
-}
-
-}} // namespace qpid::sys
diff --git a/cpp/src/qpid/sys/posix/Socket.cpp b/cpp/src/qpid/sys/posix/Socket.cpp
deleted file mode 100644
index 3449a753e3..0000000000
--- a/cpp/src/qpid/sys/posix/Socket.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/Socket.h"
-
-#include "qpid/sys/SocketAddress.h"
-#include "qpid/sys/posix/check.h"
-#include "qpid/sys/posix/PrivatePosix.h"
-
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/errno.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <netdb.h>
-#include <cstdlib>
-#include <string.h>
-#include <iostream>
-
-#include <boost/format.hpp>
-#include <boost/lexical_cast.hpp>
-
-namespace qpid {
-namespace sys {
-
-namespace {
-std::string getName(int fd, bool local, bool includeService = false)
-{
-    ::sockaddr_storage name; // big enough for any socket address
-    ::socklen_t namelen = sizeof(name);
-
-    int result = -1;
-    if (local) {
-        result = ::getsockname(fd, (::sockaddr*)&name, &namelen);
-    } else {
-        result = ::getpeername(fd, (::sockaddr*)&name, &namelen);
-    }
-
-    QPID_POSIX_CHECK(result);
-
-    char servName[NI_MAXSERV];
-    char dispName[NI_MAXHOST];
-    if (includeService) {
-        if (int rc=::getnameinfo((::sockaddr*)&name, namelen, dispName, sizeof(dispName),
-                                 servName, sizeof(servName),
-                                 NI_NUMERICHOST | NI_NUMERICSERV) != 0)
-            throw QPID_POSIX_ERROR(rc);
-        return std::string(dispName) + ":" + std::string(servName);
-
-    } else {
-        if (int rc=::getnameinfo((::sockaddr*)&name, namelen, dispName, sizeof(dispName), 0, 0, NI_NUMERICHOST) != 0)
-            throw QPID_POSIX_ERROR(rc);
-        return dispName;
-    }
-}
-
-std::string getService(int fd, bool local)
-{
-    ::sockaddr_storage name; // big enough for any socket address
-    ::socklen_t namelen = sizeof(name);
-
-    int result = -1;
-    if (local) {
-        result = ::getsockname(fd, (::sockaddr*)&name, &namelen);
-    } else {
-        result = ::getpeername(fd, (::sockaddr*)&name, &namelen);
-    }
-
-    QPID_POSIX_CHECK(result);
-
-    char servName[NI_MAXSERV];
-    if (int rc=::getnameinfo((::sockaddr*)&name, namelen, 0, 0,
-                                 servName, sizeof(servName),
-                                 NI_NUMERICHOST | NI_NUMERICSERV) != 0)
-        throw QPID_POSIX_ERROR(rc);
-    return servName;
-}
-}
-
-Socket::Socket() :
-    IOHandle(new IOHandlePrivate),
-    nonblocking(false),
-    nodelay(false)
-{}
-
-Socket::Socket(IOHandlePrivate* h) :
-    IOHandle(h),
-    nonblocking(false),
-    nodelay(false)
-{}
-
-void Socket::createSocket(const SocketAddress& sa) const
-{
-    int& socket = impl->fd;
-    if (socket != -1) Socket::close();
-    int s = ::socket(getAddrInfo(sa).ai_family, getAddrInfo(sa).ai_socktype, 0);
-    if (s < 0) throw QPID_POSIX_ERROR(errno);
-    socket = s;
-
-    try {
-        if (nonblocking) setNonblocking();
-        if (nodelay) setTcpNoDelay();
-    } catch (std::exception&) {
-        ::close(s);
-        socket = -1;
-        throw;
-    }
-}
-
-void Socket::setTimeout(const Duration& interval) const
-{
-    const int& socket = impl->fd;
-    struct timeval tv;
-    toTimeval(tv, interval);
-    setsockopt(socket, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
-    setsockopt(socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
-}
-
-void Socket::setNonblocking() const {
-    int& socket = impl->fd;
-    nonblocking = true;
-    if (socket != -1) {
-        QPID_POSIX_CHECK(::fcntl(socket, F_SETFL, O_NONBLOCK));
-    }
-}
-
-void Socket::setTcpNoDelay() const
-{
-    int& socket = impl->fd;
-    nodelay = true;
-    if (socket != -1) {
-        int flag = 1;
-        int result = setsockopt(impl->fd, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(flag));
-        QPID_POSIX_CHECK(result);
-    }
-}
-
-void Socket::connect(const std::string& host, uint16_t port) const
-{
-    SocketAddress sa(host, boost::lexical_cast<std::string>(port));
-    connect(sa);
-}
-
-void Socket::connect(const SocketAddress& addr) const
-{
-    connectname = addr.asString();
-
-    createSocket(addr);
-
-    const int& socket = impl->fd;
-    // TODO the correct thing to do here is loop on failure until you've used all the returned addresses
-    if ((::connect(socket, getAddrInfo(addr).ai_addr, getAddrInfo(addr).ai_addrlen) < 0) &&
-        (errno != EINPROGRESS)) {
-        throw Exception(QPID_MSG(strError(errno) << ": " << connectname));
-    }
-    // When connecting to a port on the same host which no longer has
-    // a process associated with it, the OS occasionally chooses the
-    // remote port (which is unoccupied) as the port to bind the local
-    // end of the socket, resulting in a "circular" connection.
-    //
-    // This seems like something the OS should prevent but I have
-    // confirmed that sporadic hangs in
-    // cluster_tests.LongTests.test_failover on RHEL5 are caused by
-    // such a circular connection.
-    //
-    // Raise an error if we see such a connection, since we know there is
-    // no listener on the peer address.
-    //
-    if (getLocalAddress() == getPeerAddress()) {
-        close();
-        throw Exception(QPID_MSG("Connection refused: " << connectname));
-    }
-}
-
-void
-Socket::close() const
-{
-    int& socket = impl->fd;
-    if (socket == -1) return;
-    if (::close(socket) < 0) throw QPID_POSIX_ERROR(errno);
-    socket = -1;
-}
-
-int Socket::listen(uint16_t port, int backlog) const
-{
-    SocketAddress sa("", boost::lexical_cast<std::string>(port));
-    return listen(sa, backlog);
-}
-
-int Socket::listen(const SocketAddress& sa, int backlog) const
-{
-    createSocket(sa);
-
-    const int& socket = impl->fd;
-    int yes=1;
-    QPID_POSIX_CHECK(setsockopt(socket,SOL_SOCKET,SO_REUSEADDR,&yes,sizeof(yes)));
-
-    if (::bind(socket, getAddrInfo(sa).ai_addr, getAddrInfo(sa).ai_addrlen) < 0)
-        throw Exception(QPID_MSG("Can't bind to port " << sa.asString() << ": " << strError(errno)));
-    if (::listen(socket, backlog) < 0)
-        throw Exception(QPID_MSG("Can't listen on port " << sa.asString() << ": " << strError(errno)));
-
-    struct sockaddr_in name;
-    socklen_t namelen = sizeof(name);
-    if (::getsockname(socket, (struct sockaddr*)&name, &namelen) < 0)
-        throw QPID_POSIX_ERROR(errno);
-
-    return ntohs(name.sin_port);
-}
-
-Socket* Socket::accept() const
-{
-    int afd = ::accept(impl->fd, 0, 0);
-    if ( afd >= 0)
-        return new Socket(new IOHandlePrivate(afd));
-    else if (errno == EAGAIN)
-        return 0;
-    else throw QPID_POSIX_ERROR(errno);
-}
-
-int Socket::read(void *buf, size_t count) const
-{
-    return ::read(impl->fd, buf, count);
-}
-
-int Socket::write(const void *buf, size_t count) const
-{
-    return ::write(impl->fd, buf, count);
-}
-
-std::string Socket::getSockname() const
-{
-    return getName(impl->fd, true);
-}
-
-std::string Socket::getPeername() const
-{
-    return getName(impl->fd, false);
-}
-
-std::string Socket::getPeerAddress() const
-{
-    if (connectname.empty()) {
-        connectname = getName(impl->fd, false, true);
-    }
-    return connectname;
-}
-
-std::string Socket::getLocalAddress() const
-{
-    return getName(impl->fd, true, true);
-}
-
-uint16_t Socket::getLocalPort() const
-{
-    return std::atoi(getService(impl->fd, true).c_str());
-}
-
-uint16_t Socket::getRemotePort() const
-{
-    return std::atoi(getService(impl->fd, true).c_str());
-}
-
-int Socket::getError() const
-{
-    int       result;
-    socklen_t rSize = sizeof (result);
-
-    if (::getsockopt(impl->fd, SOL_SOCKET, SO_ERROR, &result, &rSize) < 0)
-        throw QPID_POSIX_ERROR(errno);
-
-    return result;
-}
-
-}} // namespace qpid::sys
diff --git a/cpp/src/qpid/sys/posix/SocketAddress.cpp b/cpp/src/qpid/sys/posix/SocketAddress.cpp
deleted file mode 100644
index 8f5f29d793..0000000000
--- a/cpp/src/qpid/sys/posix/SocketAddress.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/SocketAddress.h"
-
-#include "qpid/sys/posix/check.h"
-
-#include <sys/socket.h>
-#include <string.h>
-#include <netdb.h>
-
-namespace qpid {
-namespace sys {
-
-SocketAddress::SocketAddress(const std::string& host0, const std::string& port0) :
-    host(host0),
-    port(port0),
-    addrInfo(0)
-{
-}
-
-SocketAddress::SocketAddress(const SocketAddress& sa) :
-    host(sa.host),
-    port(sa.port),
-    addrInfo(0)
-{
-}
-
-SocketAddress& SocketAddress::operator=(const SocketAddress& sa)
-{
-    if (&sa != this) {
-        host = sa.host;
-        port = sa.port;
-
-        if (addrInfo) {
-            ::freeaddrinfo(addrInfo);
-            addrInfo = 0;
-        }
-    }
-    return *this;
-}
-
-SocketAddress::~SocketAddress()
-{
-    if (addrInfo) {
-        ::freeaddrinfo(addrInfo);
-    }
-}
-
-std::string SocketAddress::asString() const
-{
-    return host + ":" + port;
-}
-
-const ::addrinfo& getAddrInfo(const SocketAddress& sa)
-{
-    if (!sa.addrInfo) {
-        ::addrinfo hints;
-        ::memset(&hints, 0, sizeof(hints));
-        hints.ai_family = AF_INET; // Change this to support IPv6
-        hints.ai_socktype = SOCK_STREAM;
-
-        const char* node = 0;
-        if (sa.host.empty()) {
-            hints.ai_flags |= AI_PASSIVE;
-        } else {
-            node = sa.host.c_str();
-        }
-        const char* service = sa.port.empty() ? "0" : sa.port.c_str();
-
-        int n = ::getaddrinfo(node, service, &hints, &sa.addrInfo);
-        if (n != 0)
-            throw Exception(QPID_MSG("Cannot resolve " << sa.host << ": " << ::gai_strerror(n)));
-    }
-
-    return *sa.addrInfo;
-}
-
-}}
diff --git a/cpp/src/qpid/sys/ssl/SslIo.cpp b/cpp/src/qpid/sys/ssl/SslIo.cpp
deleted file mode 100644
index a58a137473..0000000000
--- a/cpp/src/qpid/sys/ssl/SslIo.cpp
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/ssl/SslIo.h"
-#include "qpid/sys/ssl/SslSocket.h"
-#include "qpid/sys/ssl/check.h"
-
-#include "qpid/sys/Time.h"
-#include "qpid/sys/posix/check.h"
-#include "qpid/log/Statement.h"
-
-// TODO The basic algorithm here is not really POSIX specific and with a bit more abstraction
-// could (should) be promoted to be platform portable
-#include <unistd.h>
-#include <sys/socket.h>
-#include <signal.h>
-#include <errno.h>
-#include <string.h>
-
-#include <boost/bind.hpp>
-
-using namespace qpid::sys;
-using namespace qpid::sys::ssl;
-
-namespace {
-
-/*
- * Make *process* not generate SIGPIPE when writing to closed
- * pipe/socket (necessary as default action is to terminate process)
- */
-void ignoreSigpipe() {
-    ::signal(SIGPIPE, SIG_IGN);
-}
-
-/*
- * We keep per thread state to avoid locking overhead. The assumption is that
- * on average all the connections are serviced by all the threads so the state
- * recorded in each thread is about the same. If this turns out not to be the
- * case we could rebalance the info occasionally.  
- */
-__thread int threadReadTotal = 0;
-__thread int threadMaxRead = 0;
-__thread int threadReadCount = 0;
-__thread int threadWriteTotal = 0;
-__thread int threadWriteCount = 0;
-__thread int64_t threadMaxReadTimeNs = 2 * 1000000; // start at 2ms
-}
-
-/*
- * Asynch Acceptor
- */
-
-SslAcceptor::SslAcceptor(const SslSocket& s, Callback callback) :
-    acceptedCallback(callback),
-    handle(s, boost::bind(&SslAcceptor::readable, this, _1), 0, 0),
-    socket(s) {
-
-    s.setNonblocking();
-    ignoreSigpipe();
-}
-
-SslAcceptor::~SslAcceptor() 
-{
-    handle.stopWatch();
-}
-
-void SslAcceptor::start(Poller::shared_ptr poller) {
-    handle.startWatch(poller);
-}
-
-/*
- * We keep on accepting as long as there is something to accept
- */
-void SslAcceptor::readable(DispatchHandle& h) {
-    SslSocket* s;
-    do {
-        errno = 0;
-        // TODO: Currently we ignore the peers address, perhaps we should
-        // log it or use it for connection acceptance.
-        try {
-            s = socket.accept();
-            if (s) {
-                acceptedCallback(*s);
-            } else {
-                break;
-            }
-        } catch (const std::exception& e) {
-            QPID_LOG(error, "Could not accept socket: " << e.what());
-        }
-    } while (true);
-
-    h.rewatch();
-}
-
-/*
- * Asynch Connector
- */
-
-SslConnector::SslConnector(const SslSocket& s,
-                                 Poller::shared_ptr poller,
-                                 std::string hostname,
-                                 uint16_t port,
-                                 ConnectedCallback connCb,
-                                 FailedCallback failCb) :
-    DispatchHandle(s,
-                   0,
-                   boost::bind(&SslConnector::connComplete, this, _1),
-                   boost::bind(&SslConnector::connComplete, this, _1)),
-    connCallback(connCb),
-    failCallback(failCb),
-    socket(s)
-{
-    //TODO: would be better for connect to be performed on a
-    //non-blocking socket, but that doesn't work at present so connect
-    //blocks until complete
-    try {
-        socket.connect(hostname, port);
-        socket.setNonblocking();
-        startWatch(poller);
-    } catch(std::exception& e) {
-        failure(-1, std::string(e.what()));
-    }
-}
-
-void SslConnector::connComplete(DispatchHandle& h)
-{
-    int errCode = socket.getError();
-
-    h.stopWatch();
-    if (errCode == 0) {
-        connCallback(socket);
-        DispatchHandle::doDelete();
-    } else {
-        // TODO: This need to be fixed as strerror isn't thread safe
-        failure(errCode, std::string(::strerror(errCode)));
-    }
-}
-
-void SslConnector::failure(int errCode, std::string message)
-{
-    if (failCallback)
-        failCallback(errCode, message);
-
-    socket.close();
-    delete &socket;
-
-    DispatchHandle::doDelete();
-}
-
-/*
- * Asynch reader/writer
- */
-SslIO::SslIO(const SslSocket& s,
-                   ReadCallback rCb, EofCallback eofCb, DisconnectCallback disCb,
-                   ClosedCallback cCb, BuffersEmptyCallback eCb, IdleCallback iCb) :
-
-    DispatchHandle(s, 
-                   boost::bind(&SslIO::readable, this, _1),
-                   boost::bind(&SslIO::writeable, this, _1),
-                   boost::bind(&SslIO::disconnected, this, _1)),
-    readCallback(rCb),
-    eofCallback(eofCb),
-    disCallback(disCb),
-    closedCallback(cCb),
-    emptyCallback(eCb),
-    idleCallback(iCb),
-    socket(s),
-    queuedClose(false),
-    writePending(false) {
-
-    s.setNonblocking();
-}
-
-struct deleter
-{
-    template <typename T>
-    void operator()(T *ptr){ delete ptr;}
-};
-
-SslIO::~SslIO() {
-    std::for_each( bufferQueue.begin(), bufferQueue.end(), deleter());
-    std::for_each( writeQueue.begin(), writeQueue.end(), deleter());
-}
-
-void SslIO::queueForDeletion() {
-    DispatchHandle::doDelete();
-}
-
-void SslIO::start(Poller::shared_ptr poller) {
-    DispatchHandle::startWatch(poller);
-}
-
-void SslIO::queueReadBuffer(BufferBase* buff) {
-    assert(buff);
-    buff->dataStart = 0;
-    buff->dataCount = 0;
-    bufferQueue.push_back(buff);
-    DispatchHandle::rewatchRead();
-}
-
-void SslIO::unread(BufferBase* buff) {
-    assert(buff);
-    if (buff->dataStart != 0) {
-        memmove(buff->bytes, buff->bytes+buff->dataStart, buff->dataCount);
-        buff->dataStart = 0;
-    }
-    bufferQueue.push_front(buff);
-    DispatchHandle::rewatchRead();
-}
-
-void SslIO::queueWrite(BufferBase* buff) {
-    assert(buff);
-    // If we've already closed the socket then throw the write away
-    if (queuedClose) {
-        bufferQueue.push_front(buff);
-        return;
-    } else {
-        writeQueue.push_front(buff);
-    }
-    writePending = false;
-    DispatchHandle::rewatchWrite();
-}
-
-void SslIO::notifyPendingWrite() {
-    writePending = true;
-    DispatchHandle::rewatchWrite();
-}
-
-void SslIO::queueWriteClose() {
-    queuedClose = true;
-    DispatchHandle::rewatchWrite();
-}
-
-/** Return a queued buffer if there are enough
- * to spare
- */
-SslIO::BufferBase* SslIO::getQueuedBuffer() {
-    // Always keep at least one buffer (it might have data that was "unread" in it)
-    if (bufferQueue.size()<=1)
-        return 0;
-    BufferBase* buff = bufferQueue.back();
-    assert(buff);
-    buff->dataStart = 0;
-    buff->dataCount = 0;
-    bufferQueue.pop_back();
-    return buff;
-}
-
-/*
- * We keep on reading as long as we have something to read and a buffer to put
- * it in
- */
-void SslIO::readable(DispatchHandle& h) {
-    int readTotal = 0;
-    AbsTime readStartTime = AbsTime::now();
-    do {
-        // (Try to) get a buffer
-        if (!bufferQueue.empty()) {
-            // Read into buffer
-            BufferBase* buff = bufferQueue.front();
-            assert(buff);
-            bufferQueue.pop_front();
-            errno = 0;
-            int readCount = buff->byteCount-buff->dataCount;
-            int rc = socket.read(buff->bytes + buff->dataCount, readCount);
-            if (rc > 0) {
-                buff->dataCount += rc;
-                threadReadTotal += rc;
-                readTotal += rc;
-
-                readCallback(*this, buff);
-                if (rc != readCount) {
-                    // If we didn't fill the read buffer then time to stop reading
-                    break;
-                }
-                
-                // Stop reading if we've overrun our timeslot
-                if (Duration(readStartTime, AbsTime::now()) > threadMaxReadTimeNs) {
-                    break;
-                }
-                
-            } else {
-                // Put buffer back (at front so it doesn't interfere with unread buffers)
-                bufferQueue.push_front(buff);
-                assert(buff);
-                
-                // Eof or other side has gone away
-                if (rc == 0 || errno == ECONNRESET) {
-                    eofCallback(*this);
-                    h.unwatchRead();
-                    break;
-                } else if (errno == EAGAIN) {
-                    // We have just put a buffer back so we know
-                    // we can carry on watching for reads
-                    break;
-                } else {
-                    // Report error then just treat as a socket disconnect
-                    QPID_LOG(error, "Error reading socket: " << getErrorString(PR_GetError()));
-                    eofCallback(*this);
-                    h.unwatchRead();
-                    break;
-                }
-            }
-        } else {
-            // Something to read but no buffer
-            if (emptyCallback) {
-                emptyCallback(*this);
-            }
-            // If we still have no buffers we can't do anything more
-            if (bufferQueue.empty()) {
-                h.unwatchRead();
-                break;
-            }
-            
-        }
-    } while (true);
-
-    ++threadReadCount;
-    threadMaxRead = std::max(threadMaxRead, readTotal);
-    return;
-}
-
-/*
- * We carry on writing whilst we have data to write and we can write
- */
-void SslIO::writeable(DispatchHandle& h) {
-    int writeTotal = 0;
-    do {
-        // See if we've got something to write
-        if (!writeQueue.empty()) {
-            // Write buffer
-            BufferBase* buff = writeQueue.back();
-            writeQueue.pop_back();
-            errno = 0;
-            assert(buff->dataStart+buff->dataCount <= buff->byteCount);
-            int rc = socket.write(buff->bytes+buff->dataStart, buff->dataCount);
-            if (rc >= 0) {
-                threadWriteTotal += rc;
-                writeTotal += rc;
-
-                // If we didn't write full buffer put rest back
-                if (rc != buff->dataCount) {
-                    buff->dataStart += rc;
-                    buff->dataCount -= rc;
-                    writeQueue.push_back(buff);
-                    break;
-                }
-                
-                // Recycle the buffer
-                queueReadBuffer(buff);
-                
-                // If we've already written more than the max for reading then stop
-                // (this is to stop writes dominating reads) 
-                if (writeTotal > threadMaxRead)
-                    break;
-            } else {
-                // Put buffer back
-                writeQueue.push_back(buff);
-                if (errno == ECONNRESET || errno == EPIPE) {
-                    // Just stop watching for write here - we'll get a
-                    // disconnect callback soon enough
-                    h.unwatchWrite();
-                    break;
-                } else if (errno == EAGAIN) {
-                    // We have just put a buffer back so we know
-                    // we can carry on watching for writes
-                    break;
-                } else {
-                    QPID_LOG(error, "Error writing to socket: " << getErrorString(PR_GetError()));
-                    h.unwatchWrite();
-                    break;
-                }
-            }
-        } else {
-            // If we're waiting to close the socket then can do it now as there is nothing to write
-            if (queuedClose) {
-                close(h);
-                break;
-            }
-            // Fd is writable, but nothing to write
-            if (idleCallback) {
-                writePending = false;
-                idleCallback(*this);
-            }
-            // If we still have no buffers to write we can't do anything more
-            if (writeQueue.empty() && !writePending && !queuedClose) {
-                h.unwatchWrite();
-                // The following handles the case where writePending is
-                // set to true after the test above; in this case its
-                // possible that the unwatchWrite overwrites the
-                // desired rewatchWrite so we correct that here
-                if (writePending)
-                    h.rewatchWrite();
-                break;
-            }
-        }
-    } while (true);
-
-    ++threadWriteCount;
-    return;
-}
-        
-void SslIO::disconnected(DispatchHandle& h) {
-    // If we've already queued close do it instead of disconnected callback
-    if (queuedClose) {
-        close(h);
-    } else if (disCallback) {
-        disCallback(*this);
-        h.unwatch();
-    }
-}
-
-/*
- * Close the socket and callback to say we've done it
- */
-void SslIO::close(DispatchHandle& h) {
-    h.stopWatch();
-    socket.close();
-    if (closedCallback) {
-        closedCallback(*this, socket);
-    }
-}
-
-SecuritySettings SslIO::getSecuritySettings() {
-    SecuritySettings settings;
-    settings.ssf = socket.getKeyLen();
-    settings.authid = socket.getClientAuthId();
-    return settings;
-}
diff --git a/cpp/src/qpid/sys/ssl/SslIo.h b/cpp/src/qpid/sys/ssl/SslIo.h
deleted file mode 100644
index 53ac69d8d6..0000000000
--- a/cpp/src/qpid/sys/ssl/SslIo.h
+++ /dev/null
@@ -1,172 +0,0 @@
-#ifndef _sys_ssl_SslIO
-#define _sys_ssl_SslIO
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/DispatchHandle.h"
-#include "qpid/sys/SecuritySettings.h"
-
-#include <boost/function.hpp>
-#include <deque>
-
-namespace qpid {
-namespace sys {
-namespace ssl {
-    
-class SslSocket;
-
-/*
- * Asynchronous ssl acceptor: accepts connections then does a callback
- * with the accepted fd
- */
-class SslAcceptor {
-public:
-    typedef boost::function1<void, const SslSocket&> Callback;
-
-private:
-    Callback acceptedCallback;
-    qpid::sys::DispatchHandle handle;
-    const SslSocket& socket;
-
-public:
-    SslAcceptor(const SslSocket& s, Callback callback);
-    ~SslAcceptor();
-    void start(qpid::sys::Poller::shared_ptr poller);
-
-private:
-    void readable(qpid::sys::DispatchHandle& handle);
-};
-
-/*
- * Asynchronous ssl connector: starts the process of initiating a
- * connection and invokes a callback when completed or failed.
- */
-class SslConnector : private qpid::sys::DispatchHandle {
-public:
-    typedef boost::function1<void, const SslSocket&> ConnectedCallback;
-    typedef boost::function2<void, int, std::string> FailedCallback;
-
-private:
-    ConnectedCallback connCallback;
-    FailedCallback failCallback;
-    const SslSocket& socket;
-
-public:
-    SslConnector(const SslSocket& socket,
-                    Poller::shared_ptr poller,
-                    std::string hostname,
-                    uint16_t port,
-                    ConnectedCallback connCb,
-                    FailedCallback failCb = 0);
-
-private:
-    void connComplete(DispatchHandle& handle);
-    void failure(int, std::string);
-};
-
-struct SslIOBufferBase {
-    char* const bytes;
-    const int32_t byteCount;
-    int32_t dataStart;
-    int32_t dataCount;
-    
-    SslIOBufferBase(char* const b, const int32_t s) :
-        bytes(b),
-        byteCount(s),
-        dataStart(0),
-        dataCount(0)
-    {}
-    
-    virtual ~SslIOBufferBase()
-    {}
-};
-
-/*
- * Asychronous reader/writer: 
- * Reader accepts buffers to read into; reads into the provided buffers
- * and then does a callback with the buffer and amount read. Optionally it can callback
- * when there is something to read but no buffer to read it into.
- * 
- * Writer accepts a buffer and queues it for writing; can also be given
- * a callback for when writing is "idle" (ie fd is writable, but nothing to write)
- * 
- * The class is implemented in terms of DispatchHandle to allow it to be deleted by deleting
- * the contained DispatchHandle
- */
-class SslIO : private qpid::sys::DispatchHandle {
-public:
-    typedef SslIOBufferBase BufferBase;
-
-    typedef boost::function2<void, SslIO&, BufferBase*> ReadCallback;
-    typedef boost::function1<void, SslIO&> EofCallback;
-    typedef boost::function1<void, SslIO&> DisconnectCallback;
-    typedef boost::function2<void, SslIO&, const SslSocket&> ClosedCallback;
-    typedef boost::function1<void, SslIO&> BuffersEmptyCallback;
-    typedef boost::function1<void, SslIO&> IdleCallback;
-
-
-private:
-    ReadCallback readCallback;
-    EofCallback eofCallback;
-    DisconnectCallback disCallback;
-    ClosedCallback closedCallback;
-    BuffersEmptyCallback emptyCallback;
-    IdleCallback idleCallback;
-    const SslSocket& socket;
-    std::deque<BufferBase*> bufferQueue;
-    std::deque<BufferBase*> writeQueue;
-    bool queuedClose;
-    /**
-     * This flag is used to detect and handle concurrency between
-     * calls to notifyPendingWrite() (which can be made from any thread) and
-     * the execution of the writeable() method (which is always on the
-     * thread processing this handle.
-     */
-    volatile bool writePending;
-
-public:
-    SslIO(const SslSocket& s,
-        ReadCallback rCb, EofCallback eofCb, DisconnectCallback disCb,
-        ClosedCallback cCb = 0, BuffersEmptyCallback eCb = 0, IdleCallback iCb = 0);
-    void queueForDeletion();
-
-    void start(qpid::sys::Poller::shared_ptr poller);
-    void queueReadBuffer(BufferBase* buff);
-    void unread(BufferBase* buff);
-    void queueWrite(BufferBase* buff);
-    void notifyPendingWrite();
-    void queueWriteClose();
-    bool writeQueueEmpty() { return writeQueue.empty(); }
-    BufferBase* getQueuedBuffer();
-
-    qpid::sys::SecuritySettings getSecuritySettings();
-
-private:
-    ~SslIO();
-    void readable(qpid::sys::DispatchHandle& handle);
-    void writeable(qpid::sys::DispatchHandle& handle);
-    void disconnected(qpid::sys::DispatchHandle& handle);
-    void close(qpid::sys::DispatchHandle& handle);
-};
-
-}}}
-
-#endif // _sys_ssl_SslIO
diff --git a/cpp/src/qpid/sys/ssl/SslSocket.cpp b/cpp/src/qpid/sys/ssl/SslSocket.cpp
deleted file mode 100644
index 01e2658877..0000000000
--- a/cpp/src/qpid/sys/ssl/SslSocket.cpp
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/ssl/SslSocket.h"
-#include "qpid/sys/ssl/check.h"
-#include "qpid/sys/ssl/util.h"
-#include "qpid/Exception.h"
-#include "qpid/sys/posix/check.h"
-#include "qpid/sys/posix/PrivatePosix.h"
-
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/errno.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <netdb.h>
-#include <cstdlib>
-#include <string.h>
-#include <iostream>
-
-#include <private/pprio.h>
-#include <nss.h>
-#include <pk11pub.h>
-#include <ssl.h>
-#include <key.h>
-
-#include <boost/format.hpp>
-
-namespace qpid {
-namespace sys {
-namespace ssl {
-
-namespace {
-std::string getName(int fd, bool local, bool includeService = false)
-{
-    ::sockaddr_storage name; // big enough for any socket address
-    ::socklen_t namelen = sizeof(name);
-
-    int result = -1;
-    if (local) {
-        result = ::getsockname(fd, (::sockaddr*)&name, &namelen);
-    } else {
-        result = ::getpeername(fd, (::sockaddr*)&name, &namelen);
-    }
-
-    QPID_POSIX_CHECK(result);
-
-    char servName[NI_MAXSERV];
-    char dispName[NI_MAXHOST];
-    if (includeService) {
-        if (int rc=::getnameinfo((::sockaddr*)&name, namelen, dispName, sizeof(dispName),
-                                 servName, sizeof(servName),
-                                 NI_NUMERICHOST | NI_NUMERICSERV) != 0)
-            throw QPID_POSIX_ERROR(rc);
-        return std::string(dispName) + ":" + std::string(servName);
-
-    } else {
-        if (int rc=::getnameinfo((::sockaddr*)&name, namelen, dispName, sizeof(dispName), 0, 0, NI_NUMERICHOST) != 0)
-            throw QPID_POSIX_ERROR(rc);
-        return dispName;
-    }
-}
-
-std::string getService(int fd, bool local)
-{
-    ::sockaddr_storage name; // big enough for any socket address
-    ::socklen_t namelen = sizeof(name);
-
-    int result = -1;
-    if (local) {
-        result = ::getsockname(fd, (::sockaddr*)&name, &namelen);
-    } else {
-        result = ::getpeername(fd, (::sockaddr*)&name, &namelen);
-    }
-
-    QPID_POSIX_CHECK(result);
-
-    char servName[NI_MAXSERV];
-    if (int rc=::getnameinfo((::sockaddr*)&name, namelen, 0, 0,
-                                 servName, sizeof(servName),
-                                 NI_NUMERICHOST | NI_NUMERICSERV) != 0)
-        throw QPID_POSIX_ERROR(rc);
-    return servName;
-}
-
-const std::string DOMAIN_SEPARATOR("@");
-const std::string DC_SEPARATOR(".");
-const std::string DC("DC");
-const std::string DN_DELIMS(" ,=");
-
-std::string getDomainFromSubject(std::string subject)
-{
-    std::string::size_type last = subject.find_first_not_of(DN_DELIMS, 0);
-    std::string::size_type i = subject.find_first_of(DN_DELIMS, last);
-
-    std::string domain;
-    bool nextTokenIsDC = false;
-    while (std::string::npos != i || std::string::npos != last)
-    {
-        std::string token = subject.substr(last, i - last);
-        if (nextTokenIsDC) {
-            if (domain.size()) domain += DC_SEPARATOR;
-            domain += token;
-            nextTokenIsDC = false;
-        } else if (token == DC) {
-            nextTokenIsDC = true;
-        }
-        last = subject.find_first_not_of(DN_DELIMS, i);
-        i = subject.find_first_of(DN_DELIMS, last);
-    }
-    return domain;
-}
-
-}
-
-SslSocket::SslSocket() : IOHandle(new IOHandlePrivate()), socket(0), prototype(0)
-{
-    impl->fd = ::socket (PF_INET, SOCK_STREAM, 0);
-    if (impl->fd < 0) throw QPID_POSIX_ERROR(errno);
-    socket = SSL_ImportFD(0, PR_ImportTCPSocket(impl->fd));
-}
-
-/**
- * This form of the constructor is used with the server-side sockets
- * returned from accept. Because we use posix accept rather than
- * PR_Accept, we have to reset the handshake.
- */
-SslSocket::SslSocket(IOHandlePrivate* ioph, PRFileDesc* model) : IOHandle(ioph), socket(0), prototype(0)
-{
-    socket = SSL_ImportFD(model, PR_ImportTCPSocket(impl->fd));
-    NSS_CHECK(SSL_ResetHandshake(socket, true));
-}
-
-void SslSocket::setNonblocking() const
-{
-    PRSocketOptionData option;
-    option.option = PR_SockOpt_Nonblocking;
-    option.value.non_blocking = true;
-    PR_SetSocketOption(socket, &option);
-}
-
-void SslSocket::connect(const std::string& host, uint16_t port) const
-{
-    std::stringstream namestream;
-    namestream << host << ":" << port;
-    connectname = namestream.str();
-
-    void* arg;
-    // Use the connection's cert-name if it has one; else use global cert-name
-    if (certname != "") {
-        arg = const_cast<char*>(certname.c_str());
-    } else if (SslOptions::global.certName.empty()) {
-        arg = 0;
-    } else {
-        arg = const_cast<char*>(SslOptions::global.certName.c_str());
-    }
-    NSS_CHECK(SSL_GetClientAuthDataHook(socket, NSS_GetClientAuthData, arg));
-    NSS_CHECK(SSL_SetURL(socket, host.data()));
-
-    char hostBuffer[PR_NETDB_BUF_SIZE];
-    PRHostEnt hostEntry;
-    PR_CHECK(PR_GetHostByName(host.data(), hostBuffer, PR_NETDB_BUF_SIZE, &hostEntry));
-    PRNetAddr address;
-    int value = PR_EnumerateHostEnt(0, &hostEntry, port, &address);
-    if (value < 0) {
-        throw Exception(QPID_MSG("Error getting address for host: " << ErrorString()));
-    } else if (value == 0) {
-        throw Exception(QPID_MSG("Could not resolve address for host."));
-    }
-    PR_CHECK(PR_Connect(socket, &address, PR_INTERVAL_NO_TIMEOUT));
-    NSS_CHECK(SSL_ForceHandshake(socket));
-}
-
-void SslSocket::close() const
-{
-    if (impl->fd > 0) {
-        PR_Close(socket);
-        impl->fd = -1;
-    }
-}
-
-int SslSocket::listen(uint16_t port, int backlog, const std::string& certName, bool clientAuth) const
-{
-    //configure prototype socket:
-    prototype = SSL_ImportFD(0, PR_NewTCPSocket());
-    if (clientAuth) {
-        NSS_CHECK(SSL_OptionSet(prototype, SSL_REQUEST_CERTIFICATE, PR_TRUE));
-        NSS_CHECK(SSL_OptionSet(prototype, SSL_REQUIRE_CERTIFICATE, PR_TRUE));
-    }
-
-    //get certificate and key (is this the correct way?)
-    CERTCertificate *cert = PK11_FindCertFromNickname(const_cast<char*>(certName.c_str()), 0);
-    if (!cert) throw Exception(QPID_MSG("Failed to load certificate '" << certName << "'"));
-    SECKEYPrivateKey *key = PK11_FindKeyByAnyCert(cert, 0);
-    if (!key) throw Exception(QPID_MSG("Failed to retrieve private key from certificate"));
-    NSS_CHECK(SSL_ConfigSecureServer(prototype, cert, key, NSS_FindCertKEAType(cert)));
-    SECKEY_DestroyPrivateKey(key);
-    CERT_DestroyCertificate(cert);
-
-    //bind and listen
-    const int& socket = impl->fd;
-    int yes=1;
-    QPID_POSIX_CHECK(setsockopt(socket,SOL_SOCKET,SO_REUSEADDR,&yes,sizeof(yes)));
-    struct sockaddr_in name;
-    name.sin_family = AF_INET;
-    name.sin_port = htons(port);
-    name.sin_addr.s_addr = 0;
-    if (::bind(socket, (struct sockaddr*)&name, sizeof(name)) < 0)
-        throw Exception(QPID_MSG("Can't bind to port " << port << ": " << strError(errno)));
-    if (::listen(socket, backlog) < 0)
-        throw Exception(QPID_MSG("Can't listen on port " << port << ": " << strError(errno)));
-
-    socklen_t namelen = sizeof(name);
-    if (::getsockname(socket, (struct sockaddr*)&name, &namelen) < 0)
-        throw QPID_POSIX_ERROR(errno);
-
-    return ntohs(name.sin_port);
-}
-
-SslSocket* SslSocket::accept() const
-{
-    int afd = ::accept(impl->fd, 0, 0);
-    if ( afd >= 0) {
-        return new SslSocket(new IOHandlePrivate(afd), prototype);
-    } else if (errno == EAGAIN) {
-        return 0;
-    } else {
-        throw QPID_POSIX_ERROR(errno);
-    }
-}
-
-int SslSocket::read(void *buf, size_t count) const
-{
-    return PR_Read(socket, buf, count);
-}
-
-int SslSocket::write(const void *buf, size_t count) const
-{
-    return PR_Write(socket, buf, count);
-}
-
-std::string SslSocket::getSockname() const
-{
-    return getName(impl->fd, true);
-}
-
-std::string SslSocket::getPeername() const
-{
-    return getName(impl->fd, false);
-}
-
-std::string SslSocket::getPeerAddress() const
-{
-    if (!connectname.empty())
-        return connectname;
-    return getName(impl->fd, false, true);
-}
-
-std::string SslSocket::getLocalAddress() const
-{
-    return getName(impl->fd, true, true);
-}
-
-uint16_t SslSocket::getLocalPort() const
-{
-    return std::atoi(getService(impl->fd, true).c_str());
-}
-
-uint16_t SslSocket::getRemotePort() const
-{
-    return atoi(getService(impl->fd, true).c_str());
-}
-
-int SslSocket::getError() const
-{
-    int       result;
-    socklen_t rSize = sizeof (result);
-
-    if (::getsockopt(impl->fd, SOL_SOCKET, SO_ERROR, &result, &rSize) < 0)
-        throw QPID_POSIX_ERROR(errno);
-
-    return result;
-}
-
-void SslSocket::setTcpNoDelay(bool nodelay) const
-{
-    if (nodelay) {
-        PRSocketOptionData option;
-        option.option = PR_SockOpt_NoDelay;
-        option.value.no_delay = true;
-        PR_SetSocketOption(socket, &option);
-    }
-}
-
-void SslSocket::setCertName(const std::string& name)
-{
-    certname = name;
-}
-
-
-/** get the bit length of the current cipher's key */
-int SslSocket::getKeyLen() const
-{
-    int enabled = 0;
-    int keySize = 0;
-    SECStatus   rc;
-
-    rc = SSL_SecurityStatus( socket,
-                             &enabled,
-                             NULL,
-                             NULL,
-                             &keySize,
-                             NULL, NULL );
-    if (rc == SECSuccess && enabled) {
-        return keySize;
-    }
-    return 0;
-}
-
-std::string SslSocket::getClientAuthId() const
-{
-    std::string authId;
-    CERTCertificate* cert = SSL_PeerCertificate(socket);
-    if (cert) {
-        authId = CERT_GetCommonName(&(cert->subject));
-        /*
-         * The NSS function CERT_GetDomainComponentName only returns
-         * the last component of the domain name, so we have to parse
-         * the subject manually to extract the full domain.
-         */
-        std::string domain = getDomainFromSubject(cert->subjectName);
-        if (!domain.empty()) {
-            authId += DOMAIN_SEPARATOR;
-            authId += domain;
-        }
-        CERT_DestroyCertificate(cert);
-    }
-    return authId;
-}
-
-}}} // namespace qpid::sys::ssl
diff --git a/cpp/src/qpid/sys/ssl/SslSocket.h b/cpp/src/qpid/sys/ssl/SslSocket.h
deleted file mode 100644
index 25712c98d5..0000000000
--- a/cpp/src/qpid/sys/ssl/SslSocket.h
+++ /dev/null
@@ -1,132 +0,0 @@
-#ifndef _sys_ssl_Socket_h
-#define _sys_ssl_Socket_h
-
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/IOHandle.h"
-#include <nspr.h>
-
-#include <string>
-
-struct sockaddr;
-
-namespace qpid {
-namespace sys {
-
-class Duration;
-
-namespace ssl {
-
-class SslSocket : public qpid::sys::IOHandle
-{
-public:
-    /** Create a socket wrapper for descriptor. */
-    SslSocket();
-
-    /** Set socket non blocking */
-    void setNonblocking() const;
-
-    /** Set tcp-nodelay */
-    void setTcpNoDelay(bool nodelay) const;
-
-    /** Set SSL cert-name. Allows the cert-name to be set per
-     * connection, overriding global cert-name settings from
-     * NSSInit().*/
-    void setCertName(const std::string& certName);
-
-    void connect(const std::string& host, uint16_t port) const;
-
-    void close() const;
-
-    /** Bind to a port and start listening.
-     *@param port 0 means choose an available port.
-     *@param backlog maximum number of pending connections.
-     *@param certName name of certificate to use to identify the server
-     *@return The bound port.
-     */
-    int listen(uint16_t port = 0, int backlog = 10, const std::string& certName = "localhost.localdomain", bool clientAuth = false) const;
-
-    /**
-     * Accept a connection from a socket that is already listening
-     * and has an incoming connection
-     */
-    SslSocket* accept() const;
-
-    // TODO The following are raw operations, maybe they need better wrapping?
-    int read(void *buf, size_t count) const;
-    int write(const void *buf, size_t count) const;
-
-    /** Returns the "socket name" ie the address bound to
-     * the near end of the socket
-     */
-    std::string getSockname() const;
-
-    /** Returns the "peer name" ie the address bound to
-     * the remote end of the socket
-     */
-    std::string getPeername() const;
-
-    /**
-     * Returns an address (host and port) for the remote end of the
-     * socket
-     */
-    std::string getPeerAddress() const;
-    /**
-     * Returns an address (host and port) for the local end of the
-     * socket
-     */
-    std::string getLocalAddress() const;
-
-    /**
-     * Returns the full address of the connection: local and remote host and port.
-     */
-    std::string getFullAddress() const { return getLocalAddress()+"-"+getPeerAddress(); }
-
-    uint16_t getLocalPort() const;
-    uint16_t getRemotePort() const;
-
-    /**
-     * Returns the error code stored in the socket.  This may be used
-     * to determine the result of a non-blocking connect.
-     */
-    int getError() const;
-
-    int getKeyLen() const;
-    std::string getClientAuthId() const;
-
-private:
-    mutable std::string connectname;
-    mutable PRFileDesc* socket;
-    std::string certname;
-
-    /**
-     * 'model' socket, with configuration to use when importing
-     * accepted sockets for use as ssl sockets. Set on listen(), used
-     * in accept to pass through to newly created socket instances.
-     */
-    mutable PRFileDesc* prototype;
-
-    SslSocket(IOHandlePrivate* ioph, PRFileDesc* model);
-};
-
-}}}
-#endif  /*!_sys_ssl_Socket_h*/
diff --git a/cpp/src/qpid/sys/windows/AsynchIO.cpp b/cpp/src/qpid/sys/windows/AsynchIO.cpp
deleted file mode 100644
index 71138757a5..0000000000
--- a/cpp/src/qpid/sys/windows/AsynchIO.cpp
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include "qpid/sys/windows/AsynchIoResult.h"
-#include "qpid/sys/windows/IoHandlePrivate.h"
-#include "qpid/sys/AsynchIO.h"
-#include "qpid/sys/Mutex.h"
-#include "qpid/sys/Socket.h"
-#include "qpid/sys/Poller.h"
-#include "qpid/sys/Thread.h"
-#include "qpid/sys/Time.h"
-#include "qpid/log/Statement.h"
-
-#include "qpid/sys/windows/check.h"
-#include "qpid/sys/windows/mingw32_compat.h"
-
-#include <boost/thread/once.hpp>
-
-#include <queue>
-#include <winsock2.h>
-#include <mswsock.h>
-#include <windows.h>
-
-#include <boost/bind.hpp>
-
-namespace {
-
-    typedef qpid::sys::ScopedLock<qpid::sys::Mutex>  QLock;
-
-/*
- * The function pointers for AcceptEx and ConnectEx need to be looked up
- * at run time. Make sure this is done only once.
- */
-boost::once_flag lookUpAcceptExOnce = BOOST_ONCE_INIT;
-LPFN_ACCEPTEX fnAcceptEx = 0;
-typedef void (*lookUpFunc)(const qpid::sys::Socket &);
-
-void lookUpAcceptEx() {
-    SOCKET h = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    GUID guidAcceptEx = WSAID_ACCEPTEX;
-    DWORD dwBytes = 0;
-    WSAIoctl(h,
-             SIO_GET_EXTENSION_FUNCTION_POINTER,
-             &guidAcceptEx,
-             sizeof(guidAcceptEx),
-             &fnAcceptEx,
-             sizeof(fnAcceptEx),
-             &dwBytes,
-             NULL,
-             NULL);
-    closesocket(h);
-    if (fnAcceptEx == 0)
-        throw qpid::Exception(QPID_MSG("Failed to look up AcceptEx"));
-}
-
-}
-
-namespace qpid {
-namespace sys {
-namespace windows {
-
-/*
- * Asynch Acceptor
- *
- */
-class AsynchAcceptor : public qpid::sys::AsynchAcceptor {
-
-    friend class AsynchAcceptResult;
-
-public:
-    AsynchAcceptor(const Socket& s, AsynchAcceptor::Callback callback);
-    ~AsynchAcceptor();
-    void start(Poller::shared_ptr poller);
-
-private:
-    void restart(void);
-
-    AsynchAcceptor::Callback acceptedCallback;
-    const Socket& socket;
-};
-
-AsynchAcceptor::AsynchAcceptor(const Socket& s, Callback callback)
-  : acceptedCallback(callback),
-    socket(s) {
-
-    s.setNonblocking();
-#if (BOOST_VERSION >= 103500)   /* boost 1.35 or later reversed the args */
-    boost::call_once(lookUpAcceptExOnce, lookUpAcceptEx);
-#else
-    boost::call_once(lookUpAcceptEx, lookUpAcceptExOnce);
-#endif
-}
-
-AsynchAcceptor::~AsynchAcceptor()
-{
-    socket.close();
-}
-
-void AsynchAcceptor::start(Poller::shared_ptr poller) {
-    PollerHandle ph = PollerHandle(socket);
-    poller->monitorHandle(ph, Poller::INPUT);
-    restart ();
-}
-
-void AsynchAcceptor::restart(void) {
-    DWORD bytesReceived = 0;  // Not used, needed for AcceptEx API
-    AsynchAcceptResult *result = new AsynchAcceptResult(acceptedCallback,
-                                                        this,
-                                                        toSocketHandle(socket));
-    BOOL status;
-    status = ::fnAcceptEx(toSocketHandle(socket),
-                          toSocketHandle(*result->newSocket),
-                          result->addressBuffer,
-                          0,
-                          AsynchAcceptResult::SOCKADDRMAXLEN,
-                          AsynchAcceptResult::SOCKADDRMAXLEN,
-                          &bytesReceived,
-                          result->overlapped());
-    QPID_WINDOWS_CHECK_ASYNC_START(status);
-}
-
-
-AsynchAcceptResult::AsynchAcceptResult(AsynchAcceptor::Callback cb,
-                                       AsynchAcceptor *acceptor,
-                                       SOCKET listener)
-  : callback(cb), acceptor(acceptor), listener(listener) {
-    newSocket.reset (new Socket());
-}
-
-void AsynchAcceptResult::success(size_t /*bytesTransferred*/) {
-    ::setsockopt (toSocketHandle(*newSocket),
-                  SOL_SOCKET,
-                  SO_UPDATE_ACCEPT_CONTEXT,
-                  (char*)&listener,
-                  sizeof (listener));
-    callback(*(newSocket.release()));
-    acceptor->restart ();
-    delete this;
-}
-
-void AsynchAcceptResult::failure(int /*status*/) {
-    //if (status != WSA_OPERATION_ABORTED)
-    // Can there be anything else?  ;
-    delete this;
-}
-
-/*
- * AsynchConnector does synchronous connects for now... to do asynch the
- * IocpPoller will need some extension to register an event handle as a
- * CONNECT-type "direction", the connect completion/result will need an
- * event handle to associate with the connecting handle. But there's no
- * time for that right now...
- */
-class AsynchConnector : public qpid::sys::AsynchConnector {
-private:
-    ConnectedCallback connCallback;
-    FailedCallback failCallback;
-    const Socket& socket;
-    const std::string hostname;
-    const uint16_t port;
-
-public:
-    AsynchConnector(const Socket& socket,
-                    std::string hostname,
-                    uint16_t port,
-                    ConnectedCallback connCb,
-                    FailedCallback failCb = 0);
-    void start(Poller::shared_ptr poller);
-};
-
-AsynchConnector::AsynchConnector(const Socket& sock,
-                                 std::string hname,
-                                 uint16_t p,
-                                 ConnectedCallback connCb,
-                                 FailedCallback failCb) :
-    connCallback(connCb), failCallback(failCb), socket(sock),
-    hostname(hname), port(p)
-{
-}
-
-void AsynchConnector::start(Poller::shared_ptr)
-{
-    try {
-        socket.connect(hostname, port);
-        socket.setNonblocking();
-        connCallback(socket);
-    } catch(std::exception& e) {
-        if (failCallback)
-            failCallback(socket, -1, std::string(e.what()));
-        socket.close();
-    }
-}
-
-} // namespace windows
-
-AsynchAcceptor* AsynchAcceptor::create(const Socket& s, 
-                                       Callback callback)
-{
-    return new windows::AsynchAcceptor(s, callback);
-}
-
-AsynchConnector* qpid::sys::AsynchConnector::create(const Socket& s,
-                                                    std::string hostname,
-                                                    uint16_t port,
-                                                    ConnectedCallback connCb,
-                                                    FailedCallback failCb)
-{
-    return new windows::AsynchConnector(s,
-                                        hostname,
-                                        port,
-                                        connCb,
-                                        failCb);
-}
-
-
-/*
- * Asynch reader/writer
- */
-
-namespace windows {
-
-class AsynchIO : public qpid::sys::AsynchIO {
-public:
-    AsynchIO(const Socket& s,
-             ReadCallback rCb,
-             EofCallback eofCb,
-             DisconnectCallback disCb,
-             ClosedCallback cCb = 0,
-             BuffersEmptyCallback eCb = 0,
-             IdleCallback iCb = 0);
-    ~AsynchIO();
-
-    // Methods inherited from qpid::sys::AsynchIO
-
-    /**
-     * Notify the object is should delete itself as soon as possible.
-     */
-    virtual void queueForDeletion();
-
-    /// Take any actions needed to prepare for working with the poller.
-    virtual void start(Poller::shared_ptr poller);
-    virtual void queueReadBuffer(BufferBase* buff);
-    virtual void unread(BufferBase* buff);
-    virtual void queueWrite(BufferBase* buff);
-    virtual void notifyPendingWrite();
-    virtual void queueWriteClose();
-    virtual bool writeQueueEmpty();
-    virtual void startReading();
-    virtual void stopReading();
-    virtual void requestCallback(RequestCallback);
-
-    /**
-     * getQueuedBuffer returns a buffer from the buffer queue, if one is
-     * available.
-     *
-     * @retval Pointer to BufferBase buffer; 0 if none is available.
-     */
-    virtual BufferBase* getQueuedBuffer();
-
-private:
-    ReadCallback readCallback;
-    EofCallback eofCallback;
-    DisconnectCallback disCallback;
-    ClosedCallback closedCallback;
-    BuffersEmptyCallback emptyCallback;
-    IdleCallback idleCallback;
-    const Socket& socket;
-    Poller::shared_ptr poller;
-
-    std::deque<BufferBase*> bufferQueue;
-    std::deque<BufferBase*> writeQueue;
-    /* The MSVC-supplied deque is not thread-safe; keep locks to serialize
-     * access to the buffer queue and write queue.
-     */
-    Mutex bufferQueueLock;
-
-    // Number of outstanding I/O operations.
-    volatile LONG opsInProgress;
-    // Is there a write in progress?
-    volatile bool writeInProgress;
-    // Deletion requested, but there are callbacks in progress.
-    volatile bool queuedDelete;
-    // Socket close requested, but there are operations in progress.
-    volatile bool queuedClose;
-
-private:
-    // Dispatch events that have completed.
-    void notifyEof(void);
-    void notifyDisconnect(void);
-    void notifyClosed(void);
-    void notifyBuffersEmpty(void);
-    void notifyIdle(void);
-
-    /**
-     * Initiate a write of the specified buffer. There's no callback for
-     * write completion to the AsynchIO object.
-     */
-    void startWrite(AsynchIO::BufferBase* buff);
-
-    void close(void);
-
-    /**
-     * readComplete is called when a read request is complete.
-     *
-     * @param result Results of the operation.
-     */
-    void readComplete(AsynchReadResult *result);
-
-    /**
-     * writeComplete is called when a write request is complete.
-     *
-     * @param result Results of the operation.
-     */
-    void writeComplete(AsynchWriteResult *result);
-
-    /**
-     * Queue of completions to run. This queue enforces the requirement
-     * from upper layers that only one thread at a time is allowed to act
-     * on any given connection. Once a thread is busy processing a completion
-     * on this object, other threads that dispatch completions queue the
-     * completions here for the in-progress thread to handle when done.
-     * Thus, any threads can dispatch a completion from the IocpPoller, but
-     * this class ensures that actual processing at the connection level is
-     * only on one thread at a time.
-     */
-    std::queue<AsynchIoResult *> completionQueue;
-    volatile bool working;
-    Mutex completionLock;
-
-    /**
-     * Called when there's a completion to process.
-     */
-    void completion(AsynchIoResult *result);
-};
-
-// This is used to encapsulate pure callbacks into a handle
-class CallbackHandle : public IOHandle {
-public:
-    CallbackHandle(AsynchIoResult::Completer completeCb,
-                   AsynchIO::RequestCallback reqCb = 0) :
-    IOHandle(new IOHandlePrivate (INVALID_SOCKET, completeCb, reqCb))
-    {}
-};
-
-AsynchIO::AsynchIO(const Socket& s,
-                   ReadCallback rCb,
-                   EofCallback eofCb,
-                   DisconnectCallback disCb,
-                   ClosedCallback cCb,
-                   BuffersEmptyCallback eCb,
-                   IdleCallback iCb) :
-
-    readCallback(rCb),
-    eofCallback(eofCb),
-    disCallback(disCb),
-    closedCallback(cCb),
-    emptyCallback(eCb),
-    idleCallback(iCb),
-    socket(s),
-    opsInProgress(0),
-    writeInProgress(false),
-    queuedDelete(false),
-    queuedClose(false),
-    working(false) {
-}
-
-struct deleter
-{
-    template <typename T>
-    void operator()(T *ptr){ delete ptr;}
-};
-
-AsynchIO::~AsynchIO() {
-    std::for_each( bufferQueue.begin(), bufferQueue.end(), deleter());
-    std::for_each( writeQueue.begin(), writeQueue.end(), deleter());
-}
-
-void AsynchIO::queueForDeletion() {
-    queuedDelete = true;
-    if (opsInProgress > 0) {
-        QPID_LOG(info, "Delete AsynchIO queued; ops in progress");
-        // AsynchIOHandler calls this then deletes itself; don't do any more
-        // callbacks.
-        readCallback = 0;
-        eofCallback = 0;
-        disCallback = 0;
-        closedCallback = 0;
-        emptyCallback = 0;
-        idleCallback = 0;
-    }
-    else {
-        delete this;
-    }
-}
-
-void AsynchIO::start(Poller::shared_ptr poller0) {
-    PollerHandle ph = PollerHandle(socket);
-    poller = poller0;
-    poller->monitorHandle(ph, Poller::INPUT);
-    if (writeQueue.size() > 0)  // Already have data queued for write
-        notifyPendingWrite();
-    startReading();
-}
-
-void AsynchIO::queueReadBuffer(AsynchIO::BufferBase* buff) {
-    assert(buff);
-    buff->dataStart = 0;
-    buff->dataCount = 0;
-    QLock l(bufferQueueLock);
-    bufferQueue.push_back(buff);
-}
-
-void AsynchIO::unread(AsynchIO::BufferBase* buff) {
-    assert(buff);
-    buff->squish();
-    QLock l(bufferQueueLock);
-    bufferQueue.push_front(buff);
-}
-
-void AsynchIO::queueWrite(AsynchIO::BufferBase* buff) {
-    assert(buff);
-    QLock l(bufferQueueLock);
-    writeQueue.push_back(buff);
-    if (!writeInProgress)
-        notifyPendingWrite();
-}
-
-void AsynchIO::notifyPendingWrite() {
-    // This method is generally called from a processing thread; transfer
-    // work on this to an I/O thread. Much of the upper layer code assumes
-    // that all I/O-related things happen in an I/O thread.
-    if (poller == 0)    // Not really going yet...
-        return;
-
-    InterlockedIncrement(&opsInProgress);
-    PollerHandle ph(CallbackHandle(boost::bind(&AsynchIO::completion, this, _1)));
-    poller->monitorHandle(ph, Poller::OUTPUT);
-}
-
-void AsynchIO::queueWriteClose() {
-    queuedClose = true;
-    if (!writeInProgress)
-        notifyPendingWrite();
-}
-
-bool AsynchIO::writeQueueEmpty() {
-    QLock l(bufferQueueLock);
-    return writeQueue.size() == 0;
-}
-
-/*
- * Initiate a read operation. AsynchIO::readComplete() will be
- * called when the read is complete and data is available.
- */
-void AsynchIO::startReading() {
-    if (queuedDelete)
-        return;
-
-    // (Try to) get a buffer; look on the front since there may be an
-    // "unread" one there with data remaining from last time.
-    AsynchIO::BufferBase *buff = 0;
-    {
-        QLock l(bufferQueueLock);
-
-        if (!bufferQueue.empty()) {
-            buff = bufferQueue.front();
-            assert(buff);
-            bufferQueue.pop_front();
-        }
-    }
-    if (buff != 0) {
-        int readCount = buff->byteCount - buff->dataCount;
-        AsynchReadResult *result =
-            new AsynchReadResult(boost::bind(&AsynchIO::completion, this, _1),
-                                 buff,
-                                 readCount);
-        DWORD bytesReceived = 0, flags = 0;
-        InterlockedIncrement(&opsInProgress);
-        int status = WSARecv(toSocketHandle(socket),
-                             const_cast<LPWSABUF>(result->getWSABUF()), 1,
-                             &bytesReceived,
-                             &flags,
-                             result->overlapped(),
-                             0);
-        if (status != 0) {
-            int error = WSAGetLastError();
-            if (error != WSA_IO_PENDING) {
-                result->failure(error);
-                result = 0;   // result is invalid here
-                return;
-            }
-        }
-        // On status 0 or WSA_IO_PENDING, completion will handle the rest.
-    }
-    else {
-        notifyBuffersEmpty();
-    }
-    return;
-}
-
-// stopReading was added to prevent a race condition with read-credit on Linux.
-// It may or may not be required on windows.
-// 
-// AsynchIOHandler::readbuff() calls stopReading() inside the same
-// critical section that protects startReading() in
-// AsynchIOHandler::giveReadCredit().
-// 
-void AsynchIO::stopReading() {}
-
-// Queue the specified callback for invocation from an I/O thread.
-void AsynchIO::requestCallback(RequestCallback callback) {
-    // This method is generally called from a processing thread; transfer
-    // work on this to an I/O thread. Much of the upper layer code assumes
-    // that all I/O-related things happen in an I/O thread.
-    if (poller == 0)    // Not really going yet...
-        return;
-
-    InterlockedIncrement(&opsInProgress);
-    PollerHandle ph(CallbackHandle(
-        boost::bind(&AsynchIO::completion, this, _1),
-        callback));
-    poller->monitorHandle(ph, Poller::INPUT);
-}
-
-/**
- * Return a queued buffer if there are enough to spare.
- */
-AsynchIO::BufferBase* AsynchIO::getQueuedBuffer() {
-    QLock l(bufferQueueLock);
-    // Always keep at least one buffer (it might have data that was
-    // "unread" in it).
-    if (bufferQueue.size() <= 1)
-        return 0;
-    BufferBase* buff = bufferQueue.back();
-    assert(buff);
-    bufferQueue.pop_back();
-    return buff;
-}
-
-void AsynchIO::notifyEof(void) {
-    if (eofCallback)
-        eofCallback(*this);
-}
-
-void AsynchIO::notifyDisconnect(void) {
-    if (disCallback)
-        disCallback(*this);
-}
-
-void AsynchIO::notifyClosed(void) {
-    if (closedCallback)
-        closedCallback(*this, socket);
-}
-
-void AsynchIO::notifyBuffersEmpty(void) {
-    if (emptyCallback)
-        emptyCallback(*this);
-}
-
-void AsynchIO::notifyIdle(void) {
-    if (idleCallback)
-        idleCallback(*this);
-}
-
-/*
- * Asynch reader/writer using overlapped I/O
- */
-
-void AsynchIO::startWrite(AsynchIO::BufferBase* buff) {
-    writeInProgress = true;
-    InterlockedIncrement(&opsInProgress);
-    AsynchWriteResult *result =
-        new AsynchWriteResult(boost::bind(&AsynchIO::completion, this, _1),
-                              buff,
-                              buff->dataCount);
-    DWORD bytesSent = 0;
-    int status = WSASend(toSocketHandle(socket),
-                         const_cast<LPWSABUF>(result->getWSABUF()), 1,
-                         &bytesSent,
-                         0,
-                         result->overlapped(),
-                         0);
-    if (status != 0) {
-        int error = WSAGetLastError();
-        if (error != WSA_IO_PENDING) {
-            result->failure(error);   // Also decrements in-progress count
-            result = 0;   // result is invalid here
-            return;
-        }
-    }
-    // On status 0 or WSA_IO_PENDING, completion will handle the rest.
-    return;
-}
-
-/*
- * Close the socket and callback to say we've done it
- */
-void AsynchIO::close(void) {
-    socket.close();
-    notifyClosed();
-}
-
-void AsynchIO::readComplete(AsynchReadResult *result) {
-    int status = result->getStatus();
-    size_t bytes = result->getTransferred();
-    if (status == 0 && bytes > 0) {
-        bool restartRead = true;     // May not if receiver doesn't want more
-        if (readCallback)
-            readCallback(*this, result->getBuff());
-        if (restartRead)
-            startReading();
-    }
-    else {
-        // No data read, so put the buffer back. It may be partially filled,
-        // so "unread" it back to the front of the queue.
-        unread(result->getBuff());
-        notifyEof();
-        if (status != 0)
-        {
-            notifyDisconnect();
-        }
-    }
-}
-
-/*
- * NOTE - this completion is called for completed writes and also when 
- * a write is desired. The difference is in the buff - if a write is desired
- * the buff is 0.
- */
-void AsynchIO::writeComplete(AsynchWriteResult *result) {
-    int status = result->getStatus();
-    size_t bytes = result->getTransferred();
-    AsynchIO::BufferBase *buff = result->getBuff();
-    if (buff != 0) {
-        writeInProgress = false;
-        if (status == 0 && bytes > 0) {
-            if (bytes < result->getRequested()) // Still more to go; resubmit
-                startWrite(buff);
-            else
-                queueReadBuffer(buff);     // All done; back to the pool
-        }
-        else {
-            // An error... if it's a connection close, ignore it - it will be
-            // noticed and handled on a read completion any moment now.
-            // What to do with real error??? Save the Buffer?
-        }
-    }
-
-    // If there are no writes outstanding, check for more writes to initiate
-    // (either queued or via idle). The opsInProgress count is handled in
-    // completion()
-    if (!writeInProgress) {
-        bool writing = false;
-        {
-            QLock l(bufferQueueLock);
-            if (writeQueue.size() > 0) {
-                buff = writeQueue.front();
-                assert(buff);
-                writeQueue.pop_front();
-                startWrite(buff);
-                writing = true;
-            }
-        }
-        if (!writing && !queuedClose) {
-            notifyIdle();
-        }
-    }
-    return;
-}
-
-void AsynchIO::completion(AsynchIoResult *result) {
-    {
-        ScopedLock<Mutex> l(completionLock);
-        if (working) {
-            completionQueue.push(result);
-            return;
-        }
-
-        // First thread in with something to do; note we're working then keep
-        // handling completions.
-        working = true;
-        while (result != 0) {
-            // New scope to unlock temporarily.
-            {
-                ScopedUnlock<Mutex> ul(completionLock);
-                AsynchReadResult *r = dynamic_cast<AsynchReadResult*>(result);
-                if (r != 0)
-                    readComplete(r);
-                else {
-                    AsynchWriteResult *w =
-                        dynamic_cast<AsynchWriteResult*>(result);
-                    if (w != 0)
-                        writeComplete(w);
-                    else {
-                        AsynchCallbackRequest *req =
-                          dynamic_cast<AsynchCallbackRequest*>(result);
-                        req->reqCallback(*this);
-                    }
-                }
-                delete result;
-                result = 0;
-                InterlockedDecrement(&opsInProgress);
-            }
-            // Lock is held again.
-            if (completionQueue.empty())
-                continue;
-            result = completionQueue.front();
-            completionQueue.pop();
-        }
-        working = false;
-    }
-    // Lock released; ok to close if ops are done and close requested.
-    // Layer above will call back to queueForDeletion() if it hasn't
-    // already been done. If it already has, go ahead and delete.
-    if (opsInProgress == 0) {
-        if (queuedClose)
-            // close() may cause a delete; don't trust 'this' on return
-            close();
-        else if (queuedDelete)
-            delete this;
-    }
-}
-
-} // namespace windows
-
-AsynchIO* qpid::sys::AsynchIO::create(const Socket& s,
-                                      AsynchIO::ReadCallback rCb,
-                                      AsynchIO::EofCallback eofCb,
-                                      AsynchIO::DisconnectCallback disCb,
-                                      AsynchIO::ClosedCallback cCb,
-                                      AsynchIO::BuffersEmptyCallback eCb,
-                                      AsynchIO::IdleCallback iCb)
-{
-    return new qpid::sys::windows::AsynchIO(s, rCb, eofCb, disCb, cCb, eCb, iCb);
-}
-
-}}  // namespace qpid::sys
diff --git a/cpp/src/qpid/sys/windows/Socket.cpp b/cpp/src/qpid/sys/windows/Socket.cpp
deleted file mode 100755
index 2ce274acc9..0000000000
--- a/cpp/src/qpid/sys/windows/Socket.cpp
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-// Ensure we get all of winsock2.h
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-#endif
-
-#include "qpid/sys/Socket.h"
-#include "qpid/sys/SocketAddress.h"
-#include "qpid/sys/windows/IoHandlePrivate.h"
-#include "qpid/sys/windows/check.h"
-#include "qpid/sys/Time.h"
-
-#include <cstdlib>
-#include <string.h>
-
-#include <winsock2.h>
-
-#include <boost/format.hpp>
-#include <boost/lexical_cast.hpp>
-
-// Need to initialize WinSock. Ideally, this would be a singleton or embedded
-// in some one-time initialization function. I tried boost singleton and could
-// not get it to compile (and others located in google had the same problem).
-// So, this simple static with an interlocked increment will do for known
-// use cases at this time. Since this will only shut down winsock at process
-// termination, there may be some problems with client programs that also
-// expect to load and unload winsock, but we'll see...
-// If someone does get an easy-to-use singleton sometime, converting to it
-// may be preferable.
-
-namespace {
-
-static LONG volatile initialized = 0;
-
-class WinSockSetup {
-    //  : public boost::details::pool::singleton_default<WinSockSetup> {
-
-public:
-    WinSockSetup() {
-        LONG timesEntered = InterlockedIncrement(&initialized);
-        if (timesEntered > 1)
-          return;
-        err = 0;
-        WORD wVersionRequested;
-        WSADATA wsaData;
-
-        /* Request WinSock 2.2 */
-        wVersionRequested = MAKEWORD(2, 2);
-        err = WSAStartup(wVersionRequested, &wsaData);
-    }
-
-    ~WinSockSetup() {
-        WSACleanup();
-    }
-
-public:
-    int error(void) const { return err; }
-
-protected:
-    DWORD err;
-};
-
-static WinSockSetup setup;
-
-} /* namespace */
-
-namespace qpid {
-namespace sys {
-
-namespace {
-
-std::string getName(SOCKET fd, bool local, bool includeService = false)
-{
-    sockaddr_in name; // big enough for any socket address    
-    socklen_t namelen = sizeof(name);
-    if (local) {
-        QPID_WINSOCK_CHECK(::getsockname(fd, (sockaddr*)&name, &namelen));
-    } else {
-        QPID_WINSOCK_CHECK(::getpeername(fd, (sockaddr*)&name, &namelen));
-    }
-
-    char servName[NI_MAXSERV];
-    char dispName[NI_MAXHOST];
-    if (includeService) {
-        if (int rc = ::getnameinfo((sockaddr*)&name, namelen,
-                                   dispName, sizeof(dispName), 
-                                   servName, sizeof(servName), 
-                                   NI_NUMERICHOST | NI_NUMERICSERV) != 0)
-            throw qpid::Exception(QPID_MSG(gai_strerror(rc)));
-        return std::string(dispName) + ":" + std::string(servName);
-    } else {
-        if (int rc = ::getnameinfo((sockaddr*)&name, namelen,
-                                   dispName, sizeof(dispName),
-                                   0, 0,
-                                   NI_NUMERICHOST) != 0)
-            throw qpid::Exception(QPID_MSG(gai_strerror(rc)));
-        return dispName;
-    }
-}
-
-std::string getService(SOCKET fd, bool local)
-{
-    sockaddr_in name; // big enough for any socket address    
-    socklen_t namelen = sizeof(name);
-    
-    if (local) {
-        QPID_WINSOCK_CHECK(::getsockname(fd, (sockaddr*)&name, &namelen));
-    } else {
-        QPID_WINSOCK_CHECK(::getpeername(fd, (sockaddr*)&name, &namelen));
-    }
-
-    char servName[NI_MAXSERV];
-    if (int rc = ::getnameinfo((sockaddr*)&name, namelen,
-                               0, 0, 
-                               servName, sizeof(servName), 
-                               NI_NUMERICHOST | NI_NUMERICSERV) != 0)
-        throw qpid::Exception(QPID_MSG(gai_strerror(rc)));
-    return servName;
-}
-}  // namespace
-
-Socket::Socket() :
-    IOHandle(new IOHandlePrivate),
-    nonblocking(false),
-    nodelay(false)
-{
-    SOCKET& socket = impl->fd;
-    if (socket != INVALID_SOCKET) Socket::close();
-    SOCKET s = ::socket (PF_INET, SOCK_STREAM, 0);
-    if (s == INVALID_SOCKET) throw QPID_WINDOWS_ERROR(WSAGetLastError());
-    socket = s;
-}
-
-Socket::Socket(IOHandlePrivate* h) :
-    IOHandle(h),
-    nonblocking(false),
-    nodelay(false)
-{}
-
-void
-Socket::createSocket(const SocketAddress& sa) const
-{
-    SOCKET& socket = impl->fd;
-    if (socket != INVALID_SOCKET) Socket::close();
-
-    SOCKET s = ::socket (getAddrInfo(sa).ai_family,
-                         getAddrInfo(sa).ai_socktype,
-                         0);
-    if (s == INVALID_SOCKET) throw QPID_WINDOWS_ERROR(WSAGetLastError());
-    socket = s;
-
-    try {
-        if (nonblocking) setNonblocking();
-        if (nodelay) setTcpNoDelay();
-    } catch (std::exception&) {
-        closesocket(s);
-        socket = INVALID_SOCKET;
-        throw;
-    }
-}
-
-void Socket::setTimeout(const Duration& interval) const
-{
-    const SOCKET& socket = impl->fd;
-    int64_t nanosecs = interval;
-    nanosecs /= (1000 * 1000); // nsecs -> usec -> msec
-    int msec = 0;
-    if (nanosecs > std::numeric_limits<int>::max())
-        msec = std::numeric_limits<int>::max();
-    else
-        msec = static_cast<int>(nanosecs);
-    setsockopt(socket, SOL_SOCKET, SO_SNDTIMEO, (char *)&msec, sizeof(msec));
-    setsockopt(socket, SOL_SOCKET, SO_RCVTIMEO, (char *)&msec, sizeof(msec));
-}
-
-void Socket::setNonblocking() const {
-    u_long nonblock = 1;
-    QPID_WINSOCK_CHECK(ioctlsocket(impl->fd, FIONBIO, &nonblock));
-}
-
-void Socket::connect(const std::string& host, uint16_t port) const
-{
-    SocketAddress sa(host, boost::lexical_cast<std::string>(port));
-    connect(sa);
-}
-
-void
-Socket::connect(const SocketAddress& addr) const
-{
-    const SOCKET& socket = impl->fd;
-    const addrinfo *addrs = &(getAddrInfo(addr));
-    int error = 0;
-    WSASetLastError(0);
-    while (addrs != 0) {
-        if ((::connect(socket, addrs->ai_addr, addrs->ai_addrlen) == 0) ||
-            (WSAGetLastError() == WSAEWOULDBLOCK))
-            break;
-        // Error... save this error code and see if there are other address
-        // to try before throwing the exception.
-        error = WSAGetLastError();
-        addrs = addrs->ai_next;
-    }
-    if (error)
-        throw qpid::Exception(QPID_MSG(strError(error) << ": " << connectname));
-}
-
-void
-Socket::close() const
-{
-    SOCKET& socket = impl->fd;
-    if (socket == INVALID_SOCKET) return;
-    QPID_WINSOCK_CHECK(closesocket(socket));
-    socket = INVALID_SOCKET;
-}
-
-
-int Socket::write(const void *buf, size_t count) const
-{
-    const SOCKET& socket = impl->fd;
-    int sent = ::send(socket, (const char *)buf, count, 0);
-    if (sent == SOCKET_ERROR)
-        return -1;
-    return sent;
-}
-
-int Socket::read(void *buf, size_t count) const
-{
-    const SOCKET& socket = impl->fd;
-    int received = ::recv(socket, (char *)buf, count, 0);
-    if (received == SOCKET_ERROR)
-        return -1;
-    return received;
-}
-
-int Socket::listen(uint16_t port, int backlog) const
-{
-    const SOCKET& socket = impl->fd;
-    BOOL yes=1;
-    QPID_WINSOCK_CHECK(setsockopt(socket, SOL_SOCKET, SO_REUSEADDR, (char *)&yes, sizeof(yes)));
-    struct sockaddr_in name;
-    memset(&name, 0, sizeof(name));
-    name.sin_family = AF_INET;
-    name.sin_port = htons(port);
-    name.sin_addr.s_addr = 0;
-    if (::bind(socket, (struct sockaddr*)&name, sizeof(name)) == SOCKET_ERROR)
-        throw Exception(QPID_MSG("Can't bind to port " << port << ": " << strError(WSAGetLastError())));
-    if (::listen(socket, backlog) == SOCKET_ERROR)
-        throw Exception(QPID_MSG("Can't listen on port " << port << ": " << strError(WSAGetLastError())));
-    
-    socklen_t namelen = sizeof(name);
-    QPID_WINSOCK_CHECK(::getsockname(socket, (struct sockaddr*)&name, &namelen));
-    return ntohs(name.sin_port);
-}
-
-Socket* Socket::accept() const
-{
-  SOCKET afd = ::accept(impl->fd, 0, 0);
-    if (afd != INVALID_SOCKET)
-        return new Socket(new IOHandlePrivate(afd));
-    else if (WSAGetLastError() == EAGAIN)
-        return 0;
-    else throw QPID_WINDOWS_ERROR(WSAGetLastError());
-}
-
-std::string Socket::getSockname() const
-{
-    return getName(impl->fd, true);
-}
-
-std::string Socket::getPeername() const
-{
-    return getName(impl->fd, false);
-}
-
-std::string Socket::getPeerAddress() const
-{
-    if (!connectname.empty())
-        return std::string (connectname);
-    return getName(impl->fd, false, true);
-}
-
-std::string Socket::getLocalAddress() const
-{
-    return getName(impl->fd, true, true);
-}
-
-uint16_t Socket::getLocalPort() const
-{
-    return atoi(getService(impl->fd, true).c_str());
-}
-
-uint16_t Socket::getRemotePort() const
-{
-    return atoi(getService(impl->fd, true).c_str());
-}
-
-int Socket::getError() const
-{
-    int       result;
-    socklen_t rSize = sizeof (result);
-
-    QPID_WINSOCK_CHECK(::getsockopt(impl->fd, SOL_SOCKET, SO_ERROR, (char *)&result, &rSize));
-    return result;
-}
-
-void Socket::setTcpNoDelay() const
-{
-    int flag = 1;
-    int result = setsockopt(impl->fd,
-                            IPPROTO_TCP,
-                            TCP_NODELAY,
-                            (char *)&flag,
-                            sizeof(flag));
-    QPID_WINSOCK_CHECK(result);
-    nodelay = true;
-}
-
-inline IOHandlePrivate* IOHandlePrivate::getImpl(const qpid::sys::IOHandle &h)
-{
-    return h.impl;
-}
-
-SOCKET toSocketHandle(const Socket& s)
-{
-    return IOHandlePrivate::getImpl(s)->fd;
-}
-
-}} // namespace qpid::sys
diff --git a/cpp/src/qpid/sys/windows/SocketAddress.cpp b/cpp/src/qpid/sys/windows/SocketAddress.cpp
deleted file mode 100644
index 5efdad0183..0000000000
--- a/cpp/src/qpid/sys/windows/SocketAddress.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-// Ensure we get all of winsock2.h
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-#endif
-
-#include "qpid/sys/SocketAddress.h"
-
-#include "qpid/sys/windows/check.h"
-
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <string.h>
-
-namespace qpid {
-namespace sys {
-
-SocketAddress::SocketAddress(const std::string& host0, const std::string& port0) :
-    host(host0),
-    port(port0),
-    addrInfo(0)
-{
-    ::addrinfo hints;
-    ::memset(&hints, 0, sizeof(hints));
-    hints.ai_family = AF_INET; // In order to allow AF_INET6 we'd have to change createTcp() as well
-    hints.ai_socktype = SOCK_STREAM;
-
-    const char* node = 0;
-    if (host.empty()) {
-        hints.ai_flags |= AI_PASSIVE;
-    } else {
-        node = host.c_str();
-    }
-    const char* service = port.empty() ? "0" : port.c_str();
-
-    int n = ::getaddrinfo(node, service, &hints, &addrInfo);
-    if (n != 0)
-        throw Exception(QPID_MSG("Cannot resolve " << host << ": " << ::gai_strerror(n)));
-}
-
-SocketAddress::~SocketAddress()
-{
-    ::freeaddrinfo(addrInfo);
-}
-
-std::string SocketAddress::asString() const
-{
-    return host + ":" + port;
-}
-
-const ::addrinfo& getAddrInfo(const SocketAddress& sa)
-{
-    return *sa.addrInfo;
-}
-
-}}
diff --git a/cpp/src/tests/ClientSessionTest.cpp b/cpp/src/tests/ClientSessionTest.cpp
deleted file mode 100644
index 939f8f2b88..0000000000
--- a/cpp/src/tests/ClientSessionTest.cpp
+++ /dev/null
@@ -1,677 +0,0 @@
-/*
- *
- * 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.
- *
- */
-#include "unit_test.h"
-#include "test_tools.h"
-#include "BrokerFixture.h"
-#include "qpid/client/QueueOptions.h"
-#include "qpid/client/MessageListener.h"
-#include "qpid/client/SubscriptionManager.h"
-#include "qpid/client/AsyncSession.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/sys/Thread.h"
-#include "qpid/sys/Runnable.h"
-#include "qpid/sys/Time.h"
-#include "qpid/client/Session.h"
-#include "qpid/client/Message.h"
-#include "qpid/framing/reply_exceptions.h"
-
-#include <boost/optional.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/bind.hpp>
-#include <boost/ptr_container/ptr_vector.hpp>
-
-#include <vector>
-
-namespace qpid {
-namespace tests {
-
-QPID_AUTO_TEST_SUITE(ClientSessionTest)
-
-using namespace qpid::client;
-using namespace qpid::framing;
-using namespace qpid;
-using qpid::sys::Monitor;
-using qpid::sys::Thread;
-using qpid::sys::TIME_SEC;
-using qpid::broker::Broker;
-using std::string;
-using std::cout;
-using std::endl;
-
-
-struct DummyListener : public sys::Runnable, public MessageListener {
-    std::vector<Message> messages;
-    string name;
-    uint expected;
-    SubscriptionManager submgr;
-
-    DummyListener(Session& session, const string& n, uint ex) :
-        name(n), expected(ex), submgr(session) {}
-
-    void run()
-    {
-        submgr.subscribe(*this, name);
-        submgr.run();
-    }
-
-    void received(Message& msg)
-    {
-        messages.push_back(msg);
-        if (--expected == 0) {
-            submgr.stop();
-        }
-    }
-};
-
-struct SimpleListener : public MessageListener
-{
-    Monitor lock;
-    std::vector<Message> messages;
-
-    void received(Message& msg)
-    {
-        Monitor::ScopedLock l(lock);
-        messages.push_back(msg);
-        lock.notifyAll();
-    }
-
-    void waitFor(const uint n)
-    {
-        Monitor::ScopedLock l(lock);
-        while (messages.size() < n) {
-            lock.wait();
-        }
-    }
-};
-
-struct ClientSessionFixture : public ProxySessionFixture
-{
-    ClientSessionFixture(Broker::Options opts = Broker::Options()) : ProxySessionFixture(opts) {
-        session.queueDeclare(arg::queue="my-queue");
-    }
-};
-
-QPID_AUTO_TEST_CASE(testQueueQuery) {
-    ClientSessionFixture fix;
-    fix.session = fix.connection.newSession();
-    fix.session.queueDeclare(arg::queue="q", arg::alternateExchange="amq.fanout",
-                             arg::exclusive=true, arg::autoDelete=true);
-    QueueQueryResult result = fix.session.queueQuery("q");
-    BOOST_CHECK_EQUAL(false, result.getDurable());
-    BOOST_CHECK_EQUAL(true, result.getExclusive());
-    BOOST_CHECK_EQUAL("amq.fanout", result.getAlternateExchange());
-}
-
-QPID_AUTO_TEST_CASE(testDispatcher)
-{
-    ClientSessionFixture fix;
-    fix.session =fix.connection.newSession();
-    size_t count = 100;
-    for (size_t i = 0; i < count; ++i)
-        fix.session.messageTransfer(arg::content=Message(boost::lexical_cast<string>(i), "my-queue"));
-    DummyListener listener(fix.session, "my-queue", count);
-    listener.run();
-    BOOST_CHECK_EQUAL(count, listener.messages.size());
-    for (size_t i = 0; i < count; ++i)
-        BOOST_CHECK_EQUAL(boost::lexical_cast<string>(i), listener.messages[i].getData());
-}
-
-QPID_AUTO_TEST_CASE(testDispatcherThread)
-{
-    ClientSessionFixture fix;
-    fix.session =fix.connection.newSession();
-    size_t count = 10;
-    DummyListener listener(fix.session, "my-queue", count);
-    sys::Thread t(listener);
-    for (size_t i = 0; i < count; ++i) {
-        fix.session.messageTransfer(arg::content=Message(boost::lexical_cast<string>(i), "my-queue"));
-    }
-    t.join();
-    BOOST_CHECK_EQUAL(count, listener.messages.size());
-    for (size_t i = 0; i < count; ++i)
-        BOOST_CHECK_EQUAL(boost::lexical_cast<string>(i), listener.messages[i].getData());
-}
-
-// FIXME aconway 2009-06-17: test for unimplemented feature, enable when implemented.
-void testSuspend0Timeout() {
-    ClientSessionFixture fix;
-    fix.session.suspend();  // session has 0 timeout.
-    try {
-        fix.connection.resume(fix.session);
-        BOOST_FAIL("Expected InvalidArgumentException.");
-    } catch(const InternalErrorException&) {}
-}
-
-QPID_AUTO_TEST_CASE(testUseSuspendedError)
-{
-    ClientSessionFixture fix;
-    fix.session.timeout(60);
-    fix.session.suspend();
-    try {
-        fix.session.exchangeQuery(arg::exchange="amq.fanout");
-        BOOST_FAIL("Expected session suspended exception");
-    } catch(const NotAttachedException&) {}
-}
-
-// FIXME aconway 2009-06-17: test for unimplemented feature, enable when implemented.
-void testSuspendResume() {
-    ClientSessionFixture fix;
-    fix.session.timeout(60);
-    fix.session.suspend();
-    // Make sure we are still subscribed after resume.
-    fix.connection.resume(fix.session);
-    fix.session.messageTransfer(arg::content=Message("my-message", "my-queue"));
-    BOOST_CHECK_EQUAL("my-message", fix.subs.get("my-queue", TIME_SEC).getData());
-}
-
-
-QPID_AUTO_TEST_CASE(testSendToSelf) {
-    ClientSessionFixture fix;
-    SimpleListener mylistener;
-    fix.session.queueDeclare(arg::queue="myq", arg::exclusive=true, arg::autoDelete=true);
-    fix.subs.subscribe(mylistener, "myq");
-    sys::Thread runner(fix.subs);//start dispatcher thread
-    string data("msg");
-    Message msg(data, "myq");
-    const uint count=10;
-    for (uint i = 0; i < count; ++i) {
-        fix.session.messageTransfer(arg::content=msg);
-    }
-    mylistener.waitFor(count);
-    fix.subs.cancel("myq");
-    fix.subs.stop();
-    runner.join();
-    fix.session.close();
-    BOOST_CHECK_EQUAL(mylistener.messages.size(), count);
-    for (uint j = 0; j < count; ++j) {
-        BOOST_CHECK_EQUAL(mylistener.messages[j].getData(), data);
-    }
-}
-
-QPID_AUTO_TEST_CASE(testLocalQueue) {
-    ClientSessionFixture fix;
-    fix.session.queueDeclare(arg::queue="lq", arg::exclusive=true, arg::autoDelete=true);
-    LocalQueue lq;
-    fix.subs.subscribe(lq, "lq", FlowControl(2, FlowControl::UNLIMITED, false));
-    fix.session.messageTransfer(arg::content=Message("foo0", "lq"));
-    fix.session.messageTransfer(arg::content=Message("foo1", "lq"));
-    fix.session.messageTransfer(arg::content=Message("foo2", "lq"));
-    BOOST_CHECK_EQUAL("foo0", lq.pop().getData());
-    BOOST_CHECK_EQUAL("foo1", lq.pop().getData());
-    BOOST_CHECK(lq.empty());    // Credit exhausted.
-    fix.subs.getSubscription("lq").setFlowControl(FlowControl::unlimited());
-    BOOST_CHECK_EQUAL("foo2", lq.pop().getData());
-}
-
-struct DelayedTransfer : sys::Runnable
-{
-    ClientSessionFixture& fixture;
-
-    DelayedTransfer(ClientSessionFixture& f) : fixture(f) {}
-
-    void run()
-    {
-        qpid::sys::sleep(1);
-        fixture.session.messageTransfer(arg::content=Message("foo2", "getq"));
-    }
-};
-
-QPID_AUTO_TEST_CASE(testGet) {
-    ClientSessionFixture fix;
-    fix.session.queueDeclare(arg::queue="getq", arg::exclusive=true, arg::autoDelete=true);
-    fix.session.messageTransfer(arg::content=Message("foo0", "getq"));
-    fix.session.messageTransfer(arg::content=Message("foo1", "getq"));
-    Message got;
-    BOOST_CHECK(fix.subs.get(got, "getq", TIME_SEC));
-    BOOST_CHECK_EQUAL("foo0", got.getData());
-    BOOST_CHECK(fix.subs.get(got, "getq", TIME_SEC));
-    BOOST_CHECK_EQUAL("foo1", got.getData());
-    BOOST_CHECK(!fix.subs.get(got, "getq"));
-    DelayedTransfer sender(fix);
-    Thread t(sender);
-    //test timed get where message shows up after a short delay
-    BOOST_CHECK(fix.subs.get(got, "getq", 5*TIME_SEC));
-    BOOST_CHECK_EQUAL("foo2", got.getData());
-    t.join();
-}
-
-QPID_AUTO_TEST_CASE(testOpenFailure) {
-    BrokerFixture b;
-    Connection c;
-    string host("unknowable-host");
-    try {
-        c.open(host);
-    } catch (const Exception&) {
-        BOOST_CHECK(!c.isOpen());
-    }
-    b.open(c);
-    BOOST_CHECK(c.isOpen());
-    c.close();
-    BOOST_CHECK(!c.isOpen());
-}
-
-QPID_AUTO_TEST_CASE(testPeriodicExpiration) {
-    Broker::Options opts;
-    opts.queueCleanInterval = 1;
-    ClientSessionFixture fix(opts);
-    fix.session.queueDeclare(arg::queue="my-queue", arg::exclusive=true, arg::autoDelete=true);
-
-    for (uint i = 0; i < 10; i++) {
-        Message m((boost::format("Message_%1%") % (i+1)).str(), "my-queue");
-        if (i % 2) m.getDeliveryProperties().setTtl(500);
-        fix.session.messageTransfer(arg::content=m);
-    }
-
-    BOOST_CHECK_EQUAL(fix.session.queueQuery(string("my-queue")).getMessageCount(), 10u);
-    qpid::sys::sleep(2);
-    BOOST_CHECK_EQUAL(fix.session.queueQuery(string("my-queue")).getMessageCount(), 5u);
-}
-
-QPID_AUTO_TEST_CASE(testExpirationOnPop) {
-    ClientSessionFixture fix;
-    fix.session.queueDeclare(arg::queue="my-queue", arg::exclusive=true, arg::autoDelete=true);
-
-    for (uint i = 0; i < 10; i++) {
-        Message m((boost::format("Message_%1%") % (i+1)).str(), "my-queue");
-        if (i % 2) m.getDeliveryProperties().setTtl(200);
-        fix.session.messageTransfer(arg::content=m);
-    }
-
-    qpid::sys::usleep(300* 1000);
-
-    for (uint i = 0; i < 10; i++) {
-        if (i % 2) continue;
-        Message m;
-        BOOST_CHECK(fix.subs.get(m, "my-queue", TIME_SEC));
-        BOOST_CHECK_EQUAL((boost::format("Message_%1%") % (i+1)).str(), m.getData());
-    }
-}
-
-QPID_AUTO_TEST_CASE(testRelease) {
-    ClientSessionFixture fix;
-
-    const uint count=10;
-    for (uint i = 0; i < count; i++) {
-        Message m((boost::format("Message_%1%") % (i+1)).str(), "my-queue");
-        fix.session.messageTransfer(arg::content=m);
-    }
-
-    fix.subs.setAutoStop(false);
-    fix.subs.start();
-    SubscriptionSettings settings;
-    settings.autoAck = 0;
-
-    SimpleListener l1;
-    Subscription s1 = fix.subs.subscribe(l1, "my-queue", settings);
-    l1.waitFor(count);
-    s1.cancel();
-
-    for (uint i = 0; i < count; i++) {
-        BOOST_CHECK_EQUAL((boost::format("Message_%1%") % (i+1)).str(), l1.messages[i].getData());
-    }
-    s1.release(s1.getUnaccepted());
-
-    //check that released messages are redelivered
-    settings.autoAck = 1;
-    SimpleListener l2;
-    Subscription s2 = fix.subs.subscribe(l2, "my-queue", settings);
-    l2.waitFor(count);
-    for (uint i = 0; i < count; i++) {
-        BOOST_CHECK_EQUAL((boost::format("Message_%1%") % (i+1)).str(), l2.messages[i].getData());
-    }
-
-    fix.subs.stop();
-    fix.subs.wait();
-    fix.session.close();
-}
-
-QPID_AUTO_TEST_CASE(testCompleteOnAccept) {
-    ClientSessionFixture fix;
-    const uint count = 8;
-    const uint chunk = 4;
-    for (uint i = 0; i < count; i++) {
-        Message m((boost::format("Message_%1%") % (i+1)).str(), "my-queue");
-        fix.session.messageTransfer(arg::content=m);
-    }
-
-    SubscriptionSettings settings;
-    settings.autoAck = 0;
-    settings.completionMode = COMPLETE_ON_ACCEPT;
-    settings.flowControl = FlowControl::messageWindow(chunk);
-
-    LocalQueue q;
-    Subscription s = fix.subs.subscribe(q, "my-queue", settings);
-    fix.session.messageFlush(arg::destination=s.getName());
-    SequenceSet accepted;
-    for (uint i = 0; i < chunk; i++) {
-        Message m;
-        BOOST_CHECK(q.get(m));
-        BOOST_CHECK_EQUAL((boost::format("Message_%1%") % (i+1)).str(), m.getData());
-        accepted.add(m.getId());
-    }
-    Message m;
-    BOOST_CHECK(!q.get(m));
-
-    s.accept(accepted);
-    fix.session.messageFlush(arg::destination=s.getName());
-    accepted.clear();
-
-    for (uint i = chunk; i < count; i++) {
-        Message m;
-        BOOST_CHECK(q.get(m));
-        BOOST_CHECK_EQUAL((boost::format("Message_%1%") % (i+1)).str(), m.getData());
-        accepted.add(m.getId());
-    }
-    fix.session.messageAccept(accepted);
-}
-
-namespace
-{
-struct Publisher : qpid::sys::Runnable
-{
-    AsyncSession session;
-    Message message;
-    uint count;
-    Thread thread;
-
-    Publisher(Connection& con, Message m, uint c) : session(con.newSession()), message(m), count(c) {}
-
-    void start()
-    {
-        thread = Thread(*this);
-    }
-
-    void join()
-    {
-        thread.join();
-    }
-
-    void run()
-    {
-        for (uint i = 0; i < count; i++) {
-            session.messageTransfer(arg::content=message);
-        }
-        session.sync();
-        session.close();
-    }
-};
-}
-
-QPID_AUTO_TEST_CASE(testConcurrentSenders)
-{
-    //Ensure concurrent publishing sessions on a connection don't
-    //cause assertions, deadlocks or other undesirables:
-    BrokerFixture fix;
-    Connection connection;
-    ConnectionSettings settings;
-    settings.maxFrameSize = 1024;
-    settings.port = fix.broker->getPort(qpid::broker::Broker::TCP_TRANSPORT);
-    connection.open(settings);
-    AsyncSession session = connection.newSession();
-    Message message(string(512, 'X'));
-
-    boost::ptr_vector<Publisher> publishers;
-    for (size_t i = 0; i < 5; i++) {
-        publishers.push_back(new Publisher(connection, message, 100));
-    }
-    std::for_each(publishers.begin(), publishers.end(), boost::bind(&Publisher::start, _1));
-    std::for_each(publishers.begin(), publishers.end(), boost::bind(&Publisher::join, _1));
-    connection.close();
-}
-
-
-QPID_AUTO_TEST_CASE(testExclusiveSubscribe)
-{
-    ClientSessionFixture fix;
-    fix.session.queueDeclare(arg::queue="myq", arg::exclusive=true, arg::autoDelete=true);
-    SubscriptionSettings settings;
-    settings.exclusive = true;
-    LocalQueue q;
-    fix.subs.subscribe(q, "myq", settings, "first");
-    //attempt to create new subscriber should fail
-    ScopedSuppressLogging sl;
-    BOOST_CHECK_THROW(fix.subs.subscribe(q, "myq", "second"), ResourceLockedException);
-    ;
-
-}
-
-QPID_AUTO_TEST_CASE(testExclusiveBinding) {
-    FieldTable options;
-    options.setString("qpid.exclusive-binding", "anything");
-    ClientSessionFixture fix;
-    fix.session.queueDeclare(arg::queue="queue-1", arg::exclusive=true, arg::autoDelete=true);
-    fix.session.queueDeclare(arg::queue="queue-2", arg::exclusive=true, arg::autoDelete=true);
-    fix.session.exchangeBind(arg::exchange="amq.direct", arg::queue="queue-1", arg::bindingKey="my-key", arg::arguments=options);
-    fix.session.messageTransfer(arg::destination="amq.direct", arg::content=Message("message1", "my-key"));
-    fix.session.exchangeBind(arg::exchange="amq.direct", arg::queue="queue-2", arg::bindingKey="my-key", arg::arguments=options);
-    fix.session.messageTransfer(arg::destination="amq.direct", arg::content=Message("message2", "my-key"));
-
-    Message got;
-    BOOST_CHECK(fix.subs.get(got, "queue-1"));
-    BOOST_CHECK_EQUAL("message1", got.getData());
-    BOOST_CHECK(!fix.subs.get(got, "queue-1"));
-
-    BOOST_CHECK(fix.subs.get(got, "queue-2"));
-    BOOST_CHECK_EQUAL("message2", got.getData());
-    BOOST_CHECK(!fix.subs.get(got, "queue-2"));
-}
-
-QPID_AUTO_TEST_CASE(testResubscribeWithLocalQueue) {
-    ClientSessionFixture fix;
-    fix.session.queueDeclare(arg::queue="some-queue", arg::exclusive=true, arg::autoDelete=true);
-    LocalQueue p, q;
-    fix.subs.subscribe(p, "some-queue");
-    fix.subs.cancel("some-queue");
-    fix.subs.subscribe(q, "some-queue");
-
-    fix.session.messageTransfer(arg::content=Message("some-data", "some-queue"));
-    fix.session.messageFlush(arg::destination="some-queue");
-
-    Message got;
-    BOOST_CHECK(!p.get(got));
-
-    BOOST_CHECK(q.get(got));
-    BOOST_CHECK_EQUAL("some-data", got.getData());
-    BOOST_CHECK(!q.get(got));
-}
-
-QPID_AUTO_TEST_CASE(testReliableDispatch) {
-    ClientSessionFixture fix;
-    std::string queue("a-queue");
-    fix.session.queueDeclare(arg::queue=queue, arg::autoDelete=true);
-
-    ConnectionSettings settings;
-    settings.port = fix.broker->getPort(qpid::broker::Broker::TCP_TRANSPORT);
-
-    Connection c1;
-    c1.open(settings);
-    Session s1 = c1.newSession();
-    SubscriptionManager subs1(s1);
-    LocalQueue q1;
-    subs1.subscribe(q1, queue, FlowControl());//first subscriber has no credit
-
-    Connection c2;
-    c2.open(settings);
-    Session s2 = c2.newSession();
-    SubscriptionManager subs2(s2);
-    LocalQueue q2;
-    subs2.subscribe(q2, queue);//second subscriber has credit
-
-    fix.session.messageTransfer(arg::content=Message("my-message", queue));
-
-    //check that the second consumer gets the message
-    Message got;
-    BOOST_CHECK(q2.get(got, 1*TIME_SEC));
-    BOOST_CHECK_EQUAL("my-message", got.getData());
-
-    c1.close();
-    c2.close();
-}
-
-QPID_AUTO_TEST_CASE(testSessionCloseOnInvalidSession) {
-    Session session;
-    session.close();
-}
-
-QPID_AUTO_TEST_CASE(testLVQVariedSize) {
-    ClientSessionFixture fix;
-    std::string queue("my-lvq");
-    QueueOptions args;
-    args.setOrdering(LVQ_NO_BROWSE);
-    fix.session.queueDeclare(arg::queue=queue, arg::exclusive=true, arg::autoDelete=true, arg::arguments=args);
-
-    std::string key;
-    args.getLVQKey(key);
-
-    for (size_t i = 0; i < 10; i++) {
-        std::ostringstream data;
-        size_t size = 100 - ((i % 10) * 10);
-        data << std::string(size, 'x');
-
-        Message m(data.str(), queue);
-        m.getHeaders().setString(key, "abc");
-        fix.session.messageTransfer(arg::content=m);
-    }
-}
-
-QPID_AUTO_TEST_CASE(testSessionManagerSetFlowControl) {
-    ClientSessionFixture fix;
-    std::string name("dummy");
-    LocalQueue queue;
-    SubscriptionSettings settings;
-    settings.flowControl = FlowControl();
-    fix.session.queueDeclare(arg::queue=name, arg::exclusive=true, arg::autoDelete=true);
-    fix.subs.subscribe(queue, name, settings);
-    fix.session.messageTransfer(arg::content=Message("my-message", name));
-    fix.subs.setFlowControl(name, 1, FlowControl::UNLIMITED, false);
-    fix.session.messageFlush(name);
-    Message got;
-    BOOST_CHECK(queue.get(got, 0));
-    BOOST_CHECK_EQUAL("my-message", got.getData());
-}
-
-QPID_AUTO_TEST_CASE(testGetThenSubscribe) {
-    ClientSessionFixture fix;
-    std::string name("myqueue");
-    fix.session.queueDeclare(arg::queue=name, arg::exclusive=true, arg::autoDelete=true);
-    fix.session.messageTransfer(arg::content=Message("one", name));
-    fix.session.messageTransfer(arg::content=Message("two", name));
-    Message got;
-    BOOST_CHECK(fix.subs.get(got, name));
-    BOOST_CHECK_EQUAL("one", got.getData());
-
-    DummyListener listener(fix.session, name, 1);
-    listener.run();
-    BOOST_CHECK_EQUAL(1u, listener.messages.size());
-    if (!listener.messages.empty()) {
-        BOOST_CHECK_EQUAL("two", listener.messages[0].getData());
-    }
-}
-
-QPID_AUTO_TEST_CASE(testSessionIsValid) {
-    ClientSessionFixture fix;
-    BOOST_CHECK(fix.session.isValid());
-    Session session;
-    BOOST_CHECK(!session.isValid());
-}
-
-QPID_AUTO_TEST_CASE(testExpirationNotAltered) {
-    ClientSessionFixture fix;
-    fix.session.queueDeclare(arg::queue="my-queue", arg::exclusive=true, arg::autoDelete=true);
-
-    Message m("my-message", "my-queue");
-    m.getDeliveryProperties().setTtl(60000);
-    m.getDeliveryProperties().setExpiration(12345);
-    fix.session.messageTransfer(arg::content=m);
-    Message got;
-    BOOST_CHECK(fix.subs.get(got, "my-queue"));
-    BOOST_CHECK_EQUAL("my-message", got.getData());
-    BOOST_CHECK_EQUAL(12345u, got.getDeliveryProperties().getExpiration());
-}
-
-QPID_AUTO_TEST_CASE(testGetConnectionFromSession) {
-    ClientSessionFixture fix;
-    FieldTable options;
-    options.setInt("no-local", 1);
-    fix.session.queueDeclare(arg::queue="a", arg::exclusive=true, arg::autoDelete=true, arg::arguments=options);
-    fix.session.queueDeclare(arg::queue="b", arg::exclusive=true, arg::autoDelete=true);
-
-    Connection c = fix.session.getConnection();
-    Session s = c.newSession();
-    //If this new session was created as expected on the same connection as
-    //fix.session, then the no-local behaviour means that queue 'a'
-    //will not enqueue messages from this new session but queue 'b'
-    //will.
-    s.messageTransfer(arg::content=Message("a", "a"));
-    s.messageTransfer(arg::content=Message("b", "b"));
-
-    Message got;
-    BOOST_CHECK(fix.subs.get(got, "b"));
-    BOOST_CHECK_EQUAL("b", got.getData());
-    BOOST_CHECK(!fix.subs.get(got, "a"));
-}
-
-
-QPID_AUTO_TEST_CASE(testQueueDeleted)
-{
-    ClientSessionFixture fix;
-    fix.session.queueDeclare(arg::queue="my-queue");
-    LocalQueue queue;
-    fix.subs.subscribe(queue, "my-queue");
-    
-    ScopedSuppressLogging sl;
-    fix.session.queueDelete(arg::queue="my-queue");
-    BOOST_CHECK_THROW(queue.get(1*qpid::sys::TIME_SEC), qpid::framing::ResourceDeletedException);
-}
-
-QPID_AUTO_TEST_CASE(testTtl)
-{
-    const uint64_t ms = 1000ULL;           // convert sec to ms
-    const uint64_t us = 1000ULL * 1000ULL; // convert sec to us
-
-    ClientSessionFixture fix;
-    fix.session.queueDeclare(arg::queue="ttl-test", arg::exclusive=true, arg::autoDelete=true);
-    Message msg1 = Message("AAA", "ttl-test");
-    uint64_t ttl = 2 * ms; // 2 sec
-    msg1.getDeliveryProperties().setTtl(ttl);
-    Connection c = fix.session.getConnection();
-    Session s = c.newSession();
-    s.messageTransfer(arg::content=msg1);
-
-    Message msg2 = Message("BBB", "ttl-test");
-    ttl = 10 * ms; // 10 sec
-    msg2.getDeliveryProperties().setTtl(ttl);
-    s.messageTransfer(arg::content=msg2);
-
-    qpid::sys::usleep(5 * us); // 5 sec
-
-    // Message "AAA" should be expired and never be delivered
-    // Check "BBB" has ttl somewhere between 1 and 5 secs
-    Message got;
-    BOOST_CHECK(fix.subs.get(got, "ttl-test"));
-    BOOST_CHECK_EQUAL("BBB", got.getData());
-    BOOST_CHECK(got.getDeliveryProperties().getTtl() > 1 * ms);
-    BOOST_CHECK(got.getDeliveryProperties().getTtl() < ttl - (5 * ms));
-}
-
-QPID_AUTO_TEST_SUITE_END()
-
-}} // namespace qpid::tests
diff --git a/cpp/src/tests/SocketProxy.h b/cpp/src/tests/SocketProxy.h
deleted file mode 100644
index 0c6f39d62e..0000000000
--- a/cpp/src/tests/SocketProxy.h
+++ /dev/null
@@ -1,181 +0,0 @@
-#ifndef SOCKETPROXY_H
-#define SOCKETPROXY_H
-
-/*
- * 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.
- *
- */
-
-#include "qpid/sys/IOHandle.h"
-#ifdef _WIN32
-#  include "qpid/sys/windows/IoHandlePrivate.h"
-   typedef SOCKET FdType;
-#else
-#  include "qpid/sys/posix/PrivatePosix.h"
-   typedef int FdType;
-#endif
-#include "qpid/sys/Socket.h"
-#include "qpid/sys/Runnable.h"
-#include "qpid/sys/Thread.h"
-#include "qpid/sys/Mutex.h"
-#include "qpid/log/Statement.h"
-
-namespace qpid {
-namespace tests {
-
-/**
- * A simple socket proxy that forwards to another socket.
- * Used between client & local broker to simulate network failures.
- */
-class SocketProxy : private qpid::sys::Runnable
-{
-    // Need a Socket we can get the fd from
-    class LowSocket : public qpid::sys::Socket {
-    public:
-#ifdef _WIN32
-        FdType getFd() { return toSocketHandle(*this); }
-#else
-        FdType getFd() { return toFd(impl); }
-#endif
-    };
-
-  public:
-    /** Connect to connectPort on host, start a forwarding thread.
-     * Listen for connection on getPort().
-     */
-    SocketProxy(int connectPort, const std::string host="localhost")
-      : closed(false), joined(true),
-        port(listener.listen()), dropClient(), dropServer()
-    {
-        client.connect(host, connectPort);
-        joined = false;
-        thread = qpid::sys::Thread(static_cast<qpid::sys::Runnable*>(this));
-    }
-
-      ~SocketProxy() { close(); if (!joined) thread.join(); }
-
-    /** Simulate a network disconnect. */
-    void close() {
-        {
-            qpid::sys::Mutex::ScopedLock l(lock);
-            if (closed) { return; }
-            closed=true;
-        }
-        if (thread && thread != qpid::sys::Thread::current()) {
-            thread.join();
-            joined = true;
-        }
-        client.close();
-    }
-
-    /** Simulate lost packets, drop data from client */
-    void dropClientData(bool drop=true) { dropClient=drop; }
-
-    /** Simulate lost packets, drop data from server */
-    void dropServerData(bool drop=true) { dropServer=drop; }
-
-    bool isClosed() const {
-        qpid::sys::Mutex::ScopedLock l(lock);
-        return closed;
-    }
-
-    uint16_t getPort() const { return port; }
-
-  private:
-    static void throwErrno(const std::string& msg) {
-        throw qpid::Exception(msg+":"+qpid::sys::strError(errno));
-    }
-    static void throwIf(bool condition, const std::string& msg) {
-        if (condition) throw qpid::Exception(msg);
-    }
-
-    void run() {
-        std::auto_ptr<LowSocket> server;
-        try {
-            fd_set socks;
-            FdType maxFd = listener.getFd();
-            struct timeval tmo;
-            for (;;) {
-                FD_ZERO(&socks);
-                FD_SET(maxFd, &socks);
-                tmo.tv_sec = 0;
-                tmo.tv_usec = 500 * 1000;
-                if (select(maxFd+1, &socks, 0, 0, &tmo) == 0) {
-                    qpid::sys::Mutex::ScopedLock l(lock);
-                    throwIf(closed, "SocketProxy: Closed by close()");
-                    continue;
-                }
-                throwIf(!FD_ISSET(maxFd, &socks), "SocketProxy: Accept failed");
-                break;   // Accept ready... go to next step
-            }
-            server.reset(reinterpret_cast<LowSocket *>(listener.accept()));
-            maxFd = server->getFd();
-            if (client.getFd() > maxFd)
-                maxFd = client.getFd();
-            char buffer[1024];
-            for (;;) {
-                FD_ZERO(&socks);
-                tmo.tv_sec = 0;
-                tmo.tv_usec = 500 * 1000;
-                FD_SET(client.getFd(), &socks);
-                FD_SET(server->getFd(), &socks);
-                if (select(maxFd+1, &socks, 0, 0, &tmo) == 0) {
-                    qpid::sys::Mutex::ScopedLock l(lock);
-                    throwIf(closed, "SocketProxy: Closed by close()");
-                    continue;
-                }
-                // Something is set; relay data as needed until something closes
-                if (FD_ISSET(server->getFd(), &socks)) {
-                    int n = server->read(buffer, sizeof(buffer));
-                    throwIf(n <= 0, "SocketProxy: server disconnected");
-                    if (!dropServer) client.write(buffer, n);
-                }
-                if (FD_ISSET(client.getFd(), &socks)) {
-                    int n = client.read(buffer, sizeof(buffer));
-                    throwIf(n <= 0, "SocketProxy: client disconnected");
-                    if (!dropServer) server->write(buffer, n);
-                }
-                if (!FD_ISSET(client.getFd(), &socks) &&
-                    !FD_ISSET(server->getFd(), &socks))
-                    throwIf(true, "SocketProxy: No handle ready");
-            }
-        }
-        catch (const std::exception& e) {
-            QPID_LOG(debug, "SocketProxy::run exception: " << e.what());
-        }
-        try {
-            if (server.get()) server->close();
-            close();
-        }
-        catch (const std::exception& e) {
-            QPID_LOG(debug, "SocketProxy::run exception in client/server close()" << e.what());
-        }
-    }
-
-    mutable qpid::sys::Mutex lock;
-    mutable bool closed;
-    bool joined;
-    LowSocket client, listener;
-    uint16_t port;
-    qpid::sys::Thread thread;
-    bool dropClient, dropServer;
-};
-
-}} // namespace qpid::tests
-
-#endif
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
deleted file mode 100644
index ab59fee020..0000000000
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
+++ /dev/null
@@ -1,1493 +0,0 @@
-/*
-*
- * 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.
- *
- */
-package org.apache.qpid.client;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.ConnectException;
-import java.net.UnknownHostException;
-import java.nio.channels.UnresolvedAddressException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-import javax.jms.ConnectionConsumer;
-import javax.jms.ConnectionMetaData;
-import javax.jms.Destination;
-import javax.jms.ExceptionListener;
-import javax.jms.IllegalStateException;
-import javax.jms.JMSException;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueSession;
-import javax.jms.ServerSessionPool;
-import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.jms.TopicSession;
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import javax.naming.Referenceable;
-import javax.naming.StringRefAddr;
-
-import org.apache.qpid.AMQConnectionFailureException;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQProtocolException;
-import org.apache.qpid.AMQUnresolvedAddressException;
-import org.apache.qpid.AMQDisconnectedException;
-import org.apache.qpid.client.failover.FailoverException;
-import org.apache.qpid.client.failover.FailoverProtectedOperation;
-import org.apache.qpid.client.protocol.AMQProtocolHandler;
-import org.apache.qpid.configuration.ClientProperties;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicQosBody;
-import org.apache.qpid.framing.BasicQosOkBody;
-import org.apache.qpid.framing.ChannelOpenBody;
-import org.apache.qpid.framing.ChannelOpenOkBody;
-import org.apache.qpid.framing.ProtocolVersion;
-import org.apache.qpid.framing.TxSelectBody;
-import org.apache.qpid.framing.TxSelectOkBody;
-import org.apache.qpid.jms.BrokerDetails;
-import org.apache.qpid.jms.Connection;
-import org.apache.qpid.jms.ConnectionListener;
-import org.apache.qpid.jms.ConnectionURL;
-import org.apache.qpid.jms.FailoverPolicy;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.url.URLSyntaxException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AMQConnection extends Closeable implements Connection, QueueConnection, TopicConnection, Referenceable
-{
-    private static final Logger _logger = LoggerFactory.getLogger(AMQConnection.class);
-
-
-    /**
-     * This is the "root" mutex that must be held when doing anything that could be impacted by failover. This must be
-     * held by any child objects of this connection such as the session, producers and consumers.
-     */
-    private final Object _failoverMutex = new Object();
-
-    private final Object _sessionCreationLock = new Object();
-
-    /**
-     * A channel is roughly analogous to a session. The server can negotiate the maximum number of channels per session
-     * and we must prevent the client from opening too many.
-     */
-    private long _maximumChannelCount;
-
-    /** The maximum size of frame supported by the server */
-    private long _maximumFrameSize;
-
-    /**
-     * The protocol handler dispatches protocol events for this connection. For example, when the connection is dropped
-     * the handler deals with this. It also deals with the initial dispatch of any protocol frames to their appropriate
-     * handler.
-     */
-    protected AMQProtocolHandler _protocolHandler;
-
-    /** Maps from session id (Integer) to AMQSession instance */
-    private final ChannelToSessionMap _sessions = new ChannelToSessionMap();
-
-    private String _clientName;
-
-    /** The user name to use for authentication */
-    private String _username;
-
-    /** The password to use for authentication */
-    private String _password;
-
-    /** The virtual path to connect to on the AMQ server */
-    private String _virtualHost;
-
-    protected ExceptionListener _exceptionListener;
-
-    private ConnectionListener _connectionListener;
-
-    private ConnectionURL _connectionURL;
-
-    /**
-     * Whether this connection is started, i.e. whether messages are flowing to consumers. It has no meaning for message
-     * publication.
-     */
-    protected volatile boolean _started;
-
-    /** Policy dictating how to failover */
-    protected FailoverPolicy _failoverPolicy;
-
-    /*
-     * _Connected should be refactored with a suitable wait object.
-     */
-    protected boolean _connected;
-
-    /*
-     * The connection meta data
-     */
-    private QpidConnectionMetaData _connectionMetaData;
-
-    /** Configuration info for SSL */
-    private SSLConfiguration _sslConfiguration;
-
-    private AMQShortString _defaultTopicExchangeName = ExchangeDefaults.TOPIC_EXCHANGE_NAME;
-    private AMQShortString _defaultQueueExchangeName = ExchangeDefaults.DIRECT_EXCHANGE_NAME;
-    private AMQShortString _temporaryTopicExchangeName = ExchangeDefaults.TOPIC_EXCHANGE_NAME;
-    private AMQShortString _temporaryQueueExchangeName = ExchangeDefaults.DIRECT_EXCHANGE_NAME;
-
-    /** Thread Pool for executing connection level processes. Such as returning bounced messages. */
-    private final ExecutorService _taskPool = Executors.newCachedThreadPool();
-    private static final long DEFAULT_TIMEOUT = 1000 * 30;
-
-    protected AMQConnectionDelegate _delegate;
-
-    // this connection maximum number of prefetched messages
-    private int _maxPrefetch;
-
-    //Indicates whether persistent messages are synchronized
-    private boolean _syncPersistence;
-
-    //Indicates whether we need to sync on every message ack
-    private boolean _syncAck;
-
-    //Indicates the sync publish options (persistent|all)
-    //By default it's async publish
-    private String _syncPublish = "";
-    
-    // Indicates whether to use the old map message format or the 
-    // new amqp-0-10 encoded format.
-    private boolean _useLegacyMapMessageFormat;
-
-    /**
-     * @param broker      brokerdetails
-     * @param username    username
-     * @param password    password
-     * @param clientName  clientid
-     * @param virtualHost virtualhost
-     *
-     * @throws AMQException
-     * @throws URLSyntaxException
-     */
-    public AMQConnection(String broker, String username, String password, String clientName, String virtualHost)
-            throws AMQException, URLSyntaxException
-    {
-        this(new AMQConnectionURL(
-                ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password + "@"
-                + ((clientName == null) ? "" : clientName) + "/" + virtualHost + "?brokerlist='"
-                + AMQBrokerDetails.checkTransport(broker) + "'"), null);
-    }
-
-    /**
-     * @param broker      brokerdetails
-     * @param username    username
-     * @param password    password
-     * @param clientName  clientid
-     * @param virtualHost virtualhost
-     *
-     * @throws AMQException
-     * @throws URLSyntaxException
-     */
-    public AMQConnection(String broker, String username, String password, String clientName, String virtualHost,
-                         SSLConfiguration sslConfig) throws AMQException, URLSyntaxException
-    {
-        this(new AMQConnectionURL(
-                ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password + "@"
-                + ((clientName == null) ? "" : clientName) + "/" + virtualHost + "?brokerlist='"
-                + AMQBrokerDetails.checkTransport(broker) + "'"), sslConfig);
-    }
-
-    public AMQConnection(String host, int port, String username, String password, String clientName, String virtualHost)
-            throws AMQException, URLSyntaxException
-    {
-        this(host, port, false, username, password, clientName, virtualHost, null);
-    }
-
-    public AMQConnection(String host, int port, String username, String password, String clientName, String virtualHost,
-                         SSLConfiguration sslConfig) throws AMQException, URLSyntaxException
-    {
-        this(host, port, false, username, password, clientName, virtualHost, sslConfig);
-    }
-
-    public AMQConnection(String host, int port, boolean useSSL, String username, String password, String clientName,
-                         String virtualHost, SSLConfiguration sslConfig) throws AMQException, URLSyntaxException
-    {
-        this(new AMQConnectionURL(
-                useSSL
-                ? (ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password + "@"
-                   + ((clientName == null) ? "" : clientName) + virtualHost + "?brokerlist='tcp://" + host + ":" + port
-                   + "'" + "," + BrokerDetails.OPTIONS_SSL + "='true'")
-                : (ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password + "@"
-                   + ((clientName == null) ? "" : clientName) + virtualHost + "?brokerlist='tcp://" + host + ":" + port
-                   + "'" + "," + BrokerDetails.OPTIONS_SSL + "='false'")), sslConfig);
-    }
-
-    public AMQConnection(String connection) throws AMQException, URLSyntaxException
-    {
-        this(new AMQConnectionURL(connection), null);
-    }
-
-    public AMQConnection(String connection, SSLConfiguration sslConfig) throws AMQException, URLSyntaxException
-    {
-        this(new AMQConnectionURL(connection), sslConfig);
-    }
-
-    /**
-     * @todo Some horrible stuff going on here with setting exceptions to be non-null to detect if an exception
-     * was thrown during the connection! Intention not clear. Use a flag anyway, not exceptions... Will fix soon.
-     */
-    public AMQConnection(ConnectionURL connectionURL, SSLConfiguration sslConfig) throws AMQException
-    {
-        // set this connection maxPrefetch
-        if (connectionURL.getOption(ConnectionURL.OPTIONS_MAXPREFETCH) != null)
-        {
-            _maxPrefetch = Integer.parseInt(connectionURL.getOption(ConnectionURL.OPTIONS_MAXPREFETCH));
-        }
-        else
-        {
-            // use the defaul value set for all connections
-            _maxPrefetch = Integer.parseInt(System.getProperties().getProperty(ClientProperties.MAX_PREFETCH_PROP_NAME,
-                    ClientProperties.MAX_PREFETCH_DEFAULT));
-        }
-
-        if (connectionURL.getOption(ConnectionURL.OPTIONS_SYNC_PERSISTENCE) != null)
-        {
-            _syncPersistence =
-                Boolean.parseBoolean(connectionURL.getOption(ConnectionURL.OPTIONS_SYNC_PERSISTENCE));
-            _logger.warn("sync_persistence is a deprecated property, " +
-            		"please use sync_publish={persistent|all} instead");
-        }
-        else
-        {
-            // use the defaul value set for all connections
-            _syncPersistence = Boolean.getBoolean(ClientProperties.SYNC_PERSISTENT_PROP_NAME);
-            if (_syncPersistence)
-            {
-                _logger.warn("sync_persistence is a deprecated property, " +
-                        "please use sync_publish={persistent|all} instead");
-            }
-        }
-
-        if (connectionURL.getOption(ConnectionURL.OPTIONS_SYNC_ACK) != null)
-        {
-            _syncAck = Boolean.parseBoolean(connectionURL.getOption(ConnectionURL.OPTIONS_SYNC_ACK));
-        }
-        else
-        {
-            // use the defaul value set for all connections
-            _syncAck = Boolean.getBoolean(ClientProperties.SYNC_ACK_PROP_NAME);
-        }
-
-        if (connectionURL.getOption(ConnectionURL.OPTIONS_SYNC_PUBLISH) != null)
-        {
-            _syncPublish = connectionURL.getOption(ConnectionURL.OPTIONS_SYNC_PUBLISH);
-        }
-        else
-        {
-            // use the default value set for all connections
-            _syncPublish = System.getProperty((ClientProperties.SYNC_PUBLISH_PROP_NAME),_syncPublish);
-        }
-        
-        if (connectionURL.getOption(ConnectionURL.OPTIONS_USE_LEGACY_MAP_MESSAGE_FORMAT) != null)
-        {
-            _useLegacyMapMessageFormat =  Boolean.parseBoolean(
-                    connectionURL.getOption(ConnectionURL.OPTIONS_USE_LEGACY_MAP_MESSAGE_FORMAT));
-        }
-        else
-        {
-            // use the default value set for all connections
-            _useLegacyMapMessageFormat = Boolean.getBoolean(ClientProperties.USE_LEGACY_MAP_MESSAGE_FORMAT);
-        }
-        
-        String amqpVersion = System.getProperty((ClientProperties.AMQP_VERSION), "0-10");
-        _logger.debug("AMQP version " + amqpVersion);
-        
-        _failoverPolicy = new FailoverPolicy(connectionURL, this);
-        BrokerDetails brokerDetails = _failoverPolicy.getCurrentBrokerDetails();
-        if (brokerDetails.getTransport().equals(BrokerDetails.VM) || "0-8".equals(amqpVersion)) 
-        {
-            _delegate = new AMQConnectionDelegate_8_0(this);
-        } 
-        else if ("0-9".equals(amqpVersion))
-        {
-            _delegate = new AMQConnectionDelegate_0_9(this);
-        }
-        else if ("0-91".equals(amqpVersion) || "0-9-1".equals(amqpVersion))
-        {
-            _delegate = new AMQConnectionDelegate_9_1(this);
-        }
-        else
-        {
-            _delegate = new AMQConnectionDelegate_0_10(this);
-        }
-
-        if (_logger.isInfoEnabled())
-        {
-            _logger.info("Connection:" + connectionURL);
-        }
-
-        _sslConfiguration = sslConfig;
-        if (connectionURL == null)
-        {
-            throw new IllegalArgumentException("Connection must be specified");
-        }
-
-        _connectionURL = connectionURL;
-
-        _clientName = connectionURL.getClientName();
-        _username = connectionURL.getUsername();
-        _password = connectionURL.getPassword();
-
-        setVirtualHost(connectionURL.getVirtualHost());
-
-        if (connectionURL.getDefaultQueueExchangeName() != null)
-        {
-            _defaultQueueExchangeName = connectionURL.getDefaultQueueExchangeName();
-        }
-
-        if (connectionURL.getDefaultTopicExchangeName() != null)
-        {
-            _defaultTopicExchangeName = connectionURL.getDefaultTopicExchangeName();
-        }
-
-        if (connectionURL.getTemporaryQueueExchangeName() != null)
-        {
-            _temporaryQueueExchangeName = connectionURL.getTemporaryQueueExchangeName();
-        }
-
-        if (connectionURL.getTemporaryTopicExchangeName() != null)
-        {
-            _temporaryTopicExchangeName = connectionURL.getTemporaryTopicExchangeName();
-        }
-
-        _protocolHandler = new AMQProtocolHandler(this);
-
-        _logger.info("Connecting with ProtocolHandler Version:"+_protocolHandler.getProtocolVersion());
-
-        // We are not currently connected
-        _connected = false;
-
-        boolean retryAllowed = true;
-        Exception connectionException = null;
-        while (!_connected && retryAllowed && brokerDetails != null)
-        {
-            ProtocolVersion pe = null;
-            try
-            {
-                pe = makeBrokerConnection(brokerDetails);
-            }
-            catch (Exception e)
-            {
-                if (_logger.isInfoEnabled())
-                {
-                    _logger.info("Unable to connect to broker at " +
-                                 _failoverPolicy.getCurrentBrokerDetails(),
-                                 e);
-                }
-                connectionException = e;
-            }
-
-            if (pe != null)
-            {
-                // reset the delegate to the version returned by the
-                // broker
-                initDelegate(pe);
-            }
-            else if (!_connected)
-            {
-                retryAllowed = _failoverPolicy.failoverAllowed();
-                brokerDetails = _failoverPolicy.getNextBrokerDetails();
-            }
-        }
-
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("Are we connected:" + _connected);
-        }
-
-        if (!_connected)
-        {
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Last attempted ProtocolHandler Version:"+_protocolHandler.getProtocolVersion());
-            }
-
-            String message = null;
-
-            if (connectionException != null)
-            {
-                if (connectionException.getCause() != null)
-                {
-                    message = connectionException.getCause().getMessage();
-                }
-                else
-                {
-                    message = connectionException.getMessage();
-                }
-            }
-
-            if ((message == null) || message.equals(""))
-            {
-                if (message == null)
-                {
-                    message = "Unable to Connect";
-                }
-                else // can only be "" if getMessage() returned it therfore lastException != null
-                {
-                    message = "Unable to Connect:" + connectionException.getClass();
-                }
-            }
-
-            for (Throwable th = connectionException; th != null; th = th.getCause())
-            {
-                if (th instanceof UnresolvedAddressException ||
-                    th instanceof UnknownHostException)
-                {
-                    throw new AMQUnresolvedAddressException
-                        (message,
-                         _failoverPolicy.getCurrentBrokerDetails().toString(),
-                         connectionException);
-                }
-            }
-
-            throw new AMQConnectionFailureException(message, connectionException);
-        }
-
-        _logger.info("Connected with ProtocolHandler Version:"+_protocolHandler.getProtocolVersion());
-
-        _sessions.setMaxChannelID(_delegate.getMaxChannelID());
-        _sessions.setMinChannelID(_delegate.getMinChannelID());
-
-        _connectionMetaData = new QpidConnectionMetaData(this);
-    }
-
-    protected boolean checkException(Throwable thrown)
-    {
-        Throwable cause = thrown.getCause();
-
-        if (cause == null)
-        {
-            cause = thrown;
-        }
-
-        return ((cause instanceof ConnectException) || (cause instanceof UnresolvedAddressException));
-    }
-
-    private void initDelegate(ProtocolVersion pe) throws AMQProtocolException
-    {
-        try
-        {
-            String delegateClassName = String.format
-                                    ("org.apache.qpid.client.AMQConnectionDelegate_%s_%s",
-                                     pe.getMajorVersion(), pe.getMinorVersion());
-            _logger.info("Looking up delegate '" + delegateClassName + "' Based on PE:" + pe);
-            Class c = Class.forName(delegateClassName);
-            Class partypes[] = new Class[1];
-            partypes[0] = AMQConnection.class;
-            _delegate = (AMQConnectionDelegate) c.getConstructor(partypes).newInstance(this);
-            //Update our session to use this new protocol version 
-            _protocolHandler.getProtocolSession().setProtocolVersion(_delegate.getProtocolVersion());
-
-        }
-        catch (ClassNotFoundException e)
-        {
-            throw new AMQProtocolException
-                (AMQConstant.UNSUPPORTED_CLIENT_PROTOCOL_ERROR,
-                 String.format("Protocol: %s.%s is rquired by the broker but is not " +
-                               "currently supported by this client library implementation",
-                               pe.getMajorVersion(), pe.getMinorVersion()),
-                 e);
-        }
-        catch (NoSuchMethodException e)
-        {
-            throw new RuntimeException("unable to locate constructor for delegate", e);
-        }
-        catch (InstantiationException e)
-        {
-            throw new RuntimeException("error instantiating delegate", e);
-        }
-        catch (IllegalAccessException e)
-        {
-            throw new RuntimeException("error accessing delegate", e);
-        }
-        catch (InvocationTargetException e)
-        {
-            throw new RuntimeException("error invoking delegate", e);
-        }
-    }
-
-    protected AMQConnection(String username, String password, String clientName, String virtualHost)
-    {
-        _clientName = clientName;
-        _username = username;
-        _password = password;
-        setVirtualHost(virtualHost);
-    }
-
-    private void setVirtualHost(String virtualHost)
-    {
-        if (virtualHost != null && virtualHost.startsWith("/"))
-        {
-            virtualHost = virtualHost.substring(1);
-        }
-
-        _virtualHost = virtualHost;
-    }
-
-    public boolean attemptReconnection(String host, int port)
-    {
-        BrokerDetails bd = new AMQBrokerDetails(host, port, _sslConfiguration);
-
-        _failoverPolicy.setBroker(bd);
-
-        try
-        {
-            makeBrokerConnection(bd);
-
-            return true;
-        }
-        catch (Exception e)
-        {
-            if (_logger.isInfoEnabled())
-            {
-                _logger.info("Unable to connect to broker at " + bd);
-            }
-
-            attemptReconnection();
-        }
-
-        return false;
-    }
-
-    public boolean attemptReconnection()
-    {
-        BrokerDetails broker = null;
-        while (_failoverPolicy.failoverAllowed() && (broker = _failoverPolicy.getNextBrokerDetails()) != null)
-        {
-            try
-            {
-                makeBrokerConnection(broker);
-                return true;
-            }
-            catch (Exception e)
-            {
-                if (!(e instanceof AMQException))
-                {
-                    if (_logger.isInfoEnabled())
-                    {
-                        _logger.info("Unable to connect to broker at " + _failoverPolicy.getCurrentBrokerDetails(), e);
-                    }
-                }
-                else
-                {
-                    if (_logger.isInfoEnabled())
-                    {
-                        _logger.info(e.getMessage() + ":Unable to connect to broker at "
-                                     + _failoverPolicy.getCurrentBrokerDetails());
-                    }
-                }
-            }
-        }
-
-        // connection unsuccessful
-        return false;
-    }
-
-    public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail) throws IOException, AMQException
-    {
-        return _delegate.makeBrokerConnection(brokerDetail);
-    }
-
-    public <T, E extends Exception> T executeRetrySupport(FailoverProtectedOperation<T,E> operation) throws E
-    {
-        return _delegate.executeRetrySupport(operation);
-    }
-
-    /**
-     * Get the details of the currently active broker
-     *
-     * @return null if no broker is active (i.e. no successful connection has been made, or the BrokerDetail instance
-     *         otherwise
-     */
-    public BrokerDetails getActiveBrokerDetails()
-    {
-        return _failoverPolicy.getCurrentBrokerDetails();
-    }
-
-    public boolean failoverAllowed()
-    {
-        if (!_connected)
-        {
-            return false;
-        }
-        else
-        {
-            return _failoverPolicy.failoverAllowed();
-        }
-    }
-
-    public org.apache.qpid.jms.Session createSession(final boolean transacted, final int acknowledgeMode) throws JMSException
-    {
-        return createSession(transacted, acknowledgeMode, _maxPrefetch);
-    }
-
-    public org.apache.qpid.jms.Session createSession(final boolean transacted, final int acknowledgeMode, final int prefetch)
-            throws JMSException
-    {
-        return createSession(transacted, acknowledgeMode, prefetch, prefetch);
-    }
-
-    public org.apache.qpid.jms.Session createSession(final boolean transacted, final int acknowledgeMode,
-                                                     final int prefetchHigh, final int prefetchLow) throws JMSException
-    {
-        synchronized (_sessionCreationLock)
-        {
-            checkNotClosed();
-            return _delegate.createSession(transacted, acknowledgeMode, prefetchHigh, prefetchLow);
-        }
-    }
-
-    private void createChannelOverWire(int channelId, int prefetchHigh, int prefetchLow, boolean transacted)
-            throws AMQException, FailoverException
-    {
-
-        ChannelOpenBody channelOpenBody = getProtocolHandler().getMethodRegistry().createChannelOpenBody(null);
-
-        // TODO: Be aware of possible changes to parameter order as versions change.
-
-        _protocolHandler.syncWrite(channelOpenBody.generateFrame(channelId), ChannelOpenOkBody.class);
-
-        BasicQosBody basicQosBody = getProtocolHandler().getMethodRegistry().createBasicQosBody(0, prefetchHigh, false);
-
-        // todo send low water mark when protocol allows.
-        // todo Be aware of possible changes to parameter order as versions change.
-        _protocolHandler.syncWrite(basicQosBody.generateFrame(channelId), BasicQosOkBody.class);
-
-        if (transacted)
-        {
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Issuing TxSelect for " + channelId);
-            }
-
-            TxSelectBody body = getProtocolHandler().getMethodRegistry().createTxSelectBody();
-
-            // TODO: Be aware of possible changes to parameter order as versions change.
-            _protocolHandler.syncWrite(body.generateFrame(channelId), TxSelectOkBody.class);
-        }
-    }
-
-    private void reopenChannel(int channelId, int prefetchHigh, int prefetchLow, boolean transacted)
-            throws AMQException, FailoverException
-    {
-        try
-        {
-            createChannelOverWire(channelId, prefetchHigh, prefetchLow, transacted);
-        }
-        catch (AMQException e)
-        {
-            deregisterSession(channelId);
-            throw new AMQException(null, "Error reopening channel " + channelId + " after failover: " + e, e);
-        }
-    }
-
-    public void setFailoverPolicy(FailoverPolicy policy)
-    {
-        _failoverPolicy = policy;
-    }
-
-    public FailoverPolicy getFailoverPolicy()
-    {
-        return _failoverPolicy;
-    }
-
-    /**
-     * Returns an AMQQueueSessionAdaptor which wraps an AMQSession and throws IllegalStateExceptions where specified in
-     * the JMS spec
-     *
-     * @param transacted
-     * @param acknowledgeMode
-     *
-     * @return QueueSession
-     *
-     * @throws JMSException
-     */
-    public QueueSession createQueueSession(boolean transacted, int acknowledgeMode) throws JMSException
-    {
-        return new AMQQueueSessionAdaptor(createSession(transacted, acknowledgeMode));
-    }
-
-    /**
-     * Returns an AMQTopicSessionAdapter which wraps an AMQSession and throws IllegalStateExceptions where specified in
-     * the JMS spec
-     *
-     * @param transacted
-     * @param acknowledgeMode
-     *
-     * @return TopicSession
-     *
-     * @throws JMSException
-     */
-    public TopicSession createTopicSession(boolean transacted, int acknowledgeMode) throws JMSException
-    {
-        return new AMQTopicSessionAdaptor(createSession(transacted, acknowledgeMode));
-    }
-
-    public boolean channelLimitReached()
-    {
-        return _sessions.size() >= _maximumChannelCount;
-    }
-
-    public String getClientID() throws JMSException
-    {
-        checkNotClosed();
-
-        return _clientName;
-    }
-
-    public void setClientID(String clientID) throws JMSException
-    {
-        checkNotClosed();
-        // in AMQP it is not possible to change the client ID. If one is not specified
-        // upon connection construction, an id is generated automatically. Therefore
-        // we can always throw an exception.
-        if (!Boolean.getBoolean(ClientProperties.IGNORE_SET_CLIENTID_PROP_NAME))
-        {
-            throw new IllegalStateException("Client name cannot be changed after being set");
-        }
-        else
-        {
-            _logger.info("Operation setClientID is ignored using ID: " + getClientID());
-        }
-    }
-
-    public ConnectionMetaData getMetaData() throws JMSException
-    {
-        checkNotClosed();
-
-        return _connectionMetaData;
-
-    }
-
-    public ExceptionListener getExceptionListener() throws JMSException
-    {
-        checkNotClosed();
-
-        return _exceptionListener;
-    }
-
-    public void setExceptionListener(ExceptionListener listener) throws JMSException
-    {
-        checkNotClosed();
-        _exceptionListener = listener;
-    }
-
-    /**
-     * Start the connection, i.e. start flowing messages. Note that this method must be called only from a single thread
-     * and is not thread safe (which is legal according to the JMS specification).
-     *
-     * @throws JMSException
-     */
-    public void start() throws JMSException
-    {
-        checkNotClosed();
-        if (!_started)
-        {
-            _started = true;
-            final Iterator it = _sessions.values().iterator();
-            while (it.hasNext())
-            {
-                final AMQSession s = (AMQSession) (it.next());
-                try
-                {
-                    s.start();
-                }
-                catch (AMQException e)
-                {
-                    throw new JMSAMQException(e);
-                }
-            }
-
-        }
-    }
-
-    public void stop() throws JMSException
-    {
-        checkNotClosed();
-        if (_started)
-        {
-            for (Iterator i = _sessions.values().iterator(); i.hasNext();)
-            {
-                try
-                {
-                    ((AMQSession) i.next()).stop();
-                }
-                catch (AMQException e)
-                {
-                    throw new JMSAMQException(e);
-                }
-            }
-
-            _started = false;
-        }
-    }
-
-    public void     close() throws JMSException
-    {
-        close(DEFAULT_TIMEOUT);
-    }
-
-    public void close(long timeout) throws JMSException
-    {
-        close(new ArrayList<AMQSession>(_sessions.values()), timeout);
-    }
-
-    public void close(List<AMQSession> sessions, long timeout) throws JMSException
-    {
-        if (!_closed.getAndSet(true))
-        {
-            _closing.set(true);
-            try{
-                doClose(sessions, timeout);
-            }finally{
-                _closing.set(false);
-            }
-        }
-    }
-
-    private void doClose(List<AMQSession> sessions, long timeout) throws JMSException
-    {
-        synchronized (_sessionCreationLock)
-        {
-            if (!sessions.isEmpty())
-            {
-                AMQSession session = sessions.remove(0);
-                synchronized (session.getMessageDeliveryLock())
-                {
-                    doClose(sessions, timeout);
-                }
-            }
-            else
-            {
-                synchronized (getFailoverMutex())
-                {
-                    try
-                    {
-                        long startCloseTime = System.currentTimeMillis();
-
-	                    closeAllSessions(null, timeout, startCloseTime);
-
-                        //This MUST occur after we have successfully closed all Channels/Sessions
-                        _taskPool.shutdown();
-
-                        if (!_taskPool.isTerminated())
-                        {
-                            try
-                            {
-                                // adjust timeout
-                                long taskPoolTimeout = adjustTimeout(timeout, startCloseTime);
-
-                                _taskPool.awaitTermination(taskPoolTimeout, TimeUnit.MILLISECONDS);
-                            }
-                            catch (InterruptedException e)
-                            {
-                                _logger.info("Interrupted while shutting down connection thread pool.");
-                            }
-                        }
-
-                        // adjust timeout
-                        timeout = adjustTimeout(timeout, startCloseTime);
-                        _delegate.closeConnection(timeout);
-
-                        //If the taskpool hasn't shutdown by now then give it shutdownNow.
-                        // This will interupt any running tasks.
-                        if (!_taskPool.isTerminated())
-                        {
-                            List<Runnable> tasks = _taskPool.shutdownNow();
-                            for (Runnable r : tasks)
-                            {
-                                _logger.warn("Connection close forced taskpool to prevent execution:" + r);
-                            }
-                        }
-                    }
-                    catch (AMQException e)
-                    {
-                        _logger.error("error:", e);
-                        JMSException jmse = new JMSException("Error closing connection: " + e);
-                        jmse.setLinkedException(e);
-                        jmse.initCause(e);
-                        throw jmse;
-                    }
-                }
-            }
-        }
-    }
-
-    private long adjustTimeout(long timeout, long startTime)
-    {
-        long now = System.currentTimeMillis();
-        timeout -= now - startTime;
-        if (timeout < 0)
-        {
-            timeout = 0;
-        }
-
-        return timeout;
-    }
-
-    /**
-     * Marks all sessions and their children as closed without sending any protocol messages. Useful when you need to
-     * mark objects "visible" in userland as closed after failover or other significant event that impacts the
-     * connection. <p/> The caller must hold the failover mutex before calling this method.
-     */
-    private void markAllSessionsClosed()
-    {
-        final LinkedList sessionCopy = new LinkedList(_sessions.values());
-        final Iterator it = sessionCopy.iterator();
-        while (it.hasNext())
-        {
-            final AMQSession session = (AMQSession) it.next();
-
-            session.markClosed();
-        }
-
-        _sessions.clear();
-    }
-
-    /**
-     * Close all the sessions, either due to normal connection closure or due to an error occurring.
-     *
-     * @param cause if not null, the error that is causing this shutdown <p/> The caller must hold the failover mutex
-     *              before calling this method.
-     */
-    private void closeAllSessions(Throwable cause, long timeout, long starttime) throws JMSException
-    {
-        final LinkedList sessionCopy = new LinkedList(_sessions.values());
-        final Iterator it = sessionCopy.iterator();
-        JMSException sessionException = null;
-        while (it.hasNext())
-        {
-            final AMQSession session = (AMQSession) it.next();
-            if (cause != null)
-            {
-                session.closed(cause);
-            }
-            else
-            {
-                try
-                {
-                    if (starttime != -1)
-                    {
-                        timeout = adjustTimeout(timeout, starttime);
-                    }
-
-                    session.close(timeout);
-                }
-                catch (JMSException e)
-                {
-                    _logger.error("Error closing session: " + e);
-                    sessionException = e;
-                }
-            }
-        }
-
-        _sessions.clear();
-        if (sessionException != null)
-        {
-            throw sessionException;
-        }
-    }
-
-    public ConnectionConsumer createConnectionConsumer(Destination destination, String messageSelector,
-                                                       ServerSessionPool sessionPool, int maxMessages) throws JMSException
-    {
-        checkNotClosed();
-
-        return null;
-    }
-
-    public ConnectionConsumer createConnectionConsumer(Queue queue, String messageSelector, ServerSessionPool sessionPool,
-                                                       int maxMessages) throws JMSException
-    {
-        checkNotClosed();
-
-        return null;
-    }
-
-    public ConnectionConsumer createConnectionConsumer(Topic topic, String messageSelector, ServerSessionPool sessionPool,
-                                                       int maxMessages) throws JMSException
-    {
-        checkNotClosed();
-
-        return null;
-    }
-
-    public ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector,
-                                                              ServerSessionPool sessionPool, int maxMessages) throws JMSException
-    {
-        // TODO Auto-generated method stub
-        checkNotClosed();
-
-        return null;
-    }
-
-    public long getMaximumChannelCount() throws JMSException
-    {
-        checkNotClosed();
-
-        return _maximumChannelCount;
-    }
-
-    public void setConnectionListener(ConnectionListener listener)
-    {
-        _connectionListener = listener;
-    }
-
-    public ConnectionListener getConnectionListener()
-    {
-        return _connectionListener;
-    }
-
-    public void setMaximumChannelCount(long maximumChannelCount)
-    {
-        _maximumChannelCount = maximumChannelCount;
-    }
-
-    public void setMaximumFrameSize(long frameMax)
-    {
-        _maximumFrameSize = frameMax;
-    }
-
-    public long getMaximumFrameSize()
-    {
-        return _maximumFrameSize;
-    }
-
-    public ChannelToSessionMap getSessions()
-    {
-        return _sessions;
-    }
-
-    public String getUsername()
-    {
-        return _username;
-    }
-
-    public void setUsername(String id)
-    {
-        _username = id;
-    }
-    
-    public String getPassword()
-    {
-        return _password;
-    }
-
-    public String getVirtualHost()
-    {
-        return _virtualHost;
-    }
-
-    public AMQProtocolHandler getProtocolHandler()
-    {
-        return _protocolHandler;
-    }
-
-    public boolean started()
-    {
-        return _started;
-    }
-
-    public void bytesSent(long writtenBytes)
-    {
-        if (_connectionListener != null)
-        {
-            _connectionListener.bytesSent(writtenBytes);
-        }
-    }
-
-    public void bytesReceived(long receivedBytes)
-    {
-        if (_connectionListener != null)
-        {
-            _connectionListener.bytesReceived(receivedBytes);
-        }
-    }
-
-    /**
-     * Fire the preFailover event to the registered connection listener (if any)
-     *
-     * @param redirect true if this is the result of a redirect request rather than a connection error
-     *
-     * @return true if no listener or listener does not veto change
-     */
-    public boolean firePreFailover(boolean redirect)
-    {
-        boolean proceed = true;
-        if (_connectionListener != null)
-        {
-            proceed = _connectionListener.preFailover(redirect);
-        }
-
-        return proceed;
-    }
-
-    /**
-     * Fire the preResubscribe event to the registered connection listener (if any). If the listener vetoes
-     * resubscription then all the sessions are closed.
-     *
-     * @return true if no listener or listener does not veto resubscription.
-     *
-     * @throws JMSException
-     */
-    public boolean firePreResubscribe() throws JMSException
-    {
-        if (_connectionListener != null)
-        {
-            boolean resubscribe = _connectionListener.preResubscribe();
-            if (!resubscribe)
-            {
-                markAllSessionsClosed();
-            }
-
-            return resubscribe;
-        }
-        else
-        {
-            return true;
-        }
-    }
-
-    /** Fires a failover complete event to the registered connection listener (if any). */
-    public void fireFailoverComplete()
-    {
-        if (_connectionListener != null)
-        {
-            _connectionListener.failoverComplete();
-        }
-    }
-
-    /**
-     * In order to protect the consistency of the connection and its child sessions, consumers and producers, the
-     * "failover mutex" must be held when doing any operations that could be corrupted during failover.
-     *
-     * @return a mutex. Guaranteed never to change for the lifetime of this connection even if failover occurs.
-     */
-    public final Object getFailoverMutex()
-    {
-        return _failoverMutex;
-    }
-
-    public void failoverPrep()
-    {
-        _delegate.failoverPrep();
-    }
-
-    public void resubscribeSessions() throws JMSException, AMQException, FailoverException
-    {
-        _delegate.resubscribeSessions();
-    }
-
-    /**
-     * If failover is taking place this will block until it has completed. If failover is not taking place it will
-     * return immediately.
-     *
-     * @throws InterruptedException
-     */
-    public void blockUntilNotFailingOver() throws InterruptedException
-    {
-        _protocolHandler.blockUntilNotFailingOver();
-    }
-
-    /**
-     * Invoked by the AMQProtocolSession when a protocol session exception has occurred. This method sends the exception
-     * to a JMS exception listener, if configured, and propagates the exception to sessions, which in turn will
-     * propagate to consumers. This allows synchronous consumers to have exceptions thrown to them.
-     *
-     * @param cause the exception
-     */
-    public void exceptionReceived(Throwable cause)
-    {
-
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("exceptionReceived done by:" + Thread.currentThread().getName(), cause);
-        }
-
-        final JMSException je;
-        if (cause instanceof JMSException)
-        {
-            je = (JMSException) cause;
-        }
-        else
-        {
-            AMQConstant code = null;
-
-            if (cause instanceof AMQException)
-            {
-                code = ((AMQException) cause).getErrorCode();
-            }
-
-            if (code != null)
-            {
-                je = new JMSException(Integer.toString(code.getCode()), "Exception thrown against " + toString() + ": " + cause);
-            }
-            else
-            {
-                //Should never get here as all AMQEs are required to have an ErrorCode!
-                // Other than AMQDisconnectedEx!
-
-                if (cause instanceof AMQDisconnectedException)
-                {
-                    Exception last = _protocolHandler.getStateManager().getLastException();
-                    if (last != null)
-                    {
-                        _logger.info("StateManager had an exception for us to use a cause of our Disconnected Exception");
-                        cause = last;
-                    }
-                }
-                je = new JMSException("Exception thrown against " + toString() + ": " + cause);
-            }
-
-            if (cause instanceof Exception)
-            {
-                je.setLinkedException((Exception) cause);
-            }
-            
-            je.initCause(cause);
-        }
-
-        boolean closer = false;
-
-        // in the case of an IOException, MINA has closed the protocol session so we set _closed to true
-        // so that any generic client code that tries to close the connection will not mess up this error
-        // handling sequence
-        if (cause instanceof IOException || cause instanceof AMQDisconnectedException)
-        {
-            // If we have an IOE/AMQDisconnect there is no connection to close on.
-            _closing.set(false);
-            closer = !_closed.getAndSet(true);
-
-            _protocolHandler.getProtocolSession().notifyError(je);
-        }
-
-        // get the failover mutex before trying to close
-        synchronized (getFailoverMutex())
-        {
-            // decide if we are going to close the session
-            if (hardError(cause))
-            {
-                closer = (!_closed.getAndSet(true)) || closer;
-                {
-                    _logger.info("Closing AMQConnection due to :" + cause);
-                }
-            }
-            else
-            {
-                _logger.info("Not a hard-error connection not closing: " + cause);
-            }
-            
-            // deliver the exception if there is a listener
-            if (_exceptionListener != null)
-            {
-                _exceptionListener.onException(je);
-            }
-            else
-            {
-                _logger.error("Throwable Received but no listener set: " + cause);
-            }
-    
-            // if we are closing the connection, close sessions first
-            if (closer)
-            {
-                try
-                {
-                    closeAllSessions(cause, -1, -1); // FIXME: when doing this end up with RejectedExecutionException from executor.
-                }
-                catch (JMSException e)
-                {
-                    _logger.error("Error closing all sessions: " + e, e);
-                }
-            }
-        }
-    }
-
-    private boolean hardError(Throwable cause)
-    {
-        if (cause instanceof AMQException)
-        {
-            return ((AMQException) cause).isHardError();
-        }
-
-        return true;
-    }
-
-    void registerSession(int channelId, AMQSession session)
-    {
-        _sessions.put(channelId, session);
-    }
-
-    public void deregisterSession(int channelId)
-    {
-        _sessions.remove(channelId);
-    }
-
-    public String toString()
-    {
-        StringBuffer buf = new StringBuffer("AMQConnection:\n");
-        if (_failoverPolicy.getCurrentBrokerDetails() == null)
-        {
-            buf.append("No active broker connection");
-        }
-        else
-        {
-            BrokerDetails bd = _failoverPolicy.getCurrentBrokerDetails();
-            buf.append("Host: ").append(String.valueOf(bd.getHost()));
-            buf.append("\nPort: ").append(String.valueOf(bd.getPort()));
-        }
-
-        buf.append("\nVirtual Host: ").append(String.valueOf(_virtualHost));
-        buf.append("\nClient ID: ").append(String.valueOf(_clientName));
-        buf.append("\nActive session count: ").append((_sessions == null) ? 0 : _sessions.size());
-
-        return buf.toString();
-    }
-
-    public String toURL()
-    {
-        return _connectionURL.toString();
-    }
-
-    public Reference getReference() throws NamingException
-    {
-        return new Reference(AMQConnection.class.getName(), new StringRefAddr(AMQConnection.class.getName(), toURL()),
-                             AMQConnectionFactory.class.getName(), null); // factory location
-    }
-
-    public SSLConfiguration getSSLConfiguration()
-    {
-        return _sslConfiguration;
-    }
-
-    public AMQShortString getDefaultTopicExchangeName()
-    {
-        return _defaultTopicExchangeName;
-    }
-
-    public void setDefaultTopicExchangeName(AMQShortString defaultTopicExchangeName)
-    {
-        _defaultTopicExchangeName = defaultTopicExchangeName;
-    }
-
-    public AMQShortString getDefaultQueueExchangeName()
-    {
-        return _defaultQueueExchangeName;
-    }
-
-    public void setDefaultQueueExchangeName(AMQShortString defaultQueueExchangeName)
-    {
-        _defaultQueueExchangeName = defaultQueueExchangeName;
-    }
-
-    public AMQShortString getTemporaryTopicExchangeName()
-    {
-        return _temporaryTopicExchangeName;
-    }
-
-    public AMQShortString getTemporaryQueueExchangeName()
-    {
-        return _temporaryQueueExchangeName; // To change body of created methods use File | Settings | File Templates.
-    }
-
-    public void setTemporaryTopicExchangeName(AMQShortString temporaryTopicExchangeName)
-    {
-        _temporaryTopicExchangeName = temporaryTopicExchangeName;
-    }
-
-    public void setTemporaryQueueExchangeName(AMQShortString temporaryQueueExchangeName)
-    {
-        _temporaryQueueExchangeName = temporaryQueueExchangeName;
-    }
-
-    public void performConnectionTask(Runnable task)
-    {
-        _taskPool.execute(task);
-    }
-
-    public AMQSession getSession(int channelId)
-    {
-        return _sessions.get(channelId);
-    }
-
-    public ProtocolVersion getProtocolVersion()
-    {
-        return _delegate.getProtocolVersion();
-    }
-
-    public boolean isFailingOver()
-    {
-        return (_protocolHandler.getFailoverLatch() != null);
-    }
-
-    /**
-     * Get the maximum number of messages that this connection can pre-fetch.
-     *
-     * @return The maximum number of messages that this connection can pre-fetch.
-     */
-    public long getMaxPrefetch()
-    {
-        return _maxPrefetch;
-    }
-
-    /**
-     * Indicates whether persistent messages are synchronized
-     *
-     * @return true if persistent messages are synchronized false otherwise
-     */
-    public boolean getSyncPersistence()
-    {
-        return _syncPersistence;
-    }
-
-    /**
-     * Indicates whether we need to sync on every message ack
-     */
-    public boolean getSyncAck()
-    {
-        return _syncAck;
-    }
-
-    public String getSyncPublish()
-    {
-        return _syncPublish;
-    }
-
-    public int getNextChannelID()
-    {
-        return _sessions.getNextChannelId();
-    }
-    
-    public boolean isUseLegacyMapMessageFormat()
-    {
-        return _useLegacyMapMessageFormat;
-    }
-}
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java b/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
deleted file mode 100644
index c81ad6422f..0000000000
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- *
- * 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.
- *
- */
-package org.apache.qpid.client.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.client.protocol.AMQProtocolSession;
-import org.apache.qpid.client.security.AMQCallbackHandler;
-import org.apache.qpid.client.security.CallbackHandlerRegistry;
-import org.apache.qpid.client.state.AMQState;
-import org.apache.qpid.client.state.StateAwareMethodListener;
-import org.apache.qpid.common.ClientProperties;
-import org.apache.qpid.common.QpidProperties;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ConnectionStartBody;
-import org.apache.qpid.framing.ConnectionStartOkBody;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.FieldTableFactory;
-import org.apache.qpid.framing.ProtocolVersion;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslClient;
-import javax.security.sasl.SaslException;
-
-import java.io.UnsupportedEncodingException;
-import java.util.HashSet;
-import java.util.StringTokenizer;
-
-public class ConnectionStartMethodHandler implements StateAwareMethodListener<ConnectionStartBody>
-{
-    private static final Logger _log = LoggerFactory.getLogger(ConnectionStartMethodHandler.class);
-
-    private static final ConnectionStartMethodHandler _instance = new ConnectionStartMethodHandler();
-
-    public static ConnectionStartMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ConnectionStartMethodHandler()
-    { }
-
-    public void methodReceived(AMQProtocolSession session, ConnectionStartBody body, int channelId)
-            throws AMQException
-    {
-        _log.debug("public void methodReceived(AMQStateManager stateManager, AMQProtocolSession protocolSession, "
-            + "AMQMethodEvent evt): called");
-
-        ProtocolVersion pv = new ProtocolVersion((byte) body.getVersionMajor(), (byte) body.getVersionMinor());
-
-        // 0-9-1 is indistinguishable from 0-9 using only major and minor ... if we established the connection as 0-9-1
-        // and now get back major = 0 , minor = 9 then we can assume it means 0-9-1
-
-        if(pv.equals(ProtocolVersion.v0_9) && session.getProtocolVersion().equals(ProtocolVersion.v0_91))
-        {
-            pv = ProtocolVersion.v0_91;
-        }
-
-        // For the purposes of interop, we can make the client accept the broker's version string.
-        // If it does, it then internally records the version as being the latest one that it understands.
-        // It needs to do this since frame lookup is done by version.
-        if (Boolean.getBoolean("qpid.accept.broker.version") && !pv.isSupported())
-        {
-
-            pv = ProtocolVersion.getLatestSupportedVersion();
-        }
-
-        if (pv.isSupported())
-        {
-            session.setProtocolVersion(pv);
-
-            try
-            {
-                // Used to hold the SASL mechanism to authenticate with.
-                String mechanism;
-
-                if (body.getMechanisms()== null)
-                {
-                    throw new AMQException(null, "mechanism not specified in ConnectionStart method frame", null);
-                }
-                else
-                {
-                    mechanism = chooseMechanism(body.getMechanisms());
-                    _log.debug("mechanism = " + mechanism);
-                }
-
-                if (mechanism == null)
-                {
-                    throw new AMQException(null, "No supported security mechanism found, passed: " + new String(body.getMechanisms()), null);
-                }
-
-                byte[] saslResponse;
-                try
-                {
-                    SaslClient sc =
-                        Sasl.createSaslClient(new String[] { mechanism }, null, "AMQP", "localhost", null,
-                            createCallbackHandler(mechanism, session));
-                    if (sc == null)
-                    {
-                        throw new AMQException(null, "Client SASL configuration error: no SaslClient could be created for mechanism " + mechanism
-                            + ". Please ensure all factories are registered. See DynamicSaslRegistrar for "
-                            + " details of how to register non-standard SASL client providers.", null);
-                    }
-
-                    session.setSaslClient(sc);
-                    saslResponse = (sc.hasInitialResponse() ? sc.evaluateChallenge(new byte[0]) : null);
-                }
-                catch (SaslException e)
-                {
-                    session.setSaslClient(null);
-                    throw new AMQException(null, "Unable to create SASL client: " + e, e);
-                }
-
-                if (body.getLocales() == null)
-                {
-                    throw new AMQException(null, "Locales is not defined in Connection Start method", null);
-                }
-
-                final String locales = new String(body.getLocales(), "utf8");
-                final StringTokenizer tokenizer = new StringTokenizer(locales, " ");
-                if (tokenizer.hasMoreTokens())
-                {
-                    tokenizer.nextToken();
-                }
-                else
-                {
-                    throw new AMQException(null, "No locales sent from server, passed: " + locales, null);
-                }
-
-                session.getStateManager().changeState(AMQState.CONNECTION_NOT_TUNED);
-                FieldTable clientProperties = FieldTableFactory.newFieldTable();
-
-                clientProperties.setString(new AMQShortString(ClientProperties.instance.toString()),
-                    session.getClientID());
-                clientProperties.setString(new AMQShortString(ClientProperties.product.toString()),
-                    QpidProperties.getProductName());
-                clientProperties.setString(new AMQShortString(ClientProperties.version.toString()),
-                    QpidProperties.getReleaseVersion());
-                clientProperties.setString(new AMQShortString(ClientProperties.platform.toString()), getFullSystemInfo());
-
-
-                ConnectionStartOkBody connectionStartOkBody = session.getMethodRegistry().createConnectionStartOkBody(clientProperties,new AMQShortString(mechanism),saslResponse,new AMQShortString(locales));
-                // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-                // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-                // Be aware of possible changes to parameter order as versions change.
-                session.writeFrame(connectionStartOkBody.generateFrame(channelId));
-                        
-            }
-            catch (UnsupportedEncodingException e)
-            {
-                throw new AMQException(null, "Unable to decode data: " + e, e);
-            }
-        }
-        else
-        {
-            _log.error("Broker requested Protocol [" + body.getVersionMajor() + "-" + body.getVersionMinor()
-                + "] which is not supported by this version of the client library");
-
-            session.closeProtocolSession();
-        }
-    }
-
-    private String getFullSystemInfo()
-    {
-        StringBuffer fullSystemInfo = new StringBuffer();
-        fullSystemInfo.append(System.getProperty("java.runtime.name"));
-        fullSystemInfo.append(", " + System.getProperty("java.runtime.version"));
-        fullSystemInfo.append(", " + System.getProperty("java.vendor"));
-        fullSystemInfo.append(", " + System.getProperty("os.arch"));
-        fullSystemInfo.append(", " + System.getProperty("os.name"));
-        fullSystemInfo.append(", " + System.getProperty("os.version"));
-        fullSystemInfo.append(", " + System.getProperty("sun.os.patch.level"));
-
-        return fullSystemInfo.toString();
-    }
-
-    private String chooseMechanism(byte[] availableMechanisms) throws UnsupportedEncodingException
-    {
-        final String mechanisms = new String(availableMechanisms, "utf8");
-        StringTokenizer tokenizer = new StringTokenizer(mechanisms, " ");
-        HashSet mechanismSet = new HashSet();
-        while (tokenizer.hasMoreTokens())
-        {
-            mechanismSet.add(tokenizer.nextToken());
-        }
-
-        String preferredMechanisms = CallbackHandlerRegistry.getInstance().getMechanisms();
-        StringTokenizer prefTokenizer = new StringTokenizer(preferredMechanisms, " ");
-        while (prefTokenizer.hasMoreTokens())
-        {
-            String mech = prefTokenizer.nextToken();
-            if (mechanismSet.contains(mech))
-            {
-                return mech;
-            }
-        }
-
-        return null;
-    }
-
-    private AMQCallbackHandler createCallbackHandler(String mechanism, AMQProtocolSession protocolSession)
-        throws AMQException
-    {
-        Class mechanismClass = CallbackHandlerRegistry.getInstance().getCallbackHandlerClass(mechanism);
-        try
-        {
-            Object instance = mechanismClass.newInstance();
-            AMQCallbackHandler cbh = (AMQCallbackHandler) instance;
-            cbh.initialise(protocolSession);
-
-            return cbh;
-        }
-        catch (Exception e)
-        {
-            throw new AMQException(null, "Unable to create callback handler: " + e, e);
-        }
-    }
-
-}
diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
deleted file mode 100644
index 7976760696..0000000000
--- a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
+++ /dev/null
@@ -1,477 +0,0 @@
-/*
- *
- * 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.
- *
- */
-package org.apache.qpid.client.protocol;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jms.JMSException;
-import javax.security.sasl.SaslClient;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.client.ConnectionTuneParameters;
-import org.apache.qpid.client.message.UnprocessedMessage;
-import org.apache.qpid.client.message.UnprocessedMessage_0_8;
-import org.apache.qpid.client.state.AMQStateManager;
-import org.apache.qpid.client.state.AMQState;
-import org.apache.qpid.framing.*;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.protocol.AMQVersionAwareProtocolSession;
-import org.apache.qpid.transport.Sender;
-import org.apache.qpid.client.handler.ClientMethodDispatcherImpl;
-
-/**
- * Wrapper for protocol session that provides type-safe access to session attributes. <p/> The underlying protocol
- * session is still available but clients should not use it to obtain session attributes.
- */
-public class AMQProtocolSession implements AMQVersionAwareProtocolSession
-{
-    protected static final int LAST_WRITE_FUTURE_JOIN_TIMEOUT = 1000 * 60 * 2;
-
-    protected static final Logger _logger = LoggerFactory.getLogger(AMQProtocolSession.class);
-
-    public static final String PROTOCOL_INITIATION_RECEIVED = "ProtocolInitiatiionReceived";
-
-    //Usable channels are numbered 1 to <ChannelMax>
-    public static final int MAX_CHANNEL_MAX = 0xFFFF;
-    public static final int MIN_USABLE_CHANNEL_NUM = 1;
-
-    protected static final String CONNECTION_TUNE_PARAMETERS = "ConnectionTuneParameters";
-
-    protected static final String AMQ_CONNECTION = "AMQConnection";
-
-    protected static final String SASL_CLIENT = "SASLClient";
-
-    /**
-     * The handler from which this session was created and which is used to handle protocol events. We send failover
-     * events to the handler.
-     */
-    protected final AMQProtocolHandler _protocolHandler;
-
-    /** Maps from the channel id to the AMQSession that it represents. */
-    protected ConcurrentMap<Integer, AMQSession> _channelId2SessionMap = new ConcurrentHashMap<Integer, AMQSession>();
-
-    protected ConcurrentMap _closingChannels = new ConcurrentHashMap();
-
-    /**
-     * Maps from a channel id to an unprocessed message. This is used to tie together the JmsDeliverBody (which arrives
-     * first) with the subsequent content header and content bodies.
-     */
-    private final ConcurrentMap<Integer, UnprocessedMessage> _channelId2UnprocessedMsgMap = new ConcurrentHashMap<Integer, UnprocessedMessage>();
-    private final UnprocessedMessage[] _channelId2UnprocessedMsgArray = new UnprocessedMessage[16];
-
-    /** Counter to ensure unique queue names */
-    protected int _queueId = 1;
-    protected final Object _queueIdLock = new Object();
-
-    private ProtocolVersion _protocolVersion;
-//    private VersionSpecificRegistry _registry =
-//        MainRegistry.getVersionSpecificRegistry(ProtocolVersion.getLatestSupportedVersion());
-
-    private MethodRegistry _methodRegistry =
-            MethodRegistry.getMethodRegistry(ProtocolVersion.getLatestSupportedVersion());
-
-    private MethodDispatcher _methodDispatcher;
-
-    protected final AMQConnection _connection;
-
-    private ConnectionTuneParameters _connectionTuneParameters;
-
-    private SaslClient _saslClient;
-
-    private static final int FAST_CHANNEL_ACCESS_MASK = 0xFFFFFFF0;
-
-    public AMQProtocolSession(AMQProtocolHandler protocolHandler, AMQConnection connection)
-    {
-        _protocolHandler = protocolHandler;
-        _protocolVersion = connection.getProtocolVersion();
-        _logger.info("Using ProtocolVersion for Session:" + _protocolVersion);
-        _methodDispatcher = ClientMethodDispatcherImpl.newMethodDispatcher(ProtocolVersion.getLatestSupportedVersion(),
-                                                                           this);
-        _connection = connection;
-    }
-
-    public void init()
-    {
-        // start the process of setting up the connection. This is the first place that
-        // data is written to the server.
-        _protocolHandler.writeFrame(new ProtocolInitiation(_connection.getProtocolVersion()));
-    }
-
-    public String getClientID()
-    {
-        try
-        {
-            return getAMQConnection().getClientID();
-        }
-        catch (JMSException e)
-        {
-            // we never throw a JMSException here
-            return null;
-        }
-    }
-
-    public void setClientID(String clientID) throws JMSException
-    {
-        getAMQConnection().setClientID(clientID);
-    }
-
-    public AMQStateManager getStateManager()
-    {
-        return _protocolHandler.getStateManager();
-    }
-
-    public String getVirtualHost()
-    {
-        return getAMQConnection().getVirtualHost();
-    }
-
-    public String getUsername()
-    {
-        return getAMQConnection().getUsername();
-    }
-
-    public String getPassword()
-    {
-        return getAMQConnection().getPassword();
-    }
-
-    public SaslClient getSaslClient()
-    {
-        return _saslClient;
-    }
-
-    /**
-     * Store the SASL client currently being used for the authentication handshake
-     *
-     * @param client if non-null, stores this in the session. if null clears any existing client being stored
-     */
-    public void setSaslClient(SaslClient client)
-    {
-        _saslClient = client;
-    }
-
-    public ConnectionTuneParameters getConnectionTuneParameters()
-    {
-        return _connectionTuneParameters;
-    }
-
-    public void setConnectionTuneParameters(ConnectionTuneParameters params)
-    {
-        _connectionTuneParameters = params;
-        AMQConnection con = getAMQConnection();
-
-        con.setMaximumChannelCount(params.getChannelMax());
-        con.setMaximumFrameSize(params.getFrameMax());
-        _protocolHandler.initHeartbeats((int) params.getHeartbeat());
-    }
-
-    /**
-     * Callback invoked from the BasicDeliverMethodHandler when a message has been received. This is invoked on the MINA
-     * dispatcher thread.
-     *
-     * @param message
-     *
-     * @throws AMQException if this was not expected
-     */
-    public void unprocessedMessageReceived(final int channelId, UnprocessedMessage message) throws AMQException
-    {
-        if ((channelId & FAST_CHANNEL_ACCESS_MASK) == 0)
-        {
-            _channelId2UnprocessedMsgArray[channelId] = message;
-        }
-        else
-        {
-            _channelId2UnprocessedMsgMap.put(channelId, message);
-        }
-    }
-
-    public void contentHeaderReceived(int channelId, ContentHeaderBody contentHeader) throws AMQException
-    {
-        final UnprocessedMessage_0_8 msg = (UnprocessedMessage_0_8) ((channelId & FAST_CHANNEL_ACCESS_MASK) == 0 ? _channelId2UnprocessedMsgArray[channelId]
-                                               : _channelId2UnprocessedMsgMap.get(channelId));
-
-        if (msg == null)
-        {
-            throw new AMQException(null, "Error: received content header without having received a BasicDeliver frame first on session:" + this, null);
-        }
-
-        if (msg.getContentHeader() != null)
-        {
-            throw new AMQException(null, "Error: received duplicate content header or did not receive correct number of content body frames on session:" + this, null);
-        }
-
-        msg.setContentHeader(contentHeader);
-        if (contentHeader.bodySize == 0)
-        {
-            deliverMessageToAMQSession(channelId, msg);
-        }
-    }
-
-    public void contentBodyReceived(final int channelId, ContentBody contentBody) throws AMQException
-    {
-        UnprocessedMessage_0_8 msg;
-        final boolean fastAccess = (channelId & FAST_CHANNEL_ACCESS_MASK) == 0;
-        if (fastAccess)
-        {
-            msg = (UnprocessedMessage_0_8) _channelId2UnprocessedMsgArray[channelId];
-        }
-        else
-        {
-            msg = (UnprocessedMessage_0_8) _channelId2UnprocessedMsgMap.get(channelId);
-        }
-
-        if (msg == null)
-        {
-            throw new AMQException(null, "Error: received content body without having received a JMSDeliver frame first", null);
-        }
-
-        if (msg.getContentHeader() == null)
-        {
-            if (fastAccess)
-            {
-                _channelId2UnprocessedMsgArray[channelId] = null;
-            }
-            else
-            {
-                _channelId2UnprocessedMsgMap.remove(channelId);
-            }
-            throw new AMQException(null, "Error: received content body without having received a ContentHeader frame first", null);
-        }
-
-        msg.receiveBody(contentBody);
-
-        if (msg.isAllBodyDataReceived())
-        {
-            deliverMessageToAMQSession(channelId, msg);
-        }
-    }
-
-    public void heartbeatBodyReceived(int channelId, HeartbeatBody body) throws AMQException
-    {
-
-    }
-
-    /**
-     * Deliver a message to the appropriate session, removing the unprocessed message from our map
-     *
-     * @param channelId the channel id the message should be delivered to
-     * @param msg       the message
-     */
-    private void deliverMessageToAMQSession(int channelId, UnprocessedMessage msg)
-    {
-        AMQSession session = getSession(channelId);
-        session.messageReceived(msg);
-        if ((channelId & FAST_CHANNEL_ACCESS_MASK) == 0)
-        {
-            _channelId2UnprocessedMsgArray[channelId] = null;
-        }
-        else
-        {
-            _channelId2UnprocessedMsgMap.remove(channelId);
-        }
-    }
-
-    protected AMQSession getSession(int channelId)
-    {
-        return _connection.getSession(channelId);
-    }
-
-    /**
-     * Convenience method that writes a frame to the protocol session. Equivalent to calling
-     * getProtocolSession().write().
-     *
-     * @param frame the frame to write
-     */
-    public void writeFrame(AMQDataBlock frame)
-    {
-        _protocolHandler.writeFrame(frame);
-    }
-
-    public void writeFrame(AMQDataBlock frame, boolean wait)
-    {
-        _protocolHandler.writeFrame(frame, wait);
-    }
-
-    /**
-     * Starts the process of closing a session
-     *
-     * @param session the AMQSession being closed
-     */
-    public void closeSession(AMQSession session)
-    {
-        _logger.debug("closeSession called on protocol session for session " + session.getChannelId());
-        final int channelId = session.getChannelId();
-        if (channelId <= 0)
-        {
-            throw new IllegalArgumentException("Attempt to close a channel with id < 0");
-        }
-        // we need to know when a channel is closing so that we can respond
-        // with a channel.close frame when we receive any other type of frame
-        // on that channel
-        _closingChannels.putIfAbsent(channelId, session);
-    }
-
-    /**
-     * Called from the ChannelClose handler when a channel close frame is received. This method decides whether this is
-     * a response or an initiation. The latter case causes the AMQSession to be closed and an exception to be thrown if
-     * appropriate.
-     *
-     * @param channelId the id of the channel (session)
-     *
-     * @return true if the client must respond to the server, i.e. if the server initiated the channel close, false if
-     *         the channel close is just the server responding to the client's earlier request to close the channel.
-     */
-    public boolean channelClosed(int channelId, AMQConstant code, String text) throws AMQException
-    {
-
-        // if this is not a response to an earlier request to close the channel
-        if (_closingChannels.remove(channelId) == null)
-        {
-            final AMQSession session = getSession(channelId);
-            try
-            {
-                session.closed(new AMQException(code, text, null));
-            }
-            catch (JMSException e)
-            {
-                throw new AMQException(null, "JMSException received while closing session", e);
-            }
-
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    public AMQConnection getAMQConnection()
-    {
-        return _connection;
-    }
-
-    public void closeProtocolSession() throws AMQException
-    {
-        _protocolHandler.closeConnection(0);
-    }
-
-    public void failover(String host, int port)
-    {
-        _protocolHandler.failover(host, port);
-    }
-
-    protected AMQShortString generateQueueName()
-    {
-        int id;
-        synchronized (_queueIdLock)
-        {
-            id = _queueId++;
-        }
-        // convert '.', '/', ':' and ';' to single '_', for spec compliance and readability
-        String localAddress = _protocolHandler.getLocalAddress().toString().replaceAll("[./:;]", "_");
-        String queueName = "tmp_" + localAddress + "_" + id;
-        return new AMQShortString(queueName.replaceAll("_+", "_"));
-    }
-
-    public void confirmConsumerCancelled(int channelId, AMQShortString consumerTag)
-    {
-        final AMQSession session = getSession(channelId);
-
-        session.confirmConsumerCancelled(consumerTag.toIntValue());
-    }
-
-    public void setProtocolVersion(final ProtocolVersion pv)
-    {
-        _logger.info("Setting ProtocolVersion to :" + pv);
-        _protocolVersion = pv;
-        _methodRegistry = MethodRegistry.getMethodRegistry(pv);
-        _methodDispatcher = ClientMethodDispatcherImpl.newMethodDispatcher(pv, this);
-  }
-
-    public byte getProtocolMinorVersion()
-    {
-        return _protocolVersion.getMinorVersion();
-    }
-
-    public byte getProtocolMajorVersion()
-    {
-        return _protocolVersion.getMajorVersion();
-    }
-
-    public ProtocolVersion getProtocolVersion()
-    {
-        return _protocolVersion;
-    }
-
-    public MethodRegistry getMethodRegistry()
-    {
-        return _methodRegistry;
-    }
-
-    public MethodDispatcher getMethodDispatcher()
-    {
-        return _methodDispatcher;
-    }
-
-    public void setTicket(int ticket, int channelId)
-    {
-        final AMQSession session = getSession(channelId);
-        session.setTicket(ticket);
-    }
-
-    public void setMethodDispatcher(MethodDispatcher methodDispatcher)
-    {
-        _methodDispatcher = methodDispatcher;
-    }
-
-    public void setFlowControl(final int channelId, final boolean active)
-    {
-        final AMQSession session = getSession(channelId);
-        session.setFlowControl(active);
-    }
-
-    public void methodFrameReceived(final int channel, final AMQMethodBody amqMethodBody) throws AMQException
-    {
-        _protocolHandler.methodBodyReceived(channel, amqMethodBody);
-    }
-
-    public void notifyError(Exception error)
-    {
-        _protocolHandler.propagateExceptionToAllWaiters(error);
-    }
-
-    public void setSender(Sender<java.nio.ByteBuffer> sender)
-    {
-        // No-op, interface munging
-    }
-
-
-    @Override
-    public String toString()
-    {
-        return "AMQProtocolSession[" + _connection + ']';
-    }
-}
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java b/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
deleted file mode 100644
index fbca444208..0000000000
--- a/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- * 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.
- *
- */
-package org.apache.qpid.client.security;
-
-import javax.security.auth.callback.CallbackHandler;
-
-import org.apache.qpid.client.protocol.AMQProtocolSession;
-
-public interface AMQCallbackHandler extends CallbackHandler
-{
-    void initialise(AMQProtocolSession protocolSession);    
-}
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java b/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java
deleted file mode 100644
index 66176dac3c..0000000000
--- a/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *
- * 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.
- *
- */
-package org.apache.qpid.client.security;
-
-import org.apache.qpid.client.protocol.AMQProtocolSession;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-public class UsernameHashedPasswordCallbackHandler implements AMQCallbackHandler
-{
-    private static final Logger _logger = LoggerFactory.getLogger(UsernameHashedPasswordCallbackHandler.class);
-
-    private AMQProtocolSession _protocolSession;
-
-    public void initialise(AMQProtocolSession protocolSession)
-    {
-        _protocolSession = protocolSession;
-    }
-
-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
-    {
-        for (int i = 0; i < callbacks.length; i++)
-        {
-            Callback cb = callbacks[i];
-            if (cb instanceof NameCallback)
-            {
-                ((NameCallback) cb).setName(_protocolSession.getUsername());
-            }
-            else if (cb instanceof PasswordCallback)
-            {
-                try
-                {
-                    ((PasswordCallback) cb).setPassword(getHash(_protocolSession.getPassword()));
-                }
-                catch (NoSuchAlgorithmException e)
-                {
-                    UnsupportedCallbackException uce = new UnsupportedCallbackException(cb);
-                    uce.initCause(e);
-                    throw uce;
-                }
-            }
-            else
-            {
-                throw new UnsupportedCallbackException(cb);
-            }
-        }
-    }
-
-    private char[] getHash(String text) throws NoSuchAlgorithmException, UnsupportedEncodingException
-    {
-
-        byte[] data = text.getBytes("utf-8");
-
-        MessageDigest md = MessageDigest.getInstance("MD5");
-
-        for (byte b : data)
-        {
-            md.update(b);
-        }
-
-        byte[] digest = md.digest();
-
-        char[] hash = new char[digest.length];
-
-        int index = 0;
-        for (byte b : digest)
-        {
-            hash[index++] = (char) b;
-        }
-
-        return hash;
-    }
-}
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java b/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
deleted file mode 100644
index c50c62710f..0000000000
--- a/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- * 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.
- *
- */
-package org.apache.qpid.client.security;
-
-import java.io.IOException;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import org.apache.qpid.client.protocol.AMQProtocolSession;
-
-public class UsernamePasswordCallbackHandler implements AMQCallbackHandler
-{
-    private AMQProtocolSession _protocolSession;
-
-    public void initialise(AMQProtocolSession protocolSession)
-    {
-        _protocolSession = protocolSession;
-    }
-
-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
-    {
-        for (int i = 0; i < callbacks.length; i++)
-        {
-            Callback cb = callbacks[i];
-            if (cb instanceof NameCallback)
-            {
-                ((NameCallback)cb).setName(_protocolSession.getUsername());
-            }
-            else if (cb instanceof PasswordCallback)
-            {
-                ((PasswordCallback)cb).setPassword(_protocolSession.getPassword().toCharArray());
-            }
-            else
-            {
-                throw new UnsupportedCallbackException(cb);
-            }
-        }
-    }
-}
diff --git a/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java b/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
deleted file mode 100644
index da44822ec3..0000000000
--- a/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *
- * 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.
- *
- */
-package org.apache.qpid.client;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.client.state.AMQState;
-import org.apache.qpid.framing.ProtocolVersion;
-import org.apache.qpid.jms.ConnectionURL;
-import org.apache.qpid.jms.BrokerDetails;
-import org.apache.qpid.url.URLSyntaxException;
-
-import java.io.IOException;
-
-public class MockAMQConnection extends AMQConnection
-{
-    public MockAMQConnection(String broker, String username, String password, String clientName, String virtualHost)
-            throws AMQException, URLSyntaxException
-    {
-        super(broker, username, password, clientName, virtualHost);
-    }
-
-    public MockAMQConnection(String broker, String username, String password, String clientName, String virtualHost, SSLConfiguration sslConfig)
-            throws AMQException, URLSyntaxException
-    {
-        super(broker, username, password, clientName, virtualHost, sslConfig);
-    }
-
-    public MockAMQConnection(String host, int port, String username, String password, String clientName, String virtualHost)
-            throws AMQException, URLSyntaxException
-    {
-        super(host, port, username, password, clientName, virtualHost);
-    }
-
-    public MockAMQConnection(String host, int port, String username, String password, String clientName, String virtualHost, SSLConfiguration sslConfig)
-            throws AMQException, URLSyntaxException
-    {
-        super(host, port, username, password, clientName, virtualHost, sslConfig);
-    }
-
-    public MockAMQConnection(String host, int port, boolean useSSL, String username, String password, String clientName, String virtualHost, SSLConfiguration sslConfig)
-            throws AMQException, URLSyntaxException
-    {
-        super(host, port, useSSL, username, password, clientName, virtualHost, sslConfig);
-    }
-
-    public MockAMQConnection(String connection)
-            throws AMQException, URLSyntaxException
-    {
-        super(connection);
-    }
-
-    public MockAMQConnection(String connection, SSLConfiguration sslConfig)
-            throws AMQException, URLSyntaxException
-    {
-        super(connection, sslConfig);
-    }
-
-    public MockAMQConnection(ConnectionURL connectionURL, SSLConfiguration sslConfig)
-            throws AMQException
-    {
-        super(connectionURL, sslConfig);
-    }
-
-    protected MockAMQConnection(String username, String password, String clientName, String virtualHost)
-    {
-        super(username, password, clientName, virtualHost);
-    }
-
-    @Override
-    public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail) throws IOException
-    {
-        _connected = true;
-        _protocolHandler.getStateManager().changeState(AMQState.CONNECTION_OPEN);
-        return null;
-    }
-}
diff --git a/python/qpid/messaging/driver.py b/python/qpid/messaging/driver.py
deleted file mode 100644
index 78af2827df..0000000000
--- a/python/qpid/messaging/driver.py
+++ /dev/null
@@ -1,1329 +0,0 @@
-#
-# 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.
-#
-
-import socket, struct, sys, time
-from logging import getLogger, DEBUG
-from qpid import compat
-from qpid import sasl
-from qpid.concurrency import synchronized
-from qpid.datatypes import RangedSet, Serial
-from qpid.framing import OpEncoder, SegmentEncoder, FrameEncoder, \
-    FrameDecoder, SegmentDecoder, OpDecoder
-from qpid.messaging import address, transports
-from qpid.messaging.constants import UNLIMITED, REJECTED, RELEASED
-from qpid.messaging.exceptions import *
-from qpid.messaging.message import get_codec, Disposition, Message
-from qpid.ops import *
-from qpid.selector import Selector
-from qpid.util import URL, default
-from qpid.validator import And, Context, List, Map, Types, Values
-from threading import Condition, Thread
-
-log = getLogger("qpid.messaging")
-rawlog = getLogger("qpid.messaging.io.raw")
-opslog = getLogger("qpid.messaging.io.ops")
-
-def addr2reply_to(addr):
-  name, subject, options = address.parse(addr)
-  if options:
-    type = options.get("node", {}).get("type")
-  else:
-    type = None
-
-  if type == "topic":
-    return ReplyTo(name, subject)
-  else:
-    return ReplyTo(None, name)
-
-def reply_to2addr(reply_to):
-  if reply_to.exchange in (None, ""):
-    return reply_to.routing_key
-  elif reply_to.routing_key is None:
-    return "%s; {node: {type: topic}}" % reply_to.exchange
-  else:
-    return "%s/%s; {node: {type: topic}}" % (reply_to.exchange, reply_to.routing_key)
-
-class Attachment:
-
-  def __init__(self, target):
-    self.target = target
-
-# XXX
-
-DURABLE_DEFAULT=False
-
-# XXX
-
-class Pattern:
-  """
-  The pattern filter matches the supplied wildcard pattern against a
-  message subject.
-  """
-
-  def __init__(self, value):
-    self.value = value
-
-  # XXX: this should become part of the driver
-  def _bind(self, sst, exchange, queue):
-    from qpid.ops import ExchangeBind
-
-    sst.write_cmd(ExchangeBind(exchange=exchange, queue=queue,
-                               binding_key=self.value.replace("*", "#")))
-
-SUBJECT_DEFAULTS = {
-  "topic": "#"
-  }
-
-# XXX
-ppid = 0
-try:
-  ppid = os.getppid()
-except:
-  pass
-
-CLIENT_PROPERTIES = {"product": "qpid python client",
-                     "version": "development",
-                     "platform": os.name,
-                     "qpid.client_process": os.path.basename(sys.argv[0]),
-                     "qpid.client_pid": os.getpid(),
-                     "qpid.client_ppid": ppid}
-
-def noop(): pass
-def sync_noop(): pass
-
-class SessionState:
-
-  def __init__(self, driver, session, name, channel):
-    self.driver = driver
-    self.session = session
-    self.name = name
-    self.channel = channel
-    self.detached = False
-    self.committing = False
-    self.aborting = False
-
-    # sender state
-    self.sent = Serial(0)
-    self.acknowledged = RangedSet()
-    self.actions = {}
-    self.min_completion = self.sent
-    self.max_completion = self.sent
-    self.results = {}
-    self.need_sync = False
-
-    # receiver state
-    self.received = None
-    self.executed = RangedSet()
-
-    # XXX: need to periodically exchange completion/known_completion
-
-    self.destinations = {}
-
-  def write_query(self, query, handler):
-    id = self.sent
-    self.write_cmd(query, lambda: handler(self.results.pop(id)))
-
-  def apply_overrides(self, cmd, overrides):
-    for k, v in overrides.items():
-      cmd[k.replace('-', '_')] = v
-
-  def write_cmd(self, cmd, action=noop, overrides=None, sync=True):
-    if overrides:
-      self.apply_overrides(cmd, overrides)
-
-    if action != noop:
-      cmd.sync = sync
-    if self.detached:
-      raise Exception("detached")
-    cmd.id = self.sent
-    self.sent += 1
-    self.actions[cmd.id] = action
-    self.max_completion = cmd.id
-    self.write_op(cmd)
-    self.need_sync = not cmd.sync
-
-  def write_cmds(self, cmds, action=noop):
-    if cmds:
-      for cmd in cmds[:-1]:
-        self.write_cmd(cmd)
-      self.write_cmd(cmds[-1], action)
-    else:
-      action()
-
-  def write_op(self, op):
-    op.channel = self.channel
-    self.driver.write_op(op)
-
-POLICIES = Values("always", "sender", "receiver", "never")
-RELIABILITY = Values("unreliable", "at-most-once", "at-least-once",
-                     "exactly-once")
-
-DECLARE = Map({}, restricted=False)
-BINDINGS = List(Map({
-      "exchange": Types(basestring),
-      "queue": Types(basestring),
-      "key": Types(basestring),
-      "arguments": Map({}, restricted=False)
-      }))
-
-COMMON_OPTS = {
-  "create": POLICIES,
-  "delete": POLICIES,
-  "assert": POLICIES,
-  "node": Map({
-      "type": Values("queue", "topic"),
-      "durable": Types(bool),
-      "x-declare": DECLARE,
-      "x-bindings": BINDINGS
-      }),
-  "link": Map({
-      "name": Types(basestring),
-      "durable": Types(bool),
-      "reliability": RELIABILITY,
-      "x-declare": DECLARE,
-      "x-bindings": BINDINGS,
-      "x-subscribe": Map({}, restricted=False)
-      })
-  }
-
-RECEIVE_MODES = Values("browse", "consume")
-
-SOURCE_OPTS = COMMON_OPTS.copy()
-SOURCE_OPTS.update({
-    "mode": RECEIVE_MODES
-    })
-
-TARGET_OPTS = COMMON_OPTS.copy()
-
-class LinkIn:
-
-  ADDR_NAME = "source"
-  DIR_NAME = "receiver"
-  VALIDATOR = Map(SOURCE_OPTS)
-
-  def init_link(self, sst, rcv, _rcv):
-    _rcv.destination = str(rcv.id)
-    sst.destinations[_rcv.destination] = _rcv
-    _rcv.draining = False
-    _rcv.bytes_open = False
-    _rcv.on_unlink = []
-
-  def do_link(self, sst, rcv, _rcv, type, subtype, action):
-    link_opts = _rcv.options.get("link", {})
-    reliability = link_opts.get("reliability", "at-least-once")
-    declare = link_opts.get("x-declare", {})
-    subscribe = link_opts.get("x-subscribe", {})
-    acq_mode = acquire_mode.pre_acquired
-    if reliability in ("unreliable", "at-most-once"):
-      rcv._accept_mode = accept_mode.none
-    else:
-      rcv._accept_mode = accept_mode.explicit
-
-    if type == "topic":
-      default_name = "%s.%s" % (rcv.session.name, _rcv.destination)
-      _rcv._queue = link_opts.get("name", default_name)
-      sst.write_cmd(QueueDeclare(queue=_rcv._queue,
-                                 durable=link_opts.get("durable", False),
-                                 exclusive=True,
-                                 auto_delete=(reliability == "unreliable")),
-                    overrides=declare)
-      _rcv.on_unlink = [QueueDelete(_rcv._queue)]
-      subject = _rcv.subject or SUBJECT_DEFAULTS.get(subtype)
-      bindings = get_bindings(link_opts, _rcv._queue, _rcv.name, subject)
-      if not bindings:
-        sst.write_cmd(ExchangeBind(_rcv._queue, _rcv.name, subject))
-
-    elif type == "queue":
-      _rcv._queue = _rcv.name
-      if _rcv.options.get("mode", "consume") == "browse":
-        acq_mode = acquire_mode.not_acquired
-      bindings = get_bindings(link_opts, queue=_rcv._queue)
-
-
-    sst.write_cmds(bindings)
-    sst.write_cmd(MessageSubscribe(queue=_rcv._queue,
-                                   destination=_rcv.destination,
-                                   acquire_mode = acq_mode,
-                                   accept_mode = rcv._accept_mode),
-                  overrides=subscribe)
-    sst.write_cmd(MessageSetFlowMode(_rcv.destination, flow_mode.credit), action)
-
-  def do_unlink(self, sst, rcv, _rcv, action=noop):
-    link_opts = _rcv.options.get("link", {})
-    reliability = link_opts.get("reliability")
-    cmds = [MessageCancel(_rcv.destination)]
-    cmds.extend(_rcv.on_unlink)
-    sst.write_cmds(cmds, action)
-
-  def del_link(self, sst, rcv, _rcv):
-    del sst.destinations[_rcv.destination]
-
-class LinkOut:
-
-  ADDR_NAME = "target"
-  DIR_NAME = "sender"
-  VALIDATOR = Map(TARGET_OPTS)
-
-  def init_link(self, sst, snd, _snd):
-    _snd.closing = False
-    _snd.pre_ack = False
-
-  def do_link(self, sst, snd, _snd, type, subtype, action):
-    link_opts = _snd.options.get("link", {})
-    reliability = link_opts.get("reliability", "at-least-once")
-    _snd.pre_ack = reliability in ("unreliable", "at-most-once")
-    if type == "topic":
-      _snd._exchange = _snd.name
-      _snd._routing_key = _snd.subject
-      bindings = get_bindings(link_opts, exchange=_snd.name, key=_snd.subject)
-    elif type == "queue":
-      _snd._exchange = ""
-      _snd._routing_key = _snd.name
-      bindings = get_bindings(link_opts, queue=_snd.name)
-    sst.write_cmds(bindings, action)
-
-  def do_unlink(self, sst, snd, _snd, action=noop):
-    action()
-
-  def del_link(self, sst, snd, _snd):
-    pass
-
-class Cache:
-
-  def __init__(self, ttl):
-    self.ttl = ttl
-    self.entries = {}
-
-  def __setitem__(self, key, value):
-    self.entries[key] = time.time(), value
-
-  def __getitem__(self, key):
-    tstamp, value = self.entries[key]
-    if time.time() - tstamp >= self.ttl:
-      del self.entries[key]
-      raise KeyError(key)
-    else:
-      return value
-
-  def __delitem__(self, key):
-    del self.entries[key]
-
-# XXX
-HEADER="!4s4B"
-
-EMPTY_DP = DeliveryProperties()
-EMPTY_MP = MessageProperties()
-
-SUBJECT = "qpid.subject"
-
-CLOSED = "CLOSED"
-READ_ONLY = "READ_ONLY"
-WRITE_ONLY = "WRITE_ONLY"
-OPEN = "OPEN"
-
-class Driver:
-
-  def __init__(self, connection):
-    self.connection = connection
-    self.log_id = "%x" % id(self.connection)
-    self._lock = self.connection._lock
-
-    self._selector = Selector.default()
-    self._attempts = 0
-    self._delay = self.connection.reconnect_interval_min
-    self._reconnect_log = self.connection.reconnect_log
-    self._host = 0
-    self._retrying = False
-    self._next_retry = None
-    self._transport = None
-
-    self._timeout = None
-
-    self.engine = None
-
-  def _next_host(self):
-    urls = [URL(u) for u in self.connection.reconnect_urls]
-    hosts = [(self.connection.host, default(self.connection.port, 5672))] + \
-        [(u.host, default(u.port, 5672)) for u in urls]
-    if self._host >= len(hosts):
-      self._host = 0
-    result = hosts[self._host]
-    if self._host == 0:
-      self._attempts += 1
-    self._host = self._host + 1
-    return result
-
-  def _num_hosts(self):
-    return len(self.connection.reconnect_urls) + 1
-
-  @synchronized
-  def wakeup(self):
-    self.dispatch()
-    self._selector.wakeup()
-
-  def start(self):
-    self._selector.register(self)
-
-  def stop(self):
-    self._selector.unregister(self)
-    if self._transport:
-      self.st_closed()
-
-  def fileno(self):
-    return self._transport.fileno()
-
-  @synchronized
-  def reading(self):
-    return self._transport is not None and \
-        self._transport.reading(True)
-
-  @synchronized
-  def writing(self):
-    return self._transport is not None and \
-        self._transport.writing(self.engine.pending())
-
-  @synchronized
-  def timing(self):
-    return self._timeout
-
-  @synchronized
-  def readable(self):
-    try:
-      data = self._transport.recv(64*1024)
-      if data is None:
-        return
-      elif data:
-        rawlog.debug("READ[%s]: %r", self.log_id, data)
-        self.engine.write(data)
-      else:
-        self.close_engine()
-    except socket.error, e:
-      self.close_engine(ConnectionError(text=str(e)))
-
-    self.update_status()
-
-    self._notify()
-
-  def _notify(self):
-    if self.connection.error:
-      self.connection._condition.gc()
-    self.connection._waiter.notifyAll()
-
-  def close_engine(self, e=None):
-    if e is None:
-      e = ConnectionError(text="connection aborted")
-
-    if (self.connection.reconnect and
-        (self.connection.reconnect_limit is None or
-         self.connection.reconnect_limit <= 0 or
-         self._attempts <= self.connection.reconnect_limit)):
-      if self._host < self._num_hosts():
-        delay = 0
-      else:
-        delay = self._delay
-        self._delay = min(2*self._delay,
-                          self.connection.reconnect_interval_max)
-      self._next_retry = time.time() + delay
-      if self._reconnect_log:
-        log.warn("recoverable error[attempt %s]: %s" % (self._attempts, e))
-        if delay > 0:
-          log.warn("sleeping %s seconds" % delay)
-      self._retrying = True
-      self.engine.close()
-    else:
-      self.engine.close(e)
-
-    self.schedule()
-
-  def update_status(self):
-    status = self.engine.status()
-    return getattr(self, "st_%s" % status.lower())()
-
-  def st_closed(self):
-    # XXX: this log statement seems to sometimes hit when the socket is not connected
-    # XXX: rawlog.debug("CLOSE[%s]: %s", self.log_id, self._socket.getpeername())
-    self._transport.close()
-    self._transport = None
-    self.engine = None
-    return True
-
-  def st_open(self):
-    return False
-
-  @synchronized
-  def writeable(self):
-    notify = False
-    try:
-      n = self._transport.send(self.engine.peek())
-      if n == 0: return
-      sent = self.engine.read(n)
-      rawlog.debug("SENT[%s]: %r", self.log_id, sent)
-    except socket.error, e:
-      self.close_engine(e)
-      notify = True
-
-    if self.update_status() or notify:
-      self._notify()
-
-  @synchronized
-  def timeout(self):
-    self.dispatch()
-    self._notify()
-    self.schedule()
-
-  def schedule(self):
-    times = []
-    if self.connection.heartbeat:
-      times.append(time.time() + self.connection.heartbeat)
-    if self._next_retry:
-      times.append(self._next_retry)
-    if times:
-      self._timeout = min(times)
-    else:
-      self._timeout = None
-
-  def dispatch(self):
-    try:
-      if self._transport is None:
-        if self.connection._connected and not self.connection.error:
-          self.connect()
-      else:
-        self.engine.dispatch()
-    except HeartbeatTimeout, e:
-      self.close_engine(e)
-    except:
-      # XXX: Does socket get leaked if this occurs?
-      msg = compat.format_exc()
-      self.connection.error = InternalError(text=msg)
-
-  def connect(self):
-    if self._retrying and time.time() < self._next_retry:
-      return
-
-    try:
-      # XXX: should make this non blocking
-      host, port = self._next_host()
-      if self._retrying and self._reconnect_log:
-        log.warn("trying: %s:%s", host, port)
-      self.engine = Engine(self.connection)
-      self.engine.open()
-      rawlog.debug("OPEN[%s]: %s:%s", self.log_id, host, port)
-      trans = transports.TRANSPORTS.get(self.connection.transport)
-      if trans:
-        self._transport = trans(self.connection, host, port)
-      else:
-        raise ConnectError("no such transport: %s" % self.connection.transport)
-      if self._retrying and self._reconnect_log:
-        log.warn("reconnect succeeded: %s:%s", host, port)
-      self._next_retry = None
-      self._attempts = 0
-      self._host = 0
-      self._delay = self.connection.reconnect_interval_min
-      self._retrying = False
-      self.schedule()
-    except socket.error, e:
-      self.close_engine(ConnectError(text=str(e)))
-
-DEFAULT_DISPOSITION = Disposition(None)
-
-def get_bindings(opts, queue=None, exchange=None, key=None):
-  bindings = opts.get("x-bindings", [])
-  cmds = []
-  for b in bindings:
-    exchange = b.get("exchange", exchange)
-    queue = b.get("queue", queue)
-    key = b.get("key", key)
-    args = b.get("arguments", {})
-    cmds.append(ExchangeBind(queue, exchange, key, args))
-  return cmds
-
-CONNECTION_ERRS = {
-  # anythong not here (i.e. everything right now) will default to
-  # connection error
-  }
-
-SESSION_ERRS = {
-  # anything not here will default to session error
-  error_code.unauthorized_access: UnauthorizedAccess,
-  error_code.not_found: NotFound,
-  error_code.resource_locked: ReceiverError,
-  error_code.resource_limit_exceeded: TargetCapacityExceeded,
-  error_code.internal_error: ServerError
-  }
-
-class Engine:
-
-  def __init__(self, connection):
-    self.connection = connection
-    self.log_id = "%x" % id(self.connection)
-    self._closing = False
-    self._connected = False
-    self._attachments = {}
-
-    self._in = LinkIn()
-    self._out = LinkOut()
-
-    self._channel_max = 65536
-    self._channels = 0
-    self._sessions = {}
-
-    self.address_cache = Cache(self.connection.address_ttl)
-
-    self._status = CLOSED
-    self._buf = ""
-    self._hdr = ""
-    self._last_in = None
-    self._last_out = None
-    self._op_enc = OpEncoder()
-    self._seg_enc = SegmentEncoder()
-    self._frame_enc = FrameEncoder()
-    self._frame_dec = FrameDecoder()
-    self._seg_dec = SegmentDecoder()
-    self._op_dec = OpDecoder()
-
-    self._sasl = sasl.Client()
-    if self.connection.username:
-      self._sasl.setAttr("username", self.connection.username)
-    if self.connection.password:
-      self._sasl.setAttr("password", self.connection.password)
-    if self.connection.host:
-      self._sasl.setAttr("host", self.connection.host)
-    self._sasl.setAttr("service", self.connection.sasl_service)
-    if self.connection.sasl_min_ssf is not None:
-      self._sasl.setAttr("minssf", self.connection.sasl_min_ssf)
-    if self.connection.sasl_max_ssf is not None:
-      self._sasl.setAttr("maxssf", self.connection.sasl_max_ssf)
-    self._sasl.init()
-    self._sasl_encode = False
-    self._sasl_decode = False
-
-  def _reset(self):
-    self.connection._transport_connected = False
-
-    for ssn in self.connection.sessions.values():
-      for m in ssn.acked + ssn.unacked + ssn.incoming:
-        m._transfer_id = None
-      for snd in ssn.senders:
-        snd.linked = False
-      for rcv in ssn.receivers:
-        rcv.impending = rcv.received
-        rcv.linked = False
-
-  def status(self):
-    return self._status
-
-  def write(self, data):
-    self._last_in = time.time()
-    try:
-      if self._sasl_decode:
-        data = self._sasl.decode(data)
-
-      if len(self._hdr) < 8:
-        r = 8 - len(self._hdr)
-        self._hdr += data[:r]
-        data = data[r:]
-
-        if len(self._hdr) == 8:
-          self.do_header(self._hdr)
-
-      self._frame_dec.write(data)
-      self._seg_dec.write(*self._frame_dec.read())
-      self._op_dec.write(*self._seg_dec.read())
-      for op in self._op_dec.read():
-        self.assign_id(op)
-        opslog.debug("RCVD[%s]: %r", self.log_id, op)
-        op.dispatch(self)
-      self.dispatch()
-    except MessagingError, e:
-      self.close(e)
-    except:
-      self.close(InternalError(text=compat.format_exc()))
-
-  def close(self, e=None):
-    self._reset()
-    if e:
-      self.connection.error = e
-    self._status = CLOSED
-
-  def assign_id(self, op):
-    if isinstance(op, Command):
-      sst = self.get_sst(op)
-      op.id = sst.received
-      sst.received += 1
-
-  def pending(self):
-    return len(self._buf)
-
-  def read(self, n):
-    result = self._buf[:n]
-    self._buf = self._buf[n:]
-    return result
-
-  def peek(self):
-    return self._buf
-
-  def write_op(self, op):
-    opslog.debug("SENT[%s]: %r", self.log_id, op)
-    self._op_enc.write(op)
-    self._seg_enc.write(*self._op_enc.read())
-    self._frame_enc.write(*self._seg_enc.read())
-    bytes = self._frame_enc.read()
-    if self._sasl_encode:
-      bytes = self._sasl.encode(bytes)
-    self._buf += bytes
-    self._last_out = time.time()
-
-  def do_header(self, hdr):
-    cli_major = 0; cli_minor = 10
-    magic, _, _, major, minor = struct.unpack(HEADER, hdr)
-    if major != cli_major or minor != cli_minor:
-      raise VersionError(text="client: %s-%s, server: %s-%s" %
-                         (cli_major, cli_minor, major, minor))
-
-  def do_connection_start(self, start):
-    if self.connection.sasl_mechanisms:
-      permitted = self.connection.sasl_mechanisms.split()
-      mechs = [m for m in start.mechanisms if m in permitted]
-    else:
-      mechs = start.mechanisms
-    try:
-      mech, initial = self._sasl.start(" ".join(mechs))
-    except sasl.SASLError, e:
-      raise AuthenticationFailure(text=str(e))
-    self.write_op(ConnectionStartOk(client_properties=CLIENT_PROPERTIES,
-                                    mechanism=mech, response=initial))
-
-  def do_connection_secure(self, secure):
-    resp = self._sasl.step(secure.challenge)
-    self.write_op(ConnectionSecureOk(response=resp))
-
-  def do_connection_tune(self, tune):
-    # XXX: is heartbeat protocol specific?
-    if tune.channel_max is not None:
-      self.channel_max = tune.channel_max
-    self.write_op(ConnectionTuneOk(heartbeat=self.connection.heartbeat,
-                                   channel_max=self.channel_max))
-    self.write_op(ConnectionOpen())
-    self._sasl_encode = True
-
-  def do_connection_open_ok(self, open_ok):
-    self.connection.auth_username = self._sasl.auth_username()
-    self._connected = True
-    self._sasl_decode = True
-    self.connection._transport_connected = True
-
-  def do_connection_heartbeat(self, hrt):
-    pass
-
-  def do_connection_close(self, close):
-    self.write_op(ConnectionCloseOk())
-    if close.reply_code != close_code.normal:
-      exc = CONNECTION_ERRS.get(close.reply_code, ConnectionError)
-      self.connection.error = exc(close.reply_code, close.reply_text)
-    # XXX: should we do a half shutdown on the socket here?
-    # XXX: we really need to test this, we may end up reporting a
-    # connection abort after this, if we were to do a shutdown on read
-    # and stop reading, then we wouldn't report the abort, that's
-    # probably the right thing to do
-
-  def do_connection_close_ok(self, close_ok):
-    self.close()
-
-  def do_session_attached(self, atc):
-    pass
-
-  def do_session_command_point(self, cp):
-    sst = self.get_sst(cp)
-    sst.received = cp.command_id
-
-  def do_session_completed(self, sc):
-    sst = self.get_sst(sc)
-    for r in sc.commands:
-      sst.acknowledged.add(r.lower, r.upper)
-
-    if not sc.commands.empty():
-      while sst.min_completion in sc.commands:
-        if sst.actions.has_key(sst.min_completion):
-          sst.actions.pop(sst.min_completion)()
-        sst.min_completion += 1
-
-  def session_known_completed(self, kcmp):
-    sst = self.get_sst(kcmp)
-    executed = RangedSet()
-    for e in sst.executed.ranges:
-      for ke in kcmp.ranges:
-        if e.lower in ke and e.upper in ke:
-          break
-      else:
-        executed.add_range(e)
-    sst.executed = completed
-
-  def do_session_flush(self, sf):
-    sst = self.get_sst(sf)
-    if sf.expected:
-      if sst.received is None:
-        exp = None
-      else:
-        exp = RangedSet(sst.received)
-      sst.write_op(SessionExpected(exp))
-    if sf.confirmed:
-      sst.write_op(SessionConfirmed(sst.executed))
-    if sf.completed:
-      sst.write_op(SessionCompleted(sst.executed))
-
-  def do_session_request_timeout(self, rt):
-    sst = self.get_sst(rt)
-    sst.write_op(SessionTimeout(timeout=0))
-
-  def do_execution_result(self, er):
-    sst = self.get_sst(er)
-    sst.results[er.command_id] = er.value
-    sst.executed.add(er.id)
-
-  def do_execution_exception(self, ex):
-    sst = self.get_sst(ex)
-    exc = SESSION_ERRS.get(ex.error_code, SessionError)
-    sst.session.error = exc(ex.error_code, ex.description)
-
-  def dispatch(self):
-    if not self.connection._connected and not self._closing and self._status != CLOSED:
-      self.disconnect()
-
-    if self._connected and not self._closing:
-      for ssn in self.connection.sessions.values():
-        self.attach(ssn)
-        self.process(ssn)
-
-      if self.connection.heartbeat and self._status != CLOSED:
-        now = time.time()
-        if self._last_in is not None and \
-              now - self._last_in > 2*self.connection.heartbeat:
-          raise HeartbeatTimeout(text="heartbeat timeout")
-        if self._last_out is None or now - self._last_out >= self.connection.heartbeat/2.0:
-          self.write_op(ConnectionHeartbeat())
-
-  def open(self):
-    self._reset()
-    self._status = OPEN
-    self._buf += struct.pack(HEADER, "AMQP", 1, 1, 0, 10)
-
-  def disconnect(self):
-    self.write_op(ConnectionClose(close_code.normal))
-    self._closing = True
-
-  def attach(self, ssn):
-    sst = self._attachments.get(ssn)
-    if sst is None and not ssn.closed:
-      for i in xrange(0, self.channel_max):
-        if not self._sessions.has_key(i):
-          ch = i
-          break
-      else:
-        raise RuntimeError("all channels used")
-      sst = SessionState(self, ssn, ssn.name, ch)
-      sst.write_op(SessionAttach(name=ssn.name))
-      sst.write_op(SessionCommandPoint(sst.sent, 0))
-      sst.outgoing_idx = 0
-      sst.acked = []
-      sst.acked_idx = 0
-      if ssn.transactional:
-        sst.write_cmd(TxSelect())
-      self._attachments[ssn] = sst
-      self._sessions[sst.channel] = sst
-
-    for snd in ssn.senders:
-      self.link(snd, self._out, snd.target)
-    for rcv in ssn.receivers:
-      self.link(rcv, self._in, rcv.source)
-
-    if sst is not None and ssn.closing and not sst.detached:
-      sst.detached = True
-      sst.write_op(SessionDetach(name=ssn.name))
-
-  def get_sst(self, op):
-    return self._sessions[op.channel]
-
-  def do_session_detached(self, dtc):
-    sst = self._sessions.pop(dtc.channel)
-    ssn = sst.session
-    del self._attachments[ssn]
-    ssn.closed = True
-
-  def do_session_detach(self, dtc):
-    sst = self.get_sst(dtc)
-    sst.write_op(SessionDetached(name=dtc.name))
-    self.do_session_detached(dtc)
-
-  def link(self, lnk, dir, addr):
-    sst = self._attachments.get(lnk.session)
-    _lnk = self._attachments.get(lnk)
-
-    if _lnk is None and not lnk.closed:
-      _lnk = Attachment(lnk)
-      _lnk.closing = False
-      dir.init_link(sst, lnk, _lnk)
-
-      err = self.parse_address(_lnk, dir, addr) or self.validate_options(_lnk, dir)
-      if err:
-        lnk.error = err
-        lnk.closed = True
-        return
-
-      def linked():
-        lnk.linked = True
-
-      def resolved(type, subtype):
-        dir.do_link(sst, lnk, _lnk, type, subtype, linked)
-
-      self.resolve_declare(sst, _lnk, dir.DIR_NAME, resolved)
-      self._attachments[lnk] = _lnk
-
-    if lnk.linked and lnk.closing and not lnk.closed:
-      if not _lnk.closing:
-        def unlinked():
-          dir.del_link(sst, lnk, _lnk)
-          del self._attachments[lnk]
-          lnk.closed = True
-        if _lnk.options.get("delete") in ("always", dir.DIR_NAME):
-          dir.do_unlink(sst, lnk, _lnk)
-          self.delete(sst, _lnk.name, unlinked)
-        else:
-          dir.do_unlink(sst, lnk, _lnk, unlinked)
-        _lnk.closing = True
-    elif not lnk.linked and lnk.closing and not lnk.closed:
-      if lnk.error: lnk.closed = True
-
-  def parse_address(self, lnk, dir, addr):
-    if addr is None:
-      return MalformedAddress(text="%s is None" % dir.ADDR_NAME)
-    else:
-      try:
-        lnk.name, lnk.subject, lnk.options = address.parse(addr)
-        # XXX: subject
-        if lnk.options is None:
-          lnk.options = {}
-      except address.LexError, e:
-        return MalformedAddress(text=str(e))
-      except address.ParseError, e:
-        return MalformedAddress(text=str(e))
-
-  def validate_options(self, lnk, dir):
-    ctx = Context()
-    err = dir.VALIDATOR.validate(lnk.options, ctx)
-    if err: return InvalidOption(text="error in options: %s" % err)
-
-  def resolve_declare(self, sst, lnk, dir, action):
-    declare = lnk.options.get("create") in ("always", dir)
-    assrt = lnk.options.get("assert") in ("always", dir)
-    def do_resolved(type, subtype):
-      err = None
-      if type is None:
-        if declare:
-          err = self.declare(sst, lnk, action)
-        else:
-          err = NotFound(text="no such queue: %s" % lnk.name)
-      else:
-        if assrt:
-          expected = lnk.options.get("node", {}).get("type")
-          if expected and type != expected:
-            err = AssertionFailed(text="expected %s, got %s" % (expected, type))
-        if err is None:
-          action(type, subtype)
-
-      if err:
-        tgt = lnk.target
-        tgt.error = err
-        del self._attachments[tgt]
-        tgt.closed = True
-        return
-    self.resolve(sst, lnk.name, do_resolved, force=declare)
-
-  def resolve(self, sst, name, action, force=False):
-    if not force:
-      try:
-        type, subtype = self.address_cache[name]
-        action(type, subtype)
-        return
-      except KeyError:
-        pass
-
-    args = []
-    def do_result(r):
-      args.append(r)
-    def do_action(r):
-      do_result(r)
-      er, qr = args
-      if er.not_found and not qr.queue:
-        type, subtype = None, None
-      elif qr.queue:
-        type, subtype = "queue", None
-      else:
-        type, subtype = "topic", er.type
-      if type is not None:
-        self.address_cache[name] = (type, subtype)
-      action(type, subtype)
-    sst.write_query(ExchangeQuery(name), do_result)
-    sst.write_query(QueueQuery(name), do_action)
-
-  def declare(self, sst, lnk, action):
-    name = lnk.name
-    props = lnk.options.get("node", {})
-    durable = props.get("durable", DURABLE_DEFAULT)
-    type = props.get("type", "queue")
-    declare = props.get("x-declare", {})
-
-    if type == "topic":
-      cmd = ExchangeDeclare(exchange=name, durable=durable)
-      bindings = get_bindings(props, exchange=name)
-    elif type == "queue":
-      cmd = QueueDeclare(queue=name, durable=durable)
-      bindings = get_bindings(props, queue=name)
-    else:
-      raise ValueError(type)
-
-    sst.apply_overrides(cmd, declare)
-
-    if type == "topic":
-      if cmd.type is None:
-        cmd.type = "topic"
-      subtype = cmd.type
-    else:
-      subtype = None
-
-    cmds = [cmd]
-    cmds.extend(bindings)
-
-    def declared():
-      self.address_cache[name] = (type, subtype)
-      action(type, subtype)
-
-    sst.write_cmds(cmds, declared)
-
-  def delete(self, sst, name, action):
-    def deleted():
-      del self.address_cache[name]
-      action()
-
-    def do_delete(type, subtype):
-      if type == "topic":
-        sst.write_cmd(ExchangeDelete(name), deleted)
-      elif type == "queue":
-        sst.write_cmd(QueueDelete(name), deleted)
-      elif type is None:
-        action()
-      else:
-        raise ValueError(type)
-    self.resolve(sst, name, do_delete, force=True)
-
-  def process(self, ssn):
-    if ssn.closed or ssn.closing: return
-
-    sst = self._attachments[ssn]
-
-    while sst.outgoing_idx < len(ssn.outgoing):
-      msg = ssn.outgoing[sst.outgoing_idx]
-      snd = msg._sender
-      # XXX: should check for sender error here
-      _snd = self._attachments.get(snd)
-      if _snd and snd.linked:
-        self.send(snd, msg)
-        sst.outgoing_idx += 1
-      else:
-        break
-
-    for snd in ssn.senders:
-      # XXX: should included snd.acked in this
-      if snd.synced >= snd.queued and sst.need_sync:
-        sst.write_cmd(ExecutionSync(), sync_noop)
-
-    for rcv in ssn.receivers:
-      self.process_receiver(rcv)
-
-    if ssn.acked:
-      messages = ssn.acked[sst.acked_idx:]
-      if messages:
-        ids = RangedSet()
-
-        disposed = [(DEFAULT_DISPOSITION, [])]
-        acked = []
-        for m in messages:
-          # XXX: we're ignoring acks that get lost when disconnected,
-          # could we deal this via some message-id based purge?
-          if m._transfer_id is None:
-            acked.append(m)
-            continue
-          ids.add(m._transfer_id)
-          if m._receiver._accept_mode is accept_mode.explicit:
-            disp = m._disposition or DEFAULT_DISPOSITION
-            last, msgs = disposed[-1]
-            if disp.type is last.type and disp.options == last.options:
-              msgs.append(m)
-            else:
-              disposed.append((disp, [m]))
-          else:
-            acked.append(m)
-
-        for range in ids:
-          sst.executed.add_range(range)
-        sst.write_op(SessionCompleted(sst.executed))
-
-        def ack_acker(msgs):
-          def ack_ack():
-            for m in msgs:
-              ssn.acked.remove(m)
-              sst.acked_idx -= 1
-              # XXX: should this check accept_mode too?
-              if not ssn.transactional:
-                sst.acked.remove(m)
-          return ack_ack
-
-        for disp, msgs in disposed:
-          if not msgs: continue
-          if disp.type is None:
-            op = MessageAccept
-          elif disp.type is RELEASED:
-            op = MessageRelease
-          elif disp.type is REJECTED:
-            op = MessageReject
-          sst.write_cmd(op(RangedSet(*[m._transfer_id for m in msgs]),
-                           **disp.options),
-                        ack_acker(msgs))
-          if log.isEnabledFor(DEBUG):
-            for m in msgs:
-              log.debug("SACK[%s]: %s, %s", ssn.log_id, m, m._disposition)
-
-        sst.acked.extend(messages)
-        sst.acked_idx += len(messages)
-        ack_acker(acked)()
-
-    if ssn.committing and not sst.committing:
-      def commit_ok():
-        del sst.acked[:]
-        ssn.committing = False
-        ssn.committed = True
-        ssn.aborting = False
-        ssn.aborted = False
-        sst.committing = False
-      sst.write_cmd(TxCommit(), commit_ok)
-      sst.committing = True
-
-    if ssn.aborting and not sst.aborting:
-      sst.aborting = True
-      def do_rb():
-        messages = sst.acked + ssn.unacked + ssn.incoming
-        ids = RangedSet(*[m._transfer_id for m in messages])
-        for range in ids:
-          sst.executed.add_range(range)
-        sst.write_op(SessionCompleted(sst.executed))
-        sst.write_cmd(MessageRelease(ids, True))
-        sst.write_cmd(TxRollback(), do_rb_ok)
-
-      def do_rb_ok():
-        del ssn.incoming[:]
-        del ssn.unacked[:]
-        del sst.acked[:]
-
-        for rcv in ssn.receivers:
-          rcv.impending = rcv.received
-          rcv.returned = rcv.received
-          # XXX: do we need to update granted here as well?
-
-        for rcv in ssn.receivers:
-          self.process_receiver(rcv)
-
-        ssn.aborting = False
-        ssn.aborted = True
-        ssn.committing = False
-        ssn.committed = False
-        sst.aborting = False
-
-      for rcv in ssn.receivers:
-        _rcv = self._attachments[rcv]
-        sst.write_cmd(MessageStop(_rcv.destination))
-      sst.write_cmd(ExecutionSync(), do_rb)
-
-  def grant(self, rcv):
-    sst = self._attachments[rcv.session]
-    _rcv = self._attachments.get(rcv)
-    if _rcv is None or not rcv.linked or _rcv.closing or _rcv.draining:
-      return
-
-    if rcv.granted is UNLIMITED:
-      if rcv.impending is UNLIMITED:
-        delta = 0
-      else:
-        delta = UNLIMITED
-    elif rcv.impending is UNLIMITED:
-      delta = -1
-    else:
-      delta = max(rcv.granted, rcv.received) - rcv.impending
-
-    if delta is UNLIMITED:
-      if not _rcv.bytes_open:
-        sst.write_cmd(MessageFlow(_rcv.destination, credit_unit.byte, UNLIMITED.value))
-        _rcv.bytes_open = True
-      sst.write_cmd(MessageFlow(_rcv.destination, credit_unit.message, UNLIMITED.value))
-      rcv.impending = UNLIMITED
-    elif delta > 0:
-      if not _rcv.bytes_open:
-        sst.write_cmd(MessageFlow(_rcv.destination, credit_unit.byte, UNLIMITED.value))
-        _rcv.bytes_open = True
-      sst.write_cmd(MessageFlow(_rcv.destination, credit_unit.message, delta))
-      rcv.impending += delta
-    elif delta < 0 and not rcv.draining:
-      _rcv.draining = True
-      def do_stop():
-        rcv.impending = rcv.received
-        _rcv.draining = False
-        _rcv.bytes_open = False
-        self.grant(rcv)
-      sst.write_cmd(MessageStop(_rcv.destination), do_stop)
-
-    if rcv.draining:
-      _rcv.draining = True
-      def do_flush():
-        rcv.impending = rcv.received
-        rcv.granted = rcv.impending
-        _rcv.draining = False
-        _rcv.bytes_open = False
-        rcv.draining = False
-      sst.write_cmd(MessageFlush(_rcv.destination), do_flush)
-
-
-  def process_receiver(self, rcv):
-    if rcv.closed: return
-    self.grant(rcv)
-
-  def send(self, snd, msg):
-    sst = self._attachments[snd.session]
-    _snd = self._attachments[snd]
-
-    if msg.subject is None or _snd._exchange == "":
-      rk = _snd._routing_key
-    else:
-      rk = msg.subject
-
-    if msg.subject is None:
-      subject = _snd.subject
-    else:
-      subject = msg.subject
-
-    # XXX: do we need to query to figure out how to create the reply-to interoperably?
-    if msg.reply_to:
-      rt = addr2reply_to(msg.reply_to)
-    else:
-      rt = None
-    content_encoding = msg.properties.get("x-amqp-0-10.content-encoding")
-    dp = DeliveryProperties(routing_key=rk)
-    mp = MessageProperties(message_id=msg.id,
-                           user_id=msg.user_id,
-                           reply_to=rt,
-                           correlation_id=msg.correlation_id,
-                           app_id = msg.properties.get("x-amqp-0-10.app-id"),
-                           content_type=msg.content_type,
-                           content_encoding=content_encoding,
-                           application_headers=msg.properties)
-    if subject is not None:
-      if mp.application_headers is None:
-        mp.application_headers = {}
-      mp.application_headers[SUBJECT] = subject
-    if msg.durable is not None:
-      if msg.durable:
-        dp.delivery_mode = delivery_mode.persistent
-      else:
-        dp.delivery_mode = delivery_mode.non_persistent
-    if msg.priority is not None:
-      dp.priority = msg.priority
-    if msg.ttl is not None:
-      dp.ttl = long(msg.ttl*1000)
-    enc, dec = get_codec(msg.content_type)
-    body = enc(msg.content)
-
-    # XXX: this is not safe for out of order, can this be triggered by pre_ack?
-    def msg_acked():
-      # XXX: should we log the ack somehow too?
-      snd.acked += 1
-      m = snd.session.outgoing.pop(0)
-      sst.outgoing_idx -= 1
-      log.debug("RACK[%s]: %s", sst.session.log_id, msg)
-      assert msg == m
-
-    xfr = MessageTransfer(destination=_snd._exchange, headers=(dp, mp),
-                          payload=body)
-
-    if _snd.pre_ack:
-      sst.write_cmd(xfr)
-    else:
-      sst.write_cmd(xfr, msg_acked, sync=msg._sync)
-
-    log.debug("SENT[%s]: %s", sst.session.log_id, msg)
-
-    if _snd.pre_ack:
-      msg_acked()
-
-  def do_message_transfer(self, xfr):
-    sst = self.get_sst(xfr)
-    ssn = sst.session
-
-    msg = self._decode(xfr)
-    rcv = sst.destinations[xfr.destination].target
-    msg._receiver = rcv
-    if rcv.impending is not UNLIMITED:
-      assert rcv.received < rcv.impending, "%s, %s" % (rcv.received, rcv.impending)
-    rcv.received += 1
-    log.debug("RCVD[%s]: %s", ssn.log_id, msg)
-    ssn.incoming.append(msg)
-
-  def _decode(self, xfr):
-    dp = EMPTY_DP
-    mp = EMPTY_MP
-
-    for h in xfr.headers:
-      if isinstance(h, DeliveryProperties):
-        dp = h
-      elif isinstance(h, MessageProperties):
-        mp = h
-
-    ap = mp.application_headers
-    enc, dec = get_codec(mp.content_type)
-    content = dec(xfr.payload)
-    msg = Message(content)
-    msg.id = mp.message_id
-    if ap is not None:
-      msg.subject = ap.get(SUBJECT)
-    msg.user_id = mp.user_id
-    if mp.reply_to is not None:
-      msg.reply_to = reply_to2addr(mp.reply_to)
-    msg.correlation_id = mp.correlation_id
-    if dp.delivery_mode is not None:
-      msg.durable = dp.delivery_mode == delivery_mode.persistent
-    msg.priority = dp.priority
-    if dp.ttl is not None:
-      msg.ttl = dp.ttl/1000.0
-    msg.redelivered = dp.redelivered
-    msg.properties = mp.application_headers or {}
-    if mp.app_id is not None:
-      msg.properties["x-amqp-0-10.app-id"] = mp.app_id
-    if mp.content_encoding is not None:
-      msg.properties["x-amqp-0-10.content-encoding"] = mp.content_encoding
-    if dp.routing_key is not None:
-      msg.properties["x-amqp-0-10.routing-key"] = dp.routing_key
-    msg.content_type = mp.content_type
-    msg._transfer_id = xfr.id
-    return msg
diff --git a/KEYS b/qpid/KEYS
index 98e057984d..98e057984d 100644
--- a/KEYS
+++ b/qpid/KEYS
diff --git a/LICENSE b/qpid/LICENSE
index 5f84a6564b..5f84a6564b 100644
--- a/LICENSE
+++ b/qpid/LICENSE
diff --git a/NOTICE b/qpid/NOTICE
index ff65d299a9..ff65d299a9 100644
--- a/NOTICE
+++ b/qpid/NOTICE
diff --git a/QPID_VERSION.txt b/qpid/QPID_VERSION.txt
index 51176c7c89..51176c7c89 100644
--- a/QPID_VERSION.txt
+++ b/qpid/QPID_VERSION.txt
diff --git a/README.txt b/qpid/README.txt
index 00a56bdc3d..00a56bdc3d 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/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 949cb57358..949cb57358 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/cc/LICENSE b/qpid/cc/LICENSE
index bc46b77047..bc46b77047 100644
--- a/cc/LICENSE
+++ b/qpid/cc/LICENSE
diff --git a/cc/NOTICE b/qpid/cc/NOTICE
index 05f39ba176..05f39ba176 100644
--- a/cc/NOTICE
+++ b/qpid/cc/NOTICE
diff --git a/cc/README.txt b/qpid/cc/README.txt
index 8d1286f6d7..8d1286f6d7 100644
--- a/cc/README.txt
+++ b/qpid/cc/README.txt
diff --git a/cc/config.properties b/qpid/cc/config.properties
index 82329722cc..82329722cc 100644
--- a/cc/config.properties
+++ b/qpid/cc/config.properties
diff --git a/cc/config.xml b/qpid/cc/config.xml
index ba89acc511..ba89acc511 100644
--- a/cc/config.xml
+++ b/qpid/cc/config.xml
diff --git a/cc/config/bdbstore-cpp-trunk.xml b/qpid/cc/config/bdbstore-cpp-trunk.xml
index 254af62170..254af62170 100644
--- a/cc/config/bdbstore-cpp-trunk.xml
+++ b/qpid/cc/config/bdbstore-cpp-trunk.xml
diff --git a/cc/config/cpp-perftests.xml b/qpid/cc/config/cpp-perftests.xml
index 8a5079b60b..8a5079b60b 100644
--- a/cc/config/cpp-perftests.xml
+++ b/qpid/cc/config/cpp-perftests.xml
diff --git a/cc/config/cpp-trunk.xml b/qpid/cc/config/cpp-trunk.xml
index 56e1d2bb54..56e1d2bb54 100644
--- a/cc/config/cpp-trunk.xml
+++ b/qpid/cc/config/cpp-trunk.xml
diff --git a/cc/config/dotnet-trunk.xml b/qpid/cc/config/dotnet-trunk.xml
index 0d922967e4..0d922967e4 100644
--- a/cc/config/dotnet-trunk.xml
+++ b/qpid/cc/config/dotnet-trunk.xml
diff --git a/cc/config/example-automation.xml b/qpid/cc/config/example-automation.xml
index 52dd135c24..52dd135c24 100644
--- a/cc/config/example-automation.xml
+++ b/qpid/cc/config/example-automation.xml
diff --git a/cc/config/java-jmstck.xml b/qpid/cc/config/java-jmstck.xml
index 2b10b0c5b5..2b10b0c5b5 100644
--- a/cc/config/java-jmstck.xml
+++ b/qpid/cc/config/java-jmstck.xml
diff --git a/cc/config/java-perftests.xml b/qpid/cc/config/java-perftests.xml
index 45e1b14b9f..45e1b14b9f 100644
--- a/cc/config/java-perftests.xml
+++ b/qpid/cc/config/java-perftests.xml
diff --git a/cc/config/java-trunk.xml b/qpid/cc/config/java-trunk.xml
index 99f469725b..99f469725b 100644
--- a/cc/config/java-trunk.xml
+++ b/qpid/cc/config/java-trunk.xml
diff --git a/cc/config/java/cpp.noprefetch.testprofile b/qpid/cc/config/java/cpp.noprefetch.testprofile
index 07c158dd4e..07c158dd4e 100644
--- a/cc/config/java/cpp.noprefetch.testprofile
+++ b/qpid/cc/config/java/cpp.noprefetch.testprofile
diff --git a/cc/config/java/cpp.testprofile b/qpid/cc/config/java/cpp.testprofile
index 28361c6b40..28361c6b40 100644
--- a/cc/config/java/cpp.testprofile
+++ b/qpid/cc/config/java/cpp.testprofile
diff --git a/cc/config/java/jndi.properties b/qpid/cc/config/java/jndi.properties
index 9340163622..9340163622 100644
--- a/cc/config/java/jndi.properties
+++ b/qpid/cc/config/java/jndi.properties
diff --git a/cc/dashboard-config.xml b/qpid/cc/dashboard-config.xml
index 9304322853..9304322853 100644
--- a/cc/dashboard-config.xml
+++ b/qpid/cc/dashboard-config.xml
diff --git a/cc/scripts/bdbstorecppbuild.sh b/qpid/cc/scripts/bdbstorecppbuild.sh
index 3385c8d2f4..3385c8d2f4 100755
--- a/cc/scripts/bdbstorecppbuild.sh
+++ b/qpid/cc/scripts/bdbstorecppbuild.sh
diff --git a/cc/scripts/build.xml b/qpid/cc/scripts/build.xml
index 2144020017..2144020017 100644
--- a/cc/scripts/build.xml
+++ b/qpid/cc/scripts/build.xml
diff --git a/cc/scripts/check_examples.sh b/qpid/cc/scripts/check_examples.sh
index c10936b36c..c10936b36c 100755
--- a/cc/scripts/check_examples.sh
+++ b/qpid/cc/scripts/check_examples.sh
diff --git a/cc/scripts/cppbuild-perftests.sh b/qpid/cc/scripts/cppbuild-perftests.sh
index 782a472175..782a472175 100755
--- a/cc/scripts/cppbuild-perftests.sh
+++ b/qpid/cc/scripts/cppbuild-perftests.sh
diff --git a/cc/scripts/cppbuild.sh b/qpid/cc/scripts/cppbuild.sh
index b63feb7141..b63feb7141 100755
--- a/cc/scripts/cppbuild.sh
+++ b/qpid/cc/scripts/cppbuild.sh
diff --git a/cc/scripts/dotnetbuild.sh b/qpid/cc/scripts/dotnetbuild.sh
index 51d2110757..51d2110757 100644
--- a/cc/scripts/dotnetbuild.sh
+++ b/qpid/cc/scripts/dotnetbuild.sh
diff --git a/cc/scripts/javaconfig.sh b/qpid/cc/scripts/javaconfig.sh
index 7a1a3a1a7d..7a1a3a1a7d 100755
--- a/cc/scripts/javaconfig.sh
+++ b/qpid/cc/scripts/javaconfig.sh
diff --git a/cc/scripts/javajmstck.sh b/qpid/cc/scripts/javajmstck.sh
index 9d279ed38e..9d279ed38e 100644
--- a/cc/scripts/javajmstck.sh
+++ b/qpid/cc/scripts/javajmstck.sh
diff --git a/cc/scripts/javareport.sh b/qpid/cc/scripts/javareport.sh
index 2b2469d31d..2b2469d31d 100755
--- a/cc/scripts/javareport.sh
+++ b/qpid/cc/scripts/javareport.sh
diff --git a/cc/scripts/runbroker.sh b/qpid/cc/scripts/runbroker.sh
index 43d9b39056..43d9b39056 100644
--- a/cc/scripts/runbroker.sh
+++ b/qpid/cc/scripts/runbroker.sh
diff --git a/cc/scripts/stopbroker.sh b/qpid/cc/scripts/stopbroker.sh
index f5839e141f..f5839e141f 100644
--- a/cc/scripts/stopbroker.sh
+++ b/qpid/cc/scripts/stopbroker.sh
diff --git a/cc/scripts/verify b/qpid/cc/scripts/verify
index 35191b17c9..35191b17c9 100755
--- a/cc/scripts/verify
+++ b/qpid/cc/scripts/verify
diff --git a/cc/scripts/verify_all b/qpid/cc/scripts/verify_all
index 8d3ec669a7..8d3ec669a7 100755
--- a/cc/scripts/verify_all
+++ b/qpid/cc/scripts/verify_all
diff --git a/cpp/.gitignore b/qpid/cpp/.gitignore
index 5049029aed..5049029aed 100644
--- a/cpp/.gitignore
+++ b/qpid/cpp/.gitignore
diff --git a/cpp/BuildInstallSettings.cmake b/qpid/cpp/BuildInstallSettings.cmake
index b3ca26b6ad..b3ca26b6ad 100644
--- a/cpp/BuildInstallSettings.cmake
+++ b/qpid/cpp/BuildInstallSettings.cmake
diff --git a/cpp/CMakeLists.txt b/qpid/cpp/CMakeLists.txt
index 17411e90a4..17411e90a4 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 6483d7de4e..6483d7de4e 100644
--- a/cpp/INSTALL
+++ b/qpid/cpp/INSTALL
diff --git a/cpp/INSTALL-WINDOWS b/qpid/cpp/INSTALL-WINDOWS
index 75fa69079e..75fa69079e 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/Makefile.am b/qpid/cpp/Makefile.am
index 01b8507454..01b8507454 100644
--- a/cpp/Makefile.am
+++ b/qpid/cpp/Makefile.am
diff --git a/cpp/NOTICE b/qpid/cpp/NOTICE
index 5de355a56c..5de355a56c 100644
--- a/cpp/NOTICE
+++ b/qpid/cpp/NOTICE
diff --git a/cpp/README-winsdk.txt b/qpid/cpp/README-winsdk.txt
index 2412566453..2412566453 100644
--- a/cpp/README-winsdk.txt
+++ b/qpid/cpp/README-winsdk.txt
diff --git a/cpp/README.txt b/qpid/cpp/README.txt
index f200802342..f200802342 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 b810d4ef10..b810d4ef10 100644
--- a/cpp/SSL
+++ b/qpid/cpp/SSL
diff --git a/cpp/bindings/qmf/Makefile.am b/qpid/cpp/bindings/qmf/Makefile.am
index eebb4b94de..eebb4b94de 100644
--- a/cpp/bindings/qmf/Makefile.am
+++ b/qpid/cpp/bindings/qmf/Makefile.am
diff --git a/qpid/cpp/bindings/qmf/python/Makefile.am b/qpid/cpp/bindings/qmf/python/Makefile.am
new file mode 100644
index 0000000000..8abad32959
--- /dev/null
+++ b/qpid/cpp/bindings/qmf/python/Makefile.am
@@ -0,0 +1,51 @@
+#
+# 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.
+#
+
+if HAVE_PYTHON_DEVEL
+
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_builddir)/src
+
+generated_file_list = \
+	qmfengine.cpp \
+	qmfengine.py
+
+EXTRA_DIST = python.i
+BUILT_SOURCES = $(generated_file_list)
+SWIG_FLAGS = -w362,401
+
+$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmfengine.i
+	$(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o qmfengine.cpp $(srcdir)/python.i
+
+pylibdir = $(PYTHON_LIB)
+
+lib_LTLIBRARIES = _qmfengine.la
+qenginedir = $(pyexecdir)
+qengine_PYTHON = qmfengine.py qmf.py
+
+#_qmfengine_la_LDFLAGS = -avoid-version -module -shrext "$(PYTHON_SO)"
+#_qmfengine_la_LDFLAGS = -avoid-version -module -shrext ".so"
+_qmfengine_la_LDFLAGS = -avoid-version -module -shared
+_qmfengine_la_LIBADD = $(PYTHON_LIBS) -L$(top_builddir)/src/.libs -lqpidclient $(top_builddir)/src/libqmf.la
+_qmfengine_la_CXXFLAGS = $(INCLUDES) -I$(srcdir)/qmf -I$(PYTHON_INC) -fno-strict-aliasing
+nodist__qmfengine_la_SOURCES = qmfengine.cpp
+
+CLEANFILES = $(generated_file_list)
+
+endif  # HAVE_PYTHON_DEVEL
+
diff --git a/cpp/bindings/qmf/python/python.i b/qpid/cpp/bindings/qmf/python/python.i
index 5e25d155f9..5e25d155f9 100644
--- a/cpp/bindings/qmf/python/python.i
+++ b/qpid/cpp/bindings/qmf/python/python.i
diff --git a/cpp/bindings/qmf/python/qmf.py b/qpid/cpp/bindings/qmf/python/qmf.py
index 06d3070841..06d3070841 100644
--- a/cpp/bindings/qmf/python/qmf.py
+++ b/qpid/cpp/bindings/qmf/python/qmf.py
diff --git a/cpp/bindings/qmf/qmfengine.i b/qpid/cpp/bindings/qmf/qmfengine.i
index eb350115a3..eb350115a3 100644
--- a/cpp/bindings/qmf/qmfengine.i
+++ b/qpid/cpp/bindings/qmf/qmfengine.i
diff --git a/qpid/cpp/bindings/qmf/ruby/Makefile.am b/qpid/cpp/bindings/qmf/ruby/Makefile.am
new file mode 100644
index 0000000000..de8c4d10d5
--- /dev/null
+++ b/qpid/cpp/bindings/qmf/ruby/Makefile.am
@@ -0,0 +1,45 @@
+#
+# 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.
+#
+
+if HAVE_RUBY_DEVEL
+
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
+
+EXTRA_DIST = ruby.i
+BUILT_SOURCES = qmfengine.cpp
+SWIG_FLAGS = -w362,401
+
+rubylibdir = $(RUBY_LIB)
+
+dist_rubylib_DATA = qmf.rb
+
+qmfengine.cpp: $(srcdir)/ruby.i $(srcdir)/../qmfengine.i
+	$(SWIG) -ruby -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o qmfengine.cpp $(srcdir)/ruby.i
+
+rubylibarchdir = $(RUBY_LIB_ARCH)
+rubylibarch_LTLIBRARIES = qmfengine.la
+
+qmfengine_la_LDFLAGS = -avoid-version -module -shared -shrext ".$(RUBY_DLEXT)"
+qmfengine_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lqpidclient $(top_builddir)/src/libqmfengine.la
+qmfengine_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH) -fno-strict-aliasing
+nodist_qmfengine_la_SOURCES = qmfengine.cpp
+
+CLEANFILES = qmfengine.cpp
+
+endif # HAVE_RUBY_DEVEL
diff --git a/cpp/bindings/qmf/ruby/qmf.rb b/qpid/cpp/bindings/qmf/ruby/qmf.rb
index 34d3255d8d..34d3255d8d 100644
--- a/cpp/bindings/qmf/ruby/qmf.rb
+++ b/qpid/cpp/bindings/qmf/ruby/qmf.rb
diff --git a/cpp/bindings/qmf/ruby/ruby.i b/qpid/cpp/bindings/qmf/ruby/ruby.i
index 0101861100..0101861100 100644
--- a/cpp/bindings/qmf/ruby/ruby.i
+++ b/qpid/cpp/bindings/qmf/ruby/ruby.i
diff --git a/cpp/bindings/qmf/tests/Makefile.am b/qpid/cpp/bindings/qmf/tests/Makefile.am
index 182771e16b..182771e16b 100644
--- a/cpp/bindings/qmf/tests/Makefile.am
+++ b/qpid/cpp/bindings/qmf/tests/Makefile.am
diff --git a/cpp/bindings/qmf/tests/agent_ruby.rb b/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
index 5ee5e371d3..5ee5e371d3 100755
--- a/cpp/bindings/qmf/tests/agent_ruby.rb
+++ b/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
diff --git a/cpp/bindings/qmf/tests/python_agent.py b/qpid/cpp/bindings/qmf/tests/python_agent.py
index 28ba47e1bb..28ba47e1bb 100644
--- a/cpp/bindings/qmf/tests/python_agent.py
+++ b/qpid/cpp/bindings/qmf/tests/python_agent.py
diff --git a/cpp/bindings/qmf/tests/python_console.py b/qpid/cpp/bindings/qmf/tests/python_console.py
index 1cef824fb5..1cef824fb5 100755
--- a/cpp/bindings/qmf/tests/python_console.py
+++ b/qpid/cpp/bindings/qmf/tests/python_console.py
diff --git a/cpp/bindings/qmf/tests/ruby_console.rb b/qpid/cpp/bindings/qmf/tests/ruby_console.rb
index 31670312d6..31670312d6 100755
--- a/cpp/bindings/qmf/tests/ruby_console.rb
+++ b/qpid/cpp/bindings/qmf/tests/ruby_console.rb
diff --git a/cpp/bindings/qmf/tests/ruby_console_test.rb b/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
index 972d5977b8..972d5977b8 100755
--- a/cpp/bindings/qmf/tests/ruby_console_test.rb
+++ b/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
diff --git a/cpp/bindings/qmf/tests/run_interop_tests b/qpid/cpp/bindings/qmf/tests/run_interop_tests
index 83e7f2593b..83e7f2593b 100755
--- a/cpp/bindings/qmf/tests/run_interop_tests
+++ b/qpid/cpp/bindings/qmf/tests/run_interop_tests
diff --git a/cpp/bindings/qmf/tests/test_base.rb b/qpid/cpp/bindings/qmf/tests/test_base.rb
index 7d4609097c..7d4609097c 100644
--- a/cpp/bindings/qmf/tests/test_base.rb
+++ b/qpid/cpp/bindings/qmf/tests/test_base.rb
diff --git a/cpp/bindings/qmf2/Makefile.am b/qpid/cpp/bindings/qmf2/Makefile.am
index 52b1bbd457..52b1bbd457 100644
--- a/cpp/bindings/qmf2/Makefile.am
+++ b/qpid/cpp/bindings/qmf2/Makefile.am
diff --git a/cpp/bindings/qmf2/examples/cpp/Makefile.am b/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am
index 84207d43c4..84207d43c4 100644
--- a/cpp/bindings/qmf2/examples/cpp/Makefile.am
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am
diff --git a/cpp/bindings/qmf2/examples/cpp/agent.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
index 00554539eb..00554539eb 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/list_agents.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
index 327da9661f..327da9661f 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 9883a19962..9883a19962 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 b24890f531..b24890f531 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 5fd71b3f1c..5fd71b3f1c 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/qpid/cpp/bindings/qmf2/python/Makefile.am b/qpid/cpp/bindings/qmf2/python/Makefile.am
new file mode 100644
index 0000000000..3dc04e832f
--- /dev/null
+++ b/qpid/cpp/bindings/qmf2/python/Makefile.am
@@ -0,0 +1,49 @@
+#
+# 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.
+#
+
+if HAVE_PYTHON_DEVEL
+
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src $(QMF_INCLUDES)
+
+generated_file_list = \
+	cqmf2.cpp \
+	cqmf2.py
+
+EXTRA_DIST = python.i
+BUILT_SOURCES = $(generated_file_list)
+SWIG_FLAGS = -w362,401
+
+$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmf2.i $(srcdir)/../../swig_python_typemaps.i
+	$(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqmf2.cpp $(srcdir)/python.i
+
+pylibdir = $(PYTHON_LIB)
+
+lib_LTLIBRARIES = _cqmf2.la
+cqpiddir = $(pyexecdir)
+cqpid_PYTHON = qmf2.py cqmf2.py
+
+_cqmf2_la_LDFLAGS = -avoid-version -module -shared
+_cqmf2_la_LIBADD = $(PYTHON_LIBS) -L$(top_builddir)/src/.libs $(top_builddir)/src/libqmf2.la
+_cqmf2_la_CXXFLAGS = $(INCLUDES) -I$(srcdir)/qmf -I$(PYTHON_INC) -fno-strict-aliasing
+nodist__cqmf2_la_SOURCES = cqmf2.cpp
+
+CLEANFILES = $(generated_file_list)
+
+endif  # HAVE_PYTHON_DEVEL
+
diff --git a/cpp/bindings/qmf2/python/python.i b/qpid/cpp/bindings/qmf2/python/python.i
index 02dd1632b0..02dd1632b0 100644
--- a/cpp/bindings/qmf2/python/python.i
+++ b/qpid/cpp/bindings/qmf2/python/python.i
diff --git a/cpp/bindings/qmf2/python/qmf2.py b/qpid/cpp/bindings/qmf2/python/qmf2.py
index 9f2d8556f4..9f2d8556f4 100644
--- a/cpp/bindings/qmf2/python/qmf2.py
+++ b/qpid/cpp/bindings/qmf2/python/qmf2.py
diff --git a/cpp/bindings/qmf2/qmf2.i b/qpid/cpp/bindings/qmf2/qmf2.i
index 0f573fe3e6..0f573fe3e6 100644
--- a/cpp/bindings/qmf2/qmf2.i
+++ b/qpid/cpp/bindings/qmf2/qmf2.i
diff --git a/qpid/cpp/bindings/qmf2/ruby/Makefile.am b/qpid/cpp/bindings/qmf2/ruby/Makefile.am
new file mode 100644
index 0000000000..97bbc6f385
--- /dev/null
+++ b/qpid/cpp/bindings/qmf2/ruby/Makefile.am
@@ -0,0 +1,44 @@
+#
+# 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.
+#
+
+if HAVE_RUBY_DEVEL
+
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src $(QMF_INCLUDES)
+
+EXTRA_DIST = ruby.i
+BUILT_SOURCES = cqmf2.cpp
+SWIG_FLAGS = -w362,401
+
+rubylibdir = $(RUBY_LIB)
+
+cqmf2.cpp: $(srcdir)/ruby.i $(srcdir)/../qmf2.i $(srcdir)/../../swig_ruby_typemaps.i
+	$(SWIG) -ruby -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqmf2.cpp $(srcdir)/ruby.i
+
+rubylibarchdir = $(RUBY_LIB_ARCH)
+rubylibarch_LTLIBRARIES = cqmf2.la
+dist_rubylib_DATA = qmf2.rb
+
+cqmf2_la_LDFLAGS = -avoid-version -module -shared -shrext ".$(RUBY_DLEXT)"
+cqmf2_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lqmf2 $(top_builddir)/src/libqmf2.la
+cqmf2_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH) -fno-strict-aliasing
+nodist_cqmf2_la_SOURCES = cqmf2.cpp
+
+CLEANFILES = cqmf2.cpp
+
+endif # HAVE_RUBY_DEVEL
diff --git a/cpp/bindings/qmf2/ruby/qmf2.rb b/qpid/cpp/bindings/qmf2/ruby/qmf2.rb
index c14ecba4e1..c14ecba4e1 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 1070c65a44..1070c65a44 100644
--- a/cpp/bindings/qmf2/ruby/ruby.i
+++ b/qpid/cpp/bindings/qmf2/ruby/ruby.i
diff --git a/cpp/bindings/qpid/CMakeLists.txt b/qpid/cpp/bindings/qpid/CMakeLists.txt
index 7c9f76f991..7c9f76f991 100644
--- a/cpp/bindings/qpid/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/CMakeLists.txt
diff --git a/cpp/bindings/qpid/Makefile.am b/qpid/cpp/bindings/qpid/Makefile.am
index 31bce5d1d5..31bce5d1d5 100644
--- a/cpp/bindings/qpid/Makefile.am
+++ b/qpid/cpp/bindings/qpid/Makefile.am
diff --git a/cpp/bindings/qpid/dotnet/Makefile.am b/qpid/cpp/bindings/qpid/dotnet/Makefile.am
index b5c1f6dda5..b5c1f6dda5 100644
--- a/cpp/bindings/qpid/dotnet/Makefile.am
+++ b/qpid/cpp/bindings/qpid/dotnet/Makefile.am
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 34395911b9..34395911b9 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 abe35cf053..abe35cf053 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.receiver/csharp.direct.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
index 34d79afa91..34d79afa91 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
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 18502a0666..18502a0666 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.direct.sender/csharp.direct.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.csproj
index a8cd07da74..a8cd07da74 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.csproj
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.client/csharp.example.client.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.csproj
index 537efa8658..537efa8658 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.csproj
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.declare_queues/csharp.example.declare_queues.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
index a458e706ad..a458e706ad 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
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.drain/csharp.example.drain.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.csproj
index 75f419d0c5..75f419d0c5 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.csproj
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.helloworld/csharp.example.helloworld.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
index 0307bea754..0307bea754 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
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.server/csharp.example.server.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.csproj
index d377018a30..d377018a30 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.csproj
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.example.spout/csharp.example.spout.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.csproj
index c0e4d7fe1f..c0e4d7fe1f 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.csproj
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 a87f92ccdf..a87f92ccdf 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 b1ba949e07..b1ba949e07 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.receiver/csharp.map.callback.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
index 1380fc4981..1380fc4981 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
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 e633f76673..e633f76673 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.callback.sender/csharp.map.callback.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
index cb0a5705af..cb0a5705af 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
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 694d6b9ce1..694d6b9ce1 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.receiver/csharp.map.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.csproj
index 82882be817..82882be817 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.csproj
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 ea29ac2417..ea29ac2417 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/csharp.map.sender/csharp.map.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.csproj
index 0e42201b6d..0e42201b6d 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/powershell.example.helloworld/powershell.example.helloworld.ps1 b/qpid/cpp/bindings/qpid/dotnet/examples/powershell.example.helloworld/powershell.example.helloworld.ps1
index e8c21bc3f6..e8c21bc3f6 100644
--- a/cpp/bindings/qpid/dotnet/examples/powershell.example.helloworld/powershell.example.helloworld.ps1
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/powershell.example.helloworld/powershell.example.helloworld.ps1
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.Designer.vb b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.Designer.vb
index 7b4d946036..7b4d946036 100644
--- a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.Designer.vb
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.Designer.vb
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.myapp b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.myapp
index 256be1aa9e..256be1aa9e 100644
--- a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.myapp
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.myapp
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb
index d0727fe9fa..d0727fe9fa 100644
--- a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.Designer.vb b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.Designer.vb
index fa8cc43f84..fa8cc43f84 100644
--- a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.Designer.vb
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.Designer.vb
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.resx b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.resx
index 70432f3b74..70432f3b74 100644
--- a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.resx
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.resx
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.Designer.vb b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.Designer.vb
index d02c7f85c6..d02c7f85c6 100644
--- a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.Designer.vb
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.Designer.vb
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.settings b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.settings
index 469395e45e..469395e45e 100644
--- a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.settings
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.settings
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vb b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vb
index f32cfd8bce..f32cfd8bce 100644
--- a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vb
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vb
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vbproj b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vbproj
index 4463dc7902..4463dc7902 100644
--- a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vbproj
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vbproj
diff --git a/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln b/qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
index 90e98a4bbe..90e98a4bbe 100644
--- a/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
+++ b/qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
diff --git a/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sln b/qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sln
index 030bcc4b2a..030bcc4b2a 100644
--- a/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sln
+++ b/qpid/cpp/bindings/qpid/dotnet/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 79a8021d9a..79a8021d9a 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 8bbc207d4e..8bbc207d4e 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.cpp b/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo.cpp
index 08d2d4b4f9..08d2d4b4f9 100644
--- a/cpp/bindings/qpid/dotnet/src/AssemblyInfo.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Connection.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp
index 12c0e29f74..12c0e29f74 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 0788f5d225..0788f5d225 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.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Duration.cpp
index 7daf803be8..7daf803be8 100644
--- a/cpp/bindings/qpid/dotnet/src/Duration.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Duration.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Duration.h b/qpid/cpp/bindings/qpid/dotnet/src/Duration.h
index d4239fae88..d4239fae88 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 d34474f2c4..d34474f2c4 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 1dd92b8688..1dd92b8688 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 e5dbf845b3..e5dbf845b3 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 ac7f285fe5..ac7f285fe5 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 c63f245f74..c63f245f74 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 a8266ba5da..a8266ba5da 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 d0f410b912..d0f410b912 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 a17f04325e..a17f04325e 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 8aa77effbd..8aa77effbd 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 8ddcc9ac01..8ddcc9ac01 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 3225f1a6e1..3225f1a6e1 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 4054e87316..4054e87316 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 4a6199f108..4a6199f108 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 4d4cad75c4..4d4cad75c4 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 b515095323..b515095323 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 df12689cf8..df12689cf8 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/org.apache.qpid.messaging.template.rc b/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
index 85b15646f3..85b15646f3 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/org.apache.qpid.messaging.vcproj b/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj
index f3a0071aeb..f3a0071aeb 100644
--- a/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj
+++ b/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj
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 98830aba70..98830aba70 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/org.apache.qpid.messaging.sessionreceiver.csproj b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/org.apache.qpid.messaging.sessionreceiver.csproj
index bc3ce57cf3..bc3ce57cf3 100644
--- a/cpp/bindings/qpid/dotnet/src/sessionreceiver/org.apache.qpid.messaging.sessionreceiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/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 680732068f..680732068f 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 cf50e88200..cf50e88200 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.csproj b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.csproj
index 7ec4d743a3..7ec4d743a3 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.csproj
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/winsdk_sources/examples/csharp.direct.receiver/csharp.direct.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
index 8a45098f73..8a45098f73 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj
index 5f39484ee0..5f39484ee0 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj
index f07274c339..f07274c339 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
index e520a3351f..e520a3351f 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj
index 8b4b89541c..8b4b89541c 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
index 627495348b..627495348b 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj
index 473078f7ca..473078f7ca 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj
index 26009880a4..26009880a4 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
index 02f8a63282..02f8a63282 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
index 56b9f285a3..56b9f285a3 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj
index ac0a4e144d..ac0a4e144d 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj
index eef669291b..eef669291b 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/winsdk_dotnet_examples.sln b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/winsdk_dotnet_examples.sln
index 6db55b5590..6db55b5590 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/winsdk_dotnet_examples.sln
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/winsdk_dotnet_examples.sln
diff --git a/cpp/bindings/qpid/examples/perl/README b/qpid/cpp/bindings/qpid/examples/perl/README
index 1e113f1fa0..1e113f1fa0 100644
--- a/cpp/bindings/qpid/examples/perl/README
+++ b/qpid/cpp/bindings/qpid/examples/perl/README
diff --git a/cpp/bindings/qpid/examples/perl/client.pl b/qpid/cpp/bindings/qpid/examples/perl/client.pl
index 19d9d3f14f..19d9d3f14f 100644
--- 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 60ac0c50ed..60ac0c50ed 100644
--- 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 a96b98a002..a96b98a002 100644
--- 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 cebf2ceee6..cebf2ceee6 100644
--- 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 2e2611e38f..2e2611e38f 100644
--- 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 4107cd48b9..4107cd48b9 100644
--- 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 b14da565b9..b14da565b9 100644
--- 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 7365e732bf..7365e732bf 100644
--- a/cpp/bindings/qpid/examples/perl/spout.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/spout.pl
diff --git a/cpp/bindings/qpid/perl/CMakeLists.txt b/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
index 6edaf284b1..6edaf284b1 100644
--- a/cpp/bindings/qpid/perl/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
diff --git a/cpp/bindings/qpid/perl/Makefile.am b/qpid/cpp/bindings/qpid/perl/Makefile.am
index da082896e8..da082896e8 100644
--- a/cpp/bindings/qpid/perl/Makefile.am
+++ b/qpid/cpp/bindings/qpid/perl/Makefile.am
diff --git a/cpp/bindings/qpid/perl/perl.i b/qpid/cpp/bindings/qpid/perl/perl.i
index 38ac91761f..38ac91761f 100644
--- a/cpp/bindings/qpid/perl/perl.i
+++ b/qpid/cpp/bindings/qpid/perl/perl.i
diff --git a/cpp/bindings/qpid/python/CMakeLists.txt b/qpid/cpp/bindings/qpid/python/CMakeLists.txt
index 5e4649cd7c..5e4649cd7c 100644
--- a/cpp/bindings/qpid/python/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/python/CMakeLists.txt
diff --git a/qpid/cpp/bindings/qpid/python/Makefile.am b/qpid/cpp/bindings/qpid/python/Makefile.am
new file mode 100644
index 0000000000..dd25f34829
--- /dev/null
+++ b/qpid/cpp/bindings/qpid/python/Makefile.am
@@ -0,0 +1,49 @@
+#
+# 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.
+#
+
+if HAVE_PYTHON_DEVEL
+
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_builddir)/src
+
+generated_file_list = \
+	cqpid.cpp \
+	cqpid.py
+
+EXTRA_DIST = CMakeLists.txt python.i
+BUILT_SOURCES = $(generated_file_list)
+SWIG_FLAGS = -w362,401
+
+$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qpid.i $(srcdir)/../../swig_python_typemaps.i
+	$(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o cqpid.cpp $(srcdir)/python.i
+
+pylibdir = $(PYTHON_LIB)
+
+lib_LTLIBRARIES = _cqpid.la
+cqpiddir = $(pyexecdir)
+cqpid_PYTHON = cqpid.py
+
+_cqpid_la_LDFLAGS = -avoid-version -module -shared
+_cqpid_la_LIBADD = $(PYTHON_LIBS) -L$(top_builddir)/src/.libs -lqpidmessaging -lqpidtypes $(top_builddir)/src/libqpidmessaging.la $(top_builddir)/src/libqpidtypes.la
+_cqpid_la_CXXFLAGS = $(INCLUDES) -I$(PYTHON_INC) -fno-strict-aliasing
+nodist__cqpid_la_SOURCES = cqpid.cpp
+
+CLEANFILES = $(generated_file_list)
+
+endif  # HAVE_PYTHON_DEVEL
+
diff --git a/cpp/bindings/qpid/python/python.i b/qpid/cpp/bindings/qpid/python/python.i
index bf61cb10b7..bf61cb10b7 100644
--- a/cpp/bindings/qpid/python/python.i
+++ b/qpid/cpp/bindings/qpid/python/python.i
diff --git a/cpp/bindings/qpid/qpid.i b/qpid/cpp/bindings/qpid/qpid.i
index 352bafa3c8..352bafa3c8 100644
--- a/cpp/bindings/qpid/qpid.i
+++ b/qpid/cpp/bindings/qpid/qpid.i
diff --git a/cpp/bindings/qpid/ruby/CMakeLists.txt b/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
index 96c00154ba..96c00154ba 100644
--- a/cpp/bindings/qpid/ruby/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
diff --git a/qpid/cpp/bindings/qpid/ruby/Makefile.am b/qpid/cpp/bindings/qpid/ruby/Makefile.am
new file mode 100644
index 0000000000..a2a5dd76bd
--- /dev/null
+++ b/qpid/cpp/bindings/qpid/ruby/Makefile.am
@@ -0,0 +1,44 @@
+#
+# 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.
+#
+
+if HAVE_RUBY_DEVEL
+
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
+
+EXTRA_DIST = CMakeLists.txt ruby.i
+BUILT_SOURCES = cqpid.cpp
+SWIG_FLAGS = -w362,401
+
+rubylibdir = $(RUBY_LIB)
+
+cqpid.cpp: $(srcdir)/ruby.i $(srcdir)/../qpid.i $(srcdir)/../../swig_ruby_typemaps.i
+	$(SWIG) -ruby -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqpid.cpp $(srcdir)/ruby.i
+
+rubylibarchdir = $(RUBY_LIB_ARCH)
+rubylibarch_LTLIBRARIES = cqpid.la
+
+cqpid_la_LDFLAGS = -avoid-version -module -shared -shrext ".$(RUBY_DLEXT)"
+cqpid_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lqpidmessaging -lqpidtypes \
+	$(top_builddir)/src/libqpidmessaging.la $(top_builddir)/src/libqpidtypes.la
+cqpid_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH) -fno-strict-aliasing
+nodist_cqpid_la_SOURCES = cqpid.cpp
+
+CLEANFILES = cqpid.cpp
+
+endif # HAVE_RUBY_DEVEL
diff --git a/cpp/bindings/qpid/ruby/ruby.i b/qpid/cpp/bindings/qpid/ruby/ruby.i
index 76463f7ddd..76463f7ddd 100644
--- a/cpp/bindings/qpid/ruby/ruby.i
+++ b/qpid/cpp/bindings/qpid/ruby/ruby.i
diff --git a/cpp/bindings/swig_perl_typemaps.i b/qpid/cpp/bindings/swig_perl_typemaps.i
index 831576a7d4..831576a7d4 100644
--- a/cpp/bindings/swig_perl_typemaps.i
+++ b/qpid/cpp/bindings/swig_perl_typemaps.i
diff --git a/cpp/bindings/swig_python_typemaps.i b/qpid/cpp/bindings/swig_python_typemaps.i
index b69784a6de..b69784a6de 100644
--- a/cpp/bindings/swig_python_typemaps.i
+++ b/qpid/cpp/bindings/swig_python_typemaps.i
diff --git a/cpp/bindings/swig_ruby_typemaps.i b/qpid/cpp/bindings/swig_ruby_typemaps.i
index 79e679663d..79e679663d 100644
--- a/cpp/bindings/swig_ruby_typemaps.i
+++ b/qpid/cpp/bindings/swig_ruby_typemaps.i
diff --git a/cpp/bld-winsdk.ps1 b/qpid/cpp/bld-winsdk.ps1
index bea46da28f..bea46da28f 100644
--- a/cpp/bld-winsdk.ps1
+++ b/qpid/cpp/bld-winsdk.ps1
diff --git a/cpp/boost-1.32-support/Makefile b/qpid/cpp/boost-1.32-support/Makefile
index 8b521a1aa3..8b521a1aa3 100644
--- a/cpp/boost-1.32-support/Makefile
+++ b/qpid/cpp/boost-1.32-support/Makefile
diff --git a/cpp/boost-1.32-support/README.txt b/qpid/cpp/boost-1.32-support/README.txt
index 3c0edc8697..3c0edc8697 100644
--- a/cpp/boost-1.32-support/README.txt
+++ b/qpid/cpp/boost-1.32-support/README.txt
diff --git a/cpp/boost-1.32-support/boost.tar.gz b/qpid/cpp/boost-1.32-support/boost.tar.gz
index 7f97622681..7f97622681 100644
--- a/cpp/boost-1.32-support/boost.tar.gz
+++ b/qpid/cpp/boost-1.32-support/boost.tar.gz
diff --git a/cpp/boost-1.32-support/main.patch b/qpid/cpp/boost-1.32-support/main.patch
index 433a8f0f25..433a8f0f25 100644
--- a/cpp/boost-1.32-support/main.patch
+++ b/qpid/cpp/boost-1.32-support/main.patch
diff --git a/cpp/boost-1.32-support/supressions b/qpid/cpp/boost-1.32-support/supressions
index 64c441e58b..64c441e58b 100644
--- a/cpp/boost-1.32-support/supressions
+++ b/qpid/cpp/boost-1.32-support/supressions
diff --git a/cpp/bootstrap b/qpid/cpp/bootstrap
index d6ff19765b..d6ff19765b 100755
--- a/cpp/bootstrap
+++ b/qpid/cpp/bootstrap
diff --git a/cpp/build-aux/.gitignore b/qpid/cpp/build-aux/.gitignore
index 42725ceff3..42725ceff3 100644
--- a/cpp/build-aux/.gitignore
+++ b/qpid/cpp/build-aux/.gitignore
diff --git a/cpp/build-aux/compile b/qpid/cpp/build-aux/compile
index 1b1d232169..1b1d232169 100755
--- a/cpp/build-aux/compile
+++ b/qpid/cpp/build-aux/compile
diff --git a/cpp/build-aux/config.guess b/qpid/cpp/build-aux/config.guess
index c93201a4d2..c93201a4d2 100755
--- a/cpp/build-aux/config.guess
+++ b/qpid/cpp/build-aux/config.guess
diff --git a/cpp/build-aux/config.rpath b/qpid/cpp/build-aux/config.rpath
index c492a93b66..c492a93b66 100755
--- a/cpp/build-aux/config.rpath
+++ b/qpid/cpp/build-aux/config.rpath
diff --git a/cpp/build-aux/config.sub b/qpid/cpp/build-aux/config.sub
index 7ccee73057..7ccee73057 100755
--- a/cpp/build-aux/config.sub
+++ b/qpid/cpp/build-aux/config.sub
diff --git a/cpp/build-aux/depcomp b/qpid/cpp/build-aux/depcomp
index ca5ea4e1ef..ca5ea4e1ef 100755
--- a/cpp/build-aux/depcomp
+++ b/qpid/cpp/build-aux/depcomp
diff --git a/cpp/build-aux/install-sh b/qpid/cpp/build-aux/install-sh
index 4fbbae7b7f..4fbbae7b7f 100755
--- a/cpp/build-aux/install-sh
+++ b/qpid/cpp/build-aux/install-sh
diff --git a/cpp/build-aux/mdate-sh b/qpid/cpp/build-aux/mdate-sh
index cd916c0a34..cd916c0a34 100755
--- a/cpp/build-aux/mdate-sh
+++ b/qpid/cpp/build-aux/mdate-sh
diff --git a/cpp/build-aux/missing b/qpid/cpp/build-aux/missing
index 1c8ff7049d..1c8ff7049d 100755
--- a/cpp/build-aux/missing
+++ b/qpid/cpp/build-aux/missing
diff --git a/cpp/configure.ac b/qpid/cpp/configure.ac
index 43a32d3ad7..43a32d3ad7 100644
--- a/cpp/configure.ac
+++ b/qpid/cpp/configure.ac
diff --git a/cpp/design_docs/new-cluster-design.txt b/qpid/cpp/design_docs/new-cluster-design.txt
index 7adb46fee3..7adb46fee3 100644
--- a/cpp/design_docs/new-cluster-design.txt
+++ b/qpid/cpp/design_docs/new-cluster-design.txt
diff --git a/cpp/design_docs/new-cluster-plan.txt b/qpid/cpp/design_docs/new-cluster-plan.txt
index 781876e55a..781876e55a 100644
--- a/cpp/design_docs/new-cluster-plan.txt
+++ b/qpid/cpp/design_docs/new-cluster-plan.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 21e6f51caf..21e6f51caf 100644
--- a/cpp/docs/api/CMakeLists.txt
+++ b/qpid/cpp/docs/api/CMakeLists.txt
diff --git a/cpp/docs/api/Makefile.am b/qpid/cpp/docs/api/Makefile.am
index 3dd78ae7ad..3dd78ae7ad 100644
--- a/cpp/docs/api/Makefile.am
+++ b/qpid/cpp/docs/api/Makefile.am
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 cb36d7edb0..cb36d7edb0 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/Makefile.am b/qpid/cpp/docs/man/Makefile.am
index b821568f81..b821568f81 100644
--- a/cpp/docs/man/Makefile.am
+++ b/qpid/cpp/docs/man/Makefile.am
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 03121b364a..03121b364a 100644
--- a/cpp/etc/CMakeLists.txt
+++ b/qpid/cpp/etc/CMakeLists.txt
diff --git a/cpp/etc/Makefile.am b/qpid/cpp/etc/Makefile.am
index c91dbcbbad..c91dbcbbad 100644
--- a/cpp/etc/Makefile.am
+++ b/qpid/cpp/etc/Makefile.am
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 b/qpid/cpp/etc/qpidd
index 07cbb825d5..07cbb825d5 100755
--- a/cpp/etc/qpidd
+++ b/qpid/cpp/etc/qpidd
diff --git a/cpp/etc/qpidd.conf b/qpid/cpp/etc/qpidd.conf
index 8082660f6f..8082660f6f 100644
--- a/cpp/etc/qpidd.conf
+++ b/qpid/cpp/etc/qpidd.conf
diff --git a/cpp/etc/sasl2/qpidd.conf b/qpid/cpp/etc/sasl2/qpidd.conf
index 3197d7792a..3197d7792a 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/Makefile b/qpid/cpp/etc/selinux/Makefile
index 1ab6337114..1ab6337114 100644
--- a/cpp/etc/selinux/Makefile
+++ b/qpid/cpp/etc/selinux/Makefile
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 1b28cfd031..1b28cfd031 100644
--- a/cpp/examples/CMakeLists.txt
+++ b/qpid/cpp/examples/CMakeLists.txt
diff --git a/cpp/examples/Makefile.am b/qpid/cpp/examples/Makefile.am
index 6b2bb73587..6b2bb73587 100644
--- a/cpp/examples/Makefile.am
+++ b/qpid/cpp/examples/Makefile.am
diff --git a/cpp/examples/README.txt b/qpid/cpp/examples/README.txt
index 494dab7cd9..494dab7cd9 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 6f96105d97..6f96105d97 100644
--- a/cpp/examples/examples.sln
+++ b/qpid/cpp/examples/examples.sln
diff --git a/cpp/examples/makedist.mk b/qpid/cpp/examples/makedist.mk
index c494af5e8f..c494af5e8f 100644
--- a/cpp/examples/makedist.mk
+++ b/qpid/cpp/examples/makedist.mk
diff --git a/cpp/examples/messaging/CMakeLists.txt b/qpid/cpp/examples/messaging/CMakeLists.txt
index 03ed2daaad..03ed2daaad 100644
--- a/cpp/examples/messaging/CMakeLists.txt
+++ b/qpid/cpp/examples/messaging/CMakeLists.txt
diff --git a/cpp/examples/messaging/Makefile.am b/qpid/cpp/examples/messaging/Makefile.am
index 298d65e6f1..298d65e6f1 100644
--- a/cpp/examples/messaging/Makefile.am
+++ b/qpid/cpp/examples/messaging/Makefile.am
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 f0ecd96206..f0ecd96206 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 7700244fa8..7700244fa8 100644
--- a/cpp/examples/messaging/drain.cpp
+++ b/qpid/cpp/examples/messaging/drain.cpp
diff --git a/cpp/examples/messaging/extra_dist/Makefile b/qpid/cpp/examples/messaging/extra_dist/Makefile
index 8dd7f658f7..8dd7f658f7 100644
--- a/cpp/examples/messaging/extra_dist/Makefile
+++ b/qpid/cpp/examples/messaging/extra_dist/Makefile
diff --git a/cpp/examples/messaging/hello_world.cpp b/qpid/cpp/examples/messaging/hello_world.cpp
index 86342b3c47..86342b3c47 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 081f7394a8..081f7394a8 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 8ce3e1d8ec..8ce3e1d8ec 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_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/spout.cpp b/qpid/cpp/examples/messaging/spout.cpp
index cd11a7ad81..cd11a7ad81 100644
--- a/cpp/examples/messaging/spout.cpp
+++ b/qpid/cpp/examples/messaging/spout.cpp
diff --git a/cpp/examples/old_api/CMakeLists.txt b/qpid/cpp/examples/old_api/CMakeLists.txt
index 701f9be860..701f9be860 100644
--- a/cpp/examples/old_api/CMakeLists.txt
+++ b/qpid/cpp/examples/old_api/CMakeLists.txt
diff --git a/cpp/examples/old_api/Makefile.am b/qpid/cpp/examples/old_api/Makefile.am
index 04216ffa97..04216ffa97 100644
--- a/cpp/examples/old_api/Makefile.am
+++ b/qpid/cpp/examples/old_api/Makefile.am
diff --git a/cpp/examples/old_api/README.verify b/qpid/cpp/examples/old_api/README.verify
index e1370764c9..e1370764c9 100644
--- a/cpp/examples/old_api/README.verify
+++ b/qpid/cpp/examples/old_api/README.verify
diff --git a/cpp/examples/old_api/direct/CMakeLists.txt b/qpid/cpp/examples/old_api/direct/CMakeLists.txt
index 2ec1b2b813..2ec1b2b813 100644
--- a/cpp/examples/old_api/direct/CMakeLists.txt
+++ b/qpid/cpp/examples/old_api/direct/CMakeLists.txt
diff --git a/cpp/examples/old_api/direct/Makefile.am b/qpid/cpp/examples/old_api/direct/Makefile.am
index 24f783fcc7..24f783fcc7 100644
--- a/cpp/examples/old_api/direct/Makefile.am
+++ b/qpid/cpp/examples/old_api/direct/Makefile.am
diff --git a/cpp/examples/old_api/direct/declare_queues.cpp b/qpid/cpp/examples/old_api/direct/declare_queues.cpp
index 9a51d1982b..9a51d1982b 100644
--- a/cpp/examples/old_api/direct/declare_queues.cpp
+++ b/qpid/cpp/examples/old_api/direct/declare_queues.cpp
diff --git a/cpp/examples/old_api/direct/direct_declare_queues.vcproj b/qpid/cpp/examples/old_api/direct/direct_declare_queues.vcproj
index 083474b9ef..083474b9ef 100644
--- a/cpp/examples/old_api/direct/direct_declare_queues.vcproj
+++ b/qpid/cpp/examples/old_api/direct/direct_declare_queues.vcproj
diff --git a/cpp/examples/old_api/direct/direct_direct_producer.vcproj b/qpid/cpp/examples/old_api/direct/direct_direct_producer.vcproj
index f091fbf291..f091fbf291 100644
--- a/cpp/examples/old_api/direct/direct_direct_producer.vcproj
+++ b/qpid/cpp/examples/old_api/direct/direct_direct_producer.vcproj
diff --git a/cpp/examples/old_api/direct/direct_listener.vcproj b/qpid/cpp/examples/old_api/direct/direct_listener.vcproj
index dce1d3ec28..dce1d3ec28 100644
--- a/cpp/examples/old_api/direct/direct_listener.vcproj
+++ b/qpid/cpp/examples/old_api/direct/direct_listener.vcproj
diff --git a/cpp/examples/old_api/direct/direct_producer.cpp b/qpid/cpp/examples/old_api/direct/direct_producer.cpp
index ecc9675189..ecc9675189 100644
--- a/cpp/examples/old_api/direct/direct_producer.cpp
+++ b/qpid/cpp/examples/old_api/direct/direct_producer.cpp
diff --git a/cpp/examples/old_api/direct/listener.cpp b/qpid/cpp/examples/old_api/direct/listener.cpp
index 38bf24ec41..38bf24ec41 100644
--- a/cpp/examples/old_api/direct/listener.cpp
+++ b/qpid/cpp/examples/old_api/direct/listener.cpp
diff --git a/cpp/examples/old_api/direct/verify b/qpid/cpp/examples/old_api/direct/verify
index f598bacc1f..f598bacc1f 100644
--- a/cpp/examples/old_api/direct/verify
+++ b/qpid/cpp/examples/old_api/direct/verify
diff --git a/cpp/examples/old_api/direct/verify.in b/qpid/cpp/examples/old_api/direct/verify.in
index d1e95f1151..d1e95f1151 100644
--- a/cpp/examples/old_api/direct/verify.in
+++ b/qpid/cpp/examples/old_api/direct/verify.in
diff --git a/cpp/examples/old_api/failover/CMakeLists.txt b/qpid/cpp/examples/old_api/failover/CMakeLists.txt
index 05db8fad51..05db8fad51 100644
--- a/cpp/examples/old_api/failover/CMakeLists.txt
+++ b/qpid/cpp/examples/old_api/failover/CMakeLists.txt
diff --git a/cpp/examples/old_api/failover/Makefile.am b/qpid/cpp/examples/old_api/failover/Makefile.am
index 8b1da80f2c..8b1da80f2c 100644
--- a/cpp/examples/old_api/failover/Makefile.am
+++ b/qpid/cpp/examples/old_api/failover/Makefile.am
diff --git a/cpp/examples/old_api/failover/declare_queues.cpp b/qpid/cpp/examples/old_api/failover/declare_queues.cpp
index a677870c53..a677870c53 100644
--- a/cpp/examples/old_api/failover/declare_queues.cpp
+++ b/qpid/cpp/examples/old_api/failover/declare_queues.cpp
diff --git a/cpp/examples/old_api/failover/failover_declare_queues.vcproj b/qpid/cpp/examples/old_api/failover/failover_declare_queues.vcproj
index c87c72affd..c87c72affd 100644
--- a/cpp/examples/old_api/failover/failover_declare_queues.vcproj
+++ b/qpid/cpp/examples/old_api/failover/failover_declare_queues.vcproj
diff --git a/cpp/examples/old_api/failover/failover_replaying_sender.vcproj b/qpid/cpp/examples/old_api/failover/failover_replaying_sender.vcproj
index 6d22fa6770..6d22fa6770 100644
--- a/cpp/examples/old_api/failover/failover_replaying_sender.vcproj
+++ b/qpid/cpp/examples/old_api/failover/failover_replaying_sender.vcproj
diff --git a/cpp/examples/old_api/failover/failover_resuming_receiver.vcproj b/qpid/cpp/examples/old_api/failover/failover_resuming_receiver.vcproj
index ba5061e248..ba5061e248 100644
--- a/cpp/examples/old_api/failover/failover_resuming_receiver.vcproj
+++ b/qpid/cpp/examples/old_api/failover/failover_resuming_receiver.vcproj
diff --git a/cpp/examples/old_api/failover/replaying_sender.cpp b/qpid/cpp/examples/old_api/failover/replaying_sender.cpp
index 22a7e1ebd3..22a7e1ebd3 100644
--- a/cpp/examples/old_api/failover/replaying_sender.cpp
+++ b/qpid/cpp/examples/old_api/failover/replaying_sender.cpp
diff --git a/cpp/examples/old_api/failover/resuming_receiver.cpp b/qpid/cpp/examples/old_api/failover/resuming_receiver.cpp
index d1886ce861..d1886ce861 100644
--- a/cpp/examples/old_api/failover/resuming_receiver.cpp
+++ b/qpid/cpp/examples/old_api/failover/resuming_receiver.cpp
diff --git a/cpp/examples/old_api/fanout/CMakeLists.txt b/qpid/cpp/examples/old_api/fanout/CMakeLists.txt
index 3f89d67650..3f89d67650 100644
--- a/cpp/examples/old_api/fanout/CMakeLists.txt
+++ b/qpid/cpp/examples/old_api/fanout/CMakeLists.txt
diff --git a/cpp/examples/old_api/fanout/Makefile.am b/qpid/cpp/examples/old_api/fanout/Makefile.am
index 3ab43b0279..3ab43b0279 100644
--- a/cpp/examples/old_api/fanout/Makefile.am
+++ b/qpid/cpp/examples/old_api/fanout/Makefile.am
diff --git a/cpp/examples/old_api/fanout/fanout_fanout_producer.vcproj b/qpid/cpp/examples/old_api/fanout/fanout_fanout_producer.vcproj
index daff5f3cf0..daff5f3cf0 100644
--- a/cpp/examples/old_api/fanout/fanout_fanout_producer.vcproj
+++ b/qpid/cpp/examples/old_api/fanout/fanout_fanout_producer.vcproj
diff --git a/cpp/examples/old_api/fanout/fanout_listener.vcproj b/qpid/cpp/examples/old_api/fanout/fanout_listener.vcproj
index f0e91b7dc6..f0e91b7dc6 100644
--- a/cpp/examples/old_api/fanout/fanout_listener.vcproj
+++ b/qpid/cpp/examples/old_api/fanout/fanout_listener.vcproj
diff --git a/cpp/examples/old_api/fanout/fanout_producer.cpp b/qpid/cpp/examples/old_api/fanout/fanout_producer.cpp
index decd4d314d..decd4d314d 100644
--- a/cpp/examples/old_api/fanout/fanout_producer.cpp
+++ b/qpid/cpp/examples/old_api/fanout/fanout_producer.cpp
diff --git a/cpp/examples/old_api/fanout/listener.cpp b/qpid/cpp/examples/old_api/fanout/listener.cpp
index cd3071c29a..cd3071c29a 100644
--- a/cpp/examples/old_api/fanout/listener.cpp
+++ b/qpid/cpp/examples/old_api/fanout/listener.cpp
diff --git a/cpp/examples/old_api/fanout/verify b/qpid/cpp/examples/old_api/fanout/verify
index 2eaadff56b..2eaadff56b 100644
--- a/cpp/examples/old_api/fanout/verify
+++ b/qpid/cpp/examples/old_api/fanout/verify
diff --git a/cpp/examples/old_api/fanout/verify.in b/qpid/cpp/examples/old_api/fanout/verify.in
index 8f8612ce67..8f8612ce67 100644
--- a/cpp/examples/old_api/fanout/verify.in
+++ b/qpid/cpp/examples/old_api/fanout/verify.in
diff --git a/cpp/examples/old_api/old-examples.sln b/qpid/cpp/examples/old_api/old-examples.sln
index e6ec9a0d66..e6ec9a0d66 100644
--- a/cpp/examples/old_api/old-examples.sln
+++ b/qpid/cpp/examples/old_api/old-examples.sln
diff --git a/cpp/examples/old_api/pub-sub/CMakeLists.txt b/qpid/cpp/examples/old_api/pub-sub/CMakeLists.txt
index 961de06d5a..961de06d5a 100644
--- a/cpp/examples/old_api/pub-sub/CMakeLists.txt
+++ b/qpid/cpp/examples/old_api/pub-sub/CMakeLists.txt
diff --git a/cpp/examples/old_api/pub-sub/Makefile.am b/qpid/cpp/examples/old_api/pub-sub/Makefile.am
index 8f42ee0211..8f42ee0211 100644
--- a/cpp/examples/old_api/pub-sub/Makefile.am
+++ b/qpid/cpp/examples/old_api/pub-sub/Makefile.am
diff --git a/cpp/examples/old_api/pub-sub/pub-sub_topic_listener.vcproj b/qpid/cpp/examples/old_api/pub-sub/pub-sub_topic_listener.vcproj
index aa0b3bcaa3..aa0b3bcaa3 100644
--- a/cpp/examples/old_api/pub-sub/pub-sub_topic_listener.vcproj
+++ b/qpid/cpp/examples/old_api/pub-sub/pub-sub_topic_listener.vcproj
diff --git a/cpp/examples/old_api/pub-sub/pub-sub_topic_publisher.vcproj b/qpid/cpp/examples/old_api/pub-sub/pub-sub_topic_publisher.vcproj
index 76e51df4df..76e51df4df 100644
--- a/cpp/examples/old_api/pub-sub/pub-sub_topic_publisher.vcproj
+++ b/qpid/cpp/examples/old_api/pub-sub/pub-sub_topic_publisher.vcproj
diff --git a/cpp/examples/old_api/pub-sub/topic_listener.cpp b/qpid/cpp/examples/old_api/pub-sub/topic_listener.cpp
index d38a806303..d38a806303 100644
--- a/cpp/examples/old_api/pub-sub/topic_listener.cpp
+++ b/qpid/cpp/examples/old_api/pub-sub/topic_listener.cpp
diff --git a/cpp/examples/old_api/pub-sub/topic_publisher.cpp b/qpid/cpp/examples/old_api/pub-sub/topic_publisher.cpp
index aed5f8f033..aed5f8f033 100644
--- a/cpp/examples/old_api/pub-sub/topic_publisher.cpp
+++ b/qpid/cpp/examples/old_api/pub-sub/topic_publisher.cpp
diff --git a/cpp/examples/old_api/pub-sub/verify b/qpid/cpp/examples/old_api/pub-sub/verify
index 528d2f401e..528d2f401e 100644
--- a/cpp/examples/old_api/pub-sub/verify
+++ b/qpid/cpp/examples/old_api/pub-sub/verify
diff --git a/cpp/examples/old_api/pub-sub/verify.in b/qpid/cpp/examples/old_api/pub-sub/verify.in
index 6413c5c788..6413c5c788 100644
--- a/cpp/examples/old_api/pub-sub/verify.in
+++ b/qpid/cpp/examples/old_api/pub-sub/verify.in
diff --git a/cpp/examples/old_api/request-response/CMakeLists.txt b/qpid/cpp/examples/old_api/request-response/CMakeLists.txt
index 873a0cfa86..873a0cfa86 100644
--- a/cpp/examples/old_api/request-response/CMakeLists.txt
+++ b/qpid/cpp/examples/old_api/request-response/CMakeLists.txt
diff --git a/cpp/examples/old_api/request-response/Makefile.am b/qpid/cpp/examples/old_api/request-response/Makefile.am
index f48762da51..f48762da51 100644
--- a/cpp/examples/old_api/request-response/Makefile.am
+++ b/qpid/cpp/examples/old_api/request-response/Makefile.am
diff --git a/cpp/examples/old_api/request-response/client.cpp b/qpid/cpp/examples/old_api/request-response/client.cpp
index 679d1c5fc2..679d1c5fc2 100644
--- a/cpp/examples/old_api/request-response/client.cpp
+++ b/qpid/cpp/examples/old_api/request-response/client.cpp
diff --git a/cpp/examples/old_api/request-response/request-response_client.vcproj b/qpid/cpp/examples/old_api/request-response/request-response_client.vcproj
index 5f9eadde36..5f9eadde36 100644
--- a/cpp/examples/old_api/request-response/request-response_client.vcproj
+++ b/qpid/cpp/examples/old_api/request-response/request-response_client.vcproj
diff --git a/cpp/examples/old_api/request-response/request-response_server.vcproj b/qpid/cpp/examples/old_api/request-response/request-response_server.vcproj
index 54352b9f46..54352b9f46 100644
--- a/cpp/examples/old_api/request-response/request-response_server.vcproj
+++ b/qpid/cpp/examples/old_api/request-response/request-response_server.vcproj
diff --git a/cpp/examples/old_api/request-response/server.cpp b/qpid/cpp/examples/old_api/request-response/server.cpp
index 65a4717b35..65a4717b35 100644
--- a/cpp/examples/old_api/request-response/server.cpp
+++ b/qpid/cpp/examples/old_api/request-response/server.cpp
diff --git a/cpp/examples/old_api/request-response/verify b/qpid/cpp/examples/old_api/request-response/verify
index dee82413e7..dee82413e7 100644
--- a/cpp/examples/old_api/request-response/verify
+++ b/qpid/cpp/examples/old_api/request-response/verify
diff --git a/cpp/examples/old_api/request-response/verify.in b/qpid/cpp/examples/old_api/request-response/verify.in
index 7925dc5671..7925dc5671 100644
--- a/cpp/examples/old_api/request-response/verify.in
+++ b/qpid/cpp/examples/old_api/request-response/verify.in
diff --git a/cpp/examples/old_api/tradedemo/CMakeLists.txt b/qpid/cpp/examples/old_api/tradedemo/CMakeLists.txt
index e61fc1467d..e61fc1467d 100644
--- a/cpp/examples/old_api/tradedemo/CMakeLists.txt
+++ b/qpid/cpp/examples/old_api/tradedemo/CMakeLists.txt
diff --git a/cpp/examples/old_api/tradedemo/Makefile.am b/qpid/cpp/examples/old_api/tradedemo/Makefile.am
index 445b15b367..445b15b367 100644
--- a/cpp/examples/old_api/tradedemo/Makefile.am
+++ b/qpid/cpp/examples/old_api/tradedemo/Makefile.am
diff --git a/cpp/examples/old_api/tradedemo/declare_queues.cpp b/qpid/cpp/examples/old_api/tradedemo/declare_queues.cpp
index b1f2cc3510..b1f2cc3510 100644
--- a/cpp/examples/old_api/tradedemo/declare_queues.cpp
+++ b/qpid/cpp/examples/old_api/tradedemo/declare_queues.cpp
diff --git a/cpp/examples/old_api/tradedemo/topic_listener.cpp b/qpid/cpp/examples/old_api/tradedemo/topic_listener.cpp
index c488e7fb69..c488e7fb69 100644
--- a/cpp/examples/old_api/tradedemo/topic_listener.cpp
+++ b/qpid/cpp/examples/old_api/tradedemo/topic_listener.cpp
diff --git a/cpp/examples/old_api/tradedemo/topic_publisher.cpp b/qpid/cpp/examples/old_api/tradedemo/topic_publisher.cpp
index e22c185bc7..e22c185bc7 100644
--- a/cpp/examples/old_api/tradedemo/topic_publisher.cpp
+++ b/qpid/cpp/examples/old_api/tradedemo/topic_publisher.cpp
diff --git a/cpp/examples/old_api/tradedemo/tradedemo_declare_queues.vcproj b/qpid/cpp/examples/old_api/tradedemo/tradedemo_declare_queues.vcproj
index 34b5cb3b2b..34b5cb3b2b 100644
--- a/cpp/examples/old_api/tradedemo/tradedemo_declare_queues.vcproj
+++ b/qpid/cpp/examples/old_api/tradedemo/tradedemo_declare_queues.vcproj
diff --git a/cpp/examples/old_api/tradedemo/tradedemo_topic_listener.vcproj b/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_listener.vcproj
index 965be2e88b..965be2e88b 100644
--- a/cpp/examples/old_api/tradedemo/tradedemo_topic_listener.vcproj
+++ b/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_listener.vcproj
diff --git a/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj b/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
index 77fd511e15..77fd511e15 100644
--- a/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
+++ b/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
diff --git a/cpp/examples/old_api/verify b/qpid/cpp/examples/old_api/verify
index 9a1ed078d6..9a1ed078d6 100755
--- a/cpp/examples/old_api/verify
+++ b/qpid/cpp/examples/old_api/verify
diff --git a/cpp/examples/old_api/verify_all b/qpid/cpp/examples/old_api/verify_all
index fbe51377b6..fbe51377b6 100755
--- a/cpp/examples/old_api/verify_all
+++ b/qpid/cpp/examples/old_api/verify_all
diff --git a/cpp/examples/old_api/xml-exchange/CMakeLists.txt b/qpid/cpp/examples/old_api/xml-exchange/CMakeLists.txt
index 3fea47a208..3fea47a208 100644
--- a/cpp/examples/old_api/xml-exchange/CMakeLists.txt
+++ b/qpid/cpp/examples/old_api/xml-exchange/CMakeLists.txt
diff --git a/cpp/examples/old_api/xml-exchange/Makefile.am b/qpid/cpp/examples/old_api/xml-exchange/Makefile.am
index 3e1082cdb2..3e1082cdb2 100644
--- a/cpp/examples/old_api/xml-exchange/Makefile.am
+++ b/qpid/cpp/examples/old_api/xml-exchange/Makefile.am
diff --git a/cpp/examples/old_api/xml-exchange/README.txt b/qpid/cpp/examples/old_api/xml-exchange/README.txt
index 85caebe352..85caebe352 100644
--- a/cpp/examples/old_api/xml-exchange/README.txt
+++ b/qpid/cpp/examples/old_api/xml-exchange/README.txt
diff --git a/cpp/examples/old_api/xml-exchange/declare_queues.cpp b/qpid/cpp/examples/old_api/xml-exchange/declare_queues.cpp
index ad08642019..ad08642019 100644
--- a/cpp/examples/old_api/xml-exchange/declare_queues.cpp
+++ b/qpid/cpp/examples/old_api/xml-exchange/declare_queues.cpp
diff --git a/cpp/examples/old_api/xml-exchange/listener.cpp b/qpid/cpp/examples/old_api/xml-exchange/listener.cpp
index 11bcb9f669..11bcb9f669 100644
--- a/cpp/examples/old_api/xml-exchange/listener.cpp
+++ b/qpid/cpp/examples/old_api/xml-exchange/listener.cpp
diff --git a/cpp/examples/old_api/xml-exchange/xml_producer.cpp b/qpid/cpp/examples/old_api/xml-exchange/xml_producer.cpp
index af1a7e60c7..af1a7e60c7 100644
--- a/cpp/examples/old_api/xml-exchange/xml_producer.cpp
+++ b/qpid/cpp/examples/old_api/xml-exchange/xml_producer.cpp
diff --git a/cpp/examples/qmf-agent/Makefile b/qpid/cpp/examples/qmf-agent/Makefile
index 5b1afc4b01..5b1afc4b01 100644
--- a/cpp/examples/qmf-agent/Makefile
+++ b/qpid/cpp/examples/qmf-agent/Makefile
diff --git a/cpp/examples/qmf-agent/example.cpp b/qpid/cpp/examples/qmf-agent/example.cpp
index f9be4f0164..f9be4f0164 100644
--- a/cpp/examples/qmf-agent/example.cpp
+++ b/qpid/cpp/examples/qmf-agent/example.cpp
diff --git a/cpp/examples/qmf-agent/example_gen.mak b/qpid/cpp/examples/qmf-agent/example_gen.mak
index 1d71e77b63..1d71e77b63 100644
--- a/cpp/examples/qmf-agent/example_gen.mak
+++ b/qpid/cpp/examples/qmf-agent/example_gen.mak
diff --git a/cpp/examples/qmf-agent/qmf_agent.vcproj b/qpid/cpp/examples/qmf-agent/qmf_agent.vcproj
index 2a1c04b367..2a1c04b367 100644
--- a/cpp/examples/qmf-agent/qmf_agent.vcproj
+++ b/qpid/cpp/examples/qmf-agent/qmf_agent.vcproj
diff --git a/cpp/examples/qmf-agent/schema.xml b/qpid/cpp/examples/qmf-agent/schema.xml
index 2a3bb461cc..2a3bb461cc 100644
--- a/cpp/examples/qmf-agent/schema.xml
+++ b/qpid/cpp/examples/qmf-agent/schema.xml
diff --git a/cpp/examples/qmf-console/CMakeLists.txt b/qpid/cpp/examples/qmf-console/CMakeLists.txt
index 4bbc7c461f..4bbc7c461f 100644
--- a/cpp/examples/qmf-console/CMakeLists.txt
+++ b/qpid/cpp/examples/qmf-console/CMakeLists.txt
diff --git a/cpp/examples/qmf-console/Makefile.am b/qpid/cpp/examples/qmf-console/Makefile.am
index f4cbb7633c..f4cbb7633c 100644
--- a/cpp/examples/qmf-console/Makefile.am
+++ b/qpid/cpp/examples/qmf-console/Makefile.am
diff --git a/cpp/examples/qmf-console/README.txt b/qpid/cpp/examples/qmf-console/README.txt
index 2ee784cbc2..2ee784cbc2 100644
--- a/cpp/examples/qmf-console/README.txt
+++ b/qpid/cpp/examples/qmf-console/README.txt
diff --git a/cpp/examples/qmf-console/cluster-qmon.cpp b/qpid/cpp/examples/qmf-console/cluster-qmon.cpp
index fe92f8a8ae..fe92f8a8ae 100644
--- a/cpp/examples/qmf-console/cluster-qmon.cpp
+++ b/qpid/cpp/examples/qmf-console/cluster-qmon.cpp
diff --git a/cpp/examples/qmf-console/console.cpp b/qpid/cpp/examples/qmf-console/console.cpp
index b5375b673f..b5375b673f 100644
--- a/cpp/examples/qmf-console/console.cpp
+++ b/qpid/cpp/examples/qmf-console/console.cpp
diff --git a/cpp/examples/qmf-console/ping.cpp b/qpid/cpp/examples/qmf-console/ping.cpp
index fe537d48d2..fe537d48d2 100644
--- a/cpp/examples/qmf-console/ping.cpp
+++ b/qpid/cpp/examples/qmf-console/ping.cpp
diff --git a/cpp/examples/qmf-console/printevents.cpp b/qpid/cpp/examples/qmf-console/printevents.cpp
index 3a0a2ab68b..3a0a2ab68b 100644
--- a/cpp/examples/qmf-console/printevents.cpp
+++ b/qpid/cpp/examples/qmf-console/printevents.cpp
diff --git a/cpp/examples/qmf-console/qmf-console_console.vcproj b/qpid/cpp/examples/qmf-console/qmf-console_console.vcproj
index eea535b85d..eea535b85d 100644
--- a/cpp/examples/qmf-console/qmf-console_console.vcproj
+++ b/qpid/cpp/examples/qmf-console/qmf-console_console.vcproj
diff --git a/cpp/examples/qmf-console/qmf-console_ping.vcproj b/qpid/cpp/examples/qmf-console/qmf-console_ping.vcproj
index b193f8cf28..b193f8cf28 100644
--- a/cpp/examples/qmf-console/qmf-console_ping.vcproj
+++ b/qpid/cpp/examples/qmf-console/qmf-console_ping.vcproj
diff --git a/cpp/examples/qmf-console/qmf-console_printevents.vcproj b/qpid/cpp/examples/qmf-console/qmf-console_printevents.vcproj
index 221d922212..221d922212 100644
--- a/cpp/examples/qmf-console/qmf-console_printevents.vcproj
+++ b/qpid/cpp/examples/qmf-console/qmf-console_printevents.vcproj
diff --git a/cpp/examples/qmf-console/qmf-console_queuestats.vcproj b/qpid/cpp/examples/qmf-console/qmf-console_queuestats.vcproj
index d89650b335..d89650b335 100644
--- a/cpp/examples/qmf-console/qmf-console_queuestats.vcproj
+++ b/qpid/cpp/examples/qmf-console/qmf-console_queuestats.vcproj
diff --git a/cpp/examples/qmf-console/queuestats.cpp b/qpid/cpp/examples/qmf-console/queuestats.cpp
index 2c38777ad8..2c38777ad8 100644
--- a/cpp/examples/qmf-console/queuestats.cpp
+++ b/qpid/cpp/examples/qmf-console/queuestats.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/include/qmf/Agent.h b/qpid/cpp/include/qmf/Agent.h
index 94083be4f3..94083be4f3 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 0f93a9bb0a..0f93a9bb0a 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 1eeb252143..1eeb252143 100644
--- a/cpp/include/qmf/AgentSession.h
+++ b/qpid/cpp/include/qmf/AgentSession.h
diff --git a/cpp/include/qmf/ConsoleEvent.h b/qpid/cpp/include/qmf/ConsoleEvent.h
index 94600f9357..94600f9357 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 6008036eec..6008036eec 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 487a02fe95..487a02fe95 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 63d309cc4b..63d309cc4b 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 50971ea626..50971ea626 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 c1264f8901..c1264f8901 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 6cfd2e2a56..6cfd2e2a56 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 2dafc1c091..2dafc1c091 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 b5944dc29e..b5944dc29e 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 bbb603fa50..bbb603fa50 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 af3da612e5..af3da612e5 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 398a45b922..398a45b922 100644
--- a/cpp/include/qmf/Subscription.h
+++ b/qpid/cpp/include/qmf/Subscription.h
diff --git a/cpp/include/qmf/engine/Agent.h b/qpid/cpp/include/qmf/engine/Agent.h
index 71abf82254..71abf82254 100644
--- a/cpp/include/qmf/engine/Agent.h
+++ b/qpid/cpp/include/qmf/engine/Agent.h
diff --git a/cpp/include/qmf/engine/ConnectionSettings.h b/qpid/cpp/include/qmf/engine/ConnectionSettings.h
index 36312400b1..36312400b1 100644
--- a/cpp/include/qmf/engine/ConnectionSettings.h
+++ b/qpid/cpp/include/qmf/engine/ConnectionSettings.h
diff --git a/cpp/include/qmf/engine/Console.h b/qpid/cpp/include/qmf/engine/Console.h
index bd40c63c6c..bd40c63c6c 100644
--- a/cpp/include/qmf/engine/Console.h
+++ b/qpid/cpp/include/qmf/engine/Console.h
diff --git a/cpp/include/qmf/engine/Event.h b/qpid/cpp/include/qmf/engine/Event.h
index 647b88dbf8..647b88dbf8 100644
--- a/cpp/include/qmf/engine/Event.h
+++ b/qpid/cpp/include/qmf/engine/Event.h
diff --git a/cpp/include/qmf/engine/Message.h b/qpid/cpp/include/qmf/engine/Message.h
index 1e95cc6afe..1e95cc6afe 100644
--- a/cpp/include/qmf/engine/Message.h
+++ b/qpid/cpp/include/qmf/engine/Message.h
diff --git a/cpp/include/qmf/engine/Object.h b/qpid/cpp/include/qmf/engine/Object.h
index ad67cfdb95..ad67cfdb95 100644
--- a/cpp/include/qmf/engine/Object.h
+++ b/qpid/cpp/include/qmf/engine/Object.h
diff --git a/cpp/include/qmf/engine/ObjectId.h b/qpid/cpp/include/qmf/engine/ObjectId.h
index 51eb2bc9e7..51eb2bc9e7 100644
--- a/cpp/include/qmf/engine/ObjectId.h
+++ b/qpid/cpp/include/qmf/engine/ObjectId.h
diff --git a/cpp/include/qmf/engine/QmfEngineImportExport.h b/qpid/cpp/include/qmf/engine/QmfEngineImportExport.h
index cf8fffdb17..cf8fffdb17 100644
--- a/cpp/include/qmf/engine/QmfEngineImportExport.h
+++ b/qpid/cpp/include/qmf/engine/QmfEngineImportExport.h
diff --git a/cpp/include/qmf/engine/Query.h b/qpid/cpp/include/qmf/engine/Query.h
index 3ed08c5d8e..3ed08c5d8e 100644
--- a/cpp/include/qmf/engine/Query.h
+++ b/qpid/cpp/include/qmf/engine/Query.h
diff --git a/cpp/include/qmf/engine/ResilientConnection.h b/qpid/cpp/include/qmf/engine/ResilientConnection.h
index c03d08cb96..c03d08cb96 100644
--- a/cpp/include/qmf/engine/ResilientConnection.h
+++ b/qpid/cpp/include/qmf/engine/ResilientConnection.h
diff --git a/cpp/include/qmf/engine/Schema.h b/qpid/cpp/include/qmf/engine/Schema.h
index f53e84324a..f53e84324a 100644
--- a/cpp/include/qmf/engine/Schema.h
+++ b/qpid/cpp/include/qmf/engine/Schema.h
diff --git a/cpp/include/qmf/engine/Typecode.h b/qpid/cpp/include/qmf/engine/Typecode.h
index 613f96a483..613f96a483 100644
--- a/cpp/include/qmf/engine/Typecode.h
+++ b/qpid/cpp/include/qmf/engine/Typecode.h
diff --git a/cpp/include/qmf/engine/Value.h b/qpid/cpp/include/qmf/engine/Value.h
index 5b45061b78..5b45061b78 100644
--- a/cpp/include/qmf/engine/Value.h
+++ b/qpid/cpp/include/qmf/engine/Value.h
diff --git a/cpp/include/qmf/exceptions.h b/qpid/cpp/include/qmf/exceptions.h
index c7ffa68ce2..c7ffa68ce2 100644
--- a/cpp/include/qmf/exceptions.h
+++ b/qpid/cpp/include/qmf/exceptions.h
diff --git a/cpp/include/qpid/Address.h b/qpid/cpp/include/qpid/Address.h
index f5b19d0532..f5b19d0532 100755
--- a/cpp/include/qpid/Address.h
+++ b/qpid/cpp/include/qpid/Address.h
diff --git a/cpp/include/qpid/CommonImportExport.h b/qpid/cpp/include/qpid/CommonImportExport.h
index dd2b900b73..dd2b900b73 100644
--- a/cpp/include/qpid/CommonImportExport.h
+++ b/qpid/cpp/include/qpid/CommonImportExport.h
diff --git a/cpp/include/qpid/Exception.h b/qpid/cpp/include/qpid/Exception.h
index cbd175214d..cbd175214d 100644
--- a/cpp/include/qpid/Exception.h
+++ b/qpid/cpp/include/qpid/Exception.h
diff --git a/cpp/include/qpid/ImportExport.h b/qpid/cpp/include/qpid/ImportExport.h
index e62399faf7..e62399faf7 100644
--- a/cpp/include/qpid/ImportExport.h
+++ b/qpid/cpp/include/qpid/ImportExport.h
diff --git a/cpp/include/qpid/InlineAllocator.h b/qpid/cpp/include/qpid/InlineAllocator.h
index 2502545dcb..2502545dcb 100644
--- a/cpp/include/qpid/InlineAllocator.h
+++ b/qpid/cpp/include/qpid/InlineAllocator.h
diff --git a/cpp/include/qpid/InlineVector.h b/qpid/cpp/include/qpid/InlineVector.h
index c55db295f3..c55db295f3 100644
--- a/cpp/include/qpid/InlineVector.h
+++ b/qpid/cpp/include/qpid/InlineVector.h
diff --git a/cpp/include/qpid/Msg.h b/qpid/cpp/include/qpid/Msg.h
index e1837c29e5..e1837c29e5 100644
--- a/cpp/include/qpid/Msg.h
+++ b/qpid/cpp/include/qpid/Msg.h
diff --git a/cpp/include/qpid/Options.h b/qpid/cpp/include/qpid/Options.h
index 63d91c2d72..63d91c2d72 100644
--- a/cpp/include/qpid/Options.h
+++ b/qpid/cpp/include/qpid/Options.h
diff --git a/cpp/include/qpid/RangeSet.h b/qpid/cpp/include/qpid/RangeSet.h
index 36991fd784..36991fd784 100644
--- a/cpp/include/qpid/RangeSet.h
+++ b/qpid/cpp/include/qpid/RangeSet.h
diff --git a/cpp/include/qpid/SessionId.h b/qpid/cpp/include/qpid/SessionId.h
index e18b360999..e18b360999 100644
--- a/cpp/include/qpid/SessionId.h
+++ b/qpid/cpp/include/qpid/SessionId.h
diff --git a/cpp/include/qpid/Url.h b/qpid/cpp/include/qpid/Url.h
index 915b08ac5f..915b08ac5f 100644
--- a/cpp/include/qpid/Url.h
+++ b/qpid/cpp/include/qpid/Url.h
diff --git a/cpp/include/qpid/agent/ManagementAgent.h b/qpid/cpp/include/qpid/agent/ManagementAgent.h
index e2451244c1..e2451244c1 100644
--- a/cpp/include/qpid/agent/ManagementAgent.h
+++ b/qpid/cpp/include/qpid/agent/ManagementAgent.h
diff --git a/cpp/include/qpid/agent/QmfAgentImportExport.h b/qpid/cpp/include/qpid/agent/QmfAgentImportExport.h
index 3f923ac4b2..3f923ac4b2 100644
--- a/cpp/include/qpid/agent/QmfAgentImportExport.h
+++ b/qpid/cpp/include/qpid/agent/QmfAgentImportExport.h
diff --git a/cpp/include/qpid/amqp_0_10/Codecs.h b/qpid/cpp/include/qpid/amqp_0_10/Codecs.h
index 08275402fc..08275402fc 100644
--- a/cpp/include/qpid/amqp_0_10/Codecs.h
+++ b/qpid/cpp/include/qpid/amqp_0_10/Codecs.h
diff --git a/cpp/include/qpid/client/AsyncSession.h b/qpid/cpp/include/qpid/client/AsyncSession.h
index d91efeb4f1..d91efeb4f1 100644
--- a/cpp/include/qpid/client/AsyncSession.h
+++ b/qpid/cpp/include/qpid/client/AsyncSession.h
diff --git a/cpp/include/qpid/client/ClientImportExport.h b/qpid/cpp/include/qpid/client/ClientImportExport.h
index 2a3a5a52e9..2a3a5a52e9 100644
--- a/cpp/include/qpid/client/ClientImportExport.h
+++ b/qpid/cpp/include/qpid/client/ClientImportExport.h
diff --git a/cpp/include/qpid/client/Completion.h b/qpid/cpp/include/qpid/client/Completion.h
index 9546db9258..9546db9258 100644
--- a/cpp/include/qpid/client/Completion.h
+++ b/qpid/cpp/include/qpid/client/Completion.h
diff --git a/cpp/include/qpid/client/Connection.h b/qpid/cpp/include/qpid/client/Connection.h
index 2477bf4800..2477bf4800 100644
--- a/cpp/include/qpid/client/Connection.h
+++ b/qpid/cpp/include/qpid/client/Connection.h
diff --git a/cpp/include/qpid/client/ConnectionSettings.h b/qpid/cpp/include/qpid/client/ConnectionSettings.h
index 2b6b86f891..2b6b86f891 100644
--- a/cpp/include/qpid/client/ConnectionSettings.h
+++ b/qpid/cpp/include/qpid/client/ConnectionSettings.h
diff --git a/cpp/include/qpid/client/FailoverListener.h b/qpid/cpp/include/qpid/client/FailoverListener.h
index 53c7c26211..53c7c26211 100644
--- a/cpp/include/qpid/client/FailoverListener.h
+++ b/qpid/cpp/include/qpid/client/FailoverListener.h
diff --git a/cpp/include/qpid/client/FailoverManager.h b/qpid/cpp/include/qpid/client/FailoverManager.h
index d3a0dbc976..d3a0dbc976 100644
--- a/cpp/include/qpid/client/FailoverManager.h
+++ b/qpid/cpp/include/qpid/client/FailoverManager.h
diff --git a/cpp/include/qpid/client/FlowControl.h b/qpid/cpp/include/qpid/client/FlowControl.h
index bff7071b3b..bff7071b3b 100644
--- a/cpp/include/qpid/client/FlowControl.h
+++ b/qpid/cpp/include/qpid/client/FlowControl.h
diff --git a/cpp/include/qpid/client/Future.h b/qpid/cpp/include/qpid/client/Future.h
index 630a7e03c0..630a7e03c0 100644
--- a/cpp/include/qpid/client/Future.h
+++ b/qpid/cpp/include/qpid/client/Future.h
diff --git a/cpp/include/qpid/client/FutureCompletion.h b/qpid/cpp/include/qpid/client/FutureCompletion.h
index 0970f494b7..0970f494b7 100644
--- a/cpp/include/qpid/client/FutureCompletion.h
+++ b/qpid/cpp/include/qpid/client/FutureCompletion.h
diff --git a/cpp/include/qpid/client/FutureResult.h b/qpid/cpp/include/qpid/client/FutureResult.h
index ead4929571..ead4929571 100644
--- a/cpp/include/qpid/client/FutureResult.h
+++ b/qpid/cpp/include/qpid/client/FutureResult.h
diff --git a/cpp/include/qpid/client/Handle.h b/qpid/cpp/include/qpid/client/Handle.h
index b8315481a9..b8315481a9 100644
--- a/cpp/include/qpid/client/Handle.h
+++ b/qpid/cpp/include/qpid/client/Handle.h
diff --git a/cpp/include/qpid/client/LocalQueue.h b/qpid/cpp/include/qpid/client/LocalQueue.h
index 1a19a8499d..1a19a8499d 100644
--- a/cpp/include/qpid/client/LocalQueue.h
+++ b/qpid/cpp/include/qpid/client/LocalQueue.h
diff --git a/cpp/include/qpid/client/Message.h b/qpid/cpp/include/qpid/client/Message.h
index ba50dda9ba..ba50dda9ba 100644
--- a/cpp/include/qpid/client/Message.h
+++ b/qpid/cpp/include/qpid/client/Message.h
diff --git a/cpp/include/qpid/client/MessageListener.h b/qpid/cpp/include/qpid/client/MessageListener.h
index 3ca2fa964a..3ca2fa964a 100644
--- a/cpp/include/qpid/client/MessageListener.h
+++ b/qpid/cpp/include/qpid/client/MessageListener.h
diff --git a/cpp/include/qpid/client/MessageReplayTracker.h b/qpid/cpp/include/qpid/client/MessageReplayTracker.h
index 06a3f29c7d..06a3f29c7d 100644
--- a/cpp/include/qpid/client/MessageReplayTracker.h
+++ b/qpid/cpp/include/qpid/client/MessageReplayTracker.h
diff --git a/cpp/include/qpid/client/QueueOptions.h b/qpid/cpp/include/qpid/client/QueueOptions.h
index 3984b63fdd..3984b63fdd 100644
--- a/cpp/include/qpid/client/QueueOptions.h
+++ b/qpid/cpp/include/qpid/client/QueueOptions.h
diff --git a/cpp/include/qpid/client/Session.h b/qpid/cpp/include/qpid/client/Session.h
index c40549bbc5..c40549bbc5 100644
--- a/cpp/include/qpid/client/Session.h
+++ b/qpid/cpp/include/qpid/client/Session.h
diff --git a/cpp/include/qpid/client/SessionBase_0_10.h b/qpid/cpp/include/qpid/client/SessionBase_0_10.h
index ea50ab32f7..ea50ab32f7 100644
--- a/cpp/include/qpid/client/SessionBase_0_10.h
+++ b/qpid/cpp/include/qpid/client/SessionBase_0_10.h
diff --git a/cpp/include/qpid/client/Subscription.h b/qpid/cpp/include/qpid/client/Subscription.h
index bb9b98e8ff..bb9b98e8ff 100644
--- a/cpp/include/qpid/client/Subscription.h
+++ b/qpid/cpp/include/qpid/client/Subscription.h
diff --git a/cpp/include/qpid/client/SubscriptionManager.h b/qpid/cpp/include/qpid/client/SubscriptionManager.h
index b69819a8ff..b69819a8ff 100644
--- a/cpp/include/qpid/client/SubscriptionManager.h
+++ b/qpid/cpp/include/qpid/client/SubscriptionManager.h
diff --git a/cpp/include/qpid/client/SubscriptionSettings.h b/qpid/cpp/include/qpid/client/SubscriptionSettings.h
index b4cb302b56..b4cb302b56 100644
--- a/cpp/include/qpid/client/SubscriptionSettings.h
+++ b/qpid/cpp/include/qpid/client/SubscriptionSettings.h
diff --git a/cpp/include/qpid/client/TypedResult.h b/qpid/cpp/include/qpid/client/TypedResult.h
index 8e1a16580c..8e1a16580c 100644
--- a/cpp/include/qpid/client/TypedResult.h
+++ b/qpid/cpp/include/qpid/client/TypedResult.h
diff --git a/cpp/include/qpid/console/Agent.h b/qpid/cpp/include/qpid/console/Agent.h
index 629dd71dee..629dd71dee 100644
--- a/cpp/include/qpid/console/Agent.h
+++ b/qpid/cpp/include/qpid/console/Agent.h
diff --git a/cpp/include/qpid/console/Broker.h b/qpid/cpp/include/qpid/console/Broker.h
index c2ba8ac81f..c2ba8ac81f 100644
--- a/cpp/include/qpid/console/Broker.h
+++ b/qpid/cpp/include/qpid/console/Broker.h
diff --git a/cpp/include/qpid/console/ClassKey.h b/qpid/cpp/include/qpid/console/ClassKey.h
index 95cd2627f1..95cd2627f1 100644
--- a/cpp/include/qpid/console/ClassKey.h
+++ b/qpid/cpp/include/qpid/console/ClassKey.h
diff --git a/cpp/include/qpid/console/ConsoleImportExport.h b/qpid/cpp/include/qpid/console/ConsoleImportExport.h
index aac30858f7..aac30858f7 100644
--- a/cpp/include/qpid/console/ConsoleImportExport.h
+++ b/qpid/cpp/include/qpid/console/ConsoleImportExport.h
diff --git a/cpp/include/qpid/console/ConsoleListener.h b/qpid/cpp/include/qpid/console/ConsoleListener.h
index 7a649da657..7a649da657 100644
--- a/cpp/include/qpid/console/ConsoleListener.h
+++ b/qpid/cpp/include/qpid/console/ConsoleListener.h
diff --git a/cpp/include/qpid/console/Event.h b/qpid/cpp/include/qpid/console/Event.h
index ef4ecc791c..ef4ecc791c 100644
--- a/cpp/include/qpid/console/Event.h
+++ b/qpid/cpp/include/qpid/console/Event.h
diff --git a/cpp/include/qpid/console/Object.h b/qpid/cpp/include/qpid/console/Object.h
index 5a29fdf792..5a29fdf792 100644
--- a/cpp/include/qpid/console/Object.h
+++ b/qpid/cpp/include/qpid/console/Object.h
diff --git a/cpp/include/qpid/console/ObjectId.h b/qpid/cpp/include/qpid/console/ObjectId.h
index 7904c85598..7904c85598 100644
--- a/cpp/include/qpid/console/ObjectId.h
+++ b/qpid/cpp/include/qpid/console/ObjectId.h
diff --git a/cpp/include/qpid/console/Package.h b/qpid/cpp/include/qpid/console/Package.h
index 3b59e366ff..3b59e366ff 100644
--- a/cpp/include/qpid/console/Package.h
+++ b/qpid/cpp/include/qpid/console/Package.h
diff --git a/cpp/include/qpid/console/Schema.h b/qpid/cpp/include/qpid/console/Schema.h
index 6d4e41ab3e..6d4e41ab3e 100644
--- a/cpp/include/qpid/console/Schema.h
+++ b/qpid/cpp/include/qpid/console/Schema.h
diff --git a/cpp/include/qpid/console/SequenceManager.h b/qpid/cpp/include/qpid/console/SequenceManager.h
index ea0ccf3f77..ea0ccf3f77 100644
--- a/cpp/include/qpid/console/SequenceManager.h
+++ b/qpid/cpp/include/qpid/console/SequenceManager.h
diff --git a/cpp/include/qpid/console/SessionManager.h b/qpid/cpp/include/qpid/console/SessionManager.h
index b46af549ff..b46af549ff 100644
--- a/cpp/include/qpid/console/SessionManager.h
+++ b/qpid/cpp/include/qpid/console/SessionManager.h
diff --git a/cpp/include/qpid/console/Value.h b/qpid/cpp/include/qpid/console/Value.h
index d9eb65053b..d9eb65053b 100644
--- a/cpp/include/qpid/console/Value.h
+++ b/qpid/cpp/include/qpid/console/Value.h
diff --git a/cpp/include/qpid/framing/Array.h b/qpid/cpp/include/qpid/framing/Array.h
index 1e97be3bb4..1e97be3bb4 100644
--- a/cpp/include/qpid/framing/Array.h
+++ b/qpid/cpp/include/qpid/framing/Array.h
diff --git a/cpp/include/qpid/framing/Buffer.h b/qpid/cpp/include/qpid/framing/Buffer.h
index 8b08e60762..8b08e60762 100644
--- a/cpp/include/qpid/framing/Buffer.h
+++ b/qpid/cpp/include/qpid/framing/Buffer.h
diff --git a/cpp/include/qpid/framing/FieldTable.h b/qpid/cpp/include/qpid/framing/FieldTable.h
index fed431129a..fed431129a 100644
--- a/cpp/include/qpid/framing/FieldTable.h
+++ b/qpid/cpp/include/qpid/framing/FieldTable.h
diff --git a/cpp/include/qpid/framing/FieldValue.h b/qpid/cpp/include/qpid/framing/FieldValue.h
index 458de62fdf..458de62fdf 100644
--- a/cpp/include/qpid/framing/FieldValue.h
+++ b/qpid/cpp/include/qpid/framing/FieldValue.h
diff --git a/cpp/include/qpid/framing/List.h b/qpid/cpp/include/qpid/framing/List.h
index 417fd4bffb..417fd4bffb 100644
--- a/cpp/include/qpid/framing/List.h
+++ b/qpid/cpp/include/qpid/framing/List.h
diff --git a/cpp/include/qpid/framing/ProtocolVersion.h b/qpid/cpp/include/qpid/framing/ProtocolVersion.h
index 30094c165d..30094c165d 100644
--- a/cpp/include/qpid/framing/ProtocolVersion.h
+++ b/qpid/cpp/include/qpid/framing/ProtocolVersion.h
diff --git a/cpp/include/qpid/framing/SequenceNumber.h b/qpid/cpp/include/qpid/framing/SequenceNumber.h
index eed15a4b75..eed15a4b75 100644
--- a/cpp/include/qpid/framing/SequenceNumber.h
+++ b/qpid/cpp/include/qpid/framing/SequenceNumber.h
diff --git a/cpp/include/qpid/framing/SequenceSet.h b/qpid/cpp/include/qpid/framing/SequenceSet.h
index 0a78e418ba..0a78e418ba 100644
--- a/cpp/include/qpid/framing/SequenceSet.h
+++ b/qpid/cpp/include/qpid/framing/SequenceSet.h
diff --git a/cpp/include/qpid/framing/StructHelper.h b/qpid/cpp/include/qpid/framing/StructHelper.h
index 21f9b91fa9..21f9b91fa9 100644
--- a/cpp/include/qpid/framing/StructHelper.h
+++ b/qpid/cpp/include/qpid/framing/StructHelper.h
diff --git a/cpp/include/qpid/framing/Uuid.h b/qpid/cpp/include/qpid/framing/Uuid.h
index ccfd7e9534..ccfd7e9534 100644
--- a/cpp/include/qpid/framing/Uuid.h
+++ b/qpid/cpp/include/qpid/framing/Uuid.h
diff --git a/cpp/include/qpid/framing/amqp_types.h b/qpid/cpp/include/qpid/framing/amqp_types.h
index d9088b7a12..d9088b7a12 100644
--- a/cpp/include/qpid/framing/amqp_types.h
+++ b/qpid/cpp/include/qpid/framing/amqp_types.h
diff --git a/cpp/include/qpid/framing/amqp_types_full.h b/qpid/cpp/include/qpid/framing/amqp_types_full.h
index c5d84dedea..c5d84dedea 100644
--- a/cpp/include/qpid/framing/amqp_types_full.h
+++ b/qpid/cpp/include/qpid/framing/amqp_types_full.h
diff --git a/cpp/include/qpid/log/Logger.h b/qpid/cpp/include/qpid/log/Logger.h
index d255b7e150..d255b7e150 100644
--- a/cpp/include/qpid/log/Logger.h
+++ b/qpid/cpp/include/qpid/log/Logger.h
diff --git a/cpp/include/qpid/log/Options.h b/qpid/cpp/include/qpid/log/Options.h
index 17cbfde9bc..17cbfde9bc 100644
--- a/cpp/include/qpid/log/Options.h
+++ b/qpid/cpp/include/qpid/log/Options.h
diff --git a/cpp/include/qpid/log/Selector.h b/qpid/cpp/include/qpid/log/Selector.h
index 061152d7e2..061152d7e2 100644
--- a/cpp/include/qpid/log/Selector.h
+++ b/qpid/cpp/include/qpid/log/Selector.h
diff --git a/cpp/include/qpid/log/SinkOptions.h b/qpid/cpp/include/qpid/log/SinkOptions.h
index 7ec2cfbc17..7ec2cfbc17 100644
--- a/cpp/include/qpid/log/SinkOptions.h
+++ b/qpid/cpp/include/qpid/log/SinkOptions.h
diff --git a/cpp/include/qpid/log/Statement.h b/qpid/cpp/include/qpid/log/Statement.h
index 7b3ab60b81..7b3ab60b81 100644
--- a/cpp/include/qpid/log/Statement.h
+++ b/qpid/cpp/include/qpid/log/Statement.h
diff --git a/cpp/include/qpid/management/Args.h b/qpid/cpp/include/qpid/management/Args.h
index 5d1cb7e01d..5d1cb7e01d 100644
--- a/cpp/include/qpid/management/Args.h
+++ b/qpid/cpp/include/qpid/management/Args.h
diff --git a/cpp/include/qpid/management/Buffer.h b/qpid/cpp/include/qpid/management/Buffer.h
index c32494b8c0..c32494b8c0 100644
--- a/cpp/include/qpid/management/Buffer.h
+++ b/qpid/cpp/include/qpid/management/Buffer.h
diff --git a/cpp/include/qpid/management/ConnectionSettings.h b/qpid/cpp/include/qpid/management/ConnectionSettings.h
index b631ffa658..b631ffa658 100644
--- a/cpp/include/qpid/management/ConnectionSettings.h
+++ b/qpid/cpp/include/qpid/management/ConnectionSettings.h
diff --git a/cpp/include/qpid/management/Manageable.h b/qpid/cpp/include/qpid/management/Manageable.h
index 1e5cd8bc42..1e5cd8bc42 100644
--- a/cpp/include/qpid/management/Manageable.h
+++ b/qpid/cpp/include/qpid/management/Manageable.h
diff --git a/cpp/include/qpid/management/ManagementEvent.h b/qpid/cpp/include/qpid/management/ManagementEvent.h
index e80175096f..e80175096f 100644
--- a/cpp/include/qpid/management/ManagementEvent.h
+++ b/qpid/cpp/include/qpid/management/ManagementEvent.h
diff --git a/cpp/include/qpid/management/ManagementObject.h b/qpid/cpp/include/qpid/management/ManagementObject.h
index 16bf21038c..16bf21038c 100644
--- a/cpp/include/qpid/management/ManagementObject.h
+++ b/qpid/cpp/include/qpid/management/ManagementObject.h
diff --git a/cpp/include/qpid/management/Mutex.h b/qpid/cpp/include/qpid/management/Mutex.h
index 67ae04bae9..67ae04bae9 100644
--- a/cpp/include/qpid/management/Mutex.h
+++ b/qpid/cpp/include/qpid/management/Mutex.h
diff --git a/cpp/include/qpid/messaging/Address.h b/qpid/cpp/include/qpid/messaging/Address.h
index 63dce0c49d..63dce0c49d 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 e938f23189..e938f23189 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 97a8f00b54..97a8f00b54 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 5cd978f2a2..5cd978f2a2 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 13317dfcbd..13317dfcbd 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 8e1c5846e9..8e1c5846e9 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 52786eb5f4..52786eb5f4 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 07d1dc414b..07d1dc414b 100644
--- a/cpp/include/qpid/messaging/exceptions.h
+++ b/qpid/cpp/include/qpid/messaging/exceptions.h
diff --git a/cpp/include/qpid/sys/Condition.h b/qpid/cpp/include/qpid/sys/Condition.h
index 9be4b357fe..9be4b357fe 100644
--- a/cpp/include/qpid/sys/Condition.h
+++ b/qpid/cpp/include/qpid/sys/Condition.h
diff --git a/cpp/include/qpid/sys/ExceptionHolder.h b/qpid/cpp/include/qpid/sys/ExceptionHolder.h
index 4bc934cf75..4bc934cf75 100644
--- a/cpp/include/qpid/sys/ExceptionHolder.h
+++ b/qpid/cpp/include/qpid/sys/ExceptionHolder.h
diff --git a/cpp/include/qpid/sys/IOHandle.h b/qpid/cpp/include/qpid/sys/IOHandle.h
index 45fc8c240a..45fc8c240a 100644
--- a/cpp/include/qpid/sys/IOHandle.h
+++ b/qpid/cpp/include/qpid/sys/IOHandle.h
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/Monitor.h b/qpid/cpp/include/qpid/sys/Monitor.h
index 123bf92dcb..123bf92dcb 100644
--- a/cpp/include/qpid/sys/Monitor.h
+++ b/qpid/cpp/include/qpid/sys/Monitor.h
diff --git a/cpp/include/qpid/sys/Mutex.h b/qpid/cpp/include/qpid/sys/Mutex.h
index 43a83d4fc3..43a83d4fc3 100644
--- a/cpp/include/qpid/sys/Mutex.h
+++ b/qpid/cpp/include/qpid/sys/Mutex.h
diff --git a/cpp/include/qpid/sys/Runnable.h b/qpid/cpp/include/qpid/sys/Runnable.h
index fed7663cb6..fed7663cb6 100644
--- a/cpp/include/qpid/sys/Runnable.h
+++ b/qpid/cpp/include/qpid/sys/Runnable.h
diff --git a/cpp/include/qpid/sys/StrError.h b/qpid/cpp/include/qpid/sys/StrError.h
index 36489dd0fc..36489dd0fc 100644
--- a/cpp/include/qpid/sys/StrError.h
+++ b/qpid/cpp/include/qpid/sys/StrError.h
diff --git a/cpp/include/qpid/sys/SystemInfo.h b/qpid/cpp/include/qpid/sys/SystemInfo.h
index 23594cf650..23594cf650 100644
--- a/cpp/include/qpid/sys/SystemInfo.h
+++ b/qpid/cpp/include/qpid/sys/SystemInfo.h
diff --git a/cpp/include/qpid/sys/Thread.h b/qpid/cpp/include/qpid/sys/Thread.h
index f556612908..f556612908 100644
--- a/cpp/include/qpid/sys/Thread.h
+++ b/qpid/cpp/include/qpid/sys/Thread.h
diff --git a/cpp/include/qpid/sys/Time.h b/qpid/cpp/include/qpid/sys/Time.h
index 9c5ac66e9a..9c5ac66e9a 100644
--- a/cpp/include/qpid/sys/Time.h
+++ b/qpid/cpp/include/qpid/sys/Time.h
diff --git a/cpp/include/qpid/sys/posix/Condition.h b/qpid/cpp/include/qpid/sys/posix/Condition.h
index 36e7557ffd..36e7557ffd 100644
--- a/cpp/include/qpid/sys/posix/Condition.h
+++ b/qpid/cpp/include/qpid/sys/posix/Condition.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/posix/Mutex.h b/qpid/cpp/include/qpid/sys/posix/Mutex.h
index e2b21b5a56..e2b21b5a56 100644
--- a/cpp/include/qpid/sys/posix/Mutex.h
+++ b/qpid/cpp/include/qpid/sys/posix/Mutex.h
diff --git a/cpp/include/qpid/sys/posix/PrivatePosix.h b/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h
index 79cb950275..79cb950275 100644
--- a/cpp/include/qpid/sys/posix/PrivatePosix.h
+++ b/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h
diff --git a/cpp/include/qpid/sys/posix/Time.h b/qpid/cpp/include/qpid/sys/posix/Time.h
index 62d734c816..62d734c816 100755
--- a/cpp/include/qpid/sys/posix/Time.h
+++ b/qpid/cpp/include/qpid/sys/posix/Time.h
diff --git a/cpp/include/qpid/sys/posix/check.h b/qpid/cpp/include/qpid/sys/posix/check.h
index 1bfe5d6d78..1bfe5d6d78 100644
--- a/cpp/include/qpid/sys/posix/check.h
+++ b/qpid/cpp/include/qpid/sys/posix/check.h
diff --git a/cpp/include/qpid/sys/windows/Condition.h b/qpid/cpp/include/qpid/sys/windows/Condition.h
index cd5aebbf09..cd5aebbf09 100755
--- a/cpp/include/qpid/sys/windows/Condition.h
+++ b/qpid/cpp/include/qpid/sys/windows/Condition.h
diff --git a/cpp/include/qpid/sys/windows/IntegerTypes.h b/qpid/cpp/include/qpid/sys/windows/IntegerTypes.h
index fff320bc96..fff320bc96 100755
--- a/cpp/include/qpid/sys/windows/IntegerTypes.h
+++ b/qpid/cpp/include/qpid/sys/windows/IntegerTypes.h
diff --git a/cpp/include/qpid/sys/windows/Mutex.h b/qpid/cpp/include/qpid/sys/windows/Mutex.h
index 5dcc69e836..5dcc69e836 100755
--- a/cpp/include/qpid/sys/windows/Mutex.h
+++ b/qpid/cpp/include/qpid/sys/windows/Mutex.h
diff --git a/cpp/include/qpid/sys/windows/Time.h b/qpid/cpp/include/qpid/sys/windows/Time.h
index 2987b1c8b2..2987b1c8b2 100644
--- a/cpp/include/qpid/sys/windows/Time.h
+++ b/qpid/cpp/include/qpid/sys/windows/Time.h
diff --git a/cpp/include/qpid/sys/windows/check.h b/qpid/cpp/include/qpid/sys/windows/check.h
index 2a8e439bed..2a8e439bed 100755
--- a/cpp/include/qpid/sys/windows/check.h
+++ b/qpid/cpp/include/qpid/sys/windows/check.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 02af4c7e7f..02af4c7e7f 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 4459fc4123..4459fc4123 100644
--- a/cpp/include/qpid/types/Variant.h
+++ b/qpid/cpp/include/qpid/types/Variant.h
diff --git a/cpp/m4/ac_pkg_swig.m4 b/qpid/cpp/m4/ac_pkg_swig.m4
index 6e385c067c..6e385c067c 100644
--- a/cpp/m4/ac_pkg_swig.m4
+++ b/qpid/cpp/m4/ac_pkg_swig.m4
diff --git a/cpp/m4/clock_time.m4 b/qpid/cpp/m4/clock_time.m4
index 227a5978e5..227a5978e5 100644
--- a/cpp/m4/clock_time.m4
+++ b/qpid/cpp/m4/clock_time.m4
diff --git a/cpp/m4/compiler-flags.m4 b/qpid/cpp/m4/compiler-flags.m4
index 01cb728f02..01cb728f02 100644
--- a/cpp/m4/compiler-flags.m4
+++ b/qpid/cpp/m4/compiler-flags.m4
diff --git a/cpp/m4/cppunit.m4 b/qpid/cpp/m4/cppunit.m4
index f009086f9d..f009086f9d 100644
--- a/cpp/m4/cppunit.m4
+++ b/qpid/cpp/m4/cppunit.m4
diff --git a/cpp/m4/extensions.m4 b/qpid/cpp/m4/extensions.m4
index fe7398b046..fe7398b046 100644
--- a/cpp/m4/extensions.m4
+++ b/qpid/cpp/m4/extensions.m4
diff --git a/cpp/m4/python.m4 b/qpid/cpp/m4/python.m4
index 229fd5547b..229fd5547b 100644
--- a/cpp/m4/python.m4
+++ b/qpid/cpp/m4/python.m4
diff --git a/cpp/make-dist b/qpid/cpp/make-dist
index a0c02402e5..a0c02402e5 100755
--- a/cpp/make-dist
+++ b/qpid/cpp/make-dist
diff --git a/cpp/managementgen/CMakeLists.txt b/qpid/cpp/managementgen/CMakeLists.txt
index 2511b745a3..2511b745a3 100644
--- a/cpp/managementgen/CMakeLists.txt
+++ b/qpid/cpp/managementgen/CMakeLists.txt
diff --git a/qpid/cpp/managementgen/Makefile.am b/qpid/cpp/managementgen/Makefile.am
new file mode 100644
index 0000000000..8769200719
--- /dev/null
+++ b/qpid/cpp/managementgen/Makefile.am
@@ -0,0 +1,39 @@
+#
+# 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.
+#
+qmfpythondir = $(pythondir)
+dist_bin_SCRIPTS = \
+	qmf-gen
+pkgpyexec_qmfgendir = $(pyexecdir)/qmfgen
+pkgpyexec_qmfgen_PYTHON = \
+	qmfgen/__init__.py \
+	qmfgen/generate.py \
+	qmfgen/schema.py \
+	qmfgen/templates/Args.h \
+	qmfgen/templates/Class.cpp \
+	qmfgen/templates/Class.h \
+	qmfgen/templates/Event.cpp \
+	qmfgen/templates/Event.h \
+	qmfgen/templates/Makefile.mk \
+	qmfgen/templates/Package.cpp \
+	qmfgen/templates/Package.h \
+	qmfgen/templates/V2Package.cpp \
+	qmfgen/templates/V2Package.h \
+	qmfgen/management-types.xml
+
+EXTRA_DIST = $(nobase_qmfpython_DATA) CMakeLists.txt
diff --git a/cpp/managementgen/qmf-gen b/qpid/cpp/managementgen/qmf-gen
index 6e8f864256..6e8f864256 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 4e688e3bc7..4e688e3bc7 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 c88f0caeae..c88f0caeae 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 59e951fb6e..59e951fb6e 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 fc0b9c8177..fc0b9c8177 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 4bcd423a26..4bcd423a26 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 a8fdd0bd92..a8fdd0bd92 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 4f912cf220..4f912cf220 100644
--- a/cpp/managementgen/qmfgen/templates/Event.h
+++ b/qpid/cpp/managementgen/qmfgen/templates/Event.h
diff --git a/cpp/managementgen/qmfgen/templates/Makefile.mk b/qpid/cpp/managementgen/qmfgen/templates/Makefile.mk
index b9adb4a2d2..b9adb4a2d2 100644
--- a/cpp/managementgen/qmfgen/templates/Makefile.mk
+++ b/qpid/cpp/managementgen/qmfgen/templates/Makefile.mk
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 569c7cfb33..569c7cfb33 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/Makefile.am b/qpid/cpp/packaging/NSIS/Makefile.am
index 0ef6b1c7c7..0ef6b1c7c7 100644
--- a/cpp/packaging/NSIS/Makefile.am
+++ b/qpid/cpp/packaging/NSIS/Makefile.am
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/qpid-autotools-install b/qpid/cpp/qpid-autotools-install
index dcd1c93902..dcd1c93902 100755
--- a/cpp/qpid-autotools-install
+++ b/qpid/cpp/qpid-autotools-install
diff --git a/cpp/qpid-config.in b/qpid/cpp/qpid-config.in
index e657815736..e657815736 100755
--- a/cpp/qpid-config.in
+++ b/qpid/cpp/qpid-config.in
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 02e3a5d547..02e3a5d547 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 20aac35194..20aac35194 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 7dc21fe1bc..7dc21fe1bc 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 e800df9b2e..e800df9b2e 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 85bfb96ac0..85bfb96ac0 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 62b33ce773..62b33ce773 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/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt
index 0fe2d7e4d0..0fe2d7e4d0 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/Makefile.am b/qpid/cpp/src/Makefile.am
index 15021cc68b..15021cc68b 100644
--- a/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
diff --git a/cpp/src/acl.mk b/qpid/cpp/src/acl.mk
index b8e2ff0e13..b8e2ff0e13 100644
--- a/cpp/src/acl.mk
+++ b/qpid/cpp/src/acl.mk
diff --git a/cpp/src/cluster.cmake b/qpid/cpp/src/cluster.cmake
index a389f8f13f..a389f8f13f 100644
--- a/cpp/src/cluster.cmake
+++ b/qpid/cpp/src/cluster.cmake
diff --git a/cpp/src/cluster.mk b/qpid/cpp/src/cluster.mk
index 3ce4ce25b3..3ce4ce25b3 100644
--- a/cpp/src/cluster.mk
+++ b/qpid/cpp/src/cluster.mk
diff --git a/cpp/src/config.h.cmake b/qpid/cpp/src/config.h.cmake
index 2bb84c6e47..2bb84c6e47 100644
--- a/cpp/src/config.h.cmake
+++ b/qpid/cpp/src/config.h.cmake
diff --git a/cpp/src/generate.sh b/qpid/cpp/src/generate.sh
index 581a45ff7f..581a45ff7f 100755
--- a/cpp/src/generate.sh
+++ b/qpid/cpp/src/generate.sh
diff --git a/cpp/src/posix/QpiddBroker.cpp b/qpid/cpp/src/posix/QpiddBroker.cpp
index 879935462e..879935462e 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 acfbaff2d4..acfbaff2d4 100755
--- a/cpp/src/prof
+++ b/qpid/cpp/src/prof
diff --git a/cpp/src/qmf.mk b/qpid/cpp/src/qmf.mk
index f3462f1a93..f3462f1a93 100644
--- a/cpp/src/qmf.mk
+++ b/qpid/cpp/src/qmf.mk
diff --git a/cpp/src/qmf/Agent.cpp b/qpid/cpp/src/qmf/Agent.cpp
index 915f2a1c88..915f2a1c88 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 7fa4f4373a..7fa4f4373a 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 71d369325f..71d369325f 100644
--- a/cpp/src/qmf/AgentSession.cpp
+++ b/qpid/cpp/src/qmf/AgentSession.cpp
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 7b839930e1..7b839930e1 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 411b3f016a..411b3f016a 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 fb51d5787f..fb51d5787f 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 3f9cae9453..3f9cae9453 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/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 e1eff84117..e1eff84117 100644
--- a/cpp/src/qmf/Hash.h
+++ b/qpid/cpp/src/qmf/Hash.h
diff --git a/cpp/src/qmf/PrivateImplRef.h b/qpid/cpp/src/qmf/PrivateImplRef.h
index 960cbb2e09..960cbb2e09 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/engine/Agent.cpp b/qpid/cpp/src/qmf/engine/Agent.cpp
index 1f08dded94..1f08dded94 100644
--- a/cpp/src/qmf/engine/Agent.cpp
+++ b/qpid/cpp/src/qmf/engine/Agent.cpp
diff --git a/cpp/src/qmf/engine/BrokerProxyImpl.cpp b/qpid/cpp/src/qmf/engine/BrokerProxyImpl.cpp
index 5fc71979fd..5fc71979fd 100644
--- a/cpp/src/qmf/engine/BrokerProxyImpl.cpp
+++ b/qpid/cpp/src/qmf/engine/BrokerProxyImpl.cpp
diff --git a/cpp/src/qmf/engine/BrokerProxyImpl.h b/qpid/cpp/src/qmf/engine/BrokerProxyImpl.h
index 0542b67dbb..0542b67dbb 100644
--- a/cpp/src/qmf/engine/BrokerProxyImpl.h
+++ b/qpid/cpp/src/qmf/engine/BrokerProxyImpl.h
diff --git a/cpp/src/qmf/engine/ConnectionSettingsImpl.cpp b/qpid/cpp/src/qmf/engine/ConnectionSettingsImpl.cpp
index 22a65f28ca..22a65f28ca 100644
--- a/cpp/src/qmf/engine/ConnectionSettingsImpl.cpp
+++ b/qpid/cpp/src/qmf/engine/ConnectionSettingsImpl.cpp
diff --git a/cpp/src/qmf/engine/ConnectionSettingsImpl.h b/qpid/cpp/src/qmf/engine/ConnectionSettingsImpl.h
index 98bf87868b..98bf87868b 100644
--- a/cpp/src/qmf/engine/ConnectionSettingsImpl.h
+++ b/qpid/cpp/src/qmf/engine/ConnectionSettingsImpl.h
diff --git a/cpp/src/qmf/engine/ConsoleImpl.cpp b/qpid/cpp/src/qmf/engine/ConsoleImpl.cpp
index 4a5da31bdc..4a5da31bdc 100644
--- a/cpp/src/qmf/engine/ConsoleImpl.cpp
+++ b/qpid/cpp/src/qmf/engine/ConsoleImpl.cpp
diff --git a/cpp/src/qmf/engine/ConsoleImpl.h b/qpid/cpp/src/qmf/engine/ConsoleImpl.h
index 0c27fdabcd..0c27fdabcd 100644
--- a/cpp/src/qmf/engine/ConsoleImpl.h
+++ b/qpid/cpp/src/qmf/engine/ConsoleImpl.h
diff --git a/cpp/src/qmf/engine/EventImpl.cpp b/qpid/cpp/src/qmf/engine/EventImpl.cpp
index 4b034e8e83..4b034e8e83 100644
--- a/cpp/src/qmf/engine/EventImpl.cpp
+++ b/qpid/cpp/src/qmf/engine/EventImpl.cpp
diff --git a/cpp/src/qmf/engine/EventImpl.h b/qpid/cpp/src/qmf/engine/EventImpl.h
index 4046e71ef9..4046e71ef9 100644
--- a/cpp/src/qmf/engine/EventImpl.h
+++ b/qpid/cpp/src/qmf/engine/EventImpl.h
diff --git a/cpp/src/qmf/engine/MessageImpl.cpp b/qpid/cpp/src/qmf/engine/MessageImpl.cpp
index 0047d3eb9d..0047d3eb9d 100644
--- a/cpp/src/qmf/engine/MessageImpl.cpp
+++ b/qpid/cpp/src/qmf/engine/MessageImpl.cpp
diff --git a/cpp/src/qmf/engine/MessageImpl.h b/qpid/cpp/src/qmf/engine/MessageImpl.h
index b91291d2e4..b91291d2e4 100644
--- a/cpp/src/qmf/engine/MessageImpl.h
+++ b/qpid/cpp/src/qmf/engine/MessageImpl.h
diff --git a/cpp/src/qmf/engine/ObjectIdImpl.cpp b/qpid/cpp/src/qmf/engine/ObjectIdImpl.cpp
index 9216f7bac0..9216f7bac0 100644
--- a/cpp/src/qmf/engine/ObjectIdImpl.cpp
+++ b/qpid/cpp/src/qmf/engine/ObjectIdImpl.cpp
diff --git a/cpp/src/qmf/engine/ObjectIdImpl.h b/qpid/cpp/src/qmf/engine/ObjectIdImpl.h
index d70c8efff4..d70c8efff4 100644
--- a/cpp/src/qmf/engine/ObjectIdImpl.h
+++ b/qpid/cpp/src/qmf/engine/ObjectIdImpl.h
diff --git a/cpp/src/qmf/engine/ObjectImpl.cpp b/qpid/cpp/src/qmf/engine/ObjectImpl.cpp
index 45925cb804..45925cb804 100644
--- a/cpp/src/qmf/engine/ObjectImpl.cpp
+++ b/qpid/cpp/src/qmf/engine/ObjectImpl.cpp
diff --git a/cpp/src/qmf/engine/ObjectImpl.h b/qpid/cpp/src/qmf/engine/ObjectImpl.h
index 6f25867004..6f25867004 100644
--- a/cpp/src/qmf/engine/ObjectImpl.h
+++ b/qpid/cpp/src/qmf/engine/ObjectImpl.h
diff --git a/cpp/src/qmf/engine/Protocol.cpp b/qpid/cpp/src/qmf/engine/Protocol.cpp
index 9e5f490604..9e5f490604 100644
--- a/cpp/src/qmf/engine/Protocol.cpp
+++ b/qpid/cpp/src/qmf/engine/Protocol.cpp
diff --git a/cpp/src/qmf/engine/Protocol.h b/qpid/cpp/src/qmf/engine/Protocol.h
index 1cdfa60c84..1cdfa60c84 100644
--- a/cpp/src/qmf/engine/Protocol.h
+++ b/qpid/cpp/src/qmf/engine/Protocol.h
diff --git a/cpp/src/qmf/engine/QueryImpl.cpp b/qpid/cpp/src/qmf/engine/QueryImpl.cpp
index 6f2beeee87..6f2beeee87 100644
--- a/cpp/src/qmf/engine/QueryImpl.cpp
+++ b/qpid/cpp/src/qmf/engine/QueryImpl.cpp
diff --git a/cpp/src/qmf/engine/QueryImpl.h b/qpid/cpp/src/qmf/engine/QueryImpl.h
index 8ebe0d932f..8ebe0d932f 100644
--- a/cpp/src/qmf/engine/QueryImpl.h
+++ b/qpid/cpp/src/qmf/engine/QueryImpl.h
diff --git a/cpp/src/qmf/engine/ResilientConnection.cpp b/qpid/cpp/src/qmf/engine/ResilientConnection.cpp
index ab65b8d768..ab65b8d768 100644
--- a/cpp/src/qmf/engine/ResilientConnection.cpp
+++ b/qpid/cpp/src/qmf/engine/ResilientConnection.cpp
diff --git a/cpp/src/qmf/engine/SchemaImpl.cpp b/qpid/cpp/src/qmf/engine/SchemaImpl.cpp
index f75663e131..f75663e131 100644
--- a/cpp/src/qmf/engine/SchemaImpl.cpp
+++ b/qpid/cpp/src/qmf/engine/SchemaImpl.cpp
diff --git a/cpp/src/qmf/engine/SchemaImpl.h b/qpid/cpp/src/qmf/engine/SchemaImpl.h
index 8b079a5ec6..8b079a5ec6 100644
--- a/cpp/src/qmf/engine/SchemaImpl.h
+++ b/qpid/cpp/src/qmf/engine/SchemaImpl.h
diff --git a/cpp/src/qmf/engine/SequenceManager.cpp b/qpid/cpp/src/qmf/engine/SequenceManager.cpp
index 4a4644a8b9..4a4644a8b9 100644
--- a/cpp/src/qmf/engine/SequenceManager.cpp
+++ b/qpid/cpp/src/qmf/engine/SequenceManager.cpp
diff --git a/cpp/src/qmf/engine/SequenceManager.h b/qpid/cpp/src/qmf/engine/SequenceManager.h
index 9e47e38610..9e47e38610 100644
--- a/cpp/src/qmf/engine/SequenceManager.h
+++ b/qpid/cpp/src/qmf/engine/SequenceManager.h
diff --git a/cpp/src/qmf/engine/ValueImpl.cpp b/qpid/cpp/src/qmf/engine/ValueImpl.cpp
index f9ebbf5028..f9ebbf5028 100644
--- a/cpp/src/qmf/engine/ValueImpl.cpp
+++ b/qpid/cpp/src/qmf/engine/ValueImpl.cpp
diff --git a/cpp/src/qmf/engine/ValueImpl.h b/qpid/cpp/src/qmf/engine/ValueImpl.h
index 8de8c5329f..8de8c5329f 100644
--- a/cpp/src/qmf/engine/ValueImpl.h
+++ b/qpid/cpp/src/qmf/engine/ValueImpl.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/qmfc.mk b/qpid/cpp/src/qmfc.mk
index e445a538a1..e445a538a1 100644
--- a/cpp/src/qmfc.mk
+++ b/qpid/cpp/src/qmfc.mk
diff --git a/cpp/src/qpid.pc.in b/qpid/cpp/src/qpid.pc.in
index 87d368f20c..87d368f20c 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 e2b2dfbcdf..e2b2dfbcdf 100644
--- a/cpp/src/qpid/Address.cpp
+++ b/qpid/cpp/src/qpid/Address.cpp
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/DataDir.cpp b/qpid/cpp/src/qpid/DataDir.cpp
index ad732052ab..ad732052ab 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/Modules.cpp b/qpid/cpp/src/qpid/Modules.cpp
index 727e05d212..727e05d212 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 159dd156c1..159dd156c1 100644
--- a/cpp/src/qpid/Modules.h
+++ b/qpid/cpp/src/qpid/Modules.h
diff --git a/cpp/src/qpid/Options.cpp b/qpid/cpp/src/qpid/Options.cpp
index 4b13e349f5..4b13e349f5 100644
--- a/cpp/src/qpid/Options.cpp
+++ b/qpid/cpp/src/qpid/Options.cpp
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/RefCounted.h b/qpid/cpp/src/qpid/RefCounted.h
index f9e0107103..f9e0107103 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 40d620f7ad..40d620f7ad 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 9a9d61b037..9a9d61b037 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 f117404028..f117404028 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 8554597147..8554597147 100644
--- a/cpp/src/qpid/SaslFactory.h
+++ b/qpid/cpp/src/qpid/SaslFactory.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/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 ab796f4642..ab796f4642 100644
--- a/cpp/src/qpid/Url.cpp
+++ b/qpid/cpp/src/qpid/Url.cpp
diff --git a/cpp/src/qpid/Version.h b/qpid/cpp/src/qpid/Version.h
index b4805a3757..b4805a3757 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 4b3dda7962..4b3dda7962 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 77f43838de..77f43838de 100644
--- a/cpp/src/qpid/acl/Acl.h
+++ b/qpid/cpp/src/qpid/acl/Acl.h
diff --git a/cpp/src/qpid/acl/AclData.cpp b/qpid/cpp/src/qpid/acl/AclData.cpp
index 658529b270..658529b270 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 efd3b60145..efd3b60145 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 e4d721ea44..e4d721ea44 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 31c69e69b5..31c69e69b5 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 62c6f38f37..62c6f38f37 100644
--- a/cpp/src/qpid/acl/AclReader.h
+++ b/qpid/cpp/src/qpid/acl/AclReader.h
diff --git a/cpp/src/qpid/acl/AclValidator.cpp b/qpid/cpp/src/qpid/acl/AclValidator.cpp
index 57b68e520a..57b68e520a 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 966e5d326b..966e5d326b 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 7f48a9be34..7f48a9be34 100644
--- a/cpp/src/qpid/acl/management-schema.xml
+++ b/qpid/cpp/src/qpid/acl/management-schema.xml
diff --git a/cpp/src/qpid/agent/ManagementAgentImpl.cpp b/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
index 633401ef5b..633401ef5b 100644
--- a/cpp/src/qpid/agent/ManagementAgentImpl.cpp
+++ b/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
diff --git a/cpp/src/qpid/agent/ManagementAgentImpl.h b/qpid/cpp/src/qpid/agent/ManagementAgentImpl.h
index bf340777d1..bf340777d1 100644
--- a/cpp/src/qpid/agent/ManagementAgentImpl.h
+++ b/qpid/cpp/src/qpid/agent/ManagementAgentImpl.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 b976a5d09b..b976a5d09b 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/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 bf2e7d5713..bf2e7d5713 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 995d824796..995d824796 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 97281a8d8c..97281a8d8c 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 b5b0fe5ee0..b5b0fe5ee0 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 2f4f7eaacc..2f4f7eaacc 100644
--- a/cpp/src/qpid/broker/AclModule.h
+++ b/qpid/cpp/src/qpid/broker/AclModule.h
diff --git a/cpp/src/qpid/broker/AsyncCompletion.h b/qpid/cpp/src/qpid/broker/AsyncCompletion.h
index fef994438f..fef994438f 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 7fbbf4e2c4..7fbbf4e2c4 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 a846254c57..a846254c57 100644
--- a/cpp/src/qpid/broker/Bridge.h
+++ b/qpid/cpp/src/qpid/broker/Bridge.h
diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp
new file mode 100644
index 0000000000..ca3be5b567
--- /dev/null
+++ b/qpid/cpp/src/qpid/broker/Broker.cpp
@@ -0,0 +1,967 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/broker/Broker.h"
+#include "qpid/broker/ConnectionState.h"
+#include "qpid/broker/DirectExchange.h"
+#include "qpid/broker/FanOutExchange.h"
+#include "qpid/broker/HeadersExchange.h"
+#include "qpid/broker/MessageStoreModule.h"
+#include "qpid/broker/NullMessageStore.h"
+#include "qpid/broker/RecoveryManagerImpl.h"
+#include "qpid/broker/SaslAuthenticator.h"
+#include "qpid/broker/SecureConnectionFactory.h"
+#include "qpid/broker/TopicExchange.h"
+#include "qpid/broker/Link.h"
+#include "qpid/broker/ExpiryPolicy.h"
+#include "qpid/broker/QueueFlowLimit.h"
+
+#include "qmf/org/apache/qpid/broker/Package.h"
+#include "qmf/org/apache/qpid/broker/ArgsBrokerCreate.h"
+#include "qmf/org/apache/qpid/broker/ArgsBrokerDelete.h"
+#include "qmf/org/apache/qpid/broker/ArgsBrokerEcho.h"
+#include "qmf/org/apache/qpid/broker/ArgsBrokerGetLogLevel.h"
+#include "qmf/org/apache/qpid/broker/ArgsBrokerQueueMoveMessages.h"
+#include "qmf/org/apache/qpid/broker/ArgsBrokerSetLogLevel.h"
+#include "qmf/org/apache/qpid/broker/EventExchangeDeclare.h"
+#include "qmf/org/apache/qpid/broker/EventExchangeDelete.h"
+#include "qmf/org/apache/qpid/broker/EventQueueDeclare.h"
+#include "qmf/org/apache/qpid/broker/EventQueueDelete.h"
+#include "qmf/org/apache/qpid/broker/EventBind.h"
+#include "qmf/org/apache/qpid/broker/EventUnbind.h"
+#include "qpid/amqp_0_10/Codecs.h"
+#include "qpid/management/ManagementDirectExchange.h"
+#include "qpid/management/ManagementTopicExchange.h"
+#include "qpid/log/Logger.h"
+#include "qpid/log/Options.h"
+#include "qpid/log/Statement.h"
+#include "qpid/log/posix/SinkOptions.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/framing/ProtocolInitiation.h"
+#include "qpid/framing/reply_exceptions.h"
+#include "qpid/framing/Uuid.h"
+#include "qpid/sys/ProtocolFactory.h"
+#include "qpid/sys/Poller.h"
+#include "qpid/sys/Dispatcher.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/sys/Time.h"
+#include "qpid/sys/ConnectionInputHandler.h"
+#include "qpid/sys/ConnectionInputHandlerFactory.h"
+#include "qpid/sys/TimeoutHandler.h"
+#include "qpid/sys/SystemInfo.h"
+#include "qpid/Address.h"
+#include "qpid/StringUtils.h"
+#include "qpid/Url.h"
+#include "qpid/Version.h"
+
+#include <boost/bind.hpp>
+#include <boost/format.hpp>
+
+#include <iostream>
+#include <memory>
+
+using qpid::sys::ProtocolFactory;
+using qpid::sys::Poller;
+using qpid::sys::Dispatcher;
+using qpid::sys::Thread;
+using qpid::framing::FrameHandler;
+using qpid::framing::ChannelId;
+using qpid::management::ManagementAgent;
+using qpid::management::ManagementObject;
+using qpid::management::Manageable;
+using qpid::management::Args;
+using qpid::management::getManagementExecutionContext;
+using qpid::types::Variant;
+using std::string;
+using std::make_pair;
+
+namespace _qmf = qmf::org::apache::qpid::broker;
+
+namespace qpid {
+namespace broker {
+
+Broker::Options::Options(const std::string& name) :
+    qpid::Options(name),
+    noDataDir(0),
+    port(DEFAULT_PORT),
+    workerThreads(5),
+    maxConnections(500),
+    connectionBacklog(10),
+    enableMgmt(1),
+    mgmtPubInterval(10),
+    queueCleanInterval(60*10),//10 minutes
+    auth(SaslAuthenticator::available()),
+    realm("QPID"),
+    replayFlushLimit(0),
+    replayHardLimit(0),
+    queueLimit(100*1048576/*100M default limit*/),
+    tcpNoDelay(false),
+    requireEncrypted(false),
+    maxSessionRate(0),
+    asyncQueueEvents(false),     // Must be false in a cluster.
+    qmf2Support(true),
+    qmf1Support(true),
+    queueFlowStopRatio(80),
+    queueFlowResumeRatio(70),
+    queueThresholdEventRatio(80)
+{
+    int c = sys::SystemInfo::concurrency();
+    workerThreads=c+1;
+    std::string home = getHome();
+
+    if (home.length() == 0)
+        dataDir += DEFAULT_DATA_DIR_LOCATION;
+    else
+        dataDir += home;
+    dataDir += DEFAULT_DATA_DIR_NAME;
+
+    addOptions()
+        ("data-dir", optValue(dataDir,"DIR"), "Directory to contain persistent data generated by the broker")
+        ("no-data-dir", optValue(noDataDir), "Don't use a data directory.  No persistent configuration will be loaded or stored")
+        ("port,p", optValue(port,"PORT"), "Tells the broker to listen on PORT")
+        ("worker-threads", optValue(workerThreads, "N"), "Sets the broker thread pool size")
+        ("max-connections", optValue(maxConnections, "N"), "Sets the maximum allowed connections")
+        ("connection-backlog", optValue(connectionBacklog, "N"), "Sets the connection backlog limit for the server socket")
+        ("mgmt-enable,m", optValue(enableMgmt,"yes|no"), "Enable Management")
+        ("mgmt-qmf2", optValue(qmf2Support,"yes|no"), "Enable broadcast of management information over QMF v2")
+        ("mgmt-qmf1", optValue(qmf1Support,"yes|no"), "Enable broadcast of management information over QMF v1")
+        ("mgmt-pub-interval", optValue(mgmtPubInterval, "SECONDS"), "Management Publish Interval")
+        ("queue-purge-interval", optValue(queueCleanInterval, "SECONDS"),
+         "Interval between attempts to purge any expired messages from queues")
+        ("auth", optValue(auth, "yes|no"), "Enable authentication, if disabled all incoming connections will be trusted")
+        ("realm", optValue(realm, "REALM"), "Use the given realm when performing authentication")
+        ("default-queue-limit", optValue(queueLimit, "BYTES"), "Default maximum size for queues (in bytes)")
+        ("tcp-nodelay", optValue(tcpNoDelay), "Set TCP_NODELAY on TCP connections")
+        ("require-encryption", optValue(requireEncrypted), "Only accept connections that are encrypted")
+        ("known-hosts-url", optValue(knownHosts, "URL or 'none'"), "URL to send as 'known-hosts' to clients ('none' implies empty list)")
+        ("sasl-config", optValue(saslConfigPath, "DIR"), "gets sasl config info from nonstandard location")
+        ("max-session-rate", optValue(maxSessionRate, "MESSAGES/S"), "Sets the maximum message rate per session (0=unlimited)")
+        ("async-queue-events", optValue(asyncQueueEvents, "yes|no"), "Set Queue Events async, used for services like replication")
+        ("default-flow-stop-threshold", optValue(queueFlowStopRatio, "PERCENT"), "Percent of queue's maximum capacity at which flow control is activated.")
+        ("default-flow-resume-threshold", optValue(queueFlowResumeRatio, "PERCENT"), "Percent of queue's maximum capacity at which flow control is de-activated.")
+        ("default-event-threshold-ratio", optValue(queueThresholdEventRatio, "%age of limit"), "The ratio of any specified queue limit at which an event will be raised");
+}
+
+const std::string empty;
+const std::string amq_direct("amq.direct");
+const std::string amq_topic("amq.topic");
+const std::string amq_fanout("amq.fanout");
+const std::string amq_match("amq.match");
+const std::string qpid_management("qpid.management");
+const std::string knownHostsNone("none");
+
+Broker::Broker(const Broker::Options& conf) :
+    poller(new Poller),
+    config(conf),
+    managementAgent(conf.enableMgmt ? new ManagementAgent(conf.qmf1Support,
+                                                          conf.qmf2Support)
+                                    : 0),
+    store(new NullMessageStore),
+    acl(0),
+    dataDir(conf.noDataDir ? std::string() : conf.dataDir),
+    queues(this),
+    exchanges(this),
+    links(this),
+    factory(new SecureConnectionFactory(*this)),
+    dtxManager(timer),
+    sessionManager(
+        qpid::SessionState::Configuration(
+            conf.replayFlushLimit*1024, // convert kb to bytes.
+            conf.replayHardLimit*1024),
+        *this),
+    queueCleaner(queues, timer),
+    queueEvents(poller,!conf.asyncQueueEvents),
+    recovery(true),
+    inCluster(false),
+    clusterUpdatee(false),
+    expiryPolicy(new ExpiryPolicy),
+    connectionCounter(conf.maxConnections),
+    getKnownBrokers(boost::bind(&Broker::getKnownBrokersImpl, this)),
+    deferDelivery(boost::bind(&Broker::deferDeliveryImpl, this, _1, _2))
+{
+    try {
+    if (conf.enableMgmt) {
+        QPID_LOG(info, "Management enabled");
+        managementAgent->configure(dataDir.isEnabled() ? dataDir.getPath() : string(),
+                                   conf.mgmtPubInterval, this, conf.workerThreads + 3);
+        managementAgent->setName("apache.org", "qpidd");
+        _qmf::Package packageInitializer(managementAgent.get());
+
+        System* system = new System (dataDir.isEnabled() ? dataDir.getPath() : string(), this);
+        systemObject = System::shared_ptr(system);
+
+        mgmtObject = new _qmf::Broker(managementAgent.get(), this, system, "amqp-broker");
+        mgmtObject->set_systemRef(system->GetManagementObject()->getObjectId());
+        mgmtObject->set_port(conf.port);
+        mgmtObject->set_workerThreads(conf.workerThreads);
+        mgmtObject->set_maxConns(conf.maxConnections);
+        mgmtObject->set_connBacklog(conf.connectionBacklog);
+        mgmtObject->set_mgmtPubInterval(conf.mgmtPubInterval);
+        mgmtObject->set_version(qpid::version);
+        if (dataDir.isEnabled())
+            mgmtObject->set_dataDir(dataDir.getPath());
+        else
+            mgmtObject->clr_dataDir();
+
+        managementAgent->addObject(mgmtObject, 0, true);
+
+        // Since there is currently no support for virtual hosts, a placeholder object
+        // representing the implied single virtual host is added here to keep the
+        // management schema correct.
+        Vhost* vhost = new Vhost(this, this);
+        vhostObject = Vhost::shared_ptr(vhost);
+        framing::Uuid uuid(managementAgent->getUuid());
+        federationTag = uuid.str();
+        vhostObject->setFederationTag(federationTag);
+
+        queues.setParent(vhost);
+        exchanges.setParent(vhost);
+        links.setParent(vhost);
+    } else {
+        // Management is disabled so there is no broker management ID.
+        // Create a unique uuid to use as the federation tag.
+        framing::Uuid uuid(true);
+        federationTag = uuid.str();
+    }
+
+    QueuePolicy::setDefaultMaxSize(conf.queueLimit);
+
+    // Early-Initialize plugins
+    Plugin::earlyInitAll(*this);
+
+    QueueFlowLimit::setDefaults(conf.queueLimit, conf.queueFlowStopRatio, conf.queueFlowResumeRatio);
+
+    // If no plugin store module registered itself, set up the null store.
+    if (NullMessageStore::isNullStore(store.get()))
+        setStore();
+
+    exchanges.declare(empty, DirectExchange::typeName); // Default exchange.
+
+    if (store.get() != 0) {
+        // The cluster plug-in will setRecovery(false) on all but the first
+        // broker to join a cluster.
+        if (getRecovery()) {
+            RecoveryManagerImpl recoverer(queues, exchanges, links, dtxManager);
+            store->recover(recoverer);
+        }
+        else {
+            QPID_LOG(notice, "Cluster recovery: recovered journal data discarded and journal files pushed down");
+            store->truncateInit(true); // save old files in subdir
+        }
+    }
+
+    //ensure standard exchanges exist (done after recovery from store)
+    declareStandardExchange(amq_direct, DirectExchange::typeName);
+    declareStandardExchange(amq_topic, TopicExchange::typeName);
+    declareStandardExchange(amq_fanout, FanOutExchange::typeName);
+    declareStandardExchange(amq_match, HeadersExchange::typeName);
+
+    if(conf.enableMgmt) {
+        exchanges.declare(qpid_management, ManagementTopicExchange::typeName);
+        Exchange::shared_ptr mExchange = exchanges.get(qpid_management);
+        Exchange::shared_ptr dExchange = exchanges.get(amq_direct);
+        managementAgent->setExchange(mExchange, dExchange);
+        boost::dynamic_pointer_cast<ManagementTopicExchange>(mExchange)->setManagmentAgent(managementAgent.get(), 1);
+
+        std::string qmfTopic("qmf.default.topic");
+        std::string qmfDirect("qmf.default.direct");
+
+        std::pair<Exchange::shared_ptr, bool> topicPair(exchanges.declare(qmfTopic, ManagementTopicExchange::typeName));
+        std::pair<Exchange::shared_ptr, bool> directPair(exchanges.declare(qmfDirect, ManagementDirectExchange::typeName));
+
+        boost::dynamic_pointer_cast<ManagementDirectExchange>(directPair.first)->setManagmentAgent(managementAgent.get(), 2);
+        boost::dynamic_pointer_cast<ManagementTopicExchange>(topicPair.first)->setManagmentAgent(managementAgent.get(), 2);
+
+        managementAgent->setExchangeV2(topicPair.first, directPair.first);
+    }
+    else
+        QPID_LOG(info, "Management not enabled");
+
+    /**
+     * SASL setup, can fail and terminate startup
+     */
+    if (conf.auth) {
+        SaslAuthenticator::init(qpid::saslName, conf.saslConfigPath);
+        QPID_LOG(info, "SASL enabled");
+    } else {
+        QPID_LOG(notice, "SASL disabled: No Authentication Performed");
+    }
+
+    // Initialize plugins
+    Plugin::initializeAll(*this);
+
+    if (managementAgent.get()) managementAgent->pluginsInitialized();
+
+    if (conf.queueCleanInterval) {
+        queueCleaner.start(conf.queueCleanInterval * qpid::sys::TIME_SEC);
+    }
+
+    //initialize known broker urls (TODO: add support for urls for other transports (SSL, RDMA)):
+    if (conf.knownHosts.empty()) {
+        boost::shared_ptr<ProtocolFactory> factory = getProtocolFactory(TCP_TRANSPORT);
+        if (factory) {
+            knownBrokers.push_back ( qpid::Url::getIpAddressesUrl ( factory->getPort() ) );
+        }
+    } else if (conf.knownHosts != knownHostsNone) {
+        knownBrokers.push_back(Url(conf.knownHosts));
+    }
+    } catch (const std::exception& /*e*/) {
+        finalize();
+        throw;
+    }
+}
+
+void Broker::declareStandardExchange(const std::string& name, const std::string& type)
+{
+    bool storeEnabled = store.get() != NULL;
+    std::pair<Exchange::shared_ptr, bool> status = exchanges.declare(name, type, storeEnabled);
+    if (status.second && storeEnabled) {
+        store->create(*status.first, framing::FieldTable ());
+    }
+}
+
+
+boost::intrusive_ptr<Broker> Broker::create(int16_t port)
+{
+    Options config;
+    config.port=port;
+    return create(config);
+}
+
+boost::intrusive_ptr<Broker> Broker::create(const Options& opts)
+{
+    return boost::intrusive_ptr<Broker>(new Broker(opts));
+}
+
+void Broker::setStore (boost::shared_ptr<MessageStore>& _store)
+{
+    store.reset(new MessageStoreModule (_store));
+    setStore();
+}
+
+void Broker::setStore () {
+    queues.setStore     (store.get());
+    dtxManager.setStore (store.get());
+    links.setStore      (store.get());
+}
+
+void Broker::run() {
+    if (config.workerThreads > 0) {
+        QPID_LOG(notice, "Broker running");
+        Dispatcher d(poller);
+        int numIOThreads = config.workerThreads;
+        std::vector<Thread> t(numIOThreads-1);
+
+        // Run n-1 io threads
+        for (int i=0; i<numIOThreads-1; ++i)
+            t[i] = Thread(d);
+
+        // Run final thread
+        d.run();
+
+        // Now wait for n-1 io threads to exit
+        for (int i=0; i<numIOThreads-1; ++i) {
+            t[i].join();
+        }
+    } else {
+        throw Exception((boost::format("Invalid value for worker-threads: %1%") % config.workerThreads).str());
+    }
+}
+
+void Broker::shutdown() {
+    // NB: this function must be async-signal safe, it must not
+    // call any function that is not async-signal safe.
+    // Any unsafe shutdown actions should be done in the destructor.
+    poller->shutdown();
+}
+
+Broker::~Broker() {
+    shutdown();
+    queueEvents.shutdown();
+    finalize();                 // Finalize any plugins.
+    if (config.auth)
+        SaslAuthenticator::fini();
+    timer.stop();
+    QPID_LOG(notice, "Shut down");
+}
+
+ManagementObject* Broker::GetManagementObject(void) const
+{
+    return (ManagementObject*) mgmtObject;
+}
+
+Manageable* Broker::GetVhostObject(void) const
+{
+    return vhostObject.get();
+}
+
+Manageable::status_t Broker::ManagementMethod (uint32_t methodId,
+                                               Args&    args,
+                                               string&)
+{
+    Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD;
+
+    switch (methodId)
+    {
+    case _qmf::Broker::METHOD_ECHO :
+        QPID_LOG (debug, "Broker::echo("
+                  << dynamic_cast<_qmf::ArgsBrokerEcho&>(args).io_sequence
+                  << ", "
+                  << dynamic_cast<_qmf::ArgsBrokerEcho&>(args).io_body
+                  << ")");
+        status = Manageable::STATUS_OK;
+        break;
+    case _qmf::Broker::METHOD_CONNECT : {
+        _qmf::ArgsBrokerConnect& hp=
+            dynamic_cast<_qmf::ArgsBrokerConnect&>(args);
+
+        QPID_LOG (debug, "Broker::connect()");
+        string transport = hp.i_transport.empty() ? TCP_TRANSPORT : hp.i_transport;
+        if (!getProtocolFactory(transport)) {
+            QPID_LOG(error, "Transport '" << transport << "' not supported");
+            return  Manageable::STATUS_NOT_IMPLEMENTED;
+        }
+        std::pair<Link::shared_ptr, bool> response =
+            links.declare (hp.i_host, hp.i_port, transport, hp.i_durable,
+                           hp.i_authMechanism, hp.i_username, hp.i_password);
+        if (hp.i_durable && response.second)
+            store->create(*response.first);
+        status = Manageable::STATUS_OK;
+        break;
+      }
+    case _qmf::Broker::METHOD_QUEUEMOVEMESSAGES : {
+        _qmf::ArgsBrokerQueueMoveMessages& moveArgs=
+            dynamic_cast<_qmf::ArgsBrokerQueueMoveMessages&>(args);
+        QPID_LOG (debug, "Broker::queueMoveMessages()");
+	if (queueMoveMessages(moveArgs.i_srcQueue, moveArgs.i_destQueue, moveArgs.i_qty))
+            status = Manageable::STATUS_OK;
+	else
+            return Manageable::STATUS_PARAMETER_INVALID;
+        break;
+      }
+    case _qmf::Broker::METHOD_SETLOGLEVEL :
+        setLogLevel(dynamic_cast<_qmf::ArgsBrokerSetLogLevel&>(args).i_level);
+        QPID_LOG (debug, "Broker::setLogLevel()");
+        status = Manageable::STATUS_OK;
+        break;
+    case _qmf::Broker::METHOD_GETLOGLEVEL :
+        dynamic_cast<_qmf::ArgsBrokerGetLogLevel&>(args).o_level = getLogLevel();
+        QPID_LOG (debug, "Broker::getLogLevel()");
+        status = Manageable::STATUS_OK;
+        break;
+    case _qmf::Broker::METHOD_CREATE :
+      {
+          _qmf::ArgsBrokerCreate& a = dynamic_cast<_qmf::ArgsBrokerCreate&>(args);
+          createObject(a.i_type, a.i_name, a.i_properties, a.i_strict, getManagementExecutionContext());
+          status = Manageable::STATUS_OK;
+          break;
+      }
+    case _qmf::Broker::METHOD_DELETE :
+      {
+          _qmf::ArgsBrokerDelete& a = dynamic_cast<_qmf::ArgsBrokerDelete&>(args);
+          deleteObject(a.i_type, a.i_name, a.i_options, getManagementExecutionContext());
+          status = Manageable::STATUS_OK;
+          break;
+      }
+   default:
+        QPID_LOG (debug, "Broker ManagementMethod not implemented: id=" << methodId << "]");
+        status = Manageable::STATUS_NOT_IMPLEMENTED;
+        break;
+    }
+
+    return status;
+}
+
+namespace
+{
+const std::string TYPE_QUEUE("queue");
+const std::string TYPE_EXCHANGE("exchange");
+const std::string TYPE_TOPIC("topic");
+const std::string TYPE_BINDING("binding");
+const std::string DURABLE("durable");
+const std::string AUTO_DELETE("auto-delete");
+const std::string ALTERNATE_EXCHANGE("alternate-exchange");
+const std::string EXCHANGE_TYPE("exchange-type");
+const std::string QUEUE_NAME("queue");
+const std::string EXCHANGE_NAME("exchange");
+
+const std::string _TRUE("true");
+const std::string _FALSE("false");
+}
+
+struct InvalidBindingIdentifier : public qpid::Exception
+{
+    InvalidBindingIdentifier(const std::string& name) : qpid::Exception(name) {}
+    std::string getPrefix() const { return "invalid binding"; }
+};
+
+struct BindingIdentifier
+{
+    std::string exchange;
+    std::string queue;
+    std::string key;
+
+    BindingIdentifier(const std::string& name)
+    {
+        std::vector<std::string> path;
+        split(path, name, "/");
+        switch (path.size()) {
+          case 1:
+            queue = path[0];
+            break;
+          case 2:
+            exchange = path[0];
+            queue = path[1];
+            break;
+          case 3:
+            exchange = path[0];
+            queue = path[1];
+            key = path[2];
+            break;
+          default:
+            throw InvalidBindingIdentifier(name);
+        }
+    }
+};
+
+struct ObjectAlreadyExists : public qpid::Exception
+{
+    ObjectAlreadyExists(const std::string& name) : qpid::Exception(name) {}
+    std::string getPrefix() const { return "object already exists"; }
+};
+
+struct UnknownObjectType : public qpid::Exception
+{
+    UnknownObjectType(const std::string& type) : qpid::Exception(type) {}
+    std::string getPrefix() const { return "unknown object type"; }
+};
+
+void Broker::createObject(const std::string& type, const std::string& name,
+                          const Variant::Map& properties, bool /*strict*/, const ConnectionState* context)
+{
+    std::string userId;
+    std::string connectionId;
+    if (context) {
+        userId = context->getUserId();
+        connectionId = context->getUrl();
+    }
+    //TODO: implement 'strict' option (check there are no unrecognised properties)
+    QPID_LOG (debug, "Broker::create(" << type << ", " << name << "," << properties << ")");
+    if (type == TYPE_QUEUE) {
+        bool durable(false);
+        bool autodelete(false);
+        std::string alternateExchange;
+        Variant::Map extensions;
+        for (Variant::Map::const_iterator i = properties.begin(); i != properties.end(); ++i) {
+            // extract durable, auto-delete and alternate-exchange properties
+            if (i->first == DURABLE) durable = i->second;
+            else if (i->first == AUTO_DELETE) autodelete = i->second;
+            else if (i->first == ALTERNATE_EXCHANGE) alternateExchange = i->second.asString();
+            //treat everything else as extension properties
+            else extensions[i->first] = i->second;
+        }
+        framing::FieldTable arguments;
+        amqp_0_10::translate(extensions, arguments);
+
+        std::pair<boost::shared_ptr<Queue>, bool> result =
+            createQueue(name, durable, autodelete, 0, alternateExchange, arguments, userId, connectionId);
+        if (!result.second) {
+            throw ObjectAlreadyExists(name);
+        }
+    } else if (type == TYPE_EXCHANGE || type == TYPE_TOPIC) {
+        bool durable(false);
+        std::string exchangeType("topic");
+        std::string alternateExchange;
+        Variant::Map extensions;
+        for (Variant::Map::const_iterator i = properties.begin(); i != properties.end(); ++i) {
+            // extract durable, auto-delete and alternate-exchange properties
+            if (i->first == DURABLE) durable = i->second;
+            else if (i->first == EXCHANGE_TYPE) exchangeType = i->second.asString();
+            else if (i->first == ALTERNATE_EXCHANGE) alternateExchange = i->second.asString();
+            //treat everything else as extension properties
+            else extensions[i->first] = i->second;
+        }
+        framing::FieldTable arguments;
+        amqp_0_10::translate(extensions, arguments);
+
+        try {
+            std::pair<boost::shared_ptr<Exchange>, bool> result =
+                createExchange(name, exchangeType, durable, alternateExchange, arguments, userId, connectionId);
+            if (!result.second) {
+                throw ObjectAlreadyExists(name);
+            }
+        } catch (const UnknownExchangeTypeException&) {
+            throw Exception(QPID_MSG("Invalid exchange type: " << exchangeType));
+        }
+    } else if (type == TYPE_BINDING) {
+        BindingIdentifier binding(name);
+        std::string exchangeType("topic");
+        Variant::Map extensions;
+        for (Variant::Map::const_iterator i = properties.begin(); i != properties.end(); ++i) {
+            // extract durable, auto-delete and alternate-exchange properties
+            if (i->first == EXCHANGE_TYPE) exchangeType = i->second.asString();
+            //treat everything else as extension properties
+            else extensions[i->first] = i->second;
+        }
+        framing::FieldTable arguments;
+        amqp_0_10::translate(extensions, arguments);
+
+        bind(binding.queue, binding.exchange, binding.key, arguments, userId, connectionId);
+    } else {
+        throw UnknownObjectType(type);
+    }
+}
+
+void Broker::deleteObject(const std::string& type, const std::string& name,
+                          const Variant::Map& options, const ConnectionState* context)
+{
+    std::string userId;
+    std::string connectionId;
+    if (context) {
+        userId = context->getUserId();
+        connectionId = context->getUrl();
+    }
+    QPID_LOG (debug, "Broker::delete(" << type << ", " << name << "," << options << ")");
+    if (type == TYPE_QUEUE) {
+        deleteQueue(name, userId, connectionId);
+    } else if (type == TYPE_EXCHANGE || type == TYPE_TOPIC) {
+        deleteExchange(name, userId, connectionId);
+    } else if (type == TYPE_BINDING) {
+        BindingIdentifier binding(name);
+        unbind(binding.queue, binding.exchange, binding.key, userId, connectionId);
+    } else {
+        throw UnknownObjectType(type);
+    }
+
+}
+
+void Broker::setLogLevel(const std::string& level)
+{
+    QPID_LOG(notice, "Changing log level to " << level);
+    std::vector<std::string> selectors;
+    split(selectors, level, ", ");
+    qpid::log::Logger::instance().reconfigure(selectors);
+}
+
+std::string Broker::getLogLevel()
+{
+    std::string level;
+    const std::vector<std::string>& selectors = qpid::log::Logger::instance().getOptions().selectors;
+    for (std::vector<std::string>::const_iterator i = selectors.begin(); i != selectors.end(); ++i) {
+        if (i != selectors.begin()) level += std::string(",");
+        level += *i;
+    }
+    return level;
+}
+
+boost::shared_ptr<ProtocolFactory> Broker::getProtocolFactory(const std::string& name) const {
+    ProtocolFactoryMap::const_iterator i
+        = name.empty() ? protocolFactories.begin() : protocolFactories.find(name);
+    if (i == protocolFactories.end()) return boost::shared_ptr<ProtocolFactory>();
+    else return i->second;
+}
+
+uint16_t Broker::getPort(const std::string& name) const  {
+    boost::shared_ptr<ProtocolFactory> factory = getProtocolFactory(name);
+    if (factory) {
+        return factory->getPort();
+    } else {
+        throw NoSuchTransportException(QPID_MSG("No such transport: '" << name << "'"));
+    }
+}
+
+void Broker::registerProtocolFactory(const std::string& name, ProtocolFactory::shared_ptr protocolFactory) {
+    protocolFactories[name] = protocolFactory;
+    Url::addProtocol(name);
+}
+
+void Broker::accept() {
+    for (ProtocolFactoryMap::const_iterator i = protocolFactories.begin(); i != protocolFactories.end(); i++) {
+        i->second->accept(poller, factory.get());
+    }
+}
+
+void Broker::connect(
+    const std::string& host, const std::string& port, const std::string& transport,
+    boost::function2<void, int, std::string> failed,
+    sys::ConnectionCodec::Factory* f)
+{
+    boost::shared_ptr<ProtocolFactory> pf = getProtocolFactory(transport);
+    if (pf) pf->connect(poller, host, port, f ? f : factory.get(), failed);
+    else throw NoSuchTransportException(QPID_MSG("Unsupported transport type: " << transport));
+}
+
+void Broker::connect(
+    const Url& url,
+    boost::function2<void, int, std::string> failed,
+    sys::ConnectionCodec::Factory* f)
+{
+    url.throwIfEmpty();
+    const Address& addr=url[0];
+    connect(addr.host, boost::lexical_cast<std::string>(addr.port), addr.protocol, failed, f);
+}
+
+uint32_t Broker::queueMoveMessages(
+     const std::string& srcQueue,
+     const std::string& destQueue,
+     uint32_t  qty)
+{
+  Queue::shared_ptr src_queue = queues.find(srcQueue);
+  if (!src_queue)
+    return 0;
+  Queue::shared_ptr dest_queue = queues.find(destQueue);
+  if (!dest_queue)
+    return 0;
+
+  return src_queue->move(dest_queue, qty);
+}
+
+
+boost::shared_ptr<sys::Poller> Broker::getPoller() { return poller; }
+
+std::vector<Url>
+Broker::getKnownBrokersImpl()
+{
+    return knownBrokers;
+}
+
+bool Broker::deferDeliveryImpl(const std::string& ,
+                               const boost::intrusive_ptr<Message>& )
+{ return false; }
+
+void Broker::setClusterTimer(std::auto_ptr<sys::Timer> t) {
+    clusterTimer = t;
+}
+
+const std::string Broker::TCP_TRANSPORT("tcp");
+
+
+std::pair<boost::shared_ptr<Queue>, bool> Broker::createQueue(
+    const std::string& name,
+    bool durable,
+    bool autodelete,
+    const OwnershipToken* owner,
+    const std::string& alternateExchange,
+    const qpid::framing::FieldTable& arguments,
+    const std::string& userId,
+    const std::string& connectionId)
+{
+    if (acl) {
+        std::map<acl::Property, std::string> params;
+        params.insert(make_pair(acl::PROP_ALTERNATE, alternateExchange));
+        params.insert(make_pair(acl::PROP_PASSIVE, _FALSE));
+        params.insert(make_pair(acl::PROP_DURABLE, durable ? _TRUE : _FALSE));
+        params.insert(make_pair(acl::PROP_EXCLUSIVE, owner ? _TRUE : _FALSE));
+        params.insert(make_pair(acl::PROP_AUTODELETE, autodelete ? _TRUE : _FALSE));
+        params.insert(make_pair(acl::PROP_POLICYTYPE, arguments.getAsString("qpid.policy_type")));
+        params.insert(make_pair(acl::PROP_MAXQUEUECOUNT, boost::lexical_cast<string>(arguments.getAsInt("qpid.max_count"))));
+        params.insert(make_pair(acl::PROP_MAXQUEUESIZE, boost::lexical_cast<string>(arguments.getAsInt64("qpid.max_size"))));
+
+        if (!acl->authorise(userId,acl::ACT_CREATE,acl::OBJ_QUEUE,name,&params) )
+            throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied queue create request from " << userId));
+    }
+
+    Exchange::shared_ptr alternate;
+    if (!alternateExchange.empty()) {
+        alternate = exchanges.get(alternateExchange);
+        if (!alternate) throw framing::NotFoundException(QPID_MSG("Alternate exchange does not exist: " << alternateExchange));
+    }
+
+    std::pair<Queue::shared_ptr, bool> result = queues.declare(name, durable, autodelete, owner, alternate, arguments);
+    if (result.second) {
+        //add default binding:
+        result.first->bind(exchanges.getDefault(), name);
+
+        if (managementAgent.get()) {
+            //TODO: debatable whether we should raise an event here for
+            //create when this is a 'declare' event; ideally add a create
+            //event instead?
+            managementAgent->raiseEvent(
+                _qmf::EventQueueDeclare(connectionId, userId, name,
+                                        durable, owner, autodelete,
+                                        ManagementAgent::toMap(arguments),
+                                        "created"));
+        }
+    }
+    return result;
+}
+
+void Broker::deleteQueue(const std::string& name, const std::string& userId,
+                         const std::string& connectionId, QueueFunctor check)
+{
+    if (acl && !acl->authorise(userId,acl::ACT_DELETE,acl::OBJ_QUEUE,name,NULL)) {
+        throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied queue delete request from " << userId));
+    }
+
+    Queue::shared_ptr queue = queues.find(name);
+    if (queue) {
+        if (check) check(queue);
+        queues.destroy(name);
+        queue->destroyed();
+    } else {
+        throw framing::NotFoundException(QPID_MSG("Delete failed. No such queue: " << name));
+    }
+
+    if (managementAgent.get())
+        managementAgent->raiseEvent(_qmf::EventQueueDelete(connectionId, userId, name));
+
+}
+
+std::pair<Exchange::shared_ptr, bool> Broker::createExchange(
+    const std::string& name,
+    const std::string& type,
+    bool durable,
+    const std::string& alternateExchange,
+    const qpid::framing::FieldTable& arguments,
+    const std::string& userId,
+    const std::string& connectionId)
+{
+    if (acl) {
+        std::map<acl::Property, std::string> params;
+        params.insert(make_pair(acl::PROP_TYPE, type));
+        params.insert(make_pair(acl::PROP_ALTERNATE, alternateExchange));
+        params.insert(make_pair(acl::PROP_PASSIVE, _FALSE));
+        params.insert(make_pair(acl::PROP_DURABLE, durable ? _TRUE : _FALSE));
+        if (!acl->authorise(userId,acl::ACT_CREATE,acl::OBJ_EXCHANGE,name,&params) )
+            throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied exchange create request from " << userId));
+    }
+
+    Exchange::shared_ptr alternate;
+    if (!alternateExchange.empty()) {
+        alternate = exchanges.get(alternateExchange);
+        if (!alternate) throw framing::NotFoundException(QPID_MSG("Alternate exchange does not exist: " << alternateExchange));
+    }
+
+    std::pair<Exchange::shared_ptr, bool> result;
+    result = exchanges.declare(name, type, durable, arguments);
+    if (result.second) {
+        if (alternate) {
+            result.first->setAlternate(alternate);
+            alternate->incAlternateUsers();
+        }
+        if (durable) {
+            store->create(*result.first, arguments);
+        }
+        if (managementAgent.get()) {
+            //TODO: debatable whether we should raise an event here for
+            //create when this is a 'declare' event; ideally add a create
+            //event instead?
+            managementAgent->raiseEvent(_qmf::EventExchangeDeclare(connectionId,
+                                                         userId,
+                                                         name,
+                                                         type,
+                                                         alternateExchange,
+                                                         durable,
+                                                         false,
+                                                         ManagementAgent::toMap(arguments),
+                                                         "created"));
+        }
+    }
+    return result;
+}
+
+void Broker::deleteExchange(const std::string& name, const std::string& userId,
+                           const std::string& connectionId)
+{
+    if (acl) {
+        if (!acl->authorise(userId,acl::ACT_DELETE,acl::OBJ_EXCHANGE,name,NULL) )
+            throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied exchange delete request from " << userId));
+    }
+
+    Exchange::shared_ptr exchange(exchanges.get(name));
+    if (!exchange) throw framing::NotFoundException(QPID_MSG("Delete failed. No such exchange: " << name));
+    if (exchange->inUseAsAlternate()) throw framing::NotAllowedException(QPID_MSG("Exchange in use as alternate-exchange."));
+    if (exchange->isDurable()) store->destroy(*exchange);
+    if (exchange->getAlternate()) exchange->getAlternate()->decAlternateUsers();
+    exchanges.destroy(name);
+
+    if (managementAgent.get())
+        managementAgent->raiseEvent(_qmf::EventExchangeDelete(connectionId, userId, name));
+
+}
+
+void Broker::bind(const std::string& queueName,
+                  const std::string& exchangeName,
+                  const std::string& key,
+                  const qpid::framing::FieldTable& arguments,
+                  const std::string& userId,
+                  const std::string& connectionId)
+{
+    if (acl) {
+        std::map<acl::Property, std::string> params;
+        params.insert(make_pair(acl::PROP_QUEUENAME, queueName));
+        params.insert(make_pair(acl::PROP_ROUTINGKEY, key));
+
+        if (!acl->authorise(userId,acl::ACT_BIND,acl::OBJ_EXCHANGE,exchangeName,&params))
+            throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied exchange bind request from " << userId));
+    }
+
+    Queue::shared_ptr queue = queues.find(queueName);
+    Exchange::shared_ptr exchange = exchanges.get(exchangeName);
+    if (!queue) {
+        throw framing::NotFoundException(QPID_MSG("Bind failed. No such queue: " << queueName));
+    } else if (!exchange) {
+        throw framing::NotFoundException(QPID_MSG("Bind failed. No such exchange: " << exchangeName));
+    } else {
+        if (queue->bind(exchange, key, arguments)) {
+            if (managementAgent.get()) {
+                managementAgent->raiseEvent(_qmf::EventBind(connectionId, userId, exchangeName,
+                                                  queueName, key, ManagementAgent::toMap(arguments)));
+            }
+        }
+    }
+}
+
+void Broker::unbind(const std::string& queueName,
+                    const std::string& exchangeName,
+                    const std::string& key,
+                    const std::string& userId,
+                    const std::string& connectionId)
+{
+    if (acl) {
+        std::map<acl::Property, std::string> params;
+        params.insert(make_pair(acl::PROP_QUEUENAME, queueName));
+        params.insert(make_pair(acl::PROP_ROUTINGKEY, key));
+        if (!acl->authorise(userId,acl::ACT_UNBIND,acl::OBJ_EXCHANGE,exchangeName,&params) )
+            throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied exchange unbind request from " << userId));
+    }
+
+    Queue::shared_ptr queue = queues.find(queueName);
+    Exchange::shared_ptr exchange = exchanges.get(exchangeName);
+    if (!queue) {
+        throw framing::NotFoundException(QPID_MSG("Bind failed. No such queue: " << queueName));
+    } else if (!exchange) {
+        throw framing::NotFoundException(QPID_MSG("Bind failed. No such exchange: " << exchangeName));
+    } else {
+        if (exchange->unbind(queue, key, 0)) {
+            if (exchange->isDurable() && queue->isDurable()) {
+                store->unbind(*exchange, *queue, key, qpid::framing::FieldTable());
+            }
+            if (managementAgent.get()) {
+                managementAgent->raiseEvent(_qmf::EventUnbind(connectionId, userId, exchangeName, queueName, key));
+            }
+        }
+    }
+}
+
+}} // namespace qpid::broker
+
diff --git a/qpid/cpp/src/qpid/broker/Broker.h b/qpid/cpp/src/qpid/broker/Broker.h
new file mode 100644
index 0000000000..40f7b6273f
--- /dev/null
+++ b/qpid/cpp/src/qpid/broker/Broker.h
@@ -0,0 +1,351 @@
+#ifndef _Broker_
+#define _Broker_
+
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/broker/BrokerImportExport.h"
+#include "qpid/broker/ConnectionFactory.h"
+#include "qpid/broker/ConnectionToken.h"
+#include "qpid/broker/DirectExchange.h"
+#include "qpid/broker/DtxManager.h"
+#include "qpid/broker/ExchangeRegistry.h"
+#include "qpid/broker/MessageStore.h"
+#include "qpid/broker/QueueRegistry.h"
+#include "qpid/broker/LinkRegistry.h"
+#include "qpid/broker/SessionManager.h"
+#include "qpid/broker/QueueCleaner.h"
+#include "qpid/broker/QueueEvents.h"
+#include "qpid/broker/Vhost.h"
+#include "qpid/broker/System.h"
+#include "qpid/broker/ExpiryPolicy.h"
+#include "qpid/management/Manageable.h"
+#include "qpid/management/ManagementAgent.h"
+#include "qmf/org/apache/qpid/broker/Broker.h"
+#include "qmf/org/apache/qpid/broker/ArgsBrokerConnect.h"
+#include "qpid/Options.h"
+#include "qpid/Plugin.h"
+#include "qpid/DataDir.h"
+#include "qpid/framing/FrameHandler.h"
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
+#include "qpid/sys/Runnable.h"
+#include "qpid/sys/Timer.h"
+#include "qpid/types/Variant.h"
+#include "qpid/RefCounted.h"
+#include "qpid/broker/AclModule.h"
+#include "qpid/sys/Mutex.h"
+
+#include <boost/intrusive_ptr.hpp>
+#include <string>
+#include <vector>
+
+namespace qpid {
+
+namespace sys {
+    class ProtocolFactory;
+    class Poller;
+}
+
+struct Url;
+
+namespace broker {
+
+class ConnectionState;
+class ExpiryPolicy;
+class Message;
+
+static const  uint16_t DEFAULT_PORT=5672;
+
+struct NoSuchTransportException : qpid::Exception
+{
+    NoSuchTransportException(const std::string& s) : Exception(s) {}
+    virtual ~NoSuchTransportException() throw() {}
+};
+
+/**
+ * A broker instance.
+ */
+class Broker : public sys::Runnable, public Plugin::Target,
+               public management::Manageable,
+               public RefCounted
+{
+public:
+
+    struct Options : public qpid::Options {
+        static const std::string DEFAULT_DATA_DIR_LOCATION;
+        static const std::string DEFAULT_DATA_DIR_NAME;
+
+        QPID_BROKER_EXTERN Options(const std::string& name="Broker Options");
+
+        bool noDataDir;
+        std::string dataDir;
+        uint16_t port;
+        int workerThreads;
+        int maxConnections;
+        int connectionBacklog;
+        bool enableMgmt;
+        uint16_t mgmtPubInterval;
+        uint16_t queueCleanInterval;
+        bool auth;
+        std::string realm;
+        size_t replayFlushLimit;
+        size_t replayHardLimit;
+        uint queueLimit;
+        bool tcpNoDelay;
+        bool requireEncrypted;
+        std::string knownHosts;
+        std::string saslConfigPath;
+        uint32_t maxSessionRate;
+        bool asyncQueueEvents;
+        bool qmf2Support;
+        bool qmf1Support;
+        uint queueFlowStopRatio;    // producer flow control: on
+        uint queueFlowResumeRatio;  // producer flow control: off
+        uint16_t queueThresholdEventRatio;
+
+      private:
+        std::string getHome();
+    };
+
+    class ConnectionCounter {
+            int maxConnections;
+            int connectionCount;
+            sys::Mutex connectionCountLock;
+        public:
+            ConnectionCounter(int mc): maxConnections(mc),connectionCount(0) {};
+            void inc_connectionCount() {
+                sys::ScopedLock<sys::Mutex> l(connectionCountLock);
+                connectionCount++;
+            }
+            void dec_connectionCount() {
+                sys::ScopedLock<sys::Mutex> l(connectionCountLock);
+                connectionCount--;
+            }
+            bool allowConnection() {
+                sys::ScopedLock<sys::Mutex> l(connectionCountLock);
+                return (maxConnections <= connectionCount);
+            }
+    };
+
+  private:
+    typedef std::map<std::string, boost::shared_ptr<sys::ProtocolFactory> > ProtocolFactoryMap;
+
+    void declareStandardExchange(const std::string& name, const std::string& type);
+    void setStore ();
+    void setLogLevel(const std::string& level);
+    std::string getLogLevel();
+    void createObject(const std::string& type, const std::string& name,
+                      const qpid::types::Variant::Map& properties, bool strict, const ConnectionState* context);
+    void deleteObject(const std::string& type, const std::string& name,
+                      const qpid::types::Variant::Map& options, const ConnectionState* context);
+
+    boost::shared_ptr<sys::Poller> poller;
+    sys::Timer timer;
+    std::auto_ptr<sys::Timer> clusterTimer;
+    Options config;
+    std::auto_ptr<management::ManagementAgent> managementAgent;
+    ProtocolFactoryMap protocolFactories;
+    std::auto_ptr<MessageStore> store;
+    AclModule* acl;
+    DataDir dataDir;
+
+    QueueRegistry queues;
+    ExchangeRegistry exchanges;
+    LinkRegistry links;
+    boost::shared_ptr<sys::ConnectionCodec::Factory> factory;
+    DtxManager dtxManager;
+    SessionManager sessionManager;
+    qmf::org::apache::qpid::broker::Broker* mgmtObject;
+    Vhost::shared_ptr            vhostObject;
+    System::shared_ptr           systemObject;
+    QueueCleaner queueCleaner;
+    QueueEvents queueEvents;
+    std::vector<Url> knownBrokers;
+    std::vector<Url> getKnownBrokersImpl();
+    bool deferDeliveryImpl(const std::string& queue,
+                           const boost::intrusive_ptr<Message>& msg);
+    std::string federationTag;
+    bool recovery;
+    bool inCluster, clusterUpdatee;
+    boost::intrusive_ptr<ExpiryPolicy> expiryPolicy;
+    ConnectionCounter connectionCounter;
+
+  public:
+    virtual ~Broker();
+
+    QPID_BROKER_EXTERN Broker(const Options& configuration);
+    static QPID_BROKER_EXTERN boost::intrusive_ptr<Broker> create(const Options& configuration);
+    static QPID_BROKER_EXTERN boost::intrusive_ptr<Broker> create(int16_t port = DEFAULT_PORT);
+
+    /**
+     * Return listening port. If called before bind this is
+     * the configured port. If called after it is the actual
+     * port, which will be different if the configured port is
+     * 0.
+     */
+    virtual uint16_t getPort(const std::string& name) const;
+
+    /**
+     * Run the broker. Implements Runnable::run() so the broker
+     * can be run in a separate thread.
+     */
+    virtual void run();
+
+    /** Shut down the broker */
+    virtual void shutdown();
+
+    QPID_BROKER_EXTERN void setStore (boost::shared_ptr<MessageStore>& store);
+    MessageStore& getStore() { return *store; }
+    void setAcl (AclModule* _acl) {acl = _acl;}
+    AclModule* getAcl() { return acl; }
+    QueueRegistry& getQueues() { return queues; }
+    ExchangeRegistry& getExchanges() { return exchanges; }
+    LinkRegistry& getLinks() { return links; }
+    DtxManager& getDtxManager() { return dtxManager; }
+    DataDir& getDataDir() { return dataDir; }
+    Options& getOptions() { return config; }
+    QueueEvents& getQueueEvents() { return queueEvents; }
+
+    void setExpiryPolicy(const boost::intrusive_ptr<ExpiryPolicy>& e) { expiryPolicy = e; }
+    boost::intrusive_ptr<ExpiryPolicy> getExpiryPolicy() { return expiryPolicy; }
+
+    SessionManager& getSessionManager() { return sessionManager; }
+    const std::string& getFederationTag() const { return federationTag; }
+
+    management::ManagementObject*     GetManagementObject (void) const;
+    management::Manageable*           GetVhostObject      (void) const;
+    management::Manageable::status_t  ManagementMethod (uint32_t methodId,
+                                                        management::Args& args,
+                                                        std::string& text);
+
+    /** Add to the broker's protocolFactorys */
+    void registerProtocolFactory(const std::string& name, boost::shared_ptr<sys::ProtocolFactory>);
+
+    /** Accept connections */
+    QPID_BROKER_EXTERN void accept();
+
+    /** Create a connection to another broker. */
+    void connect(const std::string& host, const std::string& port,
+                 const std::string& transport,
+                 boost::function2<void, int, std::string> failed,
+                 sys::ConnectionCodec::Factory* =0);
+    /** Create a connection to another broker. */
+    void connect(const Url& url,
+                 boost::function2<void, int, std::string> failed,
+                 sys::ConnectionCodec::Factory* =0);
+
+    /** Move messages from one queue to another.
+        A zero quantity means to move all messages
+    */
+    uint32_t queueMoveMessages( const std::string& srcQueue,
+			    const std::string& destQueue,
+			    uint32_t  qty);
+
+    boost::shared_ptr<sys::ProtocolFactory> getProtocolFactory(const std::string& name = TCP_TRANSPORT) const;
+
+    /** Expose poller so plugins can register their descriptors. */
+    boost::shared_ptr<sys::Poller> getPoller();
+
+    boost::shared_ptr<sys::ConnectionCodec::Factory> getConnectionFactory() { return factory; }
+    void setConnectionFactory(boost::shared_ptr<sys::ConnectionCodec::Factory> f) { factory = f; }
+
+    /** Timer for local tasks affecting only this broker */
+    sys::Timer& getTimer() { return timer; }
+
+    /** Timer for tasks that must be synchronized if we are in a cluster */
+    sys::Timer& getClusterTimer() { return clusterTimer.get() ? *clusterTimer : timer; }
+    void setClusterTimer(std::auto_ptr<sys::Timer>);
+
+    boost::function<std::vector<Url> ()> getKnownBrokers;
+
+    static QPID_BROKER_EXTERN const std::string TCP_TRANSPORT;
+
+    void setRecovery(bool set) { recovery = set; }
+    bool getRecovery() const { return recovery; }
+
+    /** True of this broker is part of a cluster.
+     * Only valid after early initialization of plugins is complete.
+     */
+    bool isInCluster() const { return inCluster; }
+    void setInCluster(bool set) { inCluster = set; }
+
+    /** True if this broker is joining a cluster and in the process of
+     * receiving a state update.
+     */
+    bool isClusterUpdatee() const { return clusterUpdatee; }
+    void setClusterUpdatee(bool set) { clusterUpdatee = set; }
+
+    management::ManagementAgent* getManagementAgent() { return managementAgent.get(); }
+
+    ConnectionCounter& getConnectionCounter() {return connectionCounter;}
+
+    /**
+     * Never true in a stand-alone broker. In a cluster, return true
+     * to defer delivery of messages deliveredg in a cluster-unsafe
+     * context.
+     *@return true if delivery of a message should be deferred.
+     */
+    boost::function<bool (const std::string& queue,
+                          const boost::intrusive_ptr<Message>& msg)> deferDelivery;
+
+    bool isAuthenticating ( ) { return config.auth; }
+
+    typedef boost::function1<void, boost::shared_ptr<Queue> > QueueFunctor;
+
+    std::pair<boost::shared_ptr<Queue>, bool> createQueue(
+        const std::string& name,
+        bool durable,
+        bool autodelete,
+        const OwnershipToken* owner,
+        const std::string& alternateExchange,
+        const qpid::framing::FieldTable& arguments,
+        const std::string& userId,
+        const std::string& connectionId);
+    void deleteQueue(const std::string& name,
+                     const std::string& userId,
+                     const std::string& connectionId,
+                     QueueFunctor check = QueueFunctor());
+    std::pair<Exchange::shared_ptr, bool> createExchange(
+        const std::string& name,
+        const std::string& type,
+        bool durable,
+        const std::string& alternateExchange,
+        const qpid::framing::FieldTable& args,
+        const std::string& userId, const std::string& connectionId);
+    void deleteExchange(const std::string& name, const std::string& userId,
+                        const std::string& connectionId);
+    void bind(const std::string& queue,
+              const std::string& exchange,
+              const std::string& key,
+              const qpid::framing::FieldTable& arguments,
+              const std::string& userId,
+              const std::string& connectionId);
+    void unbind(const std::string& queue,
+                const std::string& exchange,
+                const std::string& key,
+                const std::string& userId,
+                const std::string& connectionId);
+};
+
+}}
+
+#endif  /*!_Broker_*/
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/Connection.cpp b/qpid/cpp/src/qpid/broker/Connection.cpp
index c07e63e68c..c07e63e68c 100644
--- a/cpp/src/qpid/broker/Connection.cpp
+++ b/qpid/cpp/src/qpid/broker/Connection.cpp
diff --git a/cpp/src/qpid/broker/Connection.h b/qpid/cpp/src/qpid/broker/Connection.h
index 8f1aa701ef..8f1aa701ef 100644
--- a/cpp/src/qpid/broker/Connection.h
+++ b/qpid/cpp/src/qpid/broker/Connection.h
diff --git a/cpp/src/qpid/broker/ConnectionFactory.cpp b/qpid/cpp/src/qpid/broker/ConnectionFactory.cpp
index 9e0020812b..9e0020812b 100644
--- a/cpp/src/qpid/broker/ConnectionFactory.cpp
+++ b/qpid/cpp/src/qpid/broker/ConnectionFactory.cpp
diff --git a/cpp/src/qpid/broker/ConnectionFactory.h b/qpid/cpp/src/qpid/broker/ConnectionFactory.h
index 7c1a9a08e1..7c1a9a08e1 100644
--- a/cpp/src/qpid/broker/ConnectionFactory.h
+++ b/qpid/cpp/src/qpid/broker/ConnectionFactory.h
diff --git a/cpp/src/qpid/broker/ConnectionHandler.cpp b/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp
index 3f97e5b9de..3f97e5b9de 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 b32167669e..b32167669e 100644
--- a/cpp/src/qpid/broker/ConnectionHandler.h
+++ b/qpid/cpp/src/qpid/broker/ConnectionHandler.h
diff --git a/cpp/src/qpid/broker/ConnectionState.h b/qpid/cpp/src/qpid/broker/ConnectionState.h
index 9c31a931d8..9c31a931d8 100644
--- a/cpp/src/qpid/broker/ConnectionState.h
+++ b/qpid/cpp/src/qpid/broker/ConnectionState.h
diff --git a/cpp/src/qpid/broker/ConnectionToken.h b/qpid/cpp/src/qpid/broker/ConnectionToken.h
index 9b40383c80..9b40383c80 100644
--- a/cpp/src/qpid/broker/ConnectionToken.h
+++ b/qpid/cpp/src/qpid/broker/ConnectionToken.h
diff --git a/cpp/src/qpid/broker/Consumer.h b/qpid/cpp/src/qpid/broker/Consumer.h
index 317338a8ad..317338a8ad 100644
--- a/cpp/src/qpid/broker/Consumer.h
+++ b/qpid/cpp/src/qpid/broker/Consumer.h
diff --git a/cpp/src/qpid/broker/Daemon.cpp b/qpid/cpp/src/qpid/broker/Daemon.cpp
index b30e5f18cb..b30e5f18cb 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 a9cd98bce2..a9cd98bce2 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 ffb5a77bca..ffb5a77bca 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 3ebb12461c..3ebb12461c 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 c8d21001eb..c8d21001eb 100644
--- a/cpp/src/qpid/broker/DeliverableMessage.h
+++ b/qpid/cpp/src/qpid/broker/DeliverableMessage.h
diff --git a/cpp/src/qpid/broker/DeliveryAdapter.h b/qpid/cpp/src/qpid/broker/DeliveryAdapter.h
index b0bec60890..b0bec60890 100644
--- a/cpp/src/qpid/broker/DeliveryAdapter.h
+++ b/qpid/cpp/src/qpid/broker/DeliveryAdapter.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 58dcc6d7c7..58dcc6d7c7 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 d388ba94be..d388ba94be 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 060f80f60d..060f80f60d 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 a6f9cf91af..a6f9cf91af 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 bca3f90bbe..bca3f90bbe 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 166147e58d..166147e58d 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 f1b8169cf7..f1b8169cf7 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 1511cb032f..1511cb032f 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 3caa41c3f4..3caa41c3f4 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 680b62eeb2..680b62eeb2 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 c4c52ec40a..c4c52ec40a 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 680a210e4f..680a210e4f 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 9f33e698db..9f33e698db 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 aec2d2aed4..aec2d2aed4 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 622cc81002..622cc81002 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 b12af9a1dd..b12af9a1dd 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 1c8d26c4f7..1c8d26c4f7 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 2b75a8f3cf..2b75a8f3cf 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 64a12d918a..64a12d918a 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 a723eb0aa8..a723eb0aa8 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 17270ffd8d..17270ffd8d 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 1b25721e0c..1b25721e0c 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 5879fa0892..5879fa0892 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 1a7d486796..1a7d486796 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/HandlerImpl.h b/qpid/cpp/src/qpid/broker/HandlerImpl.h
index aae636e818..aae636e818 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 abcaa5f69d..abcaa5f69d 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 3b939d6851..3b939d6851 100644
--- a/cpp/src/qpid/broker/HeadersExchange.h
+++ b/qpid/cpp/src/qpid/broker/HeadersExchange.h
diff --git a/cpp/src/qpid/broker/LegacyLVQ.cpp b/qpid/cpp/src/qpid/broker/LegacyLVQ.cpp
index a811a86492..a811a86492 100644
--- a/cpp/src/qpid/broker/LegacyLVQ.cpp
+++ b/qpid/cpp/src/qpid/broker/LegacyLVQ.cpp
diff --git a/cpp/src/qpid/broker/LegacyLVQ.h b/qpid/cpp/src/qpid/broker/LegacyLVQ.h
index dd0fd7aaec..dd0fd7aaec 100644
--- a/cpp/src/qpid/broker/LegacyLVQ.h
+++ b/qpid/cpp/src/qpid/broker/LegacyLVQ.h
diff --git a/qpid/cpp/src/qpid/broker/Link.cpp b/qpid/cpp/src/qpid/broker/Link.cpp
new file mode 100644
index 0000000000..9ab4379a69
--- /dev/null
+++ b/qpid/cpp/src/qpid/broker/Link.cpp
@@ -0,0 +1,474 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/broker/Link.h"
+#include "qpid/broker/LinkRegistry.h"
+#include "qpid/broker/Broker.h"
+#include "qpid/broker/Connection.h"
+#include "qmf/org/apache/qpid/broker/EventBrokerLinkUp.h"
+#include "qmf/org/apache/qpid/broker/EventBrokerLinkDown.h"
+#include "boost/bind.hpp"
+#include "qpid/log/Statement.h"
+#include "qpid/framing/enum.h"
+#include "qpid/framing/reply_exceptions.h"
+#include "qpid/broker/AclModule.h"
+
+using namespace qpid::broker;
+using qpid::framing::Buffer;
+using qpid::framing::FieldTable;
+using qpid::framing::UnauthorizedAccessException;
+using qpid::framing::connection::CLOSE_CODE_CONNECTION_FORCED;
+using qpid::management::ManagementAgent;
+using qpid::management::ManagementObject;
+using qpid::management::Manageable;
+using qpid::management::Args;
+using qpid::sys::Mutex;
+using std::stringstream;
+using std::string;
+namespace _qmf = qmf::org::apache::qpid::broker;
+
+Link::Link(LinkRegistry*  _links,
+           MessageStore*  _store,
+           string&        _host,
+           uint16_t       _port,
+           string&        _transport,
+           bool           _durable,
+           string&        _authMechanism,
+           string&        _username,
+           string&        _password,
+           Broker*        _broker,
+           Manageable*    parent)
+    : links(_links), store(_store), host(_host), port(_port),
+      transport(_transport),
+      durable(_durable),
+      authMechanism(_authMechanism), username(_username), password(_password),
+      persistenceId(0), mgmtObject(0), broker(_broker), state(0),
+      visitCount(0),
+      currentInterval(1),
+      closing(false),
+      updateUrls(false),
+      channelCounter(1),
+      connection(0),
+      agent(0)
+{
+    if (parent != 0 && broker != 0)
+    {
+        agent = broker->getManagementAgent();
+        if (agent != 0)
+        {
+            mgmtObject = new _qmf::Link(agent, this, parent, _host, _port, _transport, _durable);
+            agent->addObject(mgmtObject, 0, durable);
+        }
+    }
+    setStateLH(STATE_WAITING);
+}
+
+Link::~Link ()
+{
+    if (state == STATE_OPERATIONAL && connection != 0)
+        connection->close(CLOSE_CODE_CONNECTION_FORCED, "closed by management");
+
+    if (mgmtObject != 0)
+        mgmtObject->resourceDestroy ();
+}
+
+void Link::setStateLH (int newState)
+{
+    if (newState == state)
+        return;
+
+    state = newState;
+
+    if (hideManagement())
+        return;
+
+    switch (state)
+    {
+    case STATE_WAITING     : mgmtObject->set_state("Waiting");     break;
+    case STATE_CONNECTING  : mgmtObject->set_state("Connecting");  break;
+    case STATE_OPERATIONAL : mgmtObject->set_state("Operational"); break;
+    case STATE_FAILED      : mgmtObject->set_state("Failed");      break;
+    case STATE_CLOSED      : mgmtObject->set_state("Closed");      break;
+    case STATE_PASSIVE     : mgmtObject->set_state("Passive");      break;
+    }
+}
+
+void Link::startConnectionLH ()
+{
+    try {
+        // Set the state before calling connect.  It is possible that connect
+        // will fail synchronously and call Link::closed before returning.
+        setStateLH(STATE_CONNECTING);
+        broker->connect (host, boost::lexical_cast<std::string>(port), transport,
+                         boost::bind (&Link::closed, this, _1, _2));
+        QPID_LOG (debug, "Inter-broker link connecting to " << host << ":" << port);
+    } catch(std::exception& e) {
+        setStateLH(STATE_WAITING);
+        if (!hideManagement())
+            mgmtObject->set_lastError (e.what());
+    }
+}
+
+void Link::established ()
+{
+    stringstream addr;
+    addr << host << ":" << port;
+    QPID_LOG (info, "Inter-broker link established to " << addr.str());
+
+    if (!hideManagement() && agent)
+        agent->raiseEvent(_qmf::EventBrokerLinkUp(addr.str()));
+
+    {
+        Mutex::ScopedLock mutex(lock);
+        setStateLH(STATE_OPERATIONAL);
+        currentInterval = 1;
+        visitCount      = 0;
+        if (closing)
+            destroy();
+    }
+}
+
+void Link::closed (int, std::string text)
+{
+    Mutex::ScopedLock mutex(lock);
+    QPID_LOG (info, "Inter-broker link disconnected from " << host << ":" << port << " " << text);
+
+    connection = 0;
+
+    if (state == STATE_OPERATIONAL) {
+        stringstream addr;
+        addr << host << ":" << port;
+        QPID_LOG (warning, "Inter-broker link disconnected from " << addr.str());
+        if (!hideManagement() && agent)
+            agent->raiseEvent(_qmf::EventBrokerLinkDown(addr.str()));
+    }
+
+    for (Bridges::iterator i = active.begin(); i != active.end(); i++) {
+        (*i)->closed();
+        created.push_back(*i);
+    }
+    active.clear();
+
+    if (state != STATE_FAILED)
+    {
+        setStateLH(STATE_WAITING);
+        if (!hideManagement())
+            mgmtObject->set_lastError (text);
+    }
+
+    if (closing)
+        destroy();
+}
+
+void Link::destroy ()
+{
+    Bridges toDelete;
+    {
+        Mutex::ScopedLock mutex(lock);
+
+        QPID_LOG (info, "Inter-broker link to " << host << ":" << port << " removed by management");
+        if (connection)
+            connection->close(CLOSE_CODE_CONNECTION_FORCED, "closed by management");
+
+        setStateLH(STATE_CLOSED);
+
+        // Move the bridges to be deleted into a local vector so there is no
+        // corruption of the iterator caused by bridge deletion.
+        for (Bridges::iterator i = active.begin(); i != active.end(); i++) {
+            (*i)->closed();
+            toDelete.push_back(*i);
+        }
+        active.clear();
+
+        for (Bridges::iterator i = created.begin(); i != created.end(); i++)
+            toDelete.push_back(*i);
+        created.clear();
+    }
+    // Now delete all bridges on this link (don't hold the lock for this).
+    for (Bridges::iterator i = toDelete.begin(); i != toDelete.end(); i++)
+        (*i)->destroy();
+    toDelete.clear();
+    links->destroy (host, port);
+}
+
+void Link::add(Bridge::shared_ptr bridge)
+{
+    Mutex::ScopedLock mutex(lock);
+    created.push_back (bridge);
+}
+
+void Link::cancel(Bridge::shared_ptr bridge)
+{
+    {
+        Mutex::ScopedLock mutex(lock);
+
+        for (Bridges::iterator i = created.begin(); i != created.end(); i++) {
+            if ((*i).get() == bridge.get()) {
+                created.erase(i);
+                break;
+            }
+        }
+        for (Bridges::iterator i = active.begin(); i != active.end(); i++) {
+            if ((*i).get() == bridge.get()) {
+                cancellations.push_back(bridge);
+                bridge->closed();
+                active.erase(i);
+                break;
+            }
+        }
+    }
+    if (!cancellations.empty()) {
+        connection->requestIOProcessing (boost::bind(&Link::ioThreadProcessing, this));
+    }
+}
+
+void Link::ioThreadProcessing()
+{
+    Mutex::ScopedLock mutex(lock);
+
+    if (state != STATE_OPERATIONAL)
+        return;
+    QPID_LOG(debug, "Link::ioThreadProcessing()");
+
+    //process any pending creates and/or cancellations
+    if (!created.empty()) {
+        for (Bridges::iterator i = created.begin(); i != created.end(); ++i) {
+            active.push_back(*i);
+            (*i)->create(*connection);
+        }
+        created.clear();
+    }
+    if (!cancellations.empty()) {
+        for (Bridges::iterator i = cancellations.begin(); i != cancellations.end(); ++i) {
+            (*i)->cancel(*connection);
+        }
+        cancellations.clear();
+    }
+}
+
+void Link::setConnection(Connection* c)
+{
+    Mutex::ScopedLock mutex(lock);
+    connection = c;
+    updateUrls = true;
+}
+
+void Link::maintenanceVisit ()
+{
+    Mutex::ScopedLock mutex(lock);
+
+    if (connection && updateUrls) {
+        urls.reset(connection->getKnownHosts());
+        QPID_LOG(debug, "Known hosts for peer of inter-broker link: " << urls);
+        updateUrls = false;
+    }
+
+    if (state == STATE_WAITING)
+    {
+        visitCount++;
+        if (visitCount >= currentInterval)
+        {
+            visitCount = 0;
+            //switch host and port to next in url list if possible
+            if (!tryFailover()) {
+                currentInterval *= 2;
+                if (currentInterval > MAX_INTERVAL)
+                    currentInterval = MAX_INTERVAL;
+                startConnectionLH();
+            }
+        }
+    }
+    else if (state == STATE_OPERATIONAL && (!created.empty() || !cancellations.empty()) && connection != 0)
+        connection->requestIOProcessing (boost::bind(&Link::ioThreadProcessing, this));
+}
+
+void Link::reconnect(const qpid::Address& a)
+{
+    Mutex::ScopedLock mutex(lock);
+    host = a.host;
+    port = a.port;
+    transport = a.protocol;
+    startConnectionLH();
+    if (!hideManagement()) {
+        stringstream errorString;
+        errorString << "Failed over to " << a;
+        mgmtObject->set_lastError(errorString.str());
+    }
+}
+
+bool Link::tryFailover()
+{
+    Address next;
+    if (urls.next(next) &&
+        (next.host != host || next.port != port || next.protocol != transport)) {
+        links->changeAddress(Address(transport, host, port), next);
+        QPID_LOG(debug, "Link failing over to " << host << ":" << port);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+// Management updates for a linke are inconsistent in a cluster, so they are
+// suppressed.
+bool Link::hideManagement() const {
+    return !mgmtObject || ( broker && broker->isInCluster());
+}
+
+uint Link::nextChannel()
+{
+    Mutex::ScopedLock mutex(lock);
+
+    return channelCounter++;
+}
+
+void Link::notifyConnectionForced(const string text)
+{
+    Mutex::ScopedLock mutex(lock);
+
+    setStateLH(STATE_FAILED);
+    if (!hideManagement())
+        mgmtObject->set_lastError(text);
+}
+
+void Link::setPersistenceId(uint64_t id) const
+{
+    persistenceId = id;
+}
+
+const string& Link::getName() const
+{
+    return host;
+}
+
+Link::shared_ptr Link::decode(LinkRegistry& links, Buffer& buffer)
+{
+    string   host;
+    uint16_t port;
+    string   transport;
+    string   authMechanism;
+    string   username;
+    string   password;
+
+    buffer.getShortString(host);
+    port = buffer.getShort();
+    buffer.getShortString(transport);
+    bool durable(buffer.getOctet());
+    buffer.getShortString(authMechanism);
+    buffer.getShortString(username);
+    buffer.getShortString(password);
+
+    return links.declare(host, port, transport, durable, authMechanism, username, password).first;
+}
+
+void Link::encode(Buffer& buffer) const
+{
+    buffer.putShortString(string("link"));
+    buffer.putShortString(host);
+    buffer.putShort(port);
+    buffer.putShortString(transport);
+    buffer.putOctet(durable ? 1 : 0);
+    buffer.putShortString(authMechanism);
+    buffer.putShortString(username);
+    buffer.putShortString(password);
+}
+
+uint32_t Link::encodedSize() const
+{
+    return host.size() + 1 // short-string (host)
+        + 5                // short-string ("link")
+        + 2                // port
+        + transport.size() + 1 // short-string(transport)
+        + 1                // durable
+        + authMechanism.size() + 1
+        + username.size() + 1
+        + password.size() + 1;
+}
+
+ManagementObject* Link::GetManagementObject (void) const
+{
+    return (ManagementObject*) mgmtObject;
+}
+
+Manageable::status_t Link::ManagementMethod (uint32_t op, Args& args, string& text)
+{
+    switch (op)
+    {
+    case _qmf::Link::METHOD_CLOSE :
+        if (!closing) {
+	    closing = true;
+	    if (state != STATE_CONNECTING && connection) {
+                //connection can only be closed on the connections own IO processing thread
+                connection->requestIOProcessing(boost::bind(&Link::destroy, this));
+	    }
+        }
+        return Manageable::STATUS_OK;
+
+    case _qmf::Link::METHOD_BRIDGE :
+        _qmf::ArgsLinkBridge& iargs = (_qmf::ArgsLinkBridge&) args;
+        QPID_LOG(debug, "Link::bridge() request received");
+
+        // Durable bridges are only valid on durable links
+        if (iargs.i_durable && !durable) {
+            text = "Can't create a durable route on a non-durable link";
+            return Manageable::STATUS_USER;
+        }
+
+        if (iargs.i_dynamic) {
+            Exchange::shared_ptr exchange = getBroker()->getExchanges().get(iargs.i_src);
+            if (exchange.get() == 0) {
+                text = "Exchange not found";
+                return Manageable::STATUS_USER;
+            }
+            if (!exchange->supportsDynamicBinding()) {
+                text = "Exchange type does not support dynamic routing";
+                return Manageable::STATUS_USER;
+            }
+        }
+
+        std::pair<Bridge::shared_ptr, bool> result =
+            links->declare (host, port, iargs.i_durable, iargs.i_src,
+                            iargs.i_dest, iargs.i_key, iargs.i_srcIsQueue,
+                            iargs.i_srcIsLocal, iargs.i_tag, iargs.i_excludes,
+                            iargs.i_dynamic, iargs.i_sync);
+
+        if (result.second && iargs.i_durable)
+            store->create(*result.first);
+
+        return Manageable::STATUS_OK;
+    }
+
+    return Manageable::STATUS_UNKNOWN_METHOD;
+}
+
+void Link::setPassive(bool passive)
+{
+    Mutex::ScopedLock mutex(lock);
+    if (passive) {
+        setStateLH(STATE_PASSIVE);
+    } else {
+        if (state == STATE_PASSIVE) {
+            setStateLH(STATE_WAITING);
+        } else {
+            QPID_LOG(warning, "Ignoring attempt to activate non-passive link");
+        }
+    }
+}
diff --git a/cpp/src/qpid/broker/Link.h b/qpid/cpp/src/qpid/broker/Link.h
index 4badd8b3a1..4badd8b3a1 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 e9885f5462..e9885f5462 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 4c97e4f9d8..4c97e4f9d8 100644
--- a/cpp/src/qpid/broker/LinkRegistry.h
+++ b/qpid/cpp/src/qpid/broker/LinkRegistry.h
diff --git a/cpp/src/qpid/broker/Message.cpp b/qpid/cpp/src/qpid/broker/Message.cpp
index 763dc55e40..763dc55e40 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 d85ee434db..d85ee434db 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 a6d605c296..a6d605c296 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 b99b8efee6..b99b8efee6 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 24b8f6f895..24b8f6f895 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 0e1aef2986..0e1aef2986 100644
--- a/cpp/src/qpid/broker/MessageDeque.h
+++ b/qpid/cpp/src/qpid/broker/MessageDeque.h
diff --git a/cpp/src/qpid/broker/MessageMap.cpp b/qpid/cpp/src/qpid/broker/MessageMap.cpp
index 39e23df533..39e23df533 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 1128a1d54a..1128a1d54a 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 ab0225ef6b..ab0225ef6b 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 cd9fd4c933..cd9fd4c933 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 56b5a3c1ae..56b5a3c1ae 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 0d75417640..0d75417640 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 6ea25c9797..6ea25c9797 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 43f600eaf1..43f600eaf1 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 c6f402662e..c6f402662e 100644
--- a/cpp/src/qpid/broker/NullMessageStore.h
+++ b/qpid/cpp/src/qpid/broker/NullMessageStore.h
diff --git a/cpp/src/qpid/broker/OwnershipToken.h b/qpid/cpp/src/qpid/broker/OwnershipToken.h
index effd2f5b3c..effd2f5b3c 100644
--- a/cpp/src/qpid/broker/OwnershipToken.h
+++ b/qpid/cpp/src/qpid/broker/OwnershipToken.h
diff --git a/cpp/src/qpid/broker/Persistable.h b/qpid/cpp/src/qpid/broker/Persistable.h
index 36499c7a1a..36499c7a1a 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 7ba28eb293..7ba28eb293 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 d29c2c45b4..d29c2c45b4 100644
--- a/cpp/src/qpid/broker/PersistableMessage.h
+++ b/qpid/cpp/src/qpid/broker/PersistableMessage.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 e07e73d323..e07e73d323 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 4bf9d26a9d..4bf9d26a9d 100644
--- a/cpp/src/qpid/broker/PriorityQueue.h
+++ b/qpid/cpp/src/qpid/broker/PriorityQueue.h
diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
new file mode 100644
index 0000000000..789ad581f5
--- /dev/null
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -0,0 +1,1225 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/broker/Broker.h"
+#include "qpid/broker/Queue.h"
+#include "qpid/broker/QueueEvents.h"
+#include "qpid/broker/Exchange.h"
+#include "qpid/broker/Fairshare.h"
+#include "qpid/broker/DeliverableMessage.h"
+#include "qpid/broker/LegacyLVQ.h"
+#include "qpid/broker/MessageDeque.h"
+#include "qpid/broker/MessageMap.h"
+#include "qpid/broker/MessageStore.h"
+#include "qpid/broker/NullMessageStore.h"
+#include "qpid/broker/QueueRegistry.h"
+#include "qpid/broker/QueueFlowLimit.h"
+#include "qpid/broker/ThresholdAlerts.h"
+
+#include "qpid/StringUtils.h"
+#include "qpid/log/Statement.h"
+#include "qpid/management/ManagementAgent.h"
+#include "qpid/framing/reply_exceptions.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/sys/ClusterSafe.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/Time.h"
+#include "qmf/org/apache/qpid/broker/ArgsQueuePurge.h"
+#include "qmf/org/apache/qpid/broker/ArgsQueueReroute.h"
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+#include <boost/bind.hpp>
+#include <boost/intrusive_ptr.hpp>
+
+
+using namespace qpid::broker;
+using namespace qpid::sys;
+using namespace qpid::framing;
+using qpid::management::ManagementAgent;
+using qpid::management::ManagementObject;
+using qpid::management::Manageable;
+using qpid::management::Args;
+using std::for_each;
+using std::mem_fun;
+namespace _qmf = qmf::org::apache::qpid::broker;
+
+
+namespace 
+{
+const std::string qpidMaxSize("qpid.max_size");
+const std::string qpidMaxCount("qpid.max_count");
+const std::string qpidNoLocal("no-local");
+const std::string qpidTraceIdentity("qpid.trace.id");
+const std::string qpidTraceExclude("qpid.trace.exclude");
+const std::string qpidLastValueQueueKey("qpid.last_value_queue_key");
+const std::string qpidLastValueQueue("qpid.last_value_queue");
+const std::string qpidLastValueQueueNoBrowse("qpid.last_value_queue_no_browse");
+const std::string qpidPersistLastNode("qpid.persist_last_node");
+const std::string qpidVQMatchProperty("qpid.LVQ_key");
+const std::string qpidQueueEventGeneration("qpid.queue_event_generation");
+const std::string qpidAutoDeleteTimeout("qpid.auto_delete_timeout");
+//following feature is not ready for general use as it doesn't handle
+//the case where a message is enqueued on more than one queue well enough:
+const std::string qpidInsertSequenceNumbers("qpid.insert_sequence_numbers");
+
+const int ENQUEUE_ONLY=1;
+const int ENQUEUE_AND_DEQUEUE=2;
+}
+
+Queue::Queue(const string& _name, bool _autodelete, 
+             MessageStore* const _store,
+             const OwnershipToken* const _owner,
+             Manageable* parent,
+             Broker* b) :
+
+    name(_name), 
+    autodelete(_autodelete),
+    store(_store),
+    owner(_owner), 
+    consumerCount(0),
+    exclusive(0),
+    noLocal(false),
+    persistLastNode(false),
+    inLastNodeFailure(false),
+    messages(new MessageDeque()),
+    persistenceId(0),
+    policyExceeded(false),
+    mgmtObject(0),
+    eventMode(0),
+    insertSeqNo(0),
+    broker(b),
+    deleted(false),
+    barrier(*this),
+    autoDeleteTimeout(0)
+{
+    if (parent != 0 && broker != 0) {
+        ManagementAgent* agent = broker->getManagementAgent();
+
+        if (agent != 0) {
+            mgmtObject = new _qmf::Queue(agent, this, parent, _name, _store != 0, _autodelete, _owner != 0);
+            agent->addObject(mgmtObject, 0, store != 0);
+        }
+    }
+}
+
+Queue::~Queue()
+{
+    if (mgmtObject != 0)
+        mgmtObject->resourceDestroy();
+}
+
+bool isLocalTo(const OwnershipToken* token, boost::intrusive_ptr<Message>& msg)
+{
+    return token && token->isLocal(msg->getPublisher());
+}
+
+bool Queue::isLocal(boost::intrusive_ptr<Message>& msg)
+{
+    //message is considered local if it was published on the same
+    //connection as that of the session which declared this queue
+    //exclusive (owner) or which has an exclusive subscription
+    //(exclusive)
+    return noLocal && (isLocalTo(owner, msg) || isLocalTo(exclusive, msg));
+}
+
+bool Queue::isExcluded(boost::intrusive_ptr<Message>& msg)
+{
+    return traceExclude.size() && msg->isExcluded(traceExclude);
+}
+
+void Queue::deliver(boost::intrusive_ptr<Message> msg){
+    // Check for deferred delivery in a cluster.
+    if (broker && broker->deferDelivery(name, msg))
+        return;
+    if (msg->isImmediate() && getConsumerCount() == 0) {
+        if (alternateExchange) {
+            DeliverableMessage deliverable(msg);
+            alternateExchange->route(deliverable, msg->getRoutingKey(), msg->getApplicationHeaders());
+        }
+    } else if (isLocal(msg)) {
+        //drop message
+        QPID_LOG(info, "Dropping 'local' message from " << getName());
+    } else if (isExcluded(msg)) {
+        //drop message
+        QPID_LOG(info, "Dropping excluded message from " << getName());
+    } else {
+        enqueue(0, msg);
+        push(msg);
+        QPID_LOG(debug, "Message " << msg << " enqueued on " << name);
+    }
+}
+
+void Queue::recoverPrepared(boost::intrusive_ptr<Message>& msg)
+{
+    if (policy.get()) policy->recoverEnqueued(msg);
+}
+
+void Queue::recover(boost::intrusive_ptr<Message>& msg){
+    if (policy.get()) policy->recoverEnqueued(msg);
+
+    push(msg, true);
+    if (store){ 
+        // setup synclist for recovered messages, so they don't get re-stored on lastNodeFailure
+        msg->addToSyncList(shared_from_this(), store); 
+    }
+
+    if (store && (!msg->isContentLoaded() || msg->checkContentReleasable())) {
+        //content has not been loaded, need to ensure that lazy loading mode is set:
+        //TODO: find a nicer way to do this
+        msg->releaseContent(store);
+        // NOTE: The log message in this section are used for flow-to-disk testing (which checks the log for the
+        // presence of this message). Do not change this without also checking these tests.
+        QPID_LOG(debug, "Message id=\"" << msg->getProperties<MessageProperties>()->getMessageId() << "\"; pid=0x" <<
+                        std::hex << msg->getPersistenceId() << std::dec << ": Content released after recovery");
+    }
+}
+
+void Queue::process(boost::intrusive_ptr<Message>& msg){
+    push(msg);
+    if (mgmtObject != 0){
+        mgmtObject->inc_msgTxnEnqueues ();
+        mgmtObject->inc_byteTxnEnqueues (msg->contentSize ());
+    }
+}
+
+void Queue::requeue(const QueuedMessage& msg){
+    assertClusterSafe();
+    QueueListeners::NotificationSet copy;
+    {    
+        Mutex::ScopedLock locker(messageLock);
+        if (!isEnqueued(msg)) return;
+        messages->reinsert(msg);
+        listeners.populate(copy);
+
+        // for persistLastNode - don't force a message twice to disk, but force it if no force before 
+        if(inLastNodeFailure && persistLastNode && !msg.payload->isStoredOnQueue(shared_from_this())) {
+            msg.payload->forcePersistent();
+            if (msg.payload->isForcedPersistent() ){
+                boost::intrusive_ptr<Message> payload = msg.payload;
+            	enqueue(0, payload);
+            }
+        }
+    }
+    copy.notify();
+}
+
+bool Queue::acquireMessageAt(const SequenceNumber& position, QueuedMessage& message) 
+{
+    Mutex::ScopedLock locker(messageLock);
+    assertClusterSafe();
+    QPID_LOG(debug, "Attempting to acquire message at " << position);
+    if (messages->remove(position, message)) {
+        QPID_LOG(debug, "Acquired message at " << position << " from " << name);
+        return true;
+    } else {
+        QPID_LOG(debug, "Could not acquire message at " << position << " from " << name << "; no message at that position");
+        return false;
+    }
+}
+
+bool Queue::acquire(const QueuedMessage& msg) {
+    QueuedMessage copy = msg;
+    return acquireMessageAt(msg.position, copy);
+}
+
+void Queue::notifyListener()
+{
+    assertClusterSafe();
+    QueueListeners::NotificationSet set;
+    {
+        Mutex::ScopedLock locker(messageLock);
+        if (messages->size()) {
+            listeners.populate(set);
+        }
+    }
+    set.notify();
+}
+
+bool Queue::getNextMessage(QueuedMessage& m, Consumer::shared_ptr c)
+{
+    checkNotDeleted();
+    if (c->preAcquires()) {
+        switch (consumeNextMessage(m, c)) {
+          case CONSUMED:
+            return true;
+          case CANT_CONSUME:
+            notifyListener();//let someone else try
+          case NO_MESSAGES:
+          default:
+            return false;
+        }        
+    } else {
+        return browseNextMessage(m, c);
+    }
+}
+
+Queue::ConsumeCode Queue::consumeNextMessage(QueuedMessage& m, Consumer::shared_ptr c)
+{
+    while (true) {
+        Mutex::ScopedLock locker(messageLock);
+        if (messages->empty()) { 
+            QPID_LOG(debug, "No messages to dispatch on queue '" << name << "'");
+            listeners.addListener(c);
+            return NO_MESSAGES;
+        } else {
+            QueuedMessage msg = messages->front();
+            if (msg.payload->hasExpired()) {
+                QPID_LOG(debug, "Message expired from queue '" << name << "'");
+                popAndDequeue();
+                continue;
+            }
+
+            if (c->filter(msg.payload)) {
+                if (c->accept(msg.payload)) {            
+                    m = msg;
+                    pop();
+                    return CONSUMED;
+                } else {
+                    //message(s) are available but consumer hasn't got enough credit
+                    QPID_LOG(debug, "Consumer can't currently accept message from '" << name << "'");
+                    return CANT_CONSUME;
+                }
+            } else {
+                //consumer will never want this message
+                QPID_LOG(debug, "Consumer doesn't want message from '" << name << "'");
+                return CANT_CONSUME;
+            } 
+        }
+    }
+}
+
+
+bool Queue::browseNextMessage(QueuedMessage& m, Consumer::shared_ptr c)
+{
+    QueuedMessage msg(this);
+    while (seek(msg, c)) {
+        if (c->filter(msg.payload) && !msg.payload->hasExpired()) {
+            if (c->accept(msg.payload)) {
+                //consumer wants the message
+                c->position = msg.position;
+                m = msg;
+                return true;
+            } else {
+                //browser hasn't got enough credit for the message
+                QPID_LOG(debug, "Browser can't currently accept message from '" << name << "'");
+                return false;
+            }
+        } else {
+            //consumer will never want this message, continue seeking
+            c->position = msg.position;
+            QPID_LOG(debug, "Browser skipping message from '" << name << "'");
+        }
+    }
+    return false;
+}
+
+void Queue::removeListener(Consumer::shared_ptr c)
+{
+    QueueListeners::NotificationSet set;
+    {
+        Mutex::ScopedLock locker(messageLock);
+        listeners.removeListener(c);
+        if (messages->size()) {
+            listeners.populate(set);
+        }
+    }
+    set.notify();
+}
+
+bool Queue::dispatch(Consumer::shared_ptr c)
+{
+    QueuedMessage msg(this);
+    if (getNextMessage(msg, c)) {
+        c->deliver(msg);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+// Find the next message 
+bool Queue::seek(QueuedMessage& msg, Consumer::shared_ptr c) {
+    Mutex::ScopedLock locker(messageLock);
+    if (messages->next(c->position, msg)) {
+        return true;
+    } else {
+        listeners.addListener(c);
+        return false;
+    }
+}
+
+QueuedMessage Queue::find(SequenceNumber pos) const {
+
+    Mutex::ScopedLock locker(messageLock);
+    QueuedMessage msg;
+    messages->find(pos, msg);
+    return msg;
+}
+
+void Queue::consume(Consumer::shared_ptr c, bool requestExclusive){
+    assertClusterSafe();
+    Mutex::ScopedLock locker(consumerLock);
+    if(exclusive) {
+        throw ResourceLockedException(
+            QPID_MSG("Queue " << getName() << " has an exclusive consumer. No more consumers allowed."));
+    } else if(requestExclusive) {
+        if(consumerCount) {
+            throw ResourceLockedException(
+                QPID_MSG("Queue " << getName() << " already has consumers. Exclusive access denied."));
+        } else {
+            exclusive = c->getSession();
+        }
+    }
+    consumerCount++;
+    if (mgmtObject != 0)
+        mgmtObject->inc_consumerCount ();
+    //reset auto deletion timer if necessary
+    if (autoDeleteTimeout && autoDeleteTask) {
+        autoDeleteTask->cancel();
+    }
+}
+
+void Queue::cancel(Consumer::shared_ptr c){
+    removeListener(c);
+    Mutex::ScopedLock locker(consumerLock);
+    consumerCount--;
+    if(exclusive) exclusive = 0;
+    if (mgmtObject != 0)
+        mgmtObject->dec_consumerCount ();
+}
+
+QueuedMessage Queue::get(){
+    Mutex::ScopedLock locker(messageLock);
+    QueuedMessage msg(this);
+    messages->pop(msg);
+    return msg;
+}
+
+bool collect_if_expired(std::deque<QueuedMessage>& expired, QueuedMessage& message)
+{
+    if (message.payload->hasExpired()) {
+        expired.push_back(message);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void Queue::purgeExpired()
+{
+    //As expired messages are discarded during dequeue also, only
+    //bother explicitly expiring if the rate of dequeues since last
+    //attempt is less than one per second.  
+
+    if (dequeueTracker.sampleRatePerSecond() < 1) {
+        std::deque<QueuedMessage> expired;
+        {
+            Mutex::ScopedLock locker(messageLock);
+            messages->removeIf(boost::bind(&collect_if_expired, boost::ref(expired), _1));
+        }
+        for_each(expired.begin(), expired.end(), boost::bind(&Queue::dequeue, this, (TransactionContext*) 0, _1));
+    }
+}
+
+/**
+ * purge - for purging all or some messages on a queue
+ *         depending on the purge_request
+ *
+ * purge_request == 0 then purge all messages
+ *               == N then purge N messages from queue
+ * Sometimes purge_request == 1 to unblock the top of queue
+ *
+ * The dest exchange may be supplied to re-route messages through the exchange.
+ * It is safe to re-route messages such that they arrive back on the same queue,
+ * even if the queue is ordered by priority.
+ */
+uint32_t Queue::purge(const uint32_t purge_request, boost::shared_ptr<Exchange> dest)
+{
+    Mutex::ScopedLock locker(messageLock);
+    uint32_t purge_count = purge_request; // only comes into play if  >0 
+    std::deque<DeliverableMessage> rerouteQueue;
+
+    uint32_t count = 0;
+    // Either purge them all or just the some (purge_count) while the queue isn't empty.
+    while((!purge_request || purge_count--) && !messages->empty()) {
+        if (dest.get()) {
+            //
+            // If there is a destination exchange, stage the messages onto a reroute queue
+            // so they don't wind up getting purged more than once.
+            //
+            DeliverableMessage msg(messages->front().payload);
+            rerouteQueue.push_back(msg);
+        }
+        popAndDequeue();
+        count++;
+    }
+
+    //
+    // Re-route purged messages into the destination exchange.  Note that there's no need
+    // to test dest.get() here because if it is NULL, the rerouteQueue will be empty.
+    //
+    while (!rerouteQueue.empty()) {
+        DeliverableMessage msg(rerouteQueue.front());
+        rerouteQueue.pop_front();
+        dest->routeWithAlternate(msg);
+    }
+
+    return count;
+}
+
+uint32_t Queue::move(const Queue::shared_ptr destq, uint32_t qty) {
+    Mutex::ScopedLock locker(messageLock);
+    uint32_t move_count = qty; // only comes into play if  qty >0 
+    uint32_t count = 0; // count how many were moved for returning
+
+    while((!qty || move_count--) && !messages->empty()) {
+        QueuedMessage qmsg = messages->front();
+        boost::intrusive_ptr<Message> msg = qmsg.payload;
+        destq->deliver(msg); // deliver message to the destination queue
+        pop();
+        dequeue(0, qmsg);
+        count++;
+    }
+    return count;
+}
+
+void Queue::pop()
+{
+    assertClusterSafe();
+    messages->pop();
+    ++dequeueTracker;
+}
+
+void Queue::push(boost::intrusive_ptr<Message>& msg, bool isRecovery){
+    assertClusterSafe();
+    QueueListeners::NotificationSet copy;
+    QueuedMessage removed;
+    bool dequeueRequired = false;
+    {
+        Mutex::ScopedLock locker(messageLock);   
+        QueuedMessage qm(this, msg, ++sequence);
+        if (insertSeqNo) msg->getOrInsertHeaders().setInt64(seqNoKey, sequence);
+         
+        dequeueRequired = messages->push(qm, removed);
+        listeners.populate(copy);
+        enqueued(qm);
+    }
+    copy.notify();
+    if (dequeueRequired) {
+        if (isRecovery) {
+            //can't issue new requests for the store until
+            //recovery is complete
+            pendingDequeues.push_back(removed);
+        } else {
+            dequeue(0, removed);
+        }
+    }
+}
+
+void isEnqueueComplete(uint32_t* result, const QueuedMessage& message)
+{
+    if (message.payload->isIngressComplete()) (*result)++;
+}
+
+/** function only provided for unit tests, or code not in critical message path */
+uint32_t Queue::getEnqueueCompleteMessageCount() const
+{
+    Mutex::ScopedLock locker(messageLock);
+    uint32_t count = 0;
+    messages->foreach(boost::bind(&isEnqueueComplete, &count, _1));
+    return count;
+}
+
+uint32_t Queue::getMessageCount() const
+{
+    Mutex::ScopedLock locker(messageLock);
+    return messages->size();
+}
+
+uint32_t Queue::getConsumerCount() const
+{
+    Mutex::ScopedLock locker(consumerLock);
+    return consumerCount;
+}
+
+bool Queue::canAutoDelete() const
+{
+    Mutex::ScopedLock locker(consumerLock);
+    return autodelete && !consumerCount && !owner;
+}
+
+void Queue::clearLastNodeFailure()
+{
+    inLastNodeFailure = false;
+}
+
+void Queue::forcePersistent(QueuedMessage& message)
+{
+    if(!message.payload->isStoredOnQueue(shared_from_this())) {
+        message.payload->forcePersistent();
+        if (message.payload->isForcedPersistent() ){
+            enqueue(0, message.payload);
+        }
+    }
+}
+
+void Queue::setLastNodeFailure()
+{
+    if (persistLastNode){
+        Mutex::ScopedLock locker(messageLock);
+        try {
+            messages->foreach(boost::bind(&Queue::forcePersistent, this, _1));
+        } catch (const std::exception& e) {
+            // Could not go into last node standing (for example journal not large enough)
+            QPID_LOG(error, "Unable to fail to last node standing for queue: " << name << " : " << e.what());
+        }
+        inLastNodeFailure = true;
+    }
+}
+
+
+// return true if store exists, 
+bool Queue::enqueue(TransactionContext* ctxt, boost::intrusive_ptr<Message>& msg, bool suppressPolicyCheck)
+{
+    ScopedUse u(barrier);
+    if (!u.acquired) return false;
+
+    if (policy.get() && !suppressPolicyCheck) {
+        std::deque<QueuedMessage> dequeues;
+        {
+            Mutex::ScopedLock locker(messageLock);
+            policy->tryEnqueue(msg);
+            policy->getPendingDequeues(dequeues);
+        }
+        //depending on policy, may have some dequeues that need to performed without holding the lock
+        for_each(dequeues.begin(), dequeues.end(), boost::bind(&Queue::dequeue, this, (TransactionContext*) 0, _1));        
+    }
+
+    if (inLastNodeFailure && persistLastNode){
+        msg->forcePersistent();
+    }
+       
+    if (traceId.size()) {
+        //copy on write: take deep copy of message before modifying it
+        //as the frames may already be available for delivery on other
+        //threads
+        boost::intrusive_ptr<Message> copy(new Message(*msg));
+        msg = copy;
+        msg->addTraceId(traceId);
+    }
+
+    if ((msg->isPersistent() || msg->checkContentReleasable()) && store) {
+        // mark the message as being enqueued - the store MUST CALL msg->enqueueComplete()
+        // when it considers the message stored.
+        msg->enqueueAsync(shared_from_this(), store);
+        boost::intrusive_ptr<PersistableMessage> pmsg = boost::static_pointer_cast<PersistableMessage>(msg);
+        store->enqueue(ctxt, pmsg, *this);
+        return true;
+    }
+    if (!store) {
+        //Messages enqueued on a transient queue should be prevented
+        //from having their content released as it may not be
+        //recoverable by these queue for delivery
+        msg->blockContentRelease();
+    }
+    return false;
+}
+
+void Queue::enqueueAborted(boost::intrusive_ptr<Message> msg)
+{
+    Mutex::ScopedLock locker(messageLock);
+    if (policy.get()) policy->enqueueAborted(msg);       
+}
+
+// return true if store exists, 
+bool Queue::dequeue(TransactionContext* ctxt, const QueuedMessage& msg)
+{
+    ScopedUse u(barrier);
+    if (!u.acquired) return false;
+
+    {
+        Mutex::ScopedLock locker(messageLock);
+        if (!isEnqueued(msg)) return false;
+        if (!ctxt) { 
+            dequeued(msg);
+        }
+    }
+    // This check prevents messages which have been forced persistent on one queue from dequeuing
+    // from another on which no forcing has taken place and thus causing a store error.
+    bool fp = msg.payload->isForcedPersistent();
+    if (!fp || (fp && msg.payload->isStoredOnQueue(shared_from_this()))) {
+        if ((msg.payload->isPersistent() || msg.payload->checkContentReleasable()) && store) {
+            msg.payload->dequeueAsync(shared_from_this(), store); //increment to async counter -- for message sent to more than one queue
+            boost::intrusive_ptr<PersistableMessage> pmsg = boost::static_pointer_cast<PersistableMessage>(msg.payload);
+            store->dequeue(ctxt, pmsg, *this);
+            return true;
+        }
+    }
+    return false;
+}
+
+void Queue::dequeueCommitted(const QueuedMessage& msg)
+{
+    Mutex::ScopedLock locker(messageLock);
+    dequeued(msg);    
+    if (mgmtObject != 0) {
+        mgmtObject->inc_msgTxnDequeues();
+        mgmtObject->inc_byteTxnDequeues(msg.payload->contentSize());
+    }
+}
+
+/**
+ * Removes a message from the in-memory delivery queue as well
+ * dequeing it from the logical (and persistent if applicable) queue
+ */
+void Queue::popAndDequeue()
+{
+    QueuedMessage msg = messages->front();
+    pop();
+    dequeue(0, msg);
+}
+
+/**
+ * Updates policy and management when a message has been dequeued,
+ * expects messageLock to be held
+ */
+void Queue::dequeued(const QueuedMessage& msg)
+{
+    if (policy.get()) policy->dequeued(msg);
+    mgntDeqStats(msg.payload);
+    for (Observers::const_iterator i = observers.begin(); i != observers.end(); ++i) {
+        try{
+            (*i)->dequeued(msg);
+        } catch (const std::exception& e) {
+            QPID_LOG(warning, "Exception on notification of dequeue for queue " << getName() << ": " << e.what());
+        }
+    }
+}
+
+
+void Queue::create(const FieldTable& _settings)
+{
+    settings = _settings;
+    if (store) {
+        store->create(*this, _settings);
+    }
+    configureImpl(_settings);
+}
+
+
+int getIntegerSetting(const qpid::framing::FieldTable& settings, const std::string& key)
+{
+    qpid::framing::FieldTable::ValuePtr v = settings.get(key);
+    if (!v) {
+        return 0;
+    } else if (v->convertsTo<int>()) {
+        return v->get<int>();
+    } else if (v->convertsTo<std::string>()){
+        std::string s = v->get<std::string>();
+        try { 
+            return boost::lexical_cast<int>(s); 
+        } catch(const boost::bad_lexical_cast&) {
+            QPID_LOG(warning, "Ignoring invalid integer value for " << key << ": " << s);
+            return 0;
+        }
+    } else {
+        QPID_LOG(warning, "Ignoring invalid integer value for " << key << ": " << *v);
+        return 0;
+    }
+}
+
+void Queue::configure(const FieldTable& _settings)
+{
+    settings = _settings;
+    configureImpl(settings);
+}
+
+void Queue::configureImpl(const FieldTable& _settings)
+{
+    eventMode = _settings.getAsInt(qpidQueueEventGeneration);
+    if (eventMode && broker) {
+        broker->getQueueEvents().observe(*this, eventMode == ENQUEUE_ONLY);
+    }
+
+    if (QueuePolicy::getType(_settings) == QueuePolicy::FLOW_TO_DISK && 
+        (!store || NullMessageStore::isNullStore(store) || (broker && !(broker->getQueueEvents().isSync())) )) {
+        if ( NullMessageStore::isNullStore(store)) {
+            QPID_LOG(warning, "Flow to disk not valid for non-persisted queue:" << getName());
+        } else if (broker && !(broker->getQueueEvents().isSync()) ) {
+            QPID_LOG(warning, "Flow to disk not valid with async Queue Events:" << getName());
+        }
+        FieldTable copy(_settings);
+        copy.erase(QueuePolicy::typeKey);
+        setPolicy(QueuePolicy::createQueuePolicy(getName(), copy));
+    } else {
+        setPolicy(QueuePolicy::createQueuePolicy(getName(), _settings));
+    }
+    if (broker && broker->getManagementAgent()) {
+        ThresholdAlerts::observe(*this, *(broker->getManagementAgent()), _settings, broker->getOptions().queueThresholdEventRatio);
+    }
+
+    //set this regardless of owner to allow use of no-local with exclusive consumers also
+    noLocal = _settings.get(qpidNoLocal);
+    QPID_LOG(debug, "Configured queue " << getName() << " with no-local=" << noLocal);
+
+    std::string lvqKey = _settings.getAsString(qpidLastValueQueueKey);
+    if (lvqKey.size()) {
+        QPID_LOG(debug, "Configured queue " <<  getName() << " as Last Value Queue with key " << lvqKey);
+        messages = std::auto_ptr<Messages>(new MessageMap(lvqKey));
+    } else if (_settings.get(qpidLastValueQueueNoBrowse)) {
+        QPID_LOG(debug, "Configured queue " <<  getName() << " as Legacy Last Value Queue with 'no-browse' on");
+        messages = LegacyLVQ::updateOrReplace(messages, qpidVQMatchProperty, true, broker);
+    } else if (_settings.get(qpidLastValueQueue)) {
+        QPID_LOG(debug, "Configured queue " <<  getName() << " as Legacy Last Value Queue");
+        messages = LegacyLVQ::updateOrReplace(messages, qpidVQMatchProperty, false, broker);
+    } else {
+        std::auto_ptr<Messages> m = Fairshare::create(_settings);
+        if (m.get()) {
+            messages = m;
+            QPID_LOG(debug, "Configured queue " <<  getName() << " as priority queue.");
+        }
+    }
+    
+    persistLastNode= _settings.get(qpidPersistLastNode);
+    if (persistLastNode) QPID_LOG(debug, "Configured queue to Persist data if cluster fails to one node for: " << getName());
+
+    traceId = _settings.getAsString(qpidTraceIdentity);
+    std::string excludeList = _settings.getAsString(qpidTraceExclude);
+    if (excludeList.size()) {
+        split(traceExclude, excludeList, ", ");
+    }
+    QPID_LOG(debug, "Configured queue " << getName() << " with qpid.trace.id='" << traceId 
+             << "' and qpid.trace.exclude='"<< excludeList << "' i.e. " << traceExclude.size() << " elements");
+
+    FieldTable::ValuePtr p =_settings.get(qpidInsertSequenceNumbers);
+    if (p && p->convertsTo<std::string>()) insertSequenceNumbers(p->get<std::string>());
+
+    autoDeleteTimeout = getIntegerSetting(_settings, qpidAutoDeleteTimeout);
+    if (autoDeleteTimeout) 
+        QPID_LOG(debug, "Configured queue " << getName() << " with qpid.auto_delete_timeout=" << autoDeleteTimeout); 
+
+    if (mgmtObject != 0) {
+        mgmtObject->set_arguments(ManagementAgent::toMap(_settings));
+    }
+
+    QueueFlowLimit::observe(*this, _settings);
+}
+
+void Queue::destroyed()
+{
+    unbind(broker->getExchanges());
+    if (alternateExchange.get()) {
+        Mutex::ScopedLock locker(messageLock);
+        while(!messages->empty()){
+            DeliverableMessage msg(messages->front().payload);
+            alternateExchange->routeWithAlternate(msg);
+            popAndDequeue();
+        }
+        alternateExchange->decAlternateUsers();
+    }
+
+    if (store) {
+        barrier.destroy();
+        store->flush(*this);
+        store->destroy(*this);
+        store = 0;//ensure we make no more calls to the store for this queue
+    }
+    if (autoDeleteTask) autoDeleteTask = boost::intrusive_ptr<TimerTask>();
+    notifyDeleted();
+}
+
+void Queue::notifyDeleted()
+{
+    QueueListeners::ListenerSet set;
+    {
+        Mutex::ScopedLock locker(messageLock);
+        listeners.snapshot(set);
+        deleted = true;
+    }
+    set.notifyAll();
+}
+
+void Queue::bound(const string& exchange, const string& key,
+                  const FieldTable& args)
+{
+    bindings.add(exchange, key, args);
+}
+
+void Queue::unbind(ExchangeRegistry& exchanges)
+{
+    bindings.unbind(exchanges, shared_from_this());
+}
+
+void Queue::setPolicy(std::auto_ptr<QueuePolicy> _policy)
+{
+    policy = _policy;
+}
+
+const QueuePolicy* Queue::getPolicy()
+{
+    return policy.get();
+}
+
+uint64_t Queue::getPersistenceId() const 
+{ 
+    return persistenceId; 
+}
+
+void Queue::setPersistenceId(uint64_t _persistenceId) const
+{
+    if (mgmtObject != 0 && persistenceId == 0 && externalQueueStore)
+    {
+        ManagementObject* childObj = externalQueueStore->GetManagementObject();
+        if (childObj != 0)
+            childObj->setReference(mgmtObject->getObjectId());
+    }
+    persistenceId = _persistenceId;
+}
+
+void Queue::encode(Buffer& buffer) const 
+{
+    buffer.putShortString(name);
+    buffer.put(settings);
+    if (policy.get()) { 
+        buffer.put(*policy);
+    }
+    buffer.putShortString(alternateExchange.get() ? alternateExchange->getName() : std::string(""));
+}
+
+uint32_t Queue::encodedSize() const
+{
+    return name.size() + 1/*short string size octet*/
+        + (alternateExchange.get() ? alternateExchange->getName().size() : 0) + 1 /* short string */
+        + settings.encodedSize()
+        + (policy.get() ? (*policy).encodedSize() : 0);
+}
+
+Queue::shared_ptr Queue::restore( QueueRegistry& queues, Buffer& buffer )
+{
+    string name;
+    buffer.getShortString(name);
+    FieldTable settings;
+    buffer.get(settings);
+    boost::shared_ptr<Exchange> alternate;
+    std::pair<Queue::shared_ptr, bool> result = queues.declare(name, true, false, 0, alternate, settings, true);
+    if (result.first->policy.get() && buffer.available() >= result.first->policy->encodedSize()) {
+        buffer.get ( *(result.first->policy) );
+    }
+    if (buffer.available()) {
+        string altExch;
+        buffer.getShortString(altExch);
+        result.first->alternateExchangeName.assign(altExch);
+    }
+
+    return result.first;
+}
+
+
+void Queue::setAlternateExchange(boost::shared_ptr<Exchange> exchange)
+{
+    alternateExchange = exchange;
+    if (mgmtObject) {
+        if (exchange.get() != 0)
+            mgmtObject->set_altExchange(exchange->GetManagementObject()->getObjectId());
+        else
+            mgmtObject->clr_altExchange();
+    }
+}
+
+boost::shared_ptr<Exchange> Queue::getAlternateExchange()
+{
+    return alternateExchange;
+}
+
+void tryAutoDeleteImpl(Broker& broker, Queue::shared_ptr queue)
+{
+    if (broker.getQueues().destroyIf(queue->getName(), 
+                                     boost::bind(boost::mem_fn(&Queue::canAutoDelete), queue))) {
+        QPID_LOG(debug, "Auto-deleting " << queue->getName());
+        queue->destroyed();
+    }
+}
+
+struct AutoDeleteTask : qpid::sys::TimerTask
+{
+    Broker& broker;
+    Queue::shared_ptr queue;
+
+    AutoDeleteTask(Broker& b, Queue::shared_ptr q, AbsTime fireTime) 
+        : qpid::sys::TimerTask(fireTime, "DelayedAutoDeletion"), broker(b), queue(q) {}
+
+    void fire()
+    {
+        //need to detect case where queue was used after the task was
+        //created, but then became unused again before the task fired;
+        //in this case ignore this request as there will have already
+        //been a later task added
+        tryAutoDeleteImpl(broker, queue);
+    }
+};
+
+void Queue::tryAutoDelete(Broker& broker, Queue::shared_ptr queue)
+{
+    if (queue->autoDeleteTimeout && queue->canAutoDelete()) {
+        AbsTime time(now(), Duration(queue->autoDeleteTimeout * TIME_SEC));
+        queue->autoDeleteTask = boost::intrusive_ptr<qpid::sys::TimerTask>(new AutoDeleteTask(broker, queue, time));
+        broker.getClusterTimer().add(queue->autoDeleteTask);        
+        QPID_LOG(debug, "Timed auto-delete for " << queue->getName() << " initiated");
+    } else {
+        tryAutoDeleteImpl(broker, queue);
+    }
+}
+
+bool Queue::isExclusiveOwner(const OwnershipToken* const o) const 
+{ 
+    Mutex::ScopedLock locker(ownershipLock);
+    return o == owner; 
+}
+
+void Queue::releaseExclusiveOwnership() 
+{ 
+    Mutex::ScopedLock locker(ownershipLock);
+    owner = 0; 
+}
+
+bool Queue::setExclusiveOwner(const OwnershipToken* const o) 
+{ 
+    //reset auto deletion timer if necessary
+    if (autoDeleteTimeout && autoDeleteTask) {
+        autoDeleteTask->cancel();
+    }
+    Mutex::ScopedLock locker(ownershipLock);
+    if (owner) {
+        return false;
+    } else {
+        owner = o; 
+        return true;
+    }
+}
+
+bool Queue::hasExclusiveOwner() const 
+{ 
+    Mutex::ScopedLock locker(ownershipLock);
+    return owner != 0; 
+}
+
+bool Queue::hasExclusiveConsumer() const 
+{ 
+    return exclusive; 
+}
+
+void Queue::setExternalQueueStore(ExternalQueueStore* inst) {
+    if (externalQueueStore!=inst && externalQueueStore) 
+        delete externalQueueStore; 
+    externalQueueStore = inst;
+
+    if (inst) {
+        ManagementObject* childObj = inst->GetManagementObject();
+        if (childObj != 0 && mgmtObject != 0)
+            childObj->setReference(mgmtObject->getObjectId());
+    }
+}
+
+ManagementObject* Queue::GetManagementObject (void) const
+{
+    return (ManagementObject*) mgmtObject;
+}
+
+Manageable::status_t Queue::ManagementMethod (uint32_t methodId, Args& args, string& etext)
+{
+    Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD;
+
+    QPID_LOG (debug, "Queue::ManagementMethod [id=" << methodId << "]");
+
+    switch (methodId) {
+    case _qmf::Queue::METHOD_PURGE :
+        {
+            _qmf::ArgsQueuePurge& purgeArgs = (_qmf::ArgsQueuePurge&) args;
+            purge(purgeArgs.i_request);
+            status = Manageable::STATUS_OK;
+        }
+        break;
+
+    case _qmf::Queue::METHOD_REROUTE :
+        {
+            _qmf::ArgsQueueReroute& rerouteArgs = (_qmf::ArgsQueueReroute&) args;
+            boost::shared_ptr<Exchange> dest;
+            if (rerouteArgs.i_useAltExchange)
+                dest = alternateExchange;
+            else {
+                try {
+                    dest = broker->getExchanges().get(rerouteArgs.i_exchange);
+                } catch(const std::exception&) {
+                    status = Manageable::STATUS_PARAMETER_INVALID;
+                    etext = "Exchange not found";
+                    break;
+                }
+            }
+
+            purge(rerouteArgs.i_request, dest);
+            status = Manageable::STATUS_OK;
+        }
+        break;
+    }
+
+    return status;
+}
+
+void Queue::setPosition(SequenceNumber n) {
+    Mutex::ScopedLock locker(messageLock);
+    sequence = n;
+}
+
+SequenceNumber Queue::getPosition() {
+    return sequence;
+}
+
+int Queue::getEventMode() { return eventMode; }
+
+void Queue::recoveryComplete(ExchangeRegistry& exchanges)
+{
+    // set the alternate exchange
+    if (!alternateExchangeName.empty()) {
+        try {
+            Exchange::shared_ptr ae = exchanges.get(alternateExchangeName);
+            setAlternateExchange(ae);
+        } catch (const NotFoundException&) {
+            QPID_LOG(warning, "Could not set alternate exchange \"" << alternateExchangeName << "\" on queue \"" << name << "\": exchange does not exist.");
+        }
+    }
+    //process any pending dequeues
+    for_each(pendingDequeues.begin(), pendingDequeues.end(), boost::bind(&Queue::dequeue, this, (TransactionContext*) 0, _1));
+    pendingDequeues.clear();
+}
+
+void Queue::insertSequenceNumbers(const std::string& key)
+{
+    seqNoKey = key;
+    insertSeqNo = !seqNoKey.empty();
+    QPID_LOG(debug, "Inserting sequence numbers as " << key);
+}
+
+void Queue::enqueued(const QueuedMessage& m)
+{
+    for (Observers::iterator i = observers.begin(); i != observers.end(); ++i) {
+        try {
+            (*i)->enqueued(m);
+        } catch (const std::exception& e) {
+            QPID_LOG(warning, "Exception on notification of enqueue for queue " << getName() << ": " << e.what());
+        }
+    }
+    if (policy.get()) {
+        policy->enqueued(m);
+    }
+    mgntEnqStats(m.payload);
+}
+
+void Queue::updateEnqueued(const QueuedMessage& m)
+{
+    if (m.payload) {
+        boost::intrusive_ptr<Message> payload = m.payload;
+        enqueue ( 0, payload, true );
+        if (policy.get()) {
+            policy->recoverEnqueued(payload);
+        }
+        enqueued(m);
+    } else {
+        QPID_LOG(warning, "Queue informed of enqueued message that has no payload");
+    }
+}
+
+bool Queue::isEnqueued(const QueuedMessage& msg)
+{
+    return !policy.get() || policy->isEnqueued(msg);
+}
+
+QueueListeners& Queue::getListeners() { return listeners; }
+Messages& Queue::getMessages() { return *messages; }
+const Messages& Queue::getMessages() const { return *messages; }
+
+void Queue::checkNotDeleted()
+{
+    if (deleted) {
+        throw ResourceDeletedException(QPID_MSG("Queue " << getName() << " has been deleted."));
+    }
+}
+
+void Queue::addObserver(boost::shared_ptr<QueueObserver> observer)
+{
+    observers.insert(observer);
+}
+
+void Queue::flush()
+{
+    ScopedUse u(barrier);
+    if (u.acquired && store) store->flush(*this);
+}
+
+
+bool Queue::bind(boost::shared_ptr<Exchange> exchange, const std::string& key,
+                 const qpid::framing::FieldTable& arguments)
+{
+    if (exchange->bind(shared_from_this(), key, &arguments)) {
+        bound(exchange->getName(), key, arguments);
+        if (exchange->isDurable() && isDurable()) {
+            store->bind(*exchange, *this, key, arguments);
+        }
+        return true;
+    } else {
+        return false;
+    }
+}
+
+
+const Broker* Queue::getBroker()
+{
+    return broker;
+}
+
+
+Queue::UsageBarrier::UsageBarrier(Queue& q) : parent(q), count(0) {}
+
+bool Queue::UsageBarrier::acquire()
+{
+    Monitor::ScopedLock l(parent.messageLock);
+    if (parent.deleted) {
+        return false;
+    } else {
+        ++count;
+        return true;
+    }
+}
+
+void Queue::UsageBarrier::release()
+{
+    Monitor::ScopedLock l(parent.messageLock);
+    if (--count == 0) parent.messageLock.notifyAll();
+}
+
+void Queue::UsageBarrier::destroy()
+{
+    Monitor::ScopedLock l(parent.messageLock);
+    parent.deleted = true;
+    while (count) parent.messageLock.wait();
+}
diff --git a/cpp/src/qpid/broker/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h
index c4f1bcc07e..c4f1bcc07e 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 60d315acfe..60d315acfe 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 1b90ba5540..1b90ba5540 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 3499ea8a4d..3499ea8a4d 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 11c2d180ac..11c2d180ac 100644
--- a/cpp/src/qpid/broker/QueueCleaner.h
+++ b/qpid/cpp/src/qpid/broker/QueueCleaner.h
diff --git a/cpp/src/qpid/broker/QueueEvents.cpp b/qpid/cpp/src/qpid/broker/QueueEvents.cpp
index 2c540ff1ad..2c540ff1ad 100644
--- a/cpp/src/qpid/broker/QueueEvents.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueEvents.cpp
diff --git a/cpp/src/qpid/broker/QueueEvents.h b/qpid/cpp/src/qpid/broker/QueueEvents.h
index fcddfe9092..fcddfe9092 100644
--- a/cpp/src/qpid/broker/QueueEvents.h
+++ b/qpid/cpp/src/qpid/broker/QueueEvents.h
diff --git a/cpp/src/qpid/broker/QueueFlowLimit.cpp b/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
index b2e2e54bdf..b2e2e54bdf 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 c02e479976..c02e479976 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 591f4443bb..591f4443bb 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 0659499253..0659499253 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 3ca01c051e..3ca01c051e 100644
--- a/cpp/src/qpid/broker/QueueObserver.h
+++ b/qpid/cpp/src/qpid/broker/QueueObserver.h
diff --git a/cpp/src/qpid/broker/QueuePolicy.cpp b/qpid/cpp/src/qpid/broker/QueuePolicy.cpp
index a93a6332fd..a93a6332fd 100644
--- a/cpp/src/qpid/broker/QueuePolicy.cpp
+++ b/qpid/cpp/src/qpid/broker/QueuePolicy.cpp
diff --git a/cpp/src/qpid/broker/QueuePolicy.h b/qpid/cpp/src/qpid/broker/QueuePolicy.h
index 3cdd63784d..3cdd63784d 100644
--- a/cpp/src/qpid/broker/QueuePolicy.h
+++ b/qpid/cpp/src/qpid/broker/QueuePolicy.h
diff --git a/cpp/src/qpid/broker/QueueRegistry.cpp b/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
index 135a3543d9..135a3543d9 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 8a32a64f05..8a32a64f05 100644
--- a/cpp/src/qpid/broker/QueueRegistry.h
+++ b/qpid/cpp/src/qpid/broker/QueueRegistry.h
diff --git a/cpp/src/qpid/broker/QueuedMessage.h b/qpid/cpp/src/qpid/broker/QueuedMessage.h
index 35e48b11f3..35e48b11f3 100644
--- a/cpp/src/qpid/broker/QueuedMessage.h
+++ b/qpid/cpp/src/qpid/broker/QueuedMessage.h
diff --git a/cpp/src/qpid/broker/RateFlowcontrol.h b/qpid/cpp/src/qpid/broker/RateFlowcontrol.h
index 99f9d2c0c4..99f9d2c0c4 100644
--- a/cpp/src/qpid/broker/RateFlowcontrol.h
+++ b/qpid/cpp/src/qpid/broker/RateFlowcontrol.h
diff --git a/cpp/src/qpid/broker/RateTracker.cpp b/qpid/cpp/src/qpid/broker/RateTracker.cpp
index 048349b658..048349b658 100644
--- a/cpp/src/qpid/broker/RateTracker.cpp
+++ b/qpid/cpp/src/qpid/broker/RateTracker.cpp
diff --git a/cpp/src/qpid/broker/RateTracker.h b/qpid/cpp/src/qpid/broker/RateTracker.h
index 0c20b37312..0c20b37312 100644
--- a/cpp/src/qpid/broker/RateTracker.h
+++ b/qpid/cpp/src/qpid/broker/RateTracker.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 ca6cc1541e..ca6cc1541e 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 c98857ceb0..c98857ceb0 100644
--- a/cpp/src/qpid/broker/RecoverableMessage.h
+++ b/qpid/cpp/src/qpid/broker/RecoverableMessage.h
diff --git a/cpp/src/qpid/broker/RecoverableQueue.h b/qpid/cpp/src/qpid/broker/RecoverableQueue.h
index 49f05f97a1..49f05f97a1 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 cd6735328f..cd6735328f 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 66e66f1d5f..66e66f1d5f 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 6d2eaee6c4..6d2eaee6c4 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 5f718001d5..5f718001d5 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 d08409695e..d08409695e 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 1ad7892b13..1ad7892b13 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 242a7d2122..242a7d2122 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 acdb4934d4..acdb4934d4 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 cfbe1a0cd1..cfbe1a0cd1 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 5c1ebf3e8b..5c1ebf3e8b 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 1547faae1e..1547faae1e 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 754b443c22..754b443c22 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 8a04dfcb15..8a04dfcb15 100644
--- a/cpp/src/qpid/broker/SecureConnectionFactory.h
+++ b/qpid/cpp/src/qpid/broker/SecureConnectionFactory.h
diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/qpid/cpp/src/qpid/broker/SemanticState.cpp
index ce86253f4a..ce86253f4a 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 8c69d6b89b..8c69d6b89b 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 63c4b660b2..63c4b660b2 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 8987c4812f..8987c4812f 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 253ce8dcf2..253ce8dcf2 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 752fa55535..752fa55535 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 ca6d6bb193..ca6d6bb193 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/qpid/cpp/src/qpid/broker/SessionState.cpp b/qpid/cpp/src/qpid/broker/SessionState.cpp
new file mode 100644
index 0000000000..119e5732c4
--- /dev/null
+++ b/qpid/cpp/src/qpid/broker/SessionState.cpp
@@ -0,0 +1,593 @@
+/*
+ *
+ * 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.
+ *
+ */
+#include "qpid/broker/SessionState.h"
+#include "qpid/broker/Broker.h"
+#include "qpid/broker/ConnectionState.h"
+#include "qpid/broker/DeliveryRecord.h"
+#include "qpid/broker/SessionManager.h"
+#include "qpid/broker/SessionHandler.h"
+#include "qpid/broker/RateFlowcontrol.h"
+#include "qpid/sys/Timer.h"
+#include "qpid/framing/AMQContentBody.h"
+#include "qpid/framing/AMQHeaderBody.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/framing/reply_exceptions.h"
+#include "qpid/framing/ServerInvoker.h"
+#include "qpid/log/Statement.h"
+#include "qpid/management/ManagementAgent.h"
+#include "qpid/framing/AMQP_ClientProxy.h"
+
+#include <boost/bind.hpp>
+#include <boost/lexical_cast.hpp>
+
+namespace qpid {
+namespace broker {
+
+using namespace framing;
+using sys::Mutex;
+using boost::intrusive_ptr;
+using qpid::management::ManagementAgent;
+using qpid::management::ManagementObject;
+using qpid::management::Manageable;
+using qpid::management::Args;
+using qpid::sys::AbsTime;
+//using qpid::sys::Timer;
+namespace _qmf = qmf::org::apache::qpid::broker;
+
+SessionState::SessionState(
+    Broker& b, SessionHandler& h, const SessionId& id,
+    const SessionState::Configuration& config, bool delayManagement)
+    : qpid::SessionState(id, config),
+      broker(b), handler(&h),
+      semanticState(*this, *this),
+      adapter(semanticState),
+      msgBuilder(&broker.getStore()),
+      mgmtObject(0),
+      rateFlowcontrol(0),
+      asyncCommandCompleter(new AsyncCommandCompleter(this))
+{
+    uint32_t maxRate = broker.getOptions().maxSessionRate;
+    if (maxRate) {
+        if (handler->getConnection().getClientThrottling()) {
+            rateFlowcontrol.reset(new RateFlowcontrol(maxRate));
+        } else {
+            QPID_LOG(warning, getId() << ": Unable to flow control client - client doesn't support");
+        }
+    }
+    if (!delayManagement) addManagementObject();
+    attach(h);
+}
+
+void SessionState::addManagementObject() {
+    if (GetManagementObject()) return; // Already added.
+    Manageable* parent = broker.GetVhostObject ();
+    if (parent != 0) {
+        ManagementAgent* agent = getBroker().getManagementAgent();
+        if (agent != 0) {
+            mgmtObject = new _qmf::Session
+                (agent, this, parent, getId().getName());
+            mgmtObject->set_attached (0);
+            mgmtObject->set_detachedLifespan (0);
+            mgmtObject->clr_expireTime();
+            if (rateFlowcontrol)
+                mgmtObject->set_maxClientRate(rateFlowcontrol->getRate());
+            agent->addObject(mgmtObject);
+        }
+    }
+}
+
+SessionState::~SessionState() {
+    asyncCommandCompleter->cancel();
+    semanticState.closed();
+    if (mgmtObject != 0)
+        mgmtObject->resourceDestroy ();
+
+    if (flowControlTimer)
+        flowControlTimer->cancel();
+}
+
+AMQP_ClientProxy& SessionState::getProxy() {
+    assert(isAttached());
+    return handler->getProxy();
+}
+
+uint16_t SessionState::getChannel() const {
+    assert(isAttached());
+    return handler->getChannel();
+}
+
+ConnectionState& SessionState::getConnection() {
+    assert(isAttached());
+    return handler->getConnection();
+}
+
+bool SessionState::isLocal(const ConnectionToken* t) const
+{
+    return isAttached() && &(handler->getConnection()) == t;
+}
+
+void SessionState::detach() {
+    QPID_LOG(debug, getId() << ": detached on broker.");
+    asyncCommandCompleter->detached();
+    disableOutput();
+    handler = 0;
+    if (mgmtObject != 0)
+        mgmtObject->set_attached  (0);
+}
+
+void SessionState::disableOutput()
+{
+    semanticState.detached(); //prevents further activateOutput calls until reattached
+}
+
+void SessionState::attach(SessionHandler& h) {
+    QPID_LOG(debug, getId() << ": attached on broker.");
+    handler = &h;
+    if (mgmtObject != 0)
+    {
+        mgmtObject->set_attached (1);
+        mgmtObject->set_connectionRef (h.getConnection().GetManagementObject()->getObjectId());
+        mgmtObject->set_channelId (h.getChannel());
+    }
+    asyncCommandCompleter->attached();
+}
+
+void SessionState::abort() {
+    if (isAttached())
+        getConnection().outputTasks.abort();
+}
+
+void SessionState::activateOutput() {
+    if (isAttached())
+        getConnection().outputTasks.activateOutput();
+}
+
+void SessionState::giveReadCredit(int32_t credit) {
+    if (isAttached())
+        getConnection().outputTasks.giveReadCredit(credit);
+}
+
+ManagementObject* SessionState::GetManagementObject (void) const
+{
+    return (ManagementObject*) mgmtObject;
+}
+
+Manageable::status_t SessionState::ManagementMethod (uint32_t methodId,
+                                                     Args&    /*args*/,
+                                                     string&  /*text*/)
+{
+    Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD;
+
+    switch (methodId)
+    {
+    case _qmf::Session::METHOD_DETACH :
+        if (handler != 0) {
+            handler->sendDetach();
+        }
+        status = Manageable::STATUS_OK;
+        break;
+
+    case _qmf::Session::METHOD_CLOSE :
+        /*
+          if (handler != 0)
+          {
+          handler->getConnection().closeChannel(handler->getChannel());
+          }
+          status = Manageable::STATUS_OK;
+          break;
+        */
+
+    case _qmf::Session::METHOD_SOLICITACK :
+    case _qmf::Session::METHOD_RESETLIFESPAN :
+        status = Manageable::STATUS_NOT_IMPLEMENTED;
+        break;
+    }
+
+    return status;
+}
+
+void SessionState::handleCommand(framing::AMQMethodBody* method, const SequenceNumber& id) {
+    currentCommandComplete = true;      // assumed, can be overridden by invoker method (this sucks).
+    Invoker::Result invocation = invoke(adapter, *method);
+    if (currentCommandComplete) receiverCompleted(id);
+
+    if (!invocation.wasHandled()) {
+        throw NotImplementedException(QPID_MSG("Not implemented: " << *method));
+    } else if (invocation.hasResult()) {
+        getProxy().getExecution().result(id, invocation.getResult());
+    }
+
+    if (method->isSync() && currentCommandComplete) {
+        sendAcceptAndCompletion();
+    }
+}
+
+struct ScheduledCreditTask : public sys::TimerTask {
+    sys::Timer& timer;
+    SessionState& sessionState;
+    ScheduledCreditTask(const qpid::sys::Duration& d, sys::Timer& t,
+                        SessionState& s) :
+        TimerTask(d,"ScheduledCredit"),
+        timer(t),
+        sessionState(s)
+    {}
+
+    void fire() {
+        // This is the best we can currently do to avoid a destruction/fire race
+        sessionState.getConnection().requestIOProcessing(boost::bind(&ScheduledCreditTask::sendCredit, this));
+    }
+
+    void sendCredit() {
+        if ( !sessionState.processSendCredit(0) ) {
+            QPID_LOG(warning, sessionState.getId() << ": Reschedule sending credit");
+            setupNextFire();
+            timer.add(this);
+        }
+    }
+};
+
+void SessionState::handleContent(AMQFrame& frame, const SequenceNumber& id)
+{
+    if (frame.getBof() && frame.getBos()) //start of frameset
+        msgBuilder.start(id);
+    intrusive_ptr<Message> msg(msgBuilder.getMessage());
+    msgBuilder.handle(frame);
+    if (frame.getEof() && frame.getEos()) {//end of frameset
+        if (frame.getBof()) {
+            //i.e this is a just a command frame, add a dummy header
+            AMQFrame header((AMQHeaderBody()));
+            header.setBof(false);
+            header.setEof(false);
+            msg->getFrames().append(header);
+        }
+        msg->setPublisher(&getConnection());
+        msg->getIngressCompletion().begin();
+        semanticState.handle(msg);
+        msgBuilder.end();
+        IncompleteIngressMsgXfer xfer(this, msg);
+        msg->getIngressCompletion().end(xfer);  // allows msg to complete xfer
+    }
+
+    // Handle producer session flow control
+    if (rateFlowcontrol && frame.getBof() && frame.getBos()) {
+        if ( !processSendCredit(1) ) {
+            QPID_LOG(debug, getId() << ": Schedule sending credit");
+            sys::Timer& timer = getBroker().getTimer();
+            // Use heuristic for scheduled credit of time for 50 messages, but not longer than 500ms
+            sys::Duration d = std::min(sys::TIME_SEC * 50 / rateFlowcontrol->getRate(), 500 * sys::TIME_MSEC);
+            flowControlTimer = new ScheduledCreditTask(d, timer, *this);
+            timer.add(flowControlTimer);
+        }
+    }
+}
+
+bool SessionState::processSendCredit(uint32_t msgs)
+{
+    qpid::sys::ScopedLock<Mutex> l(rateLock);
+    // Check for violating flow control
+    if ( msgs > 0 && rateFlowcontrol->flowStopped() ) {
+        QPID_LOG(warning, getId() << ": producer throttling violation");
+        // TODO: Probably do message.stop("") first time then disconnect
+        // See comment on getClusterOrderProxy() in .h file
+        getClusterOrderProxy().getMessage().stop("");
+        return true;
+    }
+    AbsTime now = AbsTime::now();
+    uint32_t sendCredit = rateFlowcontrol->receivedMessage(now, msgs);
+    if (mgmtObject) mgmtObject->dec_clientCredit(msgs);
+    if ( sendCredit>0 ) {
+        QPID_LOG(debug, getId() << ": send producer credit " << sendCredit);
+        getClusterOrderProxy().getMessage().flow("", 0, sendCredit);
+        rateFlowcontrol->sentCredit(now, sendCredit);
+        if (mgmtObject) mgmtObject->inc_clientCredit(sendCredit);
+        return true;
+    } else {
+        return !rateFlowcontrol->flowStopped() ;
+    }
+}
+
+void SessionState::sendAcceptAndCompletion()
+{
+    if (!accepted.empty()) {
+        getProxy().getMessage().accept(accepted);
+        accepted.clear();
+    }
+    sendCompletion();
+}
+
+/** Invoked when the given inbound message is finished being processed
+ * by all interested parties (eg. it is done being enqueued to all queues,
+ * its credit has been accounted for, etc).  At this point, msg is considered
+ * by this receiver as 'completed' (as defined by AMQP 0_10)
+ */
+void SessionState::completeRcvMsg(SequenceNumber id,
+                                  bool requiresAccept,
+                                  bool requiresSync)
+{
+    bool callSendCompletion = false;
+    receiverCompleted(id);
+    if (requiresAccept)
+        // will cause msg's seq to appear in the next message.accept we send.
+        accepted.add(id);
+
+    // Are there any outstanding Execution.Sync commands pending the
+    // completion of this msg?  If so, complete them.
+    while (!pendingExecutionSyncs.empty() &&
+           receiverGetIncomplete().front() >= pendingExecutionSyncs.front()) {
+        const SequenceNumber id = pendingExecutionSyncs.front();
+        pendingExecutionSyncs.pop();
+        QPID_LOG(debug, getId() << ": delayed execution.sync " << id << " is completed.");
+        receiverCompleted(id);
+        callSendCompletion = true;   // likely peer is pending for this completion.
+    }
+
+    // if the sender has requested immediate notification of the completion...
+    if (requiresSync) {
+        sendAcceptAndCompletion();
+    } else if (callSendCompletion) {
+        sendCompletion();
+    }
+}
+
+void SessionState::handleIn(AMQFrame& frame) {
+    SequenceNumber commandId = receiverGetCurrent();
+    //TODO: make command handling more uniform, regardless of whether
+    //commands carry content.
+    AMQMethodBody* m = frame.getMethod();
+    if (m == 0 || m->isContentBearing()) {
+        handleContent(frame, commandId);
+    } else if (frame.getBof() && frame.getEof()) {
+        handleCommand(frame.getMethod(), commandId);
+    } else {
+        throw InternalErrorException("Cannot handle multi-frame command segments yet");
+    }
+}
+
+void SessionState::handleOut(AMQFrame& frame) {
+    assert(handler);
+    handler->out(frame);
+}
+
+void SessionState::deliver(DeliveryRecord& msg, bool sync)
+{
+    uint32_t maxFrameSize = getConnection().getFrameMax();
+    assert(senderGetCommandPoint().offset == 0);
+    SequenceNumber commandId = senderGetCommandPoint().command;
+    msg.deliver(getProxy().getHandler(), commandId, maxFrameSize);
+    assert(senderGetCommandPoint() == SessionPoint(commandId+1, 0)); // Delivery has moved sendPoint.
+    if (sync) {
+        AMQP_ClientProxy::Execution& p(getProxy().getExecution());
+        Proxy::ScopedSync s(p);
+        p.sync();
+    }
+}
+
+void SessionState::sendCompletion() {
+    handler->sendCompletion();
+}
+
+void SessionState::senderCompleted(const SequenceSet& commands) {
+    qpid::SessionState::senderCompleted(commands);
+    semanticState.completed(commands);
+}
+
+void SessionState::readyToSend() {
+    QPID_LOG(debug, getId() << ": ready to send, activating output.");
+    assert(handler);
+    semanticState.attached();
+    if (rateFlowcontrol) {
+        qpid::sys::ScopedLock<Mutex> l(rateLock);
+        // Issue initial credit - use a heuristic here issue min of 300 messages or 1 secs worth
+        uint32_t credit = std::min(rateFlowcontrol->getRate(), 300U);
+        QPID_LOG(debug, getId() << ": Issuing producer message credit " << credit);
+        // See comment on getClusterOrderProxy() in .h file
+        getClusterOrderProxy().getMessage().setFlowMode("", 0);
+        getClusterOrderProxy().getMessage().flow("", 0, credit);
+        rateFlowcontrol->sentCredit(AbsTime::now(), credit);
+        if (mgmtObject) mgmtObject->inc_clientCredit(credit);
+    }
+}
+
+Broker& SessionState::getBroker() { return broker; }
+
+// Session resume is not fully implemented so it is useless to set a
+// non-0 timeout. Moreover it creates problems in a cluster because
+// dead sessions are kept and interfere with failover.
+void SessionState::setTimeout(uint32_t) { }
+
+framing::AMQP_ClientProxy& SessionState::getClusterOrderProxy() {
+    return handler->getClusterOrderProxy();
+}
+
+
+// Current received command is an execution.sync command.
+// Complete this command only when all preceding commands have completed.
+// (called via the invoker() in handleCommand() above)
+void SessionState::addPendingExecutionSync()
+{
+    SequenceNumber syncCommandId = receiverGetCurrent();
+    if (receiverGetIncomplete().front() < syncCommandId) {
+        currentCommandComplete = false;
+        pendingExecutionSyncs.push(syncCommandId);
+        asyncCommandCompleter->flushPendingMessages();
+        QPID_LOG(debug, getId() << ": delaying completion of execution.sync " << syncCommandId);
+    }
+}
+
+
+/** factory for creating a reference-counted IncompleteIngressMsgXfer object
+ * which will be attached to a message that will be completed asynchronously.
+ */
+boost::intrusive_ptr<AsyncCompletion::Callback>
+SessionState::IncompleteIngressMsgXfer::clone()
+{
+    boost::intrusive_ptr<SessionState::IncompleteIngressMsgXfer> cb(new SessionState::IncompleteIngressMsgXfer(session, msg));
+
+    // Optimization: this routine is *only* invoked when the message needs to be asynchronously completed.
+    // If the client is pending the message.transfer completion, flush now to force immediate write to journal.
+    if (requiresSync)
+        msg->flush();
+    else {
+        // otherwise, we need to track this message in order to flush it if an execution.sync arrives
+        // before it has been completed (see flushPendingMessages())
+        pending = true;
+        completerContext->addPendingMessage(msg);
+    }
+    return cb;
+}
+
+
+/** Invoked by the asynchronous completer associated with a received
+ * msg that is pending Completion.  May be invoked by the IO thread
+ * (sync == true), or some external thread (!sync).
+ */
+void SessionState::IncompleteIngressMsgXfer::completed(bool sync)
+{
+    if (pending) completerContext->deletePendingMessage(id);
+    if (!sync) {
+        /** note well: this path may execute in any thread.  It is safe to access
+         * the scheduledCompleterContext, since *this has a shared pointer to it.
+         * but not session!
+         */
+        session = 0;
+        QPID_LOG(debug, ": async completion callback scheduled for msg seq=" << id);
+        completerContext->scheduleMsgCompletion(id, requiresAccept, requiresSync);
+    } else {
+        // this path runs directly from the ac->end() call in handleContent() above,
+        // so *session is definately valid.
+        if (session->isAttached()) {
+            QPID_LOG(debug, ": receive completed for msg seq=" << id);
+            session->completeRcvMsg(id, requiresAccept, requiresSync);
+        }
+    }
+    completerContext = boost::intrusive_ptr<AsyncCommandCompleter>();
+}
+
+
+/** Scheduled from an asynchronous command's completed callback to run on
+ * the IO thread.
+ */
+void SessionState::AsyncCommandCompleter::schedule(boost::intrusive_ptr<AsyncCommandCompleter> ctxt)
+{
+    ctxt->completeCommands();
+}
+
+
+/** Track an ingress message that is pending completion */
+void SessionState::AsyncCommandCompleter::addPendingMessage(boost::intrusive_ptr<Message> msg)
+{
+    qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
+    std::pair<SequenceNumber, boost::intrusive_ptr<Message> > item(msg->getCommandId(), msg);
+    bool unique = pendingMsgs.insert(item).second;
+    if (!unique) {
+      assert(false);
+    }
+}
+
+
+/** pending message has completed */
+void SessionState::AsyncCommandCompleter::deletePendingMessage(SequenceNumber id)
+{
+    qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
+    pendingMsgs.erase(id);
+}
+
+
+/** done when an execution.sync arrives */
+void SessionState::AsyncCommandCompleter::flushPendingMessages()
+{
+    std::map<SequenceNumber, boost::intrusive_ptr<Message> > copy;
+    {
+        qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
+        pendingMsgs.swap(copy);    // we've only tracked these in case a flush is needed, so nuke 'em now.
+    }
+    // drop lock, so it is safe to call "flush()"
+    for (std::map<SequenceNumber, boost::intrusive_ptr<Message> >::iterator i = copy.begin();
+         i != copy.end(); ++i) {
+        i->second->flush();
+    }
+}
+
+
+/** mark an ingress Message.Transfer command as completed.
+ * This method must be thread safe - it may run on any thread.
+ */
+void SessionState::AsyncCommandCompleter::scheduleMsgCompletion(SequenceNumber cmd,
+                                                                bool requiresAccept,
+                                                                bool requiresSync)
+{
+    qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
+
+    if (session && isAttached) {
+        MessageInfo msg(cmd, requiresAccept, requiresSync);
+        completedMsgs.push_back(msg);
+        if (completedMsgs.size() == 1) {
+            session->getConnection().requestIOProcessing(boost::bind(&schedule,
+                                                                     session->asyncCommandCompleter));
+        }
+    }
+}
+
+
+/** Cause the session to complete all completed commands.
+ * Executes on the IO thread.
+ */
+void SessionState::AsyncCommandCompleter::completeCommands()
+{
+    qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
+
+    // when session is destroyed, it clears the session pointer via cancel().
+    if (session && session->isAttached()) {
+        for (std::vector<MessageInfo>::iterator msg = completedMsgs.begin();
+             msg != completedMsgs.end(); ++msg) {
+            session->completeRcvMsg(msg->cmd, msg->requiresAccept, msg->requiresSync);
+        }
+    }
+    completedMsgs.clear();
+}
+
+
+/** cancel any pending calls to scheduleComplete */
+void SessionState::AsyncCommandCompleter::cancel()
+{
+    qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
+    session = 0;
+}
+
+
+/** inform the completer that the session has attached,
+ * allows command completion scheduling from any thread */
+void SessionState::AsyncCommandCompleter::attached()
+{
+    qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
+    isAttached = true;
+}
+
+
+/** inform the completer that the session has detached,
+ * disables command completion scheduling from any thread */
+void SessionState::AsyncCommandCompleter::detached()
+{
+    qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
+    isAttached = false;
+}
+
+}} // namespace qpid::broker
diff --git a/cpp/src/qpid/broker/SessionState.h b/qpid/cpp/src/qpid/broker/SessionState.h
index b43df0c0aa..b43df0c0aa 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/StatefulQueueObserver.h b/qpid/cpp/src/qpid/broker/StatefulQueueObserver.h
index c682d460b7..c682d460b7 100644
--- a/cpp/src/qpid/broker/StatefulQueueObserver.h
+++ b/qpid/cpp/src/qpid/broker/StatefulQueueObserver.h
diff --git a/cpp/src/qpid/broker/System.cpp b/qpid/cpp/src/qpid/broker/System.cpp
index 8cd2edda76..8cd2edda76 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 0fc2c2bd88..0fc2c2bd88 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 3c9e210d4d..3c9e210d4d 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 c77722e700..c77722e700 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 644a3d628e..644a3d628e 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 636918f8a1..636918f8a1 100644
--- a/cpp/src/qpid/broker/TopicExchange.h
+++ b/qpid/cpp/src/qpid/broker/TopicExchange.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 928ac12c10..928ac12c10 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 314a150176..314a150176 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 b509778e89..b509778e89 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 d49c8ba16a..d49c8ba16a 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 a8fa1c2621..a8fa1c2621 100644
--- a/cpp/src/qpid/broker/TxOp.h
+++ b/qpid/cpp/src/qpid/broker/TxOp.h
diff --git a/cpp/src/qpid/broker/TxOpVisitor.h b/qpid/cpp/src/qpid/broker/TxOpVisitor.h
index ceb894896e..ceb894896e 100644
--- a/cpp/src/qpid/broker/TxOpVisitor.h
+++ b/qpid/cpp/src/qpid/broker/TxOpVisitor.h
diff --git a/cpp/src/qpid/broker/TxPublish.cpp b/qpid/cpp/src/qpid/broker/TxPublish.cpp
index 9c2cf4a467..9c2cf4a467 100644
--- a/cpp/src/qpid/broker/TxPublish.cpp
+++ b/qpid/cpp/src/qpid/broker/TxPublish.cpp
diff --git a/cpp/src/qpid/broker/TxPublish.h b/qpid/cpp/src/qpid/broker/TxPublish.h
index f0b9c0a302..f0b9c0a302 100644
--- a/cpp/src/qpid/broker/TxPublish.h
+++ b/qpid/cpp/src/qpid/broker/TxPublish.h
diff --git a/cpp/src/qpid/broker/Vhost.cpp b/qpid/cpp/src/qpid/broker/Vhost.cpp
index a9ca3b42ab..a9ca3b42ab 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 9554d641c2..9554d641c2 100644
--- a/cpp/src/qpid/broker/Vhost.h
+++ b/qpid/cpp/src/qpid/broker/Vhost.h
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/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 962877a471..962877a471 100644
--- a/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
+++ b/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
diff --git a/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp b/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
new file mode 100644
index 0000000000..676074a590
--- /dev/null
+++ b/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
@@ -0,0 +1,297 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/ProtocolFactory.h"
+
+#include "qpid/Plugin.h"
+#include "qpid/broker/Broker.h"
+#include "qpid/log/Statement.h"
+#include "qpid/sys/AsynchIOHandler.h"
+#include "qpid/sys/ConnectionCodec.h"
+#include "qpid/sys/Socket.h"
+#include "qpid/sys/SystemInfo.h"
+#include "qpid/sys/windows/SslAsynchIO.h"
+#include <boost/bind.hpp>
+#include <memory>
+// security.h needs to see this to distinguish from kernel use.
+#define SECURITY_WIN32
+#include <security.h>
+#include <Schnlsp.h>
+#undef SECURITY_WIN32
+
+
+namespace qpid {
+namespace sys {
+namespace windows {
+
+struct SslServerOptions : qpid::Options
+{
+    std::string certStore;
+    std::string certName;
+    uint16_t port;
+    bool clientAuth;
+
+    SslServerOptions() : qpid::Options("SSL Options"),
+                         certStore("My"), port(5671), clientAuth(false)
+    {
+        qpid::Address me;
+        if (qpid::sys::SystemInfo::getLocalHostname(me))
+            certName = me.host;
+        else
+            certName = "localhost";
+
+        addOptions()
+            ("ssl-cert-store", optValue(certStore, "NAME"), "Local store name from which to obtain certificate")
+            ("ssl-cert-name", optValue(certName, "NAME"), "Name of the certificate to use")
+            ("ssl-port", optValue(port, "PORT"), "Port on which to listen for SSL connections")
+            ("ssl-require-client-authentication", optValue(clientAuth), 
+             "Forces clients to authenticate in order to establish an SSL connection");
+    }
+};
+
+class SslProtocolFactory : public qpid::sys::ProtocolFactory {
+    qpid::sys::Socket listener;
+    const bool tcpNoDelay;
+    const uint16_t listeningPort;
+    std::string brokerHost;
+    const bool clientAuthSelected;
+    std::auto_ptr<qpid::sys::AsynchAcceptor> acceptor;
+    ConnectFailedCallback connectFailedCallback;
+    CredHandle credHandle;
+
+  public:
+    SslProtocolFactory(const SslServerOptions&, int backlog, bool nodelay);
+    ~SslProtocolFactory();
+    void accept(sys::Poller::shared_ptr, sys::ConnectionCodec::Factory*);
+    void connect(sys::Poller::shared_ptr, const std::string& host, const std::string& port,
+                 sys::ConnectionCodec::Factory*,
+                 ConnectFailedCallback failed);
+
+    uint16_t getPort() const;
+    bool supports(const std::string& capability);
+
+  private:
+    void connectFailed(const qpid::sys::Socket&,
+                       int err,
+                       const std::string& msg);
+    void established(sys::Poller::shared_ptr,
+                     const qpid::sys::Socket&,
+                     sys::ConnectionCodec::Factory*,
+                     bool isClient);
+};
+
+// Static instance to initialise plugin
+static struct SslPlugin : public Plugin {
+    SslServerOptions options;
+
+    Options* getOptions() { return &options; }
+
+    void earlyInitialize(Target&) {
+    }
+    
+    void initialize(Target& target) {
+        broker::Broker* broker = dynamic_cast<broker::Broker*>(&target);
+        // Only provide to a Broker
+        if (broker) {
+            try {
+                const broker::Broker::Options& opts = broker->getOptions();
+                ProtocolFactory::shared_ptr protocol(new SslProtocolFactory(options,
+                                                                            opts.connectionBacklog,
+                                                                            opts.tcpNoDelay));
+                QPID_LOG(notice, "Listening for SSL connections on TCP port " << protocol->getPort());
+                broker->registerProtocolFactory("ssl", protocol);
+            } catch (const std::exception& e) {
+                QPID_LOG(error, "Failed to initialise SSL listener: " << e.what());
+            }
+        }
+    }
+} sslPlugin;
+
+SslProtocolFactory::SslProtocolFactory(const SslServerOptions& options,
+                                       int backlog,
+                                       bool nodelay)
+    : tcpNoDelay(nodelay),
+    listeningPort(listener.listen("", boost::lexical_cast<std::string>(options.port), backlog)),
+      clientAuthSelected(options.clientAuth) {
+
+    SecInvalidateHandle(&credHandle);
+
+    // Get the certificate for this server.
+    HCERTSTORE certStoreHandle;
+    certStoreHandle = ::CertOpenStore(CERT_STORE_PROV_SYSTEM_A,
+                                      X509_ASN_ENCODING,
+                                      0,
+                                      CERT_SYSTEM_STORE_LOCAL_MACHINE,
+                                      options.certStore.c_str());
+    if (!certStoreHandle)
+        throw qpid::Exception(QPID_MSG("Opening store " << options.certStore << " " << qpid::sys::strError(GetLastError())));
+
+    PCCERT_CONTEXT certContext;
+    certContext = ::CertFindCertificateInStore(certStoreHandle,
+                                               X509_ASN_ENCODING,
+                                               0,
+                                               CERT_FIND_SUBJECT_STR_A,
+                                               options.certName.c_str(),
+                                               NULL);
+    if (certContext == NULL) {
+        int err = ::GetLastError();
+        ::CertCloseStore(certStoreHandle, 0);
+        throw qpid::Exception(QPID_MSG("Locating certificate " << options.certName << " in store " << options.certStore << " " << qpid::sys::strError(GetLastError())));
+        throw QPID_WINDOWS_ERROR(err);
+    }
+
+    SCHANNEL_CRED cred;
+    memset(&cred, 0, sizeof(cred));
+    cred.dwVersion = SCHANNEL_CRED_VERSION;
+    cred.cCreds = 1;
+    cred.paCred = &certContext;
+    SECURITY_STATUS status = ::AcquireCredentialsHandle(NULL,
+                                                        UNISP_NAME,
+                                                        SECPKG_CRED_INBOUND,
+                                                        NULL,
+                                                        &cred,
+                                                        NULL,
+                                                        NULL,
+                                                        &credHandle,
+                                                        NULL);
+    if (status != SEC_E_OK)
+        throw QPID_WINDOWS_ERROR(status);
+    ::CertFreeCertificateContext(certContext);
+    ::CertCloseStore(certStoreHandle, 0);
+}
+
+SslProtocolFactory::~SslProtocolFactory() {
+    ::FreeCredentialsHandle(&credHandle);
+}
+
+void SslProtocolFactory::connectFailed(const qpid::sys::Socket&,
+                                       int err,
+                                       const std::string& msg) {
+    if (connectFailedCallback)
+        connectFailedCallback(err, msg);
+}
+
+void SslProtocolFactory::established(sys::Poller::shared_ptr poller,
+                                     const qpid::sys::Socket& s,
+                                     sys::ConnectionCodec::Factory* f,
+                                     bool isClient) {
+    sys::AsynchIOHandler* async = new sys::AsynchIOHandler(s.getFullAddress(), f);
+
+    if (tcpNoDelay) {
+        s.setTcpNoDelay();
+        QPID_LOG(info,
+                 "Set TCP_NODELAY on connection to " << s.getPeerAddress());
+    }
+
+    SslAsynchIO *aio;
+    if (isClient) {
+        async->setClient();
+        aio =
+          new qpid::sys::windows::ClientSslAsynchIO(brokerHost,
+                                                    s,
+                                                    credHandle,
+                                                    boost::bind(&AsynchIOHandler::readbuff, async, _1, _2),
+                                                    boost::bind(&AsynchIOHandler::eof, async, _1),
+                                                    boost::bind(&AsynchIOHandler::disconnect, async, _1),
+                                                    boost::bind(&AsynchIOHandler::closedSocket, async, _1, _2),
+                                                    boost::bind(&AsynchIOHandler::nobuffs, async, _1),
+                                                    boost::bind(&AsynchIOHandler::idle, async, _1));
+    }
+    else {
+        aio =
+          new qpid::sys::windows::ServerSslAsynchIO(clientAuthSelected,
+                                                    s,
+                                                    credHandle,
+                                                    boost::bind(&AsynchIOHandler::readbuff, async, _1, _2),
+                                                    boost::bind(&AsynchIOHandler::eof, async, _1),
+                                                    boost::bind(&AsynchIOHandler::disconnect, async, _1),
+                                                    boost::bind(&AsynchIOHandler::closedSocket, async, _1, _2),
+                                                    boost::bind(&AsynchIOHandler::nobuffs, async, _1),
+                                                    boost::bind(&AsynchIOHandler::idle, async, _1));
+    }
+
+    async->init(aio, 4);
+    aio->start(poller);
+}
+
+uint16_t SslProtocolFactory::getPort() const {
+    return listeningPort; // Immutable no need for lock.
+}
+
+void SslProtocolFactory::accept(sys::Poller::shared_ptr poller,
+                                sys::ConnectionCodec::Factory* fact) {
+    acceptor.reset(
+        AsynchAcceptor::create(listener,
+                               boost::bind(&SslProtocolFactory::established, this, poller, _1, fact, false)));
+    acceptor->start(poller);
+}
+
+void SslProtocolFactory::connect(sys::Poller::shared_ptr poller,
+                                 const std::string& host,
+                                 const std::string& port,
+                                 sys::ConnectionCodec::Factory* fact,
+                                 ConnectFailedCallback failed)
+{
+    SCHANNEL_CRED cred;
+    memset(&cred, 0, sizeof(cred));
+    cred.dwVersion = SCHANNEL_CRED_VERSION;
+    SECURITY_STATUS status = ::AcquireCredentialsHandle(NULL,
+                                                        UNISP_NAME,
+                                                        SECPKG_CRED_OUTBOUND,
+                                                        NULL,
+                                                        &cred,
+                                                        NULL,
+                                                        NULL,
+                                                        &credHandle,
+                                                        NULL);
+    if (status != SEC_E_OK)
+        throw QPID_WINDOWS_ERROR(status);
+
+    brokerHost = host;
+    // Note that the following logic does not cause a memory leak.
+    // The allocated Socket is freed either by the AsynchConnector
+    // upon connection failure or by the AsynchIO upon connection
+    // shutdown.  The allocated AsynchConnector frees itself when it
+    // is no longer needed.
+    qpid::sys::Socket* socket = new qpid::sys::Socket();
+    connectFailedCallback = failed;
+    AsynchConnector::create(*socket,
+                            host,
+                            port,
+                            boost::bind(&SslProtocolFactory::established,
+                                        this, poller, _1, fact, true),
+                            boost::bind(&SslProtocolFactory::connectFailed,
+                                        this, _1, _2, _3));
+}
+
+namespace
+{
+const std::string SSL = "ssl";
+}
+
+bool SslProtocolFactory::supports(const std::string& capability)
+{
+    std::string s = capability;
+    transform(s.begin(), s.end(), s.begin(), tolower);
+    return s == SSL;
+}
+
+}}} // namespace qpid::sys::windows
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/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/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 2882ef5d42..2882ef5d42 100644
--- a/cpp/src/qpid/client/Connection.cpp
+++ b/qpid/cpp/src/qpid/client/Connection.cpp
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 4fbf55aa60..4fbf55aa60 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/qpid/cpp/src/qpid/client/ConnectionImpl.cpp b/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
new file mode 100644
index 0000000000..4b7aa07065
--- /dev/null
+++ b/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
@@ -0,0 +1,451 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/client/ConnectionImpl.h"
+
+#include "qpid/client/LoadPlugins.h"
+#include "qpid/client/Connector.h"
+#include "qpid/client/ConnectionSettings.h"
+#include "qpid/client/SessionImpl.h"
+
+#include "qpid/log/Statement.h"
+#include "qpid/Url.h"
+#include "qpid/framing/enum.h"
+#include "qpid/framing/reply_exceptions.h"
+#include "qpid/sys/Poller.h"
+#include "qpid/sys/SystemInfo.h"
+#include "qpid/Options.h"
+
+#include <boost/bind.hpp>
+#include <boost/format.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <limits>
+#include <vector>
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+namespace qpid {
+namespace client {
+
+using namespace qpid::framing;
+using namespace qpid::framing::connection;
+using namespace qpid::sys;
+using namespace qpid::framing::connection;//for connection error codes
+
+namespace {
+// Maybe should amalgamate the singletons into a single client singleton
+
+// Get timer singleton
+Timer& theTimer() {
+    static Mutex timerInitLock;
+    ScopedLock<Mutex> l(timerInitLock);
+
+    static qpid::sys::Timer t;
+    return t;
+}
+
+struct IOThreadOptions : public qpid::Options {
+    int maxIOThreads;
+
+    IOThreadOptions(int c) :
+        Options("IO threading options"),
+        maxIOThreads(c)
+    {
+        addOptions()
+            ("max-iothreads", optValue(maxIOThreads, "N"), "Maximum number of io threads to use");
+    }
+};
+
+// IO threads
+class IOThread {
+    int maxIOThreads;
+    int ioThreads;
+    int connections;
+    Mutex threadLock;
+    std::vector<Thread> t;
+    Poller::shared_ptr poller_;
+
+public:
+    void add() {
+        ScopedLock<Mutex> l(threadLock);
+        ++connections;
+        if (!poller_)
+            poller_.reset(new Poller);
+        if (ioThreads < connections && ioThreads < maxIOThreads) {
+            QPID_LOG(debug, "Created IO thread: " << ioThreads);
+            ++ioThreads;
+            t.push_back( Thread(poller_.get()) );
+        }
+    }
+
+    void sub() {
+        ScopedLock<Mutex> l(threadLock);
+        --connections;
+    }
+
+    Poller::shared_ptr poller() const {
+        assert(poller_);
+        return poller_;
+    }
+
+    // Here is where the maximum number of threads is set
+    IOThread(int c) :
+        ioThreads(0),
+        connections(0)
+    {
+        IOThreadOptions options(c);
+        options.parse(0, 0, QPIDC_CONF_FILE, true);
+        maxIOThreads = (options.maxIOThreads != -1) ?
+            options.maxIOThreads : 1;
+    }
+
+    // We can't destroy threads one-by-one as the only
+    // control we have is to shutdown the whole lot
+    // and we can't do that before we're unloaded as we can't
+    // restart the Poller after shutting it down
+    ~IOThread() {
+        std::vector<Thread> threads;
+        {
+            ScopedLock<Mutex> l(threadLock);
+            if (poller_)
+                poller_->shutdown();
+            t.swap(threads);
+        }
+        for (std::vector<Thread>::iterator i = threads.begin(); i != threads.end(); ++i) {
+            i->join();
+        }
+    }
+};
+
+IOThread& theIO() {
+    static IOThread io(SystemInfo::concurrency());
+    return io;
+}
+
+class HeartbeatTask : public TimerTask {
+    TimeoutHandler& timeout;
+
+    void fire() {
+        // If we ever get here then we have timed out
+        QPID_LOG(debug, "Traffic timeout");
+        timeout.idleIn();
+    }
+
+public:
+    HeartbeatTask(Duration p, TimeoutHandler& t) :
+        TimerTask(p,"Heartbeat"),
+        timeout(t)
+    {}
+};
+
+}
+
+void ConnectionImpl::init() {
+    // Ensure that the plugin modules have been loaded
+    // This will make sure that any plugin protocols are available
+    theModuleLoader();
+
+    // Ensure the IO threads exist:
+    // This needs to be called in the Connection constructor
+    // so that they will still exist at last connection destruction
+    (void) theIO();
+}
+
+boost::shared_ptr<ConnectionImpl> ConnectionImpl::create(framing::ProtocolVersion version, const ConnectionSettings& settings)
+{
+    boost::shared_ptr<ConnectionImpl> instance(new ConnectionImpl(version, settings), boost::bind(&ConnectionImpl::release, _1));
+    return instance;
+}
+
+ConnectionImpl::ConnectionImpl(framing::ProtocolVersion v, const ConnectionSettings& settings)
+    : Bounds(settings.maxFrameSize * settings.bounds),
+      handler(settings, v, *this),
+      version(v),
+      nextChannel(1),
+      shutdownComplete(false),
+      released(false)
+{
+    handler.in = boost::bind(&ConnectionImpl::incoming, this, _1);
+    handler.out = boost::bind(&Connector::send, boost::ref(connector), _1);
+    handler.onClose = boost::bind(&ConnectionImpl::closed, this,
+                                  CLOSE_CODE_NORMAL, std::string());
+    //only set error handler once  open
+    handler.onError = boost::bind(&ConnectionImpl::closed, this, _1, _2);
+    handler.getSecuritySettings = boost::bind(&Connector::getSecuritySettings, boost::ref(connector));
+}
+
+const uint16_t ConnectionImpl::NEXT_CHANNEL = std::numeric_limits<uint16_t>::max();
+
+ConnectionImpl::~ConnectionImpl() {
+    if (heartbeatTask) heartbeatTask->cancel();
+    theIO().sub();
+}
+
+void ConnectionImpl::addSession(const boost::shared_ptr<SessionImpl>& session, uint16_t channel)
+{
+    Mutex::ScopedLock l(lock);
+    for (uint16_t i = 0; i < NEXT_CHANNEL; i++) { //will at most search through channels once
+        uint16_t c = channel == NEXT_CHANNEL ? nextChannel++ : channel;
+        boost::weak_ptr<SessionImpl>& s = sessions[c];
+        boost::shared_ptr<SessionImpl> ss = s.lock();
+        if (!ss) {
+            //channel is free, we can assign it to this session
+            session->setChannel(c);
+            s = session;
+            return;
+        } else if (channel != NEXT_CHANNEL) {
+            //channel is taken and was requested explicitly so don't look for another
+            throw SessionBusyException(QPID_MSG("Channel " << ss->getChannel() << " attached to " << ss->getId()));
+        } //else channel is busy, but we can keep looking for a free one
+    }
+    // If we get here, we didn't find any available channel.
+    throw ResourceLimitExceededException("There are no channels available");
+}
+
+void ConnectionImpl::handle(framing::AMQFrame& frame)
+{
+    handler.outgoing(frame);
+}
+
+void ConnectionImpl::incoming(framing::AMQFrame& frame)
+{
+    boost::shared_ptr<SessionImpl> s;
+    {
+        Mutex::ScopedLock l(lock);
+        s = sessions[frame.getChannel()].lock();
+    }
+    if (!s) {
+        QPID_LOG(info, *this << " dropping frame received on invalid channel: " << frame);
+    } else {
+        s->in(frame);
+    }
+}
+
+bool ConnectionImpl::isOpen() const 
+{
+    return handler.isOpen();
+}
+
+void ConnectionImpl::open()
+{
+    const std::string& protocol = handler.protocol;
+    const std::string& host = handler.host;
+    int port = handler.port;
+
+    theIO().add();
+    connector.reset(Connector::create(protocol, theIO().poller(), version, handler, this));
+    connector->setInputHandler(&handler);
+    connector->setShutdownHandler(this);
+    try {
+        std::string p = boost::lexical_cast<std::string>(port);
+        connector->connect(host, p);
+
+    } catch (const std::exception& e) {
+        QPID_LOG(debug, "Failed to connect to " << protocol << ":" << host << ":" << port << " " << e.what());
+        connector.reset();
+        throw;
+    }
+    connector->init();
+
+    // Enable heartbeat if requested
+    uint16_t heartbeat = static_cast<ConnectionSettings&>(handler).heartbeat;
+    if (heartbeat) {
+        // Set connection timeout to be 2x heart beat interval and setup timer
+        heartbeatTask = new HeartbeatTask(heartbeat * 2 * TIME_SEC, *this);
+        handler.setRcvTimeoutTask(heartbeatTask);
+        theTimer().add(heartbeatTask);
+    }
+
+    // If the connect fails then the connector is cleaned up either when we try to connect again
+    // - in that case in connector.reset() above;
+    // - or when we are deleted
+    handler.waitForOpen();
+    QPID_LOG(info, *this << " connected to " << protocol << ":" << host << ":" << port);
+
+    // If the SASL layer has provided an "operational" userId for the connection,
+    // put it in the negotiated settings.
+    const std::string& userId(handler.getUserId());
+    if (!userId.empty())
+        handler.username = userId;
+
+    //enable security layer if one has been negotiated:
+    std::auto_ptr<SecurityLayer> securityLayer = handler.getSecurityLayer();
+    if (securityLayer.get()) {
+        QPID_LOG(debug, *this << " activating security layer");
+        connector->activateSecurityLayer(securityLayer);
+    } else {
+        QPID_LOG(debug, *this << " no security layer in place");
+    }
+}
+
+void ConnectionImpl::idleIn()
+{
+    connector->abort();
+}
+
+void ConnectionImpl::idleOut()
+{
+    AMQFrame frame((AMQHeartbeatBody()));
+    connector->send(frame);
+}
+
+void ConnectionImpl::close()
+{
+    if (heartbeatTask) 
+        heartbeatTask->cancel();
+    // close() must be idempotent and no-throw as it will often be called in destructors.
+    if (handler.isOpen()) {
+        try {
+            handler.close();
+            closed(CLOSE_CODE_NORMAL, "Closed by client");
+        } catch (...) {}
+    }
+    assert(!handler.isOpen());
+}
+
+
+template <class F> void ConnectionImpl::closeInternal(const F& f) {
+    if (heartbeatTask) {
+        heartbeatTask->cancel();
+    }
+    {
+        Mutex::ScopedUnlock u(lock);
+        connector->close();
+    }
+    //notifying sessions of failure can result in those session being
+    //deleted which in turn results in a call to erase(); this can
+    //even happen on this thread, when 's' goes out of scope
+    //below. Using a copy prevents the map being modified as we
+    //iterate through.
+    SessionMap copy;
+    sessions.swap(copy);
+    for (SessionMap::iterator i = copy.begin(); i != copy.end(); ++i) {
+        boost::shared_ptr<SessionImpl> s = i->second.lock();
+        if (s) f(s);
+    }
+}
+
+void ConnectionImpl::closed(uint16_t code, const std::string& text) { 
+    Mutex::ScopedLock l(lock);
+    setException(new ConnectionException(ConnectionHandler::convert(code), text));
+    closeInternal(boost::bind(&SessionImpl::connectionClosed, _1, code, text));
+}
+
+void ConnectionImpl::shutdown() {
+    if (!handler.isClosed()) {
+        failedConnection();
+    }
+    bool canDelete;
+    {
+        Mutex::ScopedLock l(lock);
+        //association with IO thread is now ended
+        shutdownComplete = true;
+        //If we have already been released, we can now delete ourselves
+        canDelete = released;
+    }
+    if (canDelete) delete this;
+}
+
+void ConnectionImpl::release() {
+    bool isActive;
+    {
+        Mutex::ScopedLock l(lock);
+        isActive = connector && !shutdownComplete;
+    }
+    //If we are still active - i.e. associated with an IO thread -
+    //then we cannot delete ourselves yet, but must wait for the
+    //shutdown callback which we can trigger by calling
+    //connector.close()
+    if (isActive) {
+        connector->close();
+        bool canDelete;
+        {
+            Mutex::ScopedLock l(lock);
+            released = true;
+            canDelete = shutdownComplete;
+        }
+        if (canDelete) delete this;
+    } else { 
+        delete this;
+    }
+}
+
+static const std::string CONN_CLOSED("Connection closed");
+
+void ConnectionImpl::failedConnection() {
+    if ( failureCallback )
+      failureCallback();
+
+    if (handler.isClosed()) return;
+
+    bool isClosing = handler.isClosing();
+    bool isOpen = handler.isOpen();
+
+    std::ostringstream msg;
+    msg << *this << " closed";
+
+    // FIXME aconway 2008-06-06: exception use, amqp0-10 does not seem to have
+    // an appropriate close-code. connection-forced is not right.
+    handler.fail(msg.str());//ensure connection is marked as failed before notifying sessions
+
+    // At this point if the object isn't open and isn't closing it must have failed to open
+    // so we can't do the rest of the cleanup
+    if (!isClosing && !isOpen) return;
+
+    Mutex::ScopedLock l(lock);
+    closeInternal(boost::bind(&SessionImpl::connectionBroke, _1, msg.str()));
+    setException(new TransportFailure(msg.str()));
+}
+
+void ConnectionImpl::erase(uint16_t ch) {
+    Mutex::ScopedLock l(lock);
+    sessions.erase(ch);
+}
+
+const ConnectionSettings& ConnectionImpl::getNegotiatedSettings()
+{
+    return handler;
+}
+
+std::vector<qpid::Url> ConnectionImpl::getInitialBrokers() {
+    return handler.knownBrokersUrls;
+}
+
+boost::shared_ptr<SessionImpl>  ConnectionImpl::newSession(const std::string& name, uint32_t timeout, uint16_t channel) {
+    boost::shared_ptr<SessionImpl> simpl(new SessionImpl(name, shared_from_this()));
+    addSession(simpl, channel);
+    simpl->open(timeout);
+    return simpl;
+}
+
+std::ostream& operator<<(std::ostream& o, const ConnectionImpl& c) {
+    if (c.connector)
+        return o << "Connection " << c.connector->getIdentifier();
+    else
+        return o << "Connection <not connected>";
+}
+
+
+}} // namespace qpid::client
diff --git a/cpp/src/qpid/client/ConnectionImpl.h b/qpid/cpp/src/qpid/client/ConnectionImpl.h
index cc81500b18..cc81500b18 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 822e4af269..822e4af269 100644
--- a/cpp/src/qpid/client/ConnectionSettings.cpp
+++ b/qpid/cpp/src/qpid/client/ConnectionSettings.cpp
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/qpid/cpp/src/qpid/client/Connector.h b/qpid/cpp/src/qpid/client/Connector.h
new file mode 100644
index 0000000000..bc611ffe0d
--- /dev/null
+++ b/qpid/cpp/src/qpid/client/Connector.h
@@ -0,0 +1,84 @@
+/*
+ *
+ * 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.
+ *
+ */
+#ifndef _Connector_
+#define _Connector_
+
+
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/ProtocolVersion.h"
+
+#include <boost/shared_ptr.hpp>
+
+#include <string>
+
+namespace qpid {
+
+namespace sys {
+class ShutdownHandler;
+class SecurityLayer;
+class Poller;
+struct SecuritySettings;
+}
+
+namespace framing {
+class InputHandler;
+class AMQFrame;
+}
+
+namespace client {
+
+struct ConnectionSettings;
+class ConnectionImpl;
+
+///@internal
+class Connector : public framing::OutputHandler
+{
+  public:
+    // Protocol connector factory related stuff (it might be better to separate this code from the TCP Connector in the future)
+    typedef Connector* Factory(boost::shared_ptr<qpid::sys::Poller>,
+                               framing::ProtocolVersion, const ConnectionSettings&, ConnectionImpl*);
+    static Connector* create(const std::string& proto,
+                             boost::shared_ptr<qpid::sys::Poller>,
+                             framing::ProtocolVersion, const ConnectionSettings&, ConnectionImpl*);
+    static void registerFactory(const std::string& proto, Factory* connectorFactory);
+
+    virtual ~Connector() {};
+    virtual void connect(const std::string& host, const std::string& port) = 0;
+    virtual void init() {};
+    virtual void close() = 0;
+    virtual void send(framing::AMQFrame& frame) = 0;
+    virtual void abort() = 0;
+
+    virtual void setInputHandler(framing::InputHandler* handler) = 0;
+    virtual void setShutdownHandler(sys::ShutdownHandler* handler) = 0;
+    virtual sys::ShutdownHandler* getShutdownHandler() const = 0;
+    virtual framing::OutputHandler* getOutputHandler() = 0;
+    virtual const std::string& getIdentifier() const = 0;
+
+    virtual void activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer>);
+
+    virtual const qpid::sys::SecuritySettings* getSecuritySettings() = 0;
+};
+
+}}
+
+
+#endif
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 bf4fa91d49..bf4fa91d49 100644
--- a/cpp/src/qpid/client/FailoverListener.cpp
+++ b/qpid/cpp/src/qpid/client/FailoverListener.cpp
diff --git a/cpp/src/qpid/client/FailoverManager.cpp b/qpid/cpp/src/qpid/client/FailoverManager.cpp
index 9405765b47..9405765b47 100644
--- a/cpp/src/qpid/client/FailoverManager.cpp
+++ b/qpid/cpp/src/qpid/client/FailoverManager.cpp
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/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/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/LoadPlugins.cpp b/qpid/cpp/src/qpid/client/LoadPlugins.cpp
index 246eb60c67..246eb60c67 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 0be4ae9f0c..0be4ae9f0c 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/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/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/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/PrivateImplRef.h b/qpid/cpp/src/qpid/client/PrivateImplRef.h
index 503a383c31..503a383c31 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 f4c1483859..f4c1483859 100644
--- a/cpp/src/qpid/client/QueueOptions.cpp
+++ b/qpid/cpp/src/qpid/client/QueueOptions.cpp
diff --git a/qpid/cpp/src/qpid/client/RdmaConnector.cpp b/qpid/cpp/src/qpid/client/RdmaConnector.cpp
new file mode 100644
index 0000000000..664640f5e7
--- /dev/null
+++ b/qpid/cpp/src/qpid/client/RdmaConnector.cpp
@@ -0,0 +1,431 @@
+/*
+ *
+ * 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.
+ *
+ */
+#include "qpid/client/Connector.h"
+
+#include "qpid/client/Bounds.h"
+#include "qpid/client/ConnectionImpl.h"
+#include "qpid/client/ConnectionSettings.h"
+#include "qpid/log/Statement.h"
+#include "qpid/sys/Time.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/sys/rdma/RdmaIO.h"
+#include "qpid/sys/rdma/rdma_exception.h"
+#include "qpid/sys/Dispatcher.h"
+#include "qpid/sys/Poller.h"
+#include "qpid/sys/SecurityLayer.h"
+#include "qpid/Msg.h"
+
+#include <iostream>
+#include <boost/bind.hpp>
+#include <boost/format.hpp>
+#include <boost/lexical_cast.hpp>
+
+// This stuff needs to abstracted out of here to a platform specific file
+#include <netdb.h>
+
+namespace qpid {
+namespace client {
+
+using namespace qpid::sys;
+using namespace qpid::framing;
+using boost::format;
+using boost::str;
+
+class RdmaConnector : public Connector, public sys::Codec
+{
+    typedef std::deque<framing::AMQFrame> Frames;
+
+    const uint16_t maxFrameSize;
+    sys::Mutex lock;
+    Frames frames;
+    size_t lastEof; // Position after last EOF in frames
+    uint64_t currentSize;
+    Bounds* bounds;
+
+    framing::ProtocolVersion version;
+    bool initiated;
+
+    sys::Mutex dataConnectedLock;
+    bool dataConnected;
+
+    sys::ShutdownHandler* shutdownHandler;
+    framing::InputHandler* input;
+    framing::InitiationHandler* initialiser;
+    framing::OutputHandler* output;
+
+    Rdma::AsynchIO* aio;
+    Rdma::Connector* acon;
+    sys::Poller::shared_ptr poller;
+    std::auto_ptr<qpid::sys::SecurityLayer> securityLayer;
+
+    ~RdmaConnector();
+
+    // Callbacks
+    void connected(sys::Poller::shared_ptr, Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&);
+    void connectionError(sys::Poller::shared_ptr, Rdma::Connection::intrusive_ptr, Rdma::ErrorType);
+    void disconnected();
+    void rejected(sys::Poller::shared_ptr, Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&);
+
+    void readbuff(Rdma::AsynchIO&, Rdma::Buffer*);
+    void writebuff(Rdma::AsynchIO&);
+    void writeDataBlock(const framing::AMQDataBlock& data);
+    void dataError(Rdma::AsynchIO&);
+    void drained();
+    void connectionStopped(Rdma::Connector* acon, Rdma::AsynchIO* aio);
+    void dataStopped(Rdma::AsynchIO* aio);
+
+    std::string identifier;
+
+    void connect(const std::string& host, const std::string& port);
+    void close();
+    void send(framing::AMQFrame& frame);
+    void abort() {} // TODO: need to fix this for heartbeat timeouts to work
+
+    void setInputHandler(framing::InputHandler* handler);
+    void setShutdownHandler(sys::ShutdownHandler* handler);
+    sys::ShutdownHandler* getShutdownHandler() const;
+    framing::OutputHandler* getOutputHandler();
+    const std::string& getIdentifier() const;
+    void activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer>);
+    const qpid::sys::SecuritySettings* getSecuritySettings() { return 0; }
+
+    size_t decode(const char* buffer, size_t size);
+    size_t encode(const char* buffer, size_t size);
+    bool canEncode();
+
+public:
+    RdmaConnector(Poller::shared_ptr,
+              framing::ProtocolVersion pVersion,
+              const ConnectionSettings&, 
+              ConnectionImpl*);
+};
+
+// Static constructor which registers connector here
+namespace {
+    Connector* create(Poller::shared_ptr p, framing::ProtocolVersion v, const ConnectionSettings& s, ConnectionImpl* c) {
+        return new RdmaConnector(p, v, s, c);
+    }
+
+    struct StaticInit {
+        StaticInit() {
+            Connector::registerFactory("rdma", &create);
+            Connector::registerFactory("ib", &create);
+        };
+    } init;
+}
+
+
+RdmaConnector::RdmaConnector(Poller::shared_ptr p,
+                     ProtocolVersion ver,
+                     const ConnectionSettings& settings,
+                     ConnectionImpl* cimpl)
+    : maxFrameSize(settings.maxFrameSize),
+      lastEof(0),
+      currentSize(0),
+      bounds(cimpl),
+      version(ver), 
+      initiated(false),
+      dataConnected(false),
+      shutdownHandler(0),
+      aio(0),
+      acon(0),
+      poller(p)
+{
+    QPID_LOG(debug, "RdmaConnector created for " << version);
+}
+
+namespace {
+    void deleteAsynchIO(Rdma::AsynchIO& aio) {
+        delete &aio;
+    }
+
+    void deleteConnector(Rdma::ConnectionManager& con) {
+        delete &con;
+    }
+}
+
+RdmaConnector::~RdmaConnector() {
+    QPID_LOG(debug, "~RdmaConnector " << identifier);
+    if (aio) {
+        aio->stop(deleteAsynchIO);
+    }
+    if (acon) {
+        acon->stop(deleteConnector);
+    }
+}
+
+void RdmaConnector::connect(const std::string& host, const std::string& port){
+    Mutex::ScopedLock l(dataConnectedLock);
+    assert(!dataConnected);
+
+    acon = new Rdma::Connector(
+        Rdma::ConnectionParams(maxFrameSize, Rdma::DEFAULT_WR_ENTRIES),
+        boost::bind(&RdmaConnector::connected, this, poller, _1, _2),
+        boost::bind(&RdmaConnector::connectionError, this, poller, _1, _2),
+        boost::bind(&RdmaConnector::disconnected, this),
+        boost::bind(&RdmaConnector::rejected, this, poller, _1, _2));
+
+    SocketAddress sa(host, port);
+    acon->start(poller, sa);
+}
+
+// The following only gets run when connected
+void RdmaConnector::connected(Poller::shared_ptr poller, Rdma::Connection::intrusive_ptr ci, const Rdma::ConnectionParams& cp) {
+    try {
+        Mutex::ScopedLock l(dataConnectedLock);
+        assert(!dataConnected);
+        Rdma::QueuePair::intrusive_ptr q = ci->getQueuePair();
+
+        aio = new Rdma::AsynchIO(ci->getQueuePair(),
+            cp.rdmaProtocolVersion,
+            cp.maxRecvBufferSize, cp.initialXmitCredit , Rdma::DEFAULT_WR_ENTRIES,
+            boost::bind(&RdmaConnector::readbuff, this, _1, _2),
+            boost::bind(&RdmaConnector::writebuff, this, _1),
+            0, // write buffers full
+            boost::bind(&RdmaConnector::dataError, this, _1));
+
+        identifier = str(format("[%1% %2%]") % ci->getLocalName() % ci->getPeerName());
+        ProtocolInitiation init(version);
+        writeDataBlock(init);
+
+        aio->start(poller);
+
+        dataConnected = true;
+
+        return;
+    } catch (const Rdma::Exception& e) {
+        QPID_LOG(error, "Rdma: Cannot create new connection (Rdma exception): " << e.what());
+    } catch (const std::exception& e) {
+        QPID_LOG(error, "Rdma: Cannot create new connection (unknown exception): " << e.what());
+    }
+    dataConnected = false;
+    connectionStopped(acon, aio);
+}
+
+void RdmaConnector::connectionError(sys::Poller::shared_ptr, Rdma::Connection::intrusive_ptr, Rdma::ErrorType) {
+    QPID_LOG(debug, "Connection Error " << identifier);
+    connectionStopped(acon, aio);
+}
+
+// Bizarrely we seem to get rejected events *after* we've already got a connected event for some peer disconnects
+// so we need to check whether the data connection is started or not in here
+void RdmaConnector::rejected(sys::Poller::shared_ptr, Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams& cp) {
+    QPID_LOG(debug, "Connection Rejected " << identifier << ": " << cp.maxRecvBufferSize);
+    if (dataConnected) {
+        disconnected();
+    } else {
+        connectionStopped(acon, aio);
+    }
+}
+
+void RdmaConnector::disconnected() {
+    QPID_LOG(debug, "Connection disconnected " << identifier);
+    {
+    Mutex::ScopedLock l(dataConnectedLock);
+    // If we're closed already then we'll get to drained() anyway
+    if (!dataConnected) return;
+    dataConnected = false;
+    }
+    // Make sure that all the disconnected actions take place on the data "thread"
+    aio->requestCallback(boost::bind(&RdmaConnector::drained, this));
+}
+
+void RdmaConnector::dataError(Rdma::AsynchIO&) {
+    QPID_LOG(debug, "Data Error " << identifier);
+    {
+    Mutex::ScopedLock l(dataConnectedLock);
+    // If we're closed already then we'll get to drained() anyway
+    if (!dataConnected) return;
+    dataConnected = false;
+    }
+    drained();
+}
+
+void RdmaConnector::close() {
+    QPID_LOG(debug, "RdmaConnector::close " << identifier);
+    {
+    Mutex::ScopedLock l(dataConnectedLock);
+    if (!dataConnected) return;
+    dataConnected = false;
+    }
+    aio->drainWriteQueue(boost::bind(&RdmaConnector::drained, this));
+}
+
+void RdmaConnector::drained() {
+    QPID_LOG(debug, "RdmaConnector::drained " << identifier);
+    assert(!dataConnected);
+    assert(aio);
+    Rdma::AsynchIO* a = aio;
+    aio = 0;
+    a->stop(boost::bind(&RdmaConnector::dataStopped, this, a));
+}
+
+void RdmaConnector::dataStopped(Rdma::AsynchIO* a) {
+    QPID_LOG(debug, "RdmaConnector::dataStopped " << identifier);
+    assert(!dataConnected);
+    assert(acon);
+    Rdma::Connector* c = acon;
+    acon = 0;
+    c->stop(boost::bind(&RdmaConnector::connectionStopped, this, c, a));
+}
+
+void RdmaConnector::connectionStopped(Rdma::Connector* c, Rdma::AsynchIO* a) {
+    QPID_LOG(debug, "RdmaConnector::connectionStopped " << identifier);
+    assert(!dataConnected);
+    aio = 0;
+    acon = 0;
+    delete a;
+    delete c;
+    if (shutdownHandler) {
+        ShutdownHandler* s = shutdownHandler;
+        shutdownHandler = 0;
+        s->shutdown();
+    }
+}
+
+void RdmaConnector::setInputHandler(InputHandler* handler){
+    input = handler;
+}
+
+void RdmaConnector::setShutdownHandler(ShutdownHandler* handler){
+    shutdownHandler = handler;
+}
+
+OutputHandler* RdmaConnector::getOutputHandler(){ 
+    return this; 
+}
+
+sys::ShutdownHandler* RdmaConnector::getShutdownHandler() const {
+    return shutdownHandler;
+}
+
+const std::string& RdmaConnector::getIdentifier() const { 
+    return identifier;
+}
+
+void RdmaConnector::send(AMQFrame& frame) {
+    // It is possible that we are called to write after we are already shutting down
+    Mutex::ScopedLock l(dataConnectedLock);
+    if (!dataConnected) return;
+
+    bool notifyWrite = false;
+    {
+    Mutex::ScopedLock l(lock);
+	frames.push_back(frame);
+	//only ask to write if this is the end of a frameset or if we
+	//already have a buffers worth of data
+	currentSize += frame.encodedSize();
+	if (frame.getEof()) {
+	    lastEof = frames.size();
+	    notifyWrite = true;
+	} else {
+	    notifyWrite = (currentSize >= maxFrameSize);
+	}
+    }
+    if (notifyWrite) aio->notifyPendingWrite();
+}
+
+// Called in IO thread. (write idle routine)
+// This is NOT only called in response to previously calling notifyPendingWrite
+void RdmaConnector::writebuff(Rdma::AsynchIO&) {
+    // It's possible to be disconnected and be writable
+    Mutex::ScopedLock l(dataConnectedLock);
+    if (!dataConnected) {
+        return;
+    }
+    Codec* codec = securityLayer.get() ? (Codec*) securityLayer.get() : (Codec*) this;
+    if (!codec->canEncode()) {
+        return;
+    }
+    Rdma::Buffer* buffer = aio->getSendBuffer();
+    if (buffer) {
+        size_t encoded = codec->encode(buffer->bytes(), buffer->byteCount());
+        buffer->dataCount(encoded);
+        aio->queueWrite(buffer);
+    }
+}
+
+bool RdmaConnector::canEncode()
+{
+    Mutex::ScopedLock l(lock);
+    //have at least one full frameset or a whole buffers worth of data
+    return aio->writable() && (lastEof || currentSize >= maxFrameSize);
+}
+
+size_t RdmaConnector::encode(const char* buffer, size_t size)
+{
+    framing::Buffer out(const_cast<char*>(buffer), size);
+    size_t bytesWritten(0);
+    {
+        Mutex::ScopedLock l(lock);
+        while (!frames.empty() && out.available() >= frames.front().encodedSize() ) {
+            frames.front().encode(out);
+            QPID_LOG(trace, "SENT " << identifier << ": " << frames.front());
+            frames.pop_front();
+            if (lastEof) --lastEof;
+        }
+        bytesWritten = size - out.available();
+        currentSize -= bytesWritten;
+    }
+    if (bounds) bounds->reduce(bytesWritten);
+    return bytesWritten;
+}
+
+void RdmaConnector::readbuff(Rdma::AsynchIO&, Rdma::Buffer* buff) {
+    Codec* codec = securityLayer.get() ? (Codec*) securityLayer.get() : (Codec*) this;
+    codec->decode(buff->bytes(), buff->dataCount());
+}
+
+size_t RdmaConnector::decode(const char* buffer, size_t size) 
+{
+    framing::Buffer in(const_cast<char*>(buffer), size);
+    if (!initiated) {
+        framing::ProtocolInitiation protocolInit;
+        if (protocolInit.decode(in)) {
+            //TODO: check the version is correct
+            QPID_LOG(debug, "RECV " << identifier << " INIT(" << protocolInit << ")");
+        }
+        initiated = true;
+    }
+    AMQFrame frame;
+    while(frame.decode(in)){
+        QPID_LOG(trace, "RECV " << identifier << ": " << frame);
+        input->received(frame);
+    }
+    return size - in.available();
+}
+
+void RdmaConnector::writeDataBlock(const AMQDataBlock& data) {
+    Rdma::Buffer* buff = aio->getSendBuffer();
+    framing::Buffer out(buff->bytes(), buff->byteCount());
+    data.encode(out);
+    buff->dataCount(data.encodedSize());
+    aio->queueWrite(buff);
+}
+
+void RdmaConnector::activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer> sl)
+{
+    securityLayer = sl;
+    securityLayer->init(this);
+}
+
+}} // namespace qpid::client
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/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_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 b507625b11..b507625b11 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 cd7b2c123d..cd7b2c123d 100644
--- a/cpp/src/qpid/client/SessionImpl.h
+++ b/qpid/cpp/src/qpid/client/SessionImpl.h
diff --git a/qpid/cpp/src/qpid/client/SslConnector.cpp b/qpid/cpp/src/qpid/client/SslConnector.cpp
new file mode 100644
index 0000000000..f121cfb1ab
--- /dev/null
+++ b/qpid/cpp/src/qpid/client/SslConnector.cpp
@@ -0,0 +1,381 @@
+/*
+ *
+ * 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.
+ *
+ */
+#include "qpid/client/Connector.h"
+
+#include "config.h"
+#include "qpid/client/Bounds.h"
+#include "qpid/client/ConnectionImpl.h"
+#include "qpid/client/ConnectionSettings.h"
+#include "qpid/Options.h"
+#include "qpid/log/Statement.h"
+#include "qpid/sys/Time.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/sys/ssl/util.h"
+#include "qpid/sys/ssl/SslIo.h"
+#include "qpid/sys/ssl/SslSocket.h"
+#include "qpid/sys/Dispatcher.h"
+#include "qpid/sys/Poller.h"
+#include "qpid/sys/SecuritySettings.h"
+#include "qpid/Msg.h"
+
+#include <iostream>
+#include <map>
+#include <boost/bind.hpp>
+#include <boost/format.hpp>
+
+namespace qpid {
+namespace client {
+
+using namespace qpid::sys;
+using namespace qpid::sys::ssl;
+using namespace qpid::framing;
+using boost::format;
+using boost::str;
+
+
+class SslConnector : public Connector
+{
+    struct Buff;
+
+    /** Batch up frames for writing to aio. */
+    class Writer : public framing::FrameHandler {
+        typedef sys::ssl::SslIOBufferBase BufferBase;
+        typedef std::vector<framing::AMQFrame> Frames;
+
+        const uint16_t maxFrameSize;
+        sys::Mutex lock;
+        sys::ssl::SslIO* aio;
+        BufferBase* buffer;
+        Frames frames;
+        size_t lastEof; // Position after last EOF in frames
+        framing::Buffer encode;
+        size_t framesEncoded;
+        std::string identifier;
+        Bounds* bounds;
+
+        void writeOne();
+        void newBuffer();
+
+      public:
+
+        Writer(uint16_t maxFrameSize, Bounds*);
+        ~Writer();
+        void init(std::string id, sys::ssl::SslIO*);
+        void handle(framing::AMQFrame&);
+        void write(sys::ssl::SslIO&);
+    };
+
+    const uint16_t maxFrameSize;
+    framing::ProtocolVersion version;
+    bool initiated;
+    SecuritySettings securitySettings;
+
+    sys::Mutex closedLock;
+    bool closed;
+
+    sys::ShutdownHandler* shutdownHandler;
+    framing::InputHandler* input;
+    framing::InitiationHandler* initialiser;
+    framing::OutputHandler* output;
+
+    Writer writer;
+
+    sys::ssl::SslSocket socket;
+
+    sys::ssl::SslIO* aio;
+    Poller::shared_ptr poller;
+
+    ~SslConnector();
+
+    void readbuff(qpid::sys::ssl::SslIO&, qpid::sys::ssl::SslIOBufferBase*);
+    void writebuff(qpid::sys::ssl::SslIO&);
+    void writeDataBlock(const framing::AMQDataBlock& data);
+    void eof(qpid::sys::ssl::SslIO&);
+    void disconnected(qpid::sys::ssl::SslIO&);
+
+    std::string identifier;
+
+    void connect(const std::string& host, const std::string& port);
+    void init();
+    void close();
+    void send(framing::AMQFrame& frame);
+    void abort() {} // TODO: Need to fix for heartbeat timeouts to work
+
+    void setInputHandler(framing::InputHandler* handler);
+    void setShutdownHandler(sys::ShutdownHandler* handler);
+    sys::ShutdownHandler* getShutdownHandler() const;
+    framing::OutputHandler* getOutputHandler();
+    const std::string& getIdentifier() const;
+    const SecuritySettings* getSecuritySettings();
+    void socketClosed(qpid::sys::ssl::SslIO&, const qpid::sys::ssl::SslSocket&);
+
+public:
+    SslConnector(Poller::shared_ptr p, framing::ProtocolVersion pVersion,
+              const ConnectionSettings&,
+              ConnectionImpl*);
+};
+
+struct SslConnector::Buff : public SslIO::BufferBase {
+    Buff(size_t size) : SslIO::BufferBase(new char[size], size) {}
+    ~Buff() { delete [] bytes;}
+};
+
+// Static constructor which registers connector here
+namespace {
+    Connector* create(Poller::shared_ptr p, framing::ProtocolVersion v, const ConnectionSettings& s, ConnectionImpl* c) {
+        return new SslConnector(p, v, s, c);
+    }
+
+    struct StaticInit {
+        StaticInit() {
+            try {
+                SslOptions options;
+                options.parse (0, 0, QPIDC_CONF_FILE, true);
+                if (options.certDbPath.empty()) {
+                    QPID_LOG(info, "SSL connector not enabled, you must set QPID_SSL_CERT_DB to enable it.");
+                } else {
+                    initNSS(options);
+                    Connector::registerFactory("ssl", &create);
+                }
+            } catch (const std::exception& e) {
+                QPID_LOG(error, "Failed to initialise SSL connector: " << e.what());
+            }
+        };
+
+        ~StaticInit() { shutdownNSS(); }
+    } init;
+}
+
+SslConnector::SslConnector(Poller::shared_ptr p,
+                     ProtocolVersion ver,
+                     const ConnectionSettings& settings,
+                     ConnectionImpl* cimpl)
+    : maxFrameSize(settings.maxFrameSize),
+      version(ver),
+      initiated(false),
+      closed(true),
+      shutdownHandler(0),
+      writer(maxFrameSize, cimpl),
+      aio(0),
+      poller(p)
+{
+    QPID_LOG(debug, "SslConnector created for " << version.toString());
+
+    if (settings.sslCertName != "") {
+        QPID_LOG(debug, "ssl-cert-name = " << settings.sslCertName);
+        socket.setCertName(settings.sslCertName);
+    }
+}
+
+SslConnector::~SslConnector() {
+    close();
+}
+
+void SslConnector::connect(const std::string& host, const std::string& port){
+    Mutex::ScopedLock l(closedLock);
+    assert(closed);
+    try {
+        socket.connect(host, port);
+    } catch (const std::exception& e) {
+        socket.close();
+        throw ConnectionException(framing::connection::CLOSE_CODE_FRAMING_ERROR, e.what());
+    }
+
+    identifier = str(format("[%1% %2%]") % socket.getLocalPort() % socket.getPeerAddress());
+    closed = false;
+    aio = new SslIO(socket,
+                       boost::bind(&SslConnector::readbuff, this, _1, _2),
+                       boost::bind(&SslConnector::eof, this, _1),
+                       boost::bind(&SslConnector::disconnected, this, _1),
+                       boost::bind(&SslConnector::socketClosed, this, _1, _2),
+                       0, // nobuffs
+                       boost::bind(&SslConnector::writebuff, this, _1));
+    writer.init(identifier, aio);
+}
+
+void SslConnector::init(){
+    Mutex::ScopedLock l(closedLock);
+    ProtocolInitiation init(version);
+    writeDataBlock(init);
+    for (int i = 0; i < 32; i++) {
+        aio->queueReadBuffer(new Buff(maxFrameSize));
+    }
+    aio->start(poller);
+}
+
+void SslConnector::close() {
+    Mutex::ScopedLock l(closedLock);
+    if (!closed) {
+        closed = true;
+        if (aio)
+            aio->queueWriteClose();
+    }
+}
+
+void SslConnector::socketClosed(SslIO&, const SslSocket&) {
+    if (aio)
+        aio->queueForDeletion();
+    if (shutdownHandler)
+        shutdownHandler->shutdown();
+}
+
+void SslConnector::setInputHandler(InputHandler* handler){
+    input = handler;
+}
+
+void SslConnector::setShutdownHandler(ShutdownHandler* handler){
+    shutdownHandler = handler;
+}
+
+OutputHandler* SslConnector::getOutputHandler() {
+    return this;
+}
+
+sys::ShutdownHandler* SslConnector::getShutdownHandler() const {
+    return shutdownHandler;
+}
+
+const std::string& SslConnector::getIdentifier() const {
+    return identifier;
+}
+
+void SslConnector::send(AMQFrame& frame) {
+    writer.handle(frame);
+}
+
+SslConnector::Writer::Writer(uint16_t s, Bounds* b) : maxFrameSize(s), aio(0), buffer(0), lastEof(0), bounds(b)
+{
+}
+
+SslConnector::Writer::~Writer() { delete buffer; }
+
+void SslConnector::Writer::init(std::string id, sys::ssl::SslIO* a) {
+    Mutex::ScopedLock l(lock);
+    identifier = id;
+    aio = a;
+    newBuffer();
+}
+void SslConnector::Writer::handle(framing::AMQFrame& frame) {
+    Mutex::ScopedLock l(lock);
+    frames.push_back(frame);
+    if (frame.getEof() || (bounds && bounds->getCurrentSize() >= maxFrameSize)) {
+        lastEof = frames.size();
+        aio->notifyPendingWrite();
+    }
+    QPID_LOG(trace, "SENT " << identifier << ": " << frame);
+}
+
+void SslConnector::Writer::writeOne() {
+    assert(buffer);
+    framesEncoded = 0;
+
+    buffer->dataStart = 0;
+    buffer->dataCount = encode.getPosition();
+    aio->queueWrite(buffer);
+    newBuffer();
+}
+
+void SslConnector::Writer::newBuffer() {
+    buffer = aio->getQueuedBuffer();
+    if (!buffer) buffer = new Buff(maxFrameSize);
+    encode = framing::Buffer(buffer->bytes, buffer->byteCount);
+    framesEncoded = 0;
+}
+
+// Called in IO thread.
+void SslConnector::Writer::write(sys::ssl::SslIO&) {
+    Mutex::ScopedLock l(lock);
+    assert(buffer);
+    size_t bytesWritten(0);
+    for (size_t i = 0; i < lastEof; ++i) {
+        AMQFrame& frame = frames[i];
+        uint32_t size = frame.encodedSize();
+        if (size > encode.available()) writeOne();
+        assert(size <= encode.available());
+        frame.encode(encode);
+        ++framesEncoded;
+        bytesWritten += size;
+    }
+    frames.erase(frames.begin(), frames.begin()+lastEof);
+    lastEof = 0;
+    if (bounds) bounds->reduce(bytesWritten);
+    if (encode.getPosition() > 0) writeOne();
+}
+
+void SslConnector::readbuff(SslIO& aio, SslIO::BufferBase* buff) {
+    framing::Buffer in(buff->bytes+buff->dataStart, buff->dataCount);
+
+    if (!initiated) {
+        framing::ProtocolInitiation protocolInit;
+        if (protocolInit.decode(in)) {
+            //TODO: check the version is correct
+            QPID_LOG(debug, "RECV " << identifier << " INIT(" << protocolInit << ")");
+        }
+        initiated = true;
+    }
+    AMQFrame frame;
+    while(frame.decode(in)){
+        QPID_LOG(trace, "RECV " << identifier << ": " << frame);
+        input->received(frame);
+    }
+    // TODO: unreading needs to go away, and when we can cope
+    // with multiple sub-buffers in the general buffer scheme, it will
+    if (in.available() != 0) {
+        // Adjust buffer for used bytes and then "unread them"
+        buff->dataStart += buff->dataCount-in.available();
+        buff->dataCount = in.available();
+        aio.unread(buff);
+    } else {
+        // Give whole buffer back to aio subsystem
+        aio.queueReadBuffer(buff);
+    }
+}
+
+void SslConnector::writebuff(SslIO& aio_) {
+    writer.write(aio_);
+}
+
+void SslConnector::writeDataBlock(const AMQDataBlock& data) {
+    SslIO::BufferBase* buff = new Buff(maxFrameSize);
+    framing::Buffer out(buff->bytes, buff->byteCount);
+    data.encode(out);
+    buff->dataCount = data.encodedSize();
+    aio->queueWrite(buff);
+}
+
+void SslConnector::eof(SslIO&) {
+    close();
+}
+
+void SslConnector::disconnected(SslIO&) {
+    close();
+    socketClosed(*aio, socket);
+}
+
+const SecuritySettings* SslConnector::getSecuritySettings()
+{
+    securitySettings.ssf = socket.getKeyLen();
+    securitySettings.authid = "dummy";//set to non-empty string to enable external authentication
+    return &securitySettings;
+}
+
+}} // namespace qpid::client
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/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/SubscriptionManagerImpl.cpp b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp
index a558d90be8..a558d90be8 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 6376a05c45..6376a05c45 100644
--- a/cpp/src/qpid/client/SubscriptionManagerImpl.h
+++ b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.h
diff --git a/qpid/cpp/src/qpid/client/TCPConnector.cpp b/qpid/cpp/src/qpid/client/TCPConnector.cpp
new file mode 100644
index 0000000000..0070b24ec0
--- /dev/null
+++ b/qpid/cpp/src/qpid/client/TCPConnector.cpp
@@ -0,0 +1,331 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/client/TCPConnector.h"
+
+#include "qpid/client/ConnectionImpl.h"
+#include "qpid/client/ConnectionSettings.h"
+#include "qpid/log/Statement.h"
+#include "qpid/sys/Codec.h"
+#include "qpid/sys/Time.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/sys/AsynchIO.h"
+#include "qpid/sys/Dispatcher.h"
+#include "qpid/sys/Poller.h"
+#include "qpid/sys/SecurityLayer.h"
+#include "qpid/Msg.h"
+
+#include <iostream>
+#include <boost/bind.hpp>
+#include <boost/format.hpp>
+
+namespace qpid {
+namespace client {
+
+using namespace qpid::sys;
+using namespace qpid::framing;
+using boost::format;
+using boost::str;
+
+struct TCPConnector::Buff : public AsynchIO::BufferBase {
+    Buff(size_t size) : AsynchIO::BufferBase(new char[size], size) {}
+    ~Buff() { delete [] bytes;}
+};
+
+// Static constructor which registers connector here
+namespace {
+    Connector* create(Poller::shared_ptr p, framing::ProtocolVersion v, const ConnectionSettings& s, ConnectionImpl* c) {
+        return new TCPConnector(p, v, s, c);
+    }
+
+    struct StaticInit {
+        StaticInit() {
+            Connector::registerFactory("tcp", &create);
+        };
+    } init;
+}
+
+TCPConnector::TCPConnector(Poller::shared_ptr p,
+                     ProtocolVersion ver,
+                     const ConnectionSettings& settings,
+                     ConnectionImpl* cimpl)
+    : maxFrameSize(settings.maxFrameSize),
+      lastEof(0),
+      currentSize(0),
+      bounds(cimpl),
+      version(ver),
+      initiated(false),
+      closed(true),
+      shutdownHandler(0),
+      connector(0),
+      aio(0),
+      poller(p)
+{
+    QPID_LOG(debug, "TCPConnector created for " << version);
+    settings.configureSocket(socket);
+}
+
+TCPConnector::~TCPConnector() {
+    close();
+}
+
+void TCPConnector::connect(const std::string& host, const std::string& port) {
+    Mutex::ScopedLock l(lock);
+    assert(closed);
+    connector = AsynchConnector::create(
+        socket,
+        host, port,
+        boost::bind(&TCPConnector::connected, this, _1),
+        boost::bind(&TCPConnector::connectFailed, this, _3));
+    closed = false;
+
+    connector->start(poller);
+}
+
+void TCPConnector::connected(const Socket&) {
+    connector = 0;
+    aio = AsynchIO::create(socket,
+                       boost::bind(&TCPConnector::readbuff, this, _1, _2),
+                       boost::bind(&TCPConnector::eof, this, _1),
+                       boost::bind(&TCPConnector::disconnected, this, _1),
+                       boost::bind(&TCPConnector::socketClosed, this, _1, _2),
+                       0, // nobuffs
+                       boost::bind(&TCPConnector::writebuff, this, _1));
+    start(aio);
+    initAmqp();
+    aio->start(poller);
+}
+
+void TCPConnector::start(sys::AsynchIO* aio_) {
+    aio = aio_;
+    for (int i = 0; i < 4; i++) {
+        aio->queueReadBuffer(new Buff(maxFrameSize));
+    }
+
+    identifier = str(format("[%1%]") % socket.getFullAddress());
+}
+
+void TCPConnector::initAmqp() {
+    ProtocolInitiation init(version);
+    writeDataBlock(init);
+}
+
+void TCPConnector::connectFailed(const std::string& msg) {
+    connector = 0;
+    QPID_LOG(warning, "Connect failed: " << msg);
+    socket.close();
+    if (!closed)
+        closed = true;
+    if (shutdownHandler)
+        shutdownHandler->shutdown();
+}
+
+void TCPConnector::close() {
+    Mutex::ScopedLock l(lock);
+    if (!closed) {
+        closed = true;
+        if (aio)
+            aio->queueWriteClose();
+    }
+}
+
+void TCPConnector::socketClosed(AsynchIO&, const Socket&) {
+    if (aio)
+        aio->queueForDeletion();
+    if (shutdownHandler)
+        shutdownHandler->shutdown();
+}
+
+void TCPConnector::abort() {
+    // Can't abort a closed connection
+    if (!closed) {
+        if (aio) {
+            // Established connection
+            aio->requestCallback(boost::bind(&TCPConnector::eof, this, _1));
+        } else if (connector) {
+            // We're still connecting
+            connector->stop();
+            connectFailed("Connection timedout");
+        }
+    }
+}
+
+void TCPConnector::setInputHandler(InputHandler* handler){
+    input = handler;
+}
+
+void TCPConnector::setShutdownHandler(ShutdownHandler* handler){
+    shutdownHandler = handler;
+}
+
+OutputHandler* TCPConnector::getOutputHandler() {
+    return this; 
+}
+
+sys::ShutdownHandler* TCPConnector::getShutdownHandler() const {
+    return shutdownHandler;
+}
+
+const std::string& TCPConnector::getIdentifier() const { 
+    return identifier;
+}
+
+void TCPConnector::send(AMQFrame& frame) {
+    bool notifyWrite = false;
+    {
+    Mutex::ScopedLock l(lock);
+    frames.push_back(frame);
+    //only ask to write if this is the end of a frameset or if we
+    //already have a buffers worth of data
+    currentSize += frame.encodedSize();
+    if (frame.getEof()) {
+        lastEof = frames.size();
+        notifyWrite = true;
+    } else {
+        notifyWrite = (currentSize >= maxFrameSize);
+    }
+    /*
+      NOTE: Moving the following line into this mutex block
+            is a workaround for BZ 570168, in which the test
+            testConcurrentSenders causes a hang about 1.5%
+            of the time.  ( To see the hang much more frequently
+            leave this line out of the mutex block, and put a 
+            small usleep just before it.)
+
+            TODO mgoulish - fix the underlying cause and then
+                            move this call back outside the mutex.
+    */
+    if (notifyWrite && !closed) aio->notifyPendingWrite();
+    }
+}
+
+void TCPConnector::writebuff(AsynchIO& /*aio*/) 
+{
+    // It's possible to be disconnected and be writable
+    if (closed)
+        return;
+
+    Codec* codec = securityLayer.get() ? (Codec*) securityLayer.get() : (Codec*) this;
+    if (codec->canEncode()) {
+        std::auto_ptr<AsynchIO::BufferBase> buffer = std::auto_ptr<AsynchIO::BufferBase>(aio->getQueuedBuffer());
+        if (!buffer.get()) buffer = std::auto_ptr<AsynchIO::BufferBase>(new Buff(maxFrameSize));
+
+        size_t encoded = codec->encode(buffer->bytes, buffer->byteCount);
+
+        buffer->dataStart = 0;
+        buffer->dataCount = encoded;
+        aio->queueWrite(buffer.release());
+    }
+}
+
+// Called in IO thread.
+bool TCPConnector::canEncode()
+{
+    Mutex::ScopedLock l(lock);
+    //have at least one full frameset or a whole buffers worth of data
+    return lastEof || currentSize >= maxFrameSize;
+}
+
+// Called in IO thread.
+size_t TCPConnector::encode(const char* buffer, size_t size)
+{
+    framing::Buffer out(const_cast<char*>(buffer), size);
+    size_t bytesWritten(0);
+    {
+        Mutex::ScopedLock l(lock);
+        while (!frames.empty() && out.available() >= frames.front().encodedSize() ) {
+            frames.front().encode(out);
+            QPID_LOG(trace, "SENT " << identifier << ": " << frames.front());
+            frames.pop_front();
+            if (lastEof) --lastEof;
+        }
+        bytesWritten = size - out.available();
+        currentSize -= bytesWritten;
+    }
+    if (bounds) bounds->reduce(bytesWritten);
+    return bytesWritten;
+}
+
+bool TCPConnector::readbuff(AsynchIO& aio, AsynchIO::BufferBase* buff) 
+{
+    Codec* codec = securityLayer.get() ? (Codec*) securityLayer.get() : (Codec*) this;
+    int32_t decoded = codec->decode(buff->bytes+buff->dataStart, buff->dataCount);
+    // TODO: unreading needs to go away, and when we can cope
+    // with multiple sub-buffers in the general buffer scheme, it will
+    if (decoded < buff->dataCount) {
+        // Adjust buffer for used bytes and then "unread them"
+        buff->dataStart += decoded;
+        buff->dataCount -= decoded;
+        aio.unread(buff);
+    } else {
+        // Give whole buffer back to aio subsystem
+        aio.queueReadBuffer(buff);
+    }
+    return true;
+}
+
+size_t TCPConnector::decode(const char* buffer, size_t size) 
+{
+    framing::Buffer in(const_cast<char*>(buffer), size);
+    if (!initiated) {
+        framing::ProtocolInitiation protocolInit;
+        if (protocolInit.decode(in)) {
+            QPID_LOG(debug, "RECV " << identifier << " INIT(" << protocolInit << ")");
+            if(!(protocolInit==version)){
+                throw Exception(QPID_MSG("Unsupported version: " << protocolInit
+                                         << " supported version " << version));
+            }
+        }
+        initiated = true;
+    }
+    AMQFrame frame;
+    while(frame.decode(in)){
+        QPID_LOG(trace, "RECV " << identifier << ": " << frame);
+        input->received(frame);
+    }
+    return size - in.available();
+}
+
+void TCPConnector::writeDataBlock(const AMQDataBlock& data) {
+    AsynchIO::BufferBase* buff = aio->getQueuedBuffer();
+    framing::Buffer out(buff->bytes, buff->byteCount);
+    data.encode(out);
+    buff->dataCount = data.encodedSize();
+    aio->queueWrite(buff);
+}
+
+void TCPConnector::eof(AsynchIO&) {
+    close();
+}
+
+void TCPConnector::disconnected(AsynchIO&) {
+    close();
+    socketClosed(*aio, socket);
+}
+
+void TCPConnector::activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer> sl)
+{
+    securityLayer = sl;
+    securityLayer->init(this);
+}
+
+}} // namespace qpid::client
diff --git a/qpid/cpp/src/qpid/client/TCPConnector.h b/qpid/cpp/src/qpid/client/TCPConnector.h
new file mode 100644
index 0000000000..eb3f696013
--- /dev/null
+++ b/qpid/cpp/src/qpid/client/TCPConnector.h
@@ -0,0 +1,120 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#ifndef _TCPConnector_
+#define _TCPConnector_
+
+#include "Connector.h"
+#include "qpid/client/Bounds.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/sys/AsynchIO.h"
+#include "qpid/sys/Codec.h"
+#include "qpid/sys/IntegerTypes.h"
+#include "qpid/sys/Mutex.h"
+#include "qpid/sys/Runnable.h"
+#include "qpid/sys/SecurityLayer.h"
+#include "qpid/sys/Socket.h"
+#include "qpid/sys/Thread.h"
+
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
+#include <deque>
+#include <string>
+
+namespace qpid {
+
+namespace framing {
+    class InitiationHandler;
+}
+
+namespace client {
+
+class TCPConnector : public Connector, public sys::Codec
+{
+    typedef std::deque<framing::AMQFrame> Frames;
+    struct Buff;
+
+    const uint16_t maxFrameSize;
+
+    sys::Mutex lock;
+    Frames frames; // Outgoing frame queue
+    size_t lastEof; // Position after last EOF in frames
+    uint64_t currentSize;
+    Bounds* bounds;
+
+    framing::ProtocolVersion version;
+    bool initiated;
+    bool closed;
+
+    sys::ShutdownHandler* shutdownHandler;
+    framing::InputHandler* input;
+    framing::InitiationHandler* initialiser;
+    framing::OutputHandler* output;
+
+    sys::Socket socket;
+
+    sys::AsynchConnector* connector;
+    sys::AsynchIO* aio;
+    std::string identifier;
+    boost::shared_ptr<sys::Poller> poller;
+    std::auto_ptr<qpid::sys::SecurityLayer> securityLayer;
+
+    virtual void connected(const sys::Socket&);
+    void writeDataBlock(const framing::AMQDataBlock& data);
+
+    void close();
+    void send(framing::AMQFrame& frame);
+    void abort();
+
+    void setInputHandler(framing::InputHandler* handler);
+    void setShutdownHandler(sys::ShutdownHandler* handler);
+    sys::ShutdownHandler* getShutdownHandler() const;
+    framing::OutputHandler* getOutputHandler();
+    const std::string& getIdentifier() const;
+    void activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer>);
+    const qpid::sys::SecuritySettings* getSecuritySettings() { return 0; }
+
+    size_t decode(const char* buffer, size_t size);
+    size_t encode(const char* buffer, size_t size);
+    bool canEncode();
+
+protected:
+    virtual ~TCPConnector();
+    void connect(const std::string& host, const std::string& port);
+    void start(sys::AsynchIO* aio_);
+    void initAmqp();
+    virtual void connectFailed(const std::string& msg);
+    bool readbuff(qpid::sys::AsynchIO&, qpid::sys::AsynchIOBufferBase*);
+    void writebuff(qpid::sys::AsynchIO&);
+    void eof(qpid::sys::AsynchIO&);
+    void disconnected(qpid::sys::AsynchIO&);
+    void socketClosed(qpid::sys::AsynchIO&, const qpid::sys::Socket&);
+
+public:
+    TCPConnector(boost::shared_ptr<sys::Poller>,
+              framing::ProtocolVersion pVersion,
+              const ConnectionSettings&,
+              ConnectionImpl*);
+};
+
+}}   // namespace qpid::client
+
+#endif  /* _TCPConnector_ */
diff --git a/cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp b/qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp
index bfb20118b5..bfb20118b5 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 87890e41cc..87890e41cc 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 f1295a3b66..f1295a3b66 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 a87a8dea67..a87a8dea67 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 09f2038312..09f2038312 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 71e89bdba1..71e89bdba1 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 f6a291bc68..f6a291bc68 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 d93416da75..d93416da75 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 0cdd2a2336..0cdd2a2336 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 030b804143..030b804143 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 5693b7b71f..5693b7b71f 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 f2f0f1a9e5..f2f0f1a9e5 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 c10c77ae18..c10c77ae18 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 75a71997fd..75a71997fd 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 2a2aa47df6..2a2aa47df6 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/amqp0_10/SimpleUrlParser.cpp b/qpid/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.cpp
index 327c2274a6..327c2274a6 100644
--- a/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.h b/qpid/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.h
index 24f90ca9d6..24f90ca9d6 100644
--- a/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.h
diff --git a/cpp/src/qpid/client/windows/SaslFactory.cpp b/qpid/cpp/src/qpid/client/windows/SaslFactory.cpp
index d1ae762f1b..d1ae762f1b 100644
--- a/cpp/src/qpid/client/windows/SaslFactory.cpp
+++ b/qpid/cpp/src/qpid/client/windows/SaslFactory.cpp
diff --git a/qpid/cpp/src/qpid/client/windows/SslConnector.cpp b/qpid/cpp/src/qpid/client/windows/SslConnector.cpp
new file mode 100644
index 0000000000..785c817928
--- /dev/null
+++ b/qpid/cpp/src/qpid/client/windows/SslConnector.cpp
@@ -0,0 +1,181 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/client/TCPConnector.h"
+
+#include "config.h"
+#include "qpid/Msg.h"
+#include "qpid/client/ConnectionImpl.h"
+#include "qpid/client/ConnectionSettings.h"
+#include "qpid/log/Statement.h"
+#include "qpid/sys/Dispatcher.h"
+#include "qpid/sys/Poller.h"
+#include "qpid/sys/Time.h"
+#include "qpid/sys/windows/check.h"
+#include "qpid/sys/windows/SslAsynchIO.h"
+
+#include <iostream>
+#include <boost/bind.hpp>
+#include <boost/format.hpp>
+
+#include <memory.h>
+// security.h needs to see this to distinguish from kernel use.
+#define SECURITY_WIN32
+#include <security.h>
+#include <Schnlsp.h>
+#undef SECURITY_WIN32
+#include <winsock2.h>
+
+namespace qpid {
+namespace client {
+namespace windows {
+
+using namespace qpid::sys;
+using boost::format;
+using boost::str;
+
+
+class SslConnector : public qpid::client::TCPConnector
+{
+    qpid::sys::windows::ClientSslAsynchIO *shim;
+	boost::shared_ptr<qpid::sys::Poller> poller;
+    std::string brokerHost;
+    SCHANNEL_CRED cred;
+    CredHandle credHandle;
+    TimeStamp credExpiry;
+
+    virtual ~SslConnector();
+    void negotiationDone(SECURITY_STATUS status);
+
+    // A number of AsynchIO callbacks go right through to TCPConnector, but
+    // we can't boost::bind to a protected ancestor, so these methods redirect
+    // to those TCPConnector methods.
+    bool redirectReadbuff(qpid::sys::AsynchIO&, qpid::sys::AsynchIOBufferBase*);
+    void redirectWritebuff(qpid::sys::AsynchIO&);
+    void redirectEof(qpid::sys::AsynchIO&);
+
+public:
+    SslConnector(boost::shared_ptr<qpid::sys::Poller>,
+                 framing::ProtocolVersion pVersion,
+                 const ConnectionSettings&, 
+                 ConnectionImpl*);
+    virtual void connect(const std::string& host, const std::string& port);
+    virtual void connected(const Socket&);
+    unsigned int getSSF();
+};
+
+// Static constructor which registers connector here
+namespace {
+    Connector* create(boost::shared_ptr<qpid::sys::Poller> p,
+                      framing::ProtocolVersion v,
+                      const ConnectionSettings& s,
+                      ConnectionImpl* c) {
+        return new SslConnector(p, v, s, c);
+    }
+
+    struct StaticInit {
+        StaticInit() {
+            try {
+                Connector::registerFactory("ssl", &create);
+            } catch (const std::exception& e) {
+                QPID_LOG(error, "Failed to initialise SSL connector: " << e.what());
+            }
+        };
+        ~StaticInit() { }
+    } init;
+}
+
+void SslConnector::negotiationDone(SECURITY_STATUS status)
+{
+    if (status == SEC_E_OK)
+        initAmqp();
+    else
+        connectFailed(QPID_MSG(qpid::sys::strError(status)));
+}
+
+bool SslConnector::redirectReadbuff(qpid::sys::AsynchIO& a,
+                                    qpid::sys::AsynchIOBufferBase* b) {
+    return readbuff(a, b);
+}
+
+void SslConnector::redirectWritebuff(qpid::sys::AsynchIO& a) {
+    writebuff(a);
+}
+
+void SslConnector::redirectEof(qpid::sys::AsynchIO& a) {
+    eof(a);
+}
+
+SslConnector::SslConnector(boost::shared_ptr<qpid::sys::Poller> p,
+                           framing::ProtocolVersion ver,
+                           const ConnectionSettings& settings,
+                           ConnectionImpl* cimpl)
+    : TCPConnector(p, ver, settings, cimpl), shim(0), poller(p)
+{
+    memset(&cred, 0, sizeof(cred));
+    cred.dwVersion = SCHANNEL_CRED_VERSION;
+    SECURITY_STATUS status = ::AcquireCredentialsHandle(NULL,
+                                                        UNISP_NAME,
+                                                        SECPKG_CRED_OUTBOUND,
+                                                        NULL,
+                                                        &cred,
+                                                        NULL,
+                                                        NULL,
+                                                        &credHandle,
+                                                        &credExpiry);
+    if (status != SEC_E_OK)
+        throw QPID_WINDOWS_ERROR(status);
+    QPID_LOG(debug, "SslConnector created for " << ver.toString());
+}
+
+SslConnector::~SslConnector()
+{
+    ::FreeCredentialsHandle(&credHandle);
+}
+
+  // Will this get reach via virtual method via boost::bind????
+
+void SslConnector::connect(const std::string& host, const std::string& port) {
+    brokerHost = host;
+    TCPConnector::connect(host, port);
+}
+
+void SslConnector::connected(const Socket& s) {
+    shim = new qpid::sys::windows::ClientSslAsynchIO(brokerHost,
+                                                     s,
+                                                     credHandle,
+                                                     boost::bind(&SslConnector::redirectReadbuff, this, _1, _2),
+                                                     boost::bind(&SslConnector::redirectEof, this, _1),
+                                                     boost::bind(&SslConnector::redirectEof, this, _1),
+                                                     0, // closed
+                                                     0, // nobuffs
+                                                     boost::bind(&SslConnector::redirectWritebuff, this, _1),
+                                                     boost::bind(&SslConnector::negotiationDone, this, _1));
+    start(shim);
+	shim->start(poller);
+}
+
+unsigned int SslConnector::getSSF()
+{
+    return shim->getSslKeySize();
+}
+
+}}} // namespace qpid::client::windows
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/qpid/cpp/src/qpid/cluster/Cluster.cpp
index 0daf0c7f5a..0daf0c7f5a 100644
--- a/cpp/src/qpid/cluster/Cluster.cpp
+++ b/qpid/cpp/src/qpid/cluster/Cluster.cpp
diff --git a/cpp/src/qpid/cluster/Cluster.h b/qpid/cpp/src/qpid/cluster/Cluster.h
index 78d325cdf9..78d325cdf9 100644
--- a/cpp/src/qpid/cluster/Cluster.h
+++ b/qpid/cpp/src/qpid/cluster/Cluster.h
diff --git a/cpp/src/qpid/cluster/ClusterMap.cpp b/qpid/cpp/src/qpid/cluster/ClusterMap.cpp
index a8389095c9..a8389095c9 100644
--- a/cpp/src/qpid/cluster/ClusterMap.cpp
+++ b/qpid/cpp/src/qpid/cluster/ClusterMap.cpp
diff --git a/cpp/src/qpid/cluster/ClusterMap.h b/qpid/cpp/src/qpid/cluster/ClusterMap.h
index cfa4ad924a..cfa4ad924a 100644
--- a/cpp/src/qpid/cluster/ClusterMap.h
+++ b/qpid/cpp/src/qpid/cluster/ClusterMap.h
diff --git a/cpp/src/qpid/cluster/ClusterPlugin.cpp b/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
index 2962daaa07..2962daaa07 100644
--- a/cpp/src/qpid/cluster/ClusterPlugin.cpp
+++ b/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
diff --git a/cpp/src/qpid/cluster/ClusterSettings.h b/qpid/cpp/src/qpid/cluster/ClusterSettings.h
index 8e708aa139..8e708aa139 100644
--- a/cpp/src/qpid/cluster/ClusterSettings.h
+++ b/qpid/cpp/src/qpid/cluster/ClusterSettings.h
diff --git a/cpp/src/qpid/cluster/ClusterTimer.cpp b/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp
index f6e1c7a849..f6e1c7a849 100644
--- a/cpp/src/qpid/cluster/ClusterTimer.cpp
+++ b/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp
diff --git a/cpp/src/qpid/cluster/ClusterTimer.h b/qpid/cpp/src/qpid/cluster/ClusterTimer.h
index 69f6c622e4..69f6c622e4 100644
--- a/cpp/src/qpid/cluster/ClusterTimer.h
+++ b/qpid/cpp/src/qpid/cluster/ClusterTimer.h
diff --git a/cpp/src/qpid/cluster/Connection.cpp b/qpid/cpp/src/qpid/cluster/Connection.cpp
index b9895290e9..b9895290e9 100644
--- a/cpp/src/qpid/cluster/Connection.cpp
+++ b/qpid/cpp/src/qpid/cluster/Connection.cpp
diff --git a/cpp/src/qpid/cluster/Connection.h b/qpid/cpp/src/qpid/cluster/Connection.h
index a0da9efbb8..a0da9efbb8 100644
--- a/cpp/src/qpid/cluster/Connection.h
+++ b/qpid/cpp/src/qpid/cluster/Connection.h
diff --git a/cpp/src/qpid/cluster/ConnectionCodec.cpp b/qpid/cpp/src/qpid/cluster/ConnectionCodec.cpp
index d0ba8abfb3..d0ba8abfb3 100644
--- a/cpp/src/qpid/cluster/ConnectionCodec.cpp
+++ b/qpid/cpp/src/qpid/cluster/ConnectionCodec.cpp
diff --git a/cpp/src/qpid/cluster/ConnectionCodec.h b/qpid/cpp/src/qpid/cluster/ConnectionCodec.h
index 17a08904d9..17a08904d9 100644
--- a/cpp/src/qpid/cluster/ConnectionCodec.h
+++ b/qpid/cpp/src/qpid/cluster/ConnectionCodec.h
diff --git a/cpp/src/qpid/cluster/Cpg.cpp b/qpid/cpp/src/qpid/cluster/Cpg.cpp
index 0856bcd824..0856bcd824 100644
--- a/cpp/src/qpid/cluster/Cpg.cpp
+++ b/qpid/cpp/src/qpid/cluster/Cpg.cpp
diff --git a/cpp/src/qpid/cluster/Cpg.h b/qpid/cpp/src/qpid/cluster/Cpg.h
index 6b81c602bd..6b81c602bd 100644
--- a/cpp/src/qpid/cluster/Cpg.h
+++ b/qpid/cpp/src/qpid/cluster/Cpg.h
diff --git a/cpp/src/qpid/cluster/Decoder.cpp b/qpid/cpp/src/qpid/cluster/Decoder.cpp
index 23ba372d78..23ba372d78 100644
--- a/cpp/src/qpid/cluster/Decoder.cpp
+++ b/qpid/cpp/src/qpid/cluster/Decoder.cpp
diff --git a/cpp/src/qpid/cluster/Decoder.h b/qpid/cpp/src/qpid/cluster/Decoder.h
index 3b5ada4a81..3b5ada4a81 100644
--- a/cpp/src/qpid/cluster/Decoder.h
+++ b/qpid/cpp/src/qpid/cluster/Decoder.h
diff --git a/cpp/src/qpid/cluster/Dispatchable.h b/qpid/cpp/src/qpid/cluster/Dispatchable.h
index e7f0df4218..e7f0df4218 100644
--- a/cpp/src/qpid/cluster/Dispatchable.h
+++ b/qpid/cpp/src/qpid/cluster/Dispatchable.h
diff --git a/cpp/src/qpid/cluster/ErrorCheck.cpp b/qpid/cpp/src/qpid/cluster/ErrorCheck.cpp
index be671c0f48..be671c0f48 100644
--- a/cpp/src/qpid/cluster/ErrorCheck.cpp
+++ b/qpid/cpp/src/qpid/cluster/ErrorCheck.cpp
diff --git a/cpp/src/qpid/cluster/ErrorCheck.h b/qpid/cpp/src/qpid/cluster/ErrorCheck.h
index a417b2ec25..a417b2ec25 100644
--- a/cpp/src/qpid/cluster/ErrorCheck.h
+++ b/qpid/cpp/src/qpid/cluster/ErrorCheck.h
diff --git a/cpp/src/qpid/cluster/Event.cpp b/qpid/cpp/src/qpid/cluster/Event.cpp
index da2bc89d8c..da2bc89d8c 100644
--- a/cpp/src/qpid/cluster/Event.cpp
+++ b/qpid/cpp/src/qpid/cluster/Event.cpp
diff --git a/cpp/src/qpid/cluster/Event.h b/qpid/cpp/src/qpid/cluster/Event.h
index 13283edff7..13283edff7 100644
--- a/cpp/src/qpid/cluster/Event.h
+++ b/qpid/cpp/src/qpid/cluster/Event.h
diff --git a/cpp/src/qpid/cluster/EventFrame.cpp b/qpid/cpp/src/qpid/cluster/EventFrame.cpp
index 5fbe1fe57c..5fbe1fe57c 100644
--- a/cpp/src/qpid/cluster/EventFrame.cpp
+++ b/qpid/cpp/src/qpid/cluster/EventFrame.cpp
diff --git a/cpp/src/qpid/cluster/EventFrame.h b/qpid/cpp/src/qpid/cluster/EventFrame.h
index 6b702a9bf8..6b702a9bf8 100644
--- a/cpp/src/qpid/cluster/EventFrame.h
+++ b/qpid/cpp/src/qpid/cluster/EventFrame.h
diff --git a/cpp/src/qpid/cluster/ExpiryPolicy.cpp b/qpid/cpp/src/qpid/cluster/ExpiryPolicy.cpp
index d9a7b0122a..d9a7b0122a 100644
--- a/cpp/src/qpid/cluster/ExpiryPolicy.cpp
+++ b/qpid/cpp/src/qpid/cluster/ExpiryPolicy.cpp
diff --git a/cpp/src/qpid/cluster/ExpiryPolicy.h b/qpid/cpp/src/qpid/cluster/ExpiryPolicy.h
index 77a656aa68..77a656aa68 100644
--- a/cpp/src/qpid/cluster/ExpiryPolicy.h
+++ b/qpid/cpp/src/qpid/cluster/ExpiryPolicy.h
diff --git a/cpp/src/qpid/cluster/FailoverExchange.cpp b/qpid/cpp/src/qpid/cluster/FailoverExchange.cpp
index 84232dac1b..84232dac1b 100644
--- a/cpp/src/qpid/cluster/FailoverExchange.cpp
+++ b/qpid/cpp/src/qpid/cluster/FailoverExchange.cpp
diff --git a/cpp/src/qpid/cluster/FailoverExchange.h b/qpid/cpp/src/qpid/cluster/FailoverExchange.h
index 2e1edfc0ae..2e1edfc0ae 100644
--- a/cpp/src/qpid/cluster/FailoverExchange.h
+++ b/qpid/cpp/src/qpid/cluster/FailoverExchange.h
diff --git a/cpp/src/qpid/cluster/InitialStatusMap.cpp b/qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp
index c8ecc13f2c..c8ecc13f2c 100644
--- a/cpp/src/qpid/cluster/InitialStatusMap.cpp
+++ b/qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp
diff --git a/cpp/src/qpid/cluster/InitialStatusMap.h b/qpid/cpp/src/qpid/cluster/InitialStatusMap.h
index a5a600365e..a5a600365e 100644
--- a/cpp/src/qpid/cluster/InitialStatusMap.h
+++ b/qpid/cpp/src/qpid/cluster/InitialStatusMap.h
diff --git a/cpp/src/qpid/cluster/LockedConnectionMap.h b/qpid/cpp/src/qpid/cluster/LockedConnectionMap.h
index ac744d4f94..ac744d4f94 100644
--- a/cpp/src/qpid/cluster/LockedConnectionMap.h
+++ b/qpid/cpp/src/qpid/cluster/LockedConnectionMap.h
diff --git a/cpp/src/qpid/cluster/McastFrameHandler.h b/qpid/cpp/src/qpid/cluster/McastFrameHandler.h
index 17e4c2e9f0..17e4c2e9f0 100644
--- a/cpp/src/qpid/cluster/McastFrameHandler.h
+++ b/qpid/cpp/src/qpid/cluster/McastFrameHandler.h
diff --git a/cpp/src/qpid/cluster/MemberSet.cpp b/qpid/cpp/src/qpid/cluster/MemberSet.cpp
index 97748947b3..97748947b3 100644
--- a/cpp/src/qpid/cluster/MemberSet.cpp
+++ b/qpid/cpp/src/qpid/cluster/MemberSet.cpp
diff --git a/cpp/src/qpid/cluster/MemberSet.h b/qpid/cpp/src/qpid/cluster/MemberSet.h
index 7c97145dc1..7c97145dc1 100644
--- a/cpp/src/qpid/cluster/MemberSet.h
+++ b/qpid/cpp/src/qpid/cluster/MemberSet.h
diff --git a/cpp/src/qpid/cluster/Multicaster.cpp b/qpid/cpp/src/qpid/cluster/Multicaster.cpp
index 8916de9628..8916de9628 100644
--- a/cpp/src/qpid/cluster/Multicaster.cpp
+++ b/qpid/cpp/src/qpid/cluster/Multicaster.cpp
diff --git a/cpp/src/qpid/cluster/Multicaster.h b/qpid/cpp/src/qpid/cluster/Multicaster.h
index f70bd5ca31..f70bd5ca31 100644
--- a/cpp/src/qpid/cluster/Multicaster.h
+++ b/qpid/cpp/src/qpid/cluster/Multicaster.h
diff --git a/cpp/src/qpid/cluster/NoOpConnectionOutputHandler.h b/qpid/cpp/src/qpid/cluster/NoOpConnectionOutputHandler.h
index 566a82476e..566a82476e 100644
--- a/cpp/src/qpid/cluster/NoOpConnectionOutputHandler.h
+++ b/qpid/cpp/src/qpid/cluster/NoOpConnectionOutputHandler.h
diff --git a/cpp/src/qpid/cluster/Numbering.h b/qpid/cpp/src/qpid/cluster/Numbering.h
index 99e152c212..99e152c212 100644
--- a/cpp/src/qpid/cluster/Numbering.h
+++ b/qpid/cpp/src/qpid/cluster/Numbering.h
diff --git a/cpp/src/qpid/cluster/OutputInterceptor.cpp b/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp
index 4bf03eefa2..4bf03eefa2 100644
--- a/cpp/src/qpid/cluster/OutputInterceptor.cpp
+++ b/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp
diff --git a/cpp/src/qpid/cluster/OutputInterceptor.h b/qpid/cpp/src/qpid/cluster/OutputInterceptor.h
index 3abf5273a0..3abf5273a0 100644
--- a/cpp/src/qpid/cluster/OutputInterceptor.h
+++ b/qpid/cpp/src/qpid/cluster/OutputInterceptor.h
diff --git a/cpp/src/qpid/cluster/PollableQueue.h b/qpid/cpp/src/qpid/cluster/PollableQueue.h
index 10e2ed6ac3..10e2ed6ac3 100644
--- a/cpp/src/qpid/cluster/PollableQueue.h
+++ b/qpid/cpp/src/qpid/cluster/PollableQueue.h
diff --git a/cpp/src/qpid/cluster/PollerDispatch.cpp b/qpid/cpp/src/qpid/cluster/PollerDispatch.cpp
index b8d94b95a5..b8d94b95a5 100644
--- a/cpp/src/qpid/cluster/PollerDispatch.cpp
+++ b/qpid/cpp/src/qpid/cluster/PollerDispatch.cpp
diff --git a/cpp/src/qpid/cluster/PollerDispatch.h b/qpid/cpp/src/qpid/cluster/PollerDispatch.h
index 63801e0de9..63801e0de9 100644
--- a/cpp/src/qpid/cluster/PollerDispatch.h
+++ b/qpid/cpp/src/qpid/cluster/PollerDispatch.h
diff --git a/cpp/src/qpid/cluster/ProxyInputHandler.h b/qpid/cpp/src/qpid/cluster/ProxyInputHandler.h
index ad7f2c44bd..ad7f2c44bd 100644
--- a/cpp/src/qpid/cluster/ProxyInputHandler.h
+++ b/qpid/cpp/src/qpid/cluster/ProxyInputHandler.h
diff --git a/cpp/src/qpid/cluster/Quorum.h b/qpid/cpp/src/qpid/cluster/Quorum.h
index bbfa473f94..bbfa473f94 100644
--- a/cpp/src/qpid/cluster/Quorum.h
+++ b/qpid/cpp/src/qpid/cluster/Quorum.h
diff --git a/cpp/src/qpid/cluster/Quorum_cman.cpp b/qpid/cpp/src/qpid/cluster/Quorum_cman.cpp
index 728f824b16..728f824b16 100644
--- a/cpp/src/qpid/cluster/Quorum_cman.cpp
+++ b/qpid/cpp/src/qpid/cluster/Quorum_cman.cpp
diff --git a/cpp/src/qpid/cluster/Quorum_cman.h b/qpid/cpp/src/qpid/cluster/Quorum_cman.h
index 98e6baee89..98e6baee89 100644
--- a/cpp/src/qpid/cluster/Quorum_cman.h
+++ b/qpid/cpp/src/qpid/cluster/Quorum_cman.h
diff --git a/cpp/src/qpid/cluster/Quorum_null.h b/qpid/cpp/src/qpid/cluster/Quorum_null.h
index dc27f0a43b..dc27f0a43b 100644
--- a/cpp/src/qpid/cluster/Quorum_null.h
+++ b/qpid/cpp/src/qpid/cluster/Quorum_null.h
diff --git a/cpp/src/qpid/cluster/RetractClient.cpp b/qpid/cpp/src/qpid/cluster/RetractClient.cpp
index a8c4b0d543..a8c4b0d543 100644
--- a/cpp/src/qpid/cluster/RetractClient.cpp
+++ b/qpid/cpp/src/qpid/cluster/RetractClient.cpp
diff --git a/cpp/src/qpid/cluster/RetractClient.h b/qpid/cpp/src/qpid/cluster/RetractClient.h
index 533fc3f7ef..533fc3f7ef 100644
--- a/cpp/src/qpid/cluster/RetractClient.h
+++ b/qpid/cpp/src/qpid/cluster/RetractClient.h
diff --git a/cpp/src/qpid/cluster/SecureConnectionFactory.cpp b/qpid/cpp/src/qpid/cluster/SecureConnectionFactory.cpp
index 6ddef66226..6ddef66226 100644
--- a/cpp/src/qpid/cluster/SecureConnectionFactory.cpp
+++ b/qpid/cpp/src/qpid/cluster/SecureConnectionFactory.cpp
diff --git a/cpp/src/qpid/cluster/SecureConnectionFactory.h b/qpid/cpp/src/qpid/cluster/SecureConnectionFactory.h
index 24d1fcfee5..24d1fcfee5 100644
--- a/cpp/src/qpid/cluster/SecureConnectionFactory.h
+++ b/qpid/cpp/src/qpid/cluster/SecureConnectionFactory.h
diff --git a/cpp/src/qpid/cluster/StoreStatus.cpp b/qpid/cpp/src/qpid/cluster/StoreStatus.cpp
index 14c999bb05..14c999bb05 100644
--- a/cpp/src/qpid/cluster/StoreStatus.cpp
+++ b/qpid/cpp/src/qpid/cluster/StoreStatus.cpp
diff --git a/cpp/src/qpid/cluster/StoreStatus.h b/qpid/cpp/src/qpid/cluster/StoreStatus.h
index 7442fcf02c..7442fcf02c 100644
--- a/cpp/src/qpid/cluster/StoreStatus.h
+++ b/qpid/cpp/src/qpid/cluster/StoreStatus.h
diff --git a/cpp/src/qpid/cluster/UpdateClient.cpp b/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
index a15c14ff48..a15c14ff48 100644
--- a/cpp/src/qpid/cluster/UpdateClient.cpp
+++ b/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
diff --git a/cpp/src/qpid/cluster/UpdateClient.h b/qpid/cpp/src/qpid/cluster/UpdateClient.h
index b72d090d73..b72d090d73 100644
--- a/cpp/src/qpid/cluster/UpdateClient.h
+++ b/qpid/cpp/src/qpid/cluster/UpdateClient.h
diff --git a/cpp/src/qpid/cluster/UpdateDataExchange.cpp b/qpid/cpp/src/qpid/cluster/UpdateDataExchange.cpp
index e5cd82e3d3..e5cd82e3d3 100644
--- a/cpp/src/qpid/cluster/UpdateDataExchange.cpp
+++ b/qpid/cpp/src/qpid/cluster/UpdateDataExchange.cpp
diff --git a/cpp/src/qpid/cluster/UpdateDataExchange.h b/qpid/cpp/src/qpid/cluster/UpdateDataExchange.h
index d2f6c35ad0..d2f6c35ad0 100644
--- a/cpp/src/qpid/cluster/UpdateDataExchange.h
+++ b/qpid/cpp/src/qpid/cluster/UpdateDataExchange.h
diff --git a/cpp/src/qpid/cluster/UpdateExchange.cpp b/qpid/cpp/src/qpid/cluster/UpdateExchange.cpp
index 11937f296f..11937f296f 100644
--- a/cpp/src/qpid/cluster/UpdateExchange.cpp
+++ b/qpid/cpp/src/qpid/cluster/UpdateExchange.cpp
diff --git a/cpp/src/qpid/cluster/UpdateExchange.h b/qpid/cpp/src/qpid/cluster/UpdateExchange.h
index 9d7d9ee5fc..9d7d9ee5fc 100644
--- a/cpp/src/qpid/cluster/UpdateExchange.h
+++ b/qpid/cpp/src/qpid/cluster/UpdateExchange.h
diff --git a/cpp/src/qpid/cluster/UpdateReceiver.h b/qpid/cpp/src/qpid/cluster/UpdateReceiver.h
index 7e8ce47662..7e8ce47662 100644
--- a/cpp/src/qpid/cluster/UpdateReceiver.h
+++ b/qpid/cpp/src/qpid/cluster/UpdateReceiver.h
diff --git a/cpp/src/qpid/cluster/WatchDogPlugin.cpp b/qpid/cpp/src/qpid/cluster/WatchDogPlugin.cpp
index 57ba5cf2fd..57ba5cf2fd 100644
--- a/cpp/src/qpid/cluster/WatchDogPlugin.cpp
+++ b/qpid/cpp/src/qpid/cluster/WatchDogPlugin.cpp
diff --git a/cpp/src/qpid/cluster/management-schema.xml b/qpid/cpp/src/qpid/cluster/management-schema.xml
index a6292e9113..a6292e9113 100644
--- a/cpp/src/qpid/cluster/management-schema.xml
+++ b/qpid/cpp/src/qpid/cluster/management-schema.xml
diff --git a/cpp/src/qpid/cluster/qpidd_watchdog.cpp b/qpid/cpp/src/qpid/cluster/qpidd_watchdog.cpp
index 51c5ed4b3f..51c5ed4b3f 100644
--- a/cpp/src/qpid/cluster/qpidd_watchdog.cpp
+++ b/qpid/cpp/src/qpid/cluster/qpidd_watchdog.cpp
diff --git a/cpp/src/qpid/cluster/types.h b/qpid/cpp/src/qpid/cluster/types.h
index bfb4fd5b9e..bfb4fd5b9e 100644
--- a/cpp/src/qpid/cluster/types.h
+++ b/qpid/cpp/src/qpid/cluster/types.h
diff --git a/cpp/src/qpid/console/Agent.cpp b/qpid/cpp/src/qpid/console/Agent.cpp
index fa76a13583..fa76a13583 100644
--- a/cpp/src/qpid/console/Agent.cpp
+++ b/qpid/cpp/src/qpid/console/Agent.cpp
diff --git a/cpp/src/qpid/console/Broker.cpp b/qpid/cpp/src/qpid/console/Broker.cpp
index 86a17d4a10..86a17d4a10 100644
--- a/cpp/src/qpid/console/Broker.cpp
+++ b/qpid/cpp/src/qpid/console/Broker.cpp
diff --git a/cpp/src/qpid/console/ClassKey.cpp b/qpid/cpp/src/qpid/console/ClassKey.cpp
index 7a16113bae..7a16113bae 100644
--- a/cpp/src/qpid/console/ClassKey.cpp
+++ b/qpid/cpp/src/qpid/console/ClassKey.cpp
diff --git a/cpp/src/qpid/console/Event.cpp b/qpid/cpp/src/qpid/console/Event.cpp
index 3e14804b35..3e14804b35 100644
--- a/cpp/src/qpid/console/Event.cpp
+++ b/qpid/cpp/src/qpid/console/Event.cpp
diff --git a/cpp/src/qpid/console/Object.cpp b/qpid/cpp/src/qpid/console/Object.cpp
index 6570e293ab..6570e293ab 100644
--- a/cpp/src/qpid/console/Object.cpp
+++ b/qpid/cpp/src/qpid/console/Object.cpp
diff --git a/cpp/src/qpid/console/ObjectId.cpp b/qpid/cpp/src/qpid/console/ObjectId.cpp
index fbaad20d57..fbaad20d57 100644
--- a/cpp/src/qpid/console/ObjectId.cpp
+++ b/qpid/cpp/src/qpid/console/ObjectId.cpp
diff --git a/cpp/src/qpid/console/Package.cpp b/qpid/cpp/src/qpid/console/Package.cpp
index e5d6fa29fd..e5d6fa29fd 100644
--- a/cpp/src/qpid/console/Package.cpp
+++ b/qpid/cpp/src/qpid/console/Package.cpp
diff --git a/cpp/src/qpid/console/Schema.cpp b/qpid/cpp/src/qpid/console/Schema.cpp
index a3dbd91201..a3dbd91201 100644
--- a/cpp/src/qpid/console/Schema.cpp
+++ b/qpid/cpp/src/qpid/console/Schema.cpp
diff --git a/cpp/src/qpid/console/SequenceManager.cpp b/qpid/cpp/src/qpid/console/SequenceManager.cpp
index 86ea829749..86ea829749 100644
--- a/cpp/src/qpid/console/SequenceManager.cpp
+++ b/qpid/cpp/src/qpid/console/SequenceManager.cpp
diff --git a/cpp/src/qpid/console/SessionManager.cpp b/qpid/cpp/src/qpid/console/SessionManager.cpp
index 80c5959417..80c5959417 100644
--- a/cpp/src/qpid/console/SessionManager.cpp
+++ b/qpid/cpp/src/qpid/console/SessionManager.cpp
diff --git a/cpp/src/qpid/console/Value.cpp b/qpid/cpp/src/qpid/console/Value.cpp
index 47c6a4ce57..47c6a4ce57 100644
--- a/cpp/src/qpid/console/Value.cpp
+++ b/qpid/cpp/src/qpid/console/Value.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/AMQCommandControlBody.h b/qpid/cpp/src/qpid/framing/AMQCommandControlBody.h
index d12b70a168..d12b70a168 100644
--- a/cpp/src/qpid/framing/AMQCommandControlBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQCommandControlBody.h
diff --git a/cpp/src/qpid/framing/AMQContentBody.cpp b/qpid/cpp/src/qpid/framing/AMQContentBody.cpp
index 72f7d9978e..72f7d9978e 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 e25451e354..e25451e354 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 cd60cd971f..cd60cd971f 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 c669d12bc0..c669d12bc0 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 a8c326969a..a8c326969a 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 454e8e298f..454e8e298f 100644
--- a/cpp/src/qpid/framing/Array.cpp
+++ b/qpid/cpp/src/qpid/framing/Array.cpp
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/BodyHandler.cpp b/qpid/cpp/src/qpid/framing/BodyHandler.cpp
index db302b1e4c..db302b1e4c 100644
--- a/cpp/src/qpid/framing/BodyHandler.cpp
+++ b/qpid/cpp/src/qpid/framing/BodyHandler.cpp
diff --git a/cpp/src/qpid/framing/BodyHandler.h b/qpid/cpp/src/qpid/framing/BodyHandler.h
index 9ded737195..9ded737195 100644
--- a/cpp/src/qpid/framing/BodyHandler.h
+++ b/qpid/cpp/src/qpid/framing/BodyHandler.h
diff --git a/cpp/src/qpid/framing/Buffer.cpp b/qpid/cpp/src/qpid/framing/Buffer.cpp
index 5a5bc0325e..5a5bc0325e 100644
--- a/cpp/src/qpid/framing/Buffer.cpp
+++ b/qpid/cpp/src/qpid/framing/Buffer.cpp
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 21eaea0f4d..21eaea0f4d 100644
--- a/cpp/src/qpid/framing/FieldTable.cpp
+++ b/qpid/cpp/src/qpid/framing/FieldTable.cpp
diff --git a/cpp/src/qpid/framing/FieldValue.cpp b/qpid/cpp/src/qpid/framing/FieldValue.cpp
index ce5a50117c..ce5a50117c 100644
--- a/cpp/src/qpid/framing/FieldValue.cpp
+++ b/qpid/cpp/src/qpid/framing/FieldValue.cpp
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 255aaf6e6b..255aaf6e6b 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 cae75e5ec8..cae75e5ec8 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 fa8db36f49..fa8db36f49 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 963ebc206b..963ebc206b 100644
--- a/cpp/src/qpid/framing/List.cpp
+++ b/qpid/cpp/src/qpid/framing/List.cpp
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 b290a0c140..b290a0c140 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/OutputHandler.h b/qpid/cpp/src/qpid/framing/OutputHandler.h
index 88c95589da..88c95589da 100644
--- a/cpp/src/qpid/framing/OutputHandler.h
+++ b/qpid/cpp/src/qpid/framing/OutputHandler.h
diff --git a/cpp/src/qpid/framing/ProtocolInitiation.cpp b/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
index e617015d64..e617015d64 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 c63cddb4cc..c63cddb4cc 100644
--- a/cpp/src/qpid/framing/ProtocolVersion.cpp
+++ b/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp
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/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/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 837d7d346a..837d7d346a 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 9a698a1823..9a698a1823 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 945c0a4d24..945c0a4d24 100644
--- a/cpp/src/qpid/framing/Uuid.cpp
+++ b/qpid/cpp/src/qpid/framing/Uuid.cpp
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 3a8b39afb5..3a8b39afb5 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/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/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 1600822142..1600822142 100644
--- a/cpp/src/qpid/log/Logger.cpp
+++ b/qpid/cpp/src/qpid/log/Logger.cpp
diff --git a/cpp/src/qpid/log/Options.cpp b/qpid/cpp/src/qpid/log/Options.cpp
index 0001d00bdf..0001d00bdf 100644
--- a/cpp/src/qpid/log/Options.cpp
+++ b/qpid/cpp/src/qpid/log/Options.cpp
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 a4bc580470..a4bc580470 100644
--- a/cpp/src/qpid/log/Selector.cpp
+++ b/qpid/cpp/src/qpid/log/Selector.cpp
diff --git a/cpp/src/qpid/log/Statement.cpp b/qpid/cpp/src/qpid/log/Statement.cpp
index 6a32b50096..6a32b50096 100644
--- a/cpp/src/qpid/log/Statement.cpp
+++ b/qpid/cpp/src/qpid/log/Statement.cpp
diff --git a/cpp/src/qpid/log/posix/SinkOptions.cpp b/qpid/cpp/src/qpid/log/posix/SinkOptions.cpp
index 292e9147f6..292e9147f6 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/Buffer.cpp b/qpid/cpp/src/qpid/management/Buffer.cpp
index 7556b2a243..7556b2a243 100644
--- a/cpp/src/qpid/management/Buffer.cpp
+++ b/qpid/cpp/src/qpid/management/Buffer.cpp
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/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/ManagementAgent.cpp b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
index 8a12a57fa6..8a12a57fa6 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 fb15dc6ed1..fb15dc6ed1 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 1d5f8bbd6b..1d5f8bbd6b 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 7507179c06..7507179c06 100644
--- a/cpp/src/qpid/management/ManagementDirectExchange.h
+++ b/qpid/cpp/src/qpid/management/ManagementDirectExchange.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/ManagementTopicExchange.cpp b/qpid/cpp/src/qpid/management/ManagementTopicExchange.cpp
index ee8657646f..ee8657646f 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 232300265e..232300265e 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/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 a516959edb..a516959edb 100644
--- a/cpp/src/qpid/messaging/Address.cpp
+++ b/qpid/cpp/src/qpid/messaging/Address.cpp
diff --git a/cpp/src/qpid/messaging/AddressParser.cpp b/qpid/cpp/src/qpid/messaging/AddressParser.cpp
index 4c8f35fbc5..4c8f35fbc5 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 1635331d19..1635331d19 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 bd90aa54a7..bd90aa54a7 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 1e11d9a6d5..1e11d9a6d5 100644
--- a/cpp/src/qpid/messaging/ConnectionImpl.h
+++ b/qpid/cpp/src/qpid/messaging/ConnectionImpl.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/HandleInstantiator.cpp b/qpid/cpp/src/qpid/messaging/HandleInstantiator.cpp
index c9a7680bb4..c9a7680bb4 100644
--- a/cpp/src/qpid/messaging/HandleInstantiator.cpp
+++ b/qpid/cpp/src/qpid/messaging/HandleInstantiator.cpp
diff --git a/cpp/src/qpid/messaging/Message.cpp b/qpid/cpp/src/qpid/messaging/Message.cpp
index 83cdfd3c55..83cdfd3c55 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 0601800e46..0601800e46 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 57df6b3fda..57df6b3fda 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 e77c58d071..e77c58d071 100644
--- a/cpp/src/qpid/messaging/PrivateImplRef.h
+++ b/qpid/cpp/src/qpid/messaging/PrivateImplRef.h
diff --git a/cpp/src/qpid/messaging/Receiver.cpp b/qpid/cpp/src/qpid/messaging/Receiver.cpp
index 78e0c5daa3..78e0c5daa3 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 57059bfd28..57059bfd28 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 53dbb69777..53dbb69777 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 a1ca02c72c..a1ca02c72c 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 496953a8e5..496953a8e5 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 02a254e4f2..02a254e4f2 100644
--- a/cpp/src/qpid/messaging/SessionImpl.h
+++ b/qpid/cpp/src/qpid/messaging/SessionImpl.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/replication/ReplicatingEventListener.cpp b/qpid/cpp/src/qpid/replication/ReplicatingEventListener.cpp
index b7d52372f4..b7d52372f4 100644
--- a/cpp/src/qpid/replication/ReplicatingEventListener.cpp
+++ b/qpid/cpp/src/qpid/replication/ReplicatingEventListener.cpp
diff --git a/cpp/src/qpid/replication/ReplicatingEventListener.h b/qpid/cpp/src/qpid/replication/ReplicatingEventListener.h
index 74418d00e6..74418d00e6 100644
--- a/cpp/src/qpid/replication/ReplicatingEventListener.h
+++ b/qpid/cpp/src/qpid/replication/ReplicatingEventListener.h
diff --git a/cpp/src/qpid/replication/ReplicationExchange.cpp b/qpid/cpp/src/qpid/replication/ReplicationExchange.cpp
index 4b6d25ac7d..4b6d25ac7d 100644
--- a/cpp/src/qpid/replication/ReplicationExchange.cpp
+++ b/qpid/cpp/src/qpid/replication/ReplicationExchange.cpp
diff --git a/cpp/src/qpid/replication/ReplicationExchange.h b/qpid/cpp/src/qpid/replication/ReplicationExchange.h
index 4b34e0df13..4b34e0df13 100644
--- a/cpp/src/qpid/replication/ReplicationExchange.h
+++ b/qpid/cpp/src/qpid/replication/ReplicationExchange.h
diff --git a/cpp/src/qpid/replication/constants.h b/qpid/cpp/src/qpid/replication/constants.h
index c5ba7d3d6a..c5ba7d3d6a 100644
--- a/cpp/src/qpid/replication/constants.h
+++ b/qpid/cpp/src/qpid/replication/constants.h
diff --git a/cpp/src/qpid/store/CMakeLists.txt b/qpid/cpp/src/qpid/store/CMakeLists.txt
index 464d2de052..464d2de052 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 2a8d971987..2a8d971987 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 4a9bb2aecb..4a9bb2aecb 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 bc8d187517..bc8d187517 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 586aaaf980..586aaaf980 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 14d63a4cd4..14d63a4cd4 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 fd07f2fb2e..fd07f2fb2e 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 04780e83e8..04780e83e8 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 7f22db3d02..7f22db3d02 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 b62a333df6..b62a333df6 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 fc95f46fb9..fc95f46fb9 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 d7c0ff29e3..d7c0ff29e3 100644
--- a/cpp/src/qpid/sys/AggregateOutput.h
+++ b/qpid/cpp/src/qpid/sys/AggregateOutput.h
diff --git a/qpid/cpp/src/qpid/sys/AsynchIO.h b/qpid/cpp/src/qpid/sys/AsynchIO.h
new file mode 100644
index 0000000000..41f74f7ed0
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/AsynchIO.h
@@ -0,0 +1,160 @@
+#ifndef _sys_AsynchIO
+#define _sys_AsynchIO
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/IntegerTypes.h"
+#include "qpid/CommonImportExport.h"
+
+#include <string.h>
+
+#include <boost/function.hpp>
+#include <boost/shared_ptr.hpp>
+
+namespace qpid {
+namespace sys {
+    
+class Socket;
+class Poller;
+
+/*
+ * Asynchronous acceptor: accepts connections then does a callback with the
+ * accepted fd
+ */
+class AsynchAcceptor {
+public:
+    typedef boost::function1<void, const Socket&> Callback;
+
+    QPID_COMMON_EXTERN static AsynchAcceptor* create(const Socket& s, Callback callback);
+    virtual ~AsynchAcceptor() {};
+    virtual void start(boost::shared_ptr<Poller> poller) = 0;
+};
+
+/*
+ * Asynchronous connector: starts the process of initiating a connection and
+ * invokes a callback when completed or failed.
+ */
+class AsynchConnector {
+public:
+    typedef boost::function1<void, const Socket&> ConnectedCallback;
+    typedef boost::function3<void, const Socket&, int, const std::string&> FailedCallback;
+
+    // Call create() to allocate a new AsynchConnector object with the
+    // specified poller, addressing, and callbacks.
+    // This method is implemented in platform-specific code to
+    // create a correctly typed object. The platform code also manages
+    // deletes. To correctly manage heaps when needed, the allocate and
+    // delete should both be done from the same class/library.
+    QPID_COMMON_EXTERN static AsynchConnector* create(const Socket& s,
+                                   const std::string& hostname,
+                                   const std::string& port,
+                                   ConnectedCallback connCb,
+                                   FailedCallback failCb);
+    virtual void start(boost::shared_ptr<Poller> poller) = 0;
+    virtual void stop() {};
+protected:
+    AsynchConnector() {}
+    virtual ~AsynchConnector() {}
+};
+
+struct AsynchIOBufferBase {
+    char* const bytes;
+    const int32_t byteCount;
+    int32_t dataStart;
+    int32_t dataCount;
+    
+    AsynchIOBufferBase(char* const b, const int32_t s) :
+        bytes(b),
+        byteCount(s),
+        dataStart(0),
+        dataCount(0)
+    {}
+    
+    virtual ~AsynchIOBufferBase()
+    {}
+
+    void squish() {
+        if (dataStart != 0) {
+            ::memmove(bytes, bytes + dataStart, dataCount);
+            dataStart = 0;
+        }
+    }
+};
+
+/*
+ * Asychronous reader/writer: 
+ * Reader accepts buffers to read into; reads into the provided buffers
+ * and then does a callback with the buffer and amount read. Optionally it
+ * can callback when there is something to read but no buffer to read it into.
+ * 
+ * Writer accepts a buffer and queues it for writing; can also be given
+ * a callback for when writing is "idle" (ie fd is writable, but nothing
+ * to write).
+ */
+class AsynchIO {
+public:
+    typedef AsynchIOBufferBase BufferBase;
+
+    typedef boost::function2<void, AsynchIO&, BufferBase*> ReadCallback;
+    typedef boost::function1<void, AsynchIO&> EofCallback;
+    typedef boost::function1<void, AsynchIO&> DisconnectCallback;
+    typedef boost::function2<void, AsynchIO&, const Socket&> ClosedCallback;
+    typedef boost::function1<void, AsynchIO&> BuffersEmptyCallback;
+    typedef boost::function1<void, AsynchIO&> IdleCallback;
+    typedef boost::function1<void, AsynchIO&> RequestCallback;
+
+    // Call create() to allocate a new AsynchIO object with the specified
+    // callbacks. This method is implemented in platform-specific code to
+    // create a correctly typed object. The platform code also manages
+    // deletes. To correctly manage heaps when needed, the allocate and
+    // delete should both be done from the same class/library.
+    QPID_COMMON_EXTERN static AsynchIO* create(const Socket& s,
+                            ReadCallback rCb,
+                            EofCallback eofCb,
+                            DisconnectCallback disCb,
+                            ClosedCallback cCb = 0,
+                            BuffersEmptyCallback eCb = 0,
+                            IdleCallback iCb = 0);
+public:
+    virtual void queueForDeletion() = 0;
+
+    virtual void start(boost::shared_ptr<Poller> poller) = 0;
+    virtual void queueReadBuffer(BufferBase* buff) = 0;
+    virtual void unread(BufferBase* buff) = 0;
+    virtual void queueWrite(BufferBase* buff) = 0;
+    virtual void notifyPendingWrite() = 0;
+    virtual void queueWriteClose() = 0;
+    virtual bool writeQueueEmpty() = 0;
+    virtual void startReading() = 0;
+    virtual void stopReading() = 0;
+    virtual void requestCallback(RequestCallback) = 0;
+    virtual BufferBase* getQueuedBuffer() = 0;
+
+protected:
+    // Derived class manages lifetime; must be constructed using the
+    // static create() method. Deletes not allowed from outside.
+    AsynchIO() {}
+    virtual ~AsynchIO() {}
+};
+
+}}
+
+#endif // _sys_AsynchIO
diff --git a/cpp/src/qpid/sys/AsynchIOHandler.cpp b/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
index 30a87d9d44..30a87d9d44 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 b9867606c4..b9867606c4 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 d022b07c1d..d022b07c1d 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/ClusterSafe.cpp b/qpid/cpp/src/qpid/sys/ClusterSafe.cpp
index dd37615145..dd37615145 100644
--- a/cpp/src/qpid/sys/ClusterSafe.cpp
+++ b/qpid/cpp/src/qpid/sys/ClusterSafe.cpp
diff --git a/cpp/src/qpid/sys/ClusterSafe.h b/qpid/cpp/src/qpid/sys/ClusterSafe.h
index 27e4eb46a5..27e4eb46a5 100644
--- a/cpp/src/qpid/sys/ClusterSafe.h
+++ b/qpid/cpp/src/qpid/sys/ClusterSafe.h
diff --git a/cpp/src/qpid/sys/Codec.h b/qpid/cpp/src/qpid/sys/Codec.h
index ace721fbcc..ace721fbcc 100644
--- a/cpp/src/qpid/sys/Codec.h
+++ b/qpid/cpp/src/qpid/sys/Codec.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 92de808308..92de808308 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 421dd7c269..421dd7c269 100644
--- a/cpp/src/qpid/sys/ConnectionOutputHandler.h
+++ b/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h
diff --git a/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h b/qpid/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
index 95a08d15ae..95a08d15ae 100644
--- a/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
+++ b/qpid/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
diff --git a/cpp/src/qpid/sys/CopyOnWriteArray.h b/qpid/cpp/src/qpid/sys/CopyOnWriteArray.h
index 45a231dfd8..45a231dfd8 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/FileSysDir.h b/qpid/cpp/src/qpid/sys/FileSysDir.h
index ffe7823f0a..ffe7823f0a 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/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/OutputControl.h b/qpid/cpp/src/qpid/sys/OutputControl.h
index eae99beb0f..eae99beb0f 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/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 81c2301c1e..81c2301c1e 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/qpid/cpp/src/qpid/sys/ProtocolFactory.h b/qpid/cpp/src/qpid/sys/ProtocolFactory.h
new file mode 100644
index 0000000000..4d198a92da
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/ProtocolFactory.h
@@ -0,0 +1,57 @@
+#ifndef _sys_ProtocolFactory_h
+#define _sys_ProtocolFactory_h
+
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/IntegerTypes.h"
+#include "qpid/SharedObject.h"
+#include "qpid/sys/ConnectionCodec.h"
+#include <boost/function.hpp>
+
+namespace qpid {
+namespace sys {
+
+class Poller;
+
+class ProtocolFactory : public qpid::SharedObject<ProtocolFactory>
+{
+  public:
+    typedef boost::function2<void, int, std::string> ConnectFailedCallback;
+
+    virtual ~ProtocolFactory() = 0;
+    virtual uint16_t getPort() const = 0;
+    virtual void accept(boost::shared_ptr<Poller>, ConnectionCodec::Factory*) = 0;
+    virtual void connect(
+        boost::shared_ptr<Poller>,
+        const std::string& host, const std::string& port,
+        ConnectionCodec::Factory* codec,
+        ConnectFailedCallback failed) = 0;
+    virtual bool supports(const std::string& /*capability*/) { return false; }
+};
+
+inline ProtocolFactory::~ProtocolFactory() {}
+
+}}
+
+
+    
+#endif  //!_sys_ProtocolFactory_h
diff --git a/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp b/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
new file mode 100644
index 0000000000..631d116b41
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
@@ -0,0 +1,399 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/ProtocolFactory.h"
+
+#include "qpid/Plugin.h"
+#include "qpid/broker/Broker.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
+#include "qpid/log/Statement.h"
+#include "qpid/sys/rdma/RdmaIO.h"
+#include "qpid/sys/rdma/rdma_exception.h"
+#include "qpid/sys/OutputControl.h"
+#include "qpid/sys/SecuritySettings.h"
+
+#include <boost/bind.hpp>
+#include <memory>
+
+#include <netdb.h>
+
+using std::auto_ptr;
+using std::string;
+using std::stringstream;
+
+namespace qpid {
+namespace sys {
+
+class RdmaIOHandler : public OutputControl {
+    std::string identifier;
+    ConnectionCodec::Factory* factory;
+    ConnectionCodec* codec;
+    bool readError;
+
+    sys::Mutex pollingLock;
+    bool polling;
+
+    Rdma::AsynchIO* aio;
+    Rdma::Connection::intrusive_ptr connection;
+
+    void write(const framing::ProtocolInitiation&);
+    void disconnectAction();
+
+  public:
+    RdmaIOHandler(Rdma::Connection::intrusive_ptr c, ConnectionCodec::Factory* f);
+    ~RdmaIOHandler();
+    void init(Rdma::AsynchIO* a);
+    void start(Poller::shared_ptr poller);
+
+    // Output side
+    void close();
+    void abort();
+    void activateOutput();
+    void giveReadCredit(int32_t credit);
+    void initProtocolOut();
+
+    // Input side
+    void readbuff(Rdma::AsynchIO& aio, Rdma::Buffer* buff);
+    void initProtocolIn(Rdma::Buffer* buff);
+
+    // Notifications
+    void full(Rdma::AsynchIO& aio);
+    void idle(Rdma::AsynchIO& aio);
+    void error(Rdma::AsynchIO& aio);
+    void disconnected();
+    void drained();
+};
+
+RdmaIOHandler::RdmaIOHandler(Rdma::Connection::intrusive_ptr c, qpid::sys::ConnectionCodec::Factory* f) :
+    identifier(c->getFullName()),
+    factory(f),
+    codec(0),
+    readError(false),
+    polling(false),
+    connection(c)
+{
+}
+
+RdmaIOHandler::~RdmaIOHandler() {
+    if (codec)
+        codec->closed();
+    delete codec;
+    delete aio;
+}
+
+void RdmaIOHandler::init(Rdma::AsynchIO* a) {
+    aio = a;
+}
+
+void RdmaIOHandler::start(Poller::shared_ptr poller) {
+    Mutex::ScopedLock l(pollingLock);
+    assert(!polling);
+
+    polling = true;
+
+    aio->start(poller);
+}
+
+void RdmaIOHandler::write(const framing::ProtocolInitiation& data)
+{
+    QPID_LOG(debug, "Rdma: SENT [" << identifier << "] INIT(" << data << ")");
+    Rdma::Buffer* buff = aio->getSendBuffer();
+    assert(buff);
+    framing::Buffer out(buff->bytes(), buff->byteCount());
+    data.encode(out);
+    buff->dataCount(data.encodedSize());
+    aio->queueWrite(buff);
+}
+
+void RdmaIOHandler::close() {
+    aio->drainWriteQueue(boost::bind(&RdmaIOHandler::drained, this));
+}
+
+// TODO: Dummy implementation, need to fill this in for heartbeat timeout to work
+void RdmaIOHandler::abort() {
+}
+
+void RdmaIOHandler::activateOutput() {
+    aio->notifyPendingWrite();
+}
+
+void RdmaIOHandler::idle(Rdma::AsynchIO&) {
+    // TODO: Shouldn't need this test as idle() should only ever be called when
+    // the connection is writable anyway
+    if ( !aio->writable() ) {
+        return;
+    }
+    if (codec == 0) return;
+    if (!codec->canEncode()) {
+        return;
+    }
+    Rdma::Buffer* buff = aio->getSendBuffer();
+    if (buff) {
+        size_t encoded=codec->encode(buff->bytes(), buff->byteCount());
+        buff->dataCount(encoded);
+        aio->queueWrite(buff);
+        if (codec->isClosed()) {
+            close();
+        }
+    }
+}
+
+void RdmaIOHandler::initProtocolOut() {
+    // We mustn't have already started the conversation
+    // but we must be able to send
+    assert( codec == 0 );
+    assert( aio->writable() );
+    codec = factory->create(*this, identifier, SecuritySettings());
+    write(framing::ProtocolInitiation(codec->getVersion()));
+}
+
+void RdmaIOHandler::error(Rdma::AsynchIO&) {
+    disconnected();
+}
+
+namespace {
+    void stopped(RdmaIOHandler* async) {
+        delete async;
+    }
+}
+
+void RdmaIOHandler::disconnectAction() {
+    {
+    Mutex::ScopedLock l(pollingLock);
+    // If we're closed already then we'll get to drained() anyway
+    if (!polling) return;
+    polling = false;
+    }
+    aio->stop(boost::bind(&stopped, this));
+}
+
+void RdmaIOHandler::disconnected() {
+    aio->requestCallback(boost::bind(&RdmaIOHandler::disconnectAction, this));
+}
+
+void RdmaIOHandler::drained() {
+    // We know we've drained the write queue now, but we don't have to do anything
+    // because we can rely on the client to disconnect to trigger the connection
+    // cleanup.
+}
+
+void RdmaIOHandler::full(Rdma::AsynchIO&) {
+    QPID_LOG(debug, "Rdma: buffer full [" << identifier << "]");
+}
+
+// TODO: Dummy implementation of read throttling
+void RdmaIOHandler::giveReadCredit(int32_t) {
+}
+
+// The logic here is subtly different from TCP as RDMA is message oriented
+// so we define that an RDMA message is a frame - in this case there is no putting back
+// of any message remainder - there shouldn't be any. And what we read here can't be
+// smaller than a frame
+void RdmaIOHandler::readbuff(Rdma::AsynchIO&, Rdma::Buffer* buff) {
+    if (readError) {
+        return;
+    }
+    size_t decoded = 0;
+    try {
+        if (codec) {
+            decoded = codec->decode(buff->bytes(), buff->dataCount());
+        }else{
+            // Need to start protocol processing
+            initProtocolIn(buff);
+        }
+    }catch(const std::exception& e){
+        QPID_LOG(error, e.what());
+        readError = true;
+        close();
+    }
+}
+
+void RdmaIOHandler::initProtocolIn(Rdma::Buffer* buff) {
+    framing::Buffer in(buff->bytes(), buff->dataCount());
+    framing::ProtocolInitiation protocolInit;
+    size_t decoded = 0;
+    if (protocolInit.decode(in)) {
+        decoded = in.getPosition();
+        QPID_LOG(debug, "Rdma: RECV [" << identifier << "] INIT(" << protocolInit << ")");
+
+        codec = factory->create(protocolInit.getVersion(), *this, identifier, SecuritySettings());
+
+        // If we failed to create the codec then we don't understand the offered protocol version
+        if (!codec) {
+            // send valid version header & close connection.
+            write(framing::ProtocolInitiation(framing::highestProtocolVersion));
+            readError = true;
+            close();
+        }
+    }
+}
+
+class RdmaIOProtocolFactory : public ProtocolFactory {
+    auto_ptr<Rdma::Listener> listener;
+    const uint16_t listeningPort;
+
+  public:
+    RdmaIOProtocolFactory(int16_t port, int backlog);
+    void accept(Poller::shared_ptr, ConnectionCodec::Factory*);
+    void connect(Poller::shared_ptr, const string& host, const std::string& port, ConnectionCodec::Factory*, ConnectFailedCallback);
+
+    uint16_t getPort() const;
+
+  private:
+    bool request(Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&, ConnectionCodec::Factory*);
+    void established(Poller::shared_ptr, Rdma::Connection::intrusive_ptr);
+    void connected(Poller::shared_ptr, Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&, ConnectionCodec::Factory*);
+    void connectionError(Rdma::Connection::intrusive_ptr, Rdma::ErrorType);
+    void disconnected(Rdma::Connection::intrusive_ptr);
+    void rejected(Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&, ConnectFailedCallback);
+};
+
+// Static instance to initialise plugin
+static class RdmaIOPlugin : public Plugin {
+    void earlyInitialize(Target&) {
+    }
+
+    void initialize(Target& target) {
+        // Check whether we actually have any rdma devices
+        if ( Rdma::deviceCount() == 0 ) {
+            QPID_LOG(info, "Rdma: Disabled: no rdma devices found");
+            return;
+        }
+
+        broker::Broker* broker = dynamic_cast<broker::Broker*>(&target);
+        // Only provide to a Broker
+        if (broker) {
+            const broker::Broker::Options& opts = broker->getOptions();
+            ProtocolFactory::shared_ptr protocol(new RdmaIOProtocolFactory(opts.port, opts.connectionBacklog));
+            QPID_LOG(notice, "Rdma: Listening on RDMA port " << protocol->getPort());
+            broker->registerProtocolFactory("rdma", protocol);
+        }
+    }
+} rdmaPlugin;
+
+RdmaIOProtocolFactory::RdmaIOProtocolFactory(int16_t port, int /*backlog*/) :
+    listeningPort(port)
+{}
+
+void RdmaIOProtocolFactory::established(Poller::shared_ptr poller, Rdma::Connection::intrusive_ptr ci) {
+    RdmaIOHandler* async = ci->getContext<RdmaIOHandler>();
+    async->start(poller);
+}
+
+bool RdmaIOProtocolFactory::request(Rdma::Connection::intrusive_ptr ci, const Rdma::ConnectionParams& cp,
+        ConnectionCodec::Factory* f) {
+    try {
+        if (cp.rdmaProtocolVersion == 0) {
+            QPID_LOG(warning, "Rdma: connection from protocol version 0 client");
+        }
+        RdmaIOHandler* async = new RdmaIOHandler(ci, f);
+        Rdma::AsynchIO* aio =
+            new Rdma::AsynchIO(ci->getQueuePair(),
+                cp.rdmaProtocolVersion,
+                cp.maxRecvBufferSize, cp.initialXmitCredit, Rdma::DEFAULT_WR_ENTRIES,
+                boost::bind(&RdmaIOHandler::readbuff, async, _1, _2),
+                boost::bind(&RdmaIOHandler::idle, async, _1),
+                0, // boost::bind(&RdmaIOHandler::full, async, _1),
+                boost::bind(&RdmaIOHandler::error, async, _1));
+        async->init(aio);
+
+        // Record aio so we can get it back from a connection
+        ci->addContext(async);
+        return true;
+    } catch (const Rdma::Exception& e) {
+        QPID_LOG(error, "Rdma: Cannot accept new connection (Rdma exception): " << e.what());
+    } catch (const std::exception& e) {
+        QPID_LOG(error, "Rdma: Cannot accept new connection (unknown exception): " << e.what());
+    }
+
+    // If we get here we caught an exception so reject connection
+    return false;
+}
+
+void RdmaIOProtocolFactory::connectionError(Rdma::Connection::intrusive_ptr, Rdma::ErrorType) {
+}
+
+void RdmaIOProtocolFactory::disconnected(Rdma::Connection::intrusive_ptr ci) {
+    // If we've got a connection already tear it down, otherwise ignore
+    RdmaIOHandler* async =  ci->getContext<RdmaIOHandler>();
+    if (async) {
+        // Make sure we don't disconnect more than once
+        ci->removeContext();
+        async->disconnected();
+    }
+}
+
+uint16_t RdmaIOProtocolFactory::getPort() const {
+    return listeningPort; // Immutable no need for lock.
+}
+
+void RdmaIOProtocolFactory::accept(Poller::shared_ptr poller, ConnectionCodec::Factory* fact) {
+    ::sockaddr_in sin;
+
+    sin.sin_family = AF_INET;
+    sin.sin_port = htons(listeningPort);
+    sin.sin_addr.s_addr = INADDR_ANY;
+
+    listener.reset(
+        new Rdma::Listener(
+            Rdma::ConnectionParams(65536, Rdma::DEFAULT_WR_ENTRIES),
+            boost::bind(&RdmaIOProtocolFactory::established, this, poller, _1),
+            boost::bind(&RdmaIOProtocolFactory::connectionError, this, _1, _2),
+            boost::bind(&RdmaIOProtocolFactory::disconnected, this, _1),
+            boost::bind(&RdmaIOProtocolFactory::request, this, _1, _2, fact)));
+
+    SocketAddress sa("",boost::lexical_cast<std::string>(listeningPort));
+    listener->start(poller, sa);
+}
+
+// Only used for outgoing connections (in federation)
+void RdmaIOProtocolFactory::rejected(Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&, ConnectFailedCallback failed) {
+    failed(-1, "Connection rejected");
+}
+
+// Do the same as connection request and established but mark a client too
+void RdmaIOProtocolFactory::connected(Poller::shared_ptr poller, Rdma::Connection::intrusive_ptr ci, const Rdma::ConnectionParams& cp,
+        ConnectionCodec::Factory* f) {
+    (void) request(ci, cp, f);
+    established(poller, ci);
+    RdmaIOHandler* async =  ci->getContext<RdmaIOHandler>();
+    async->initProtocolOut();
+}
+
+void RdmaIOProtocolFactory::connect(
+    Poller::shared_ptr poller,
+    const std::string& host, const std::string& port,
+    ConnectionCodec::Factory* f,
+    ConnectFailedCallback failed)
+{
+    Rdma::Connector* c =
+        new Rdma::Connector(
+            Rdma::ConnectionParams(8000, Rdma::DEFAULT_WR_ENTRIES),
+            boost::bind(&RdmaIOProtocolFactory::connected, this, poller, _1, _2, f),
+            boost::bind(&RdmaIOProtocolFactory::connectionError, this, _1, _2),
+            boost::bind(&RdmaIOProtocolFactory::disconnected, this, _1),
+            boost::bind(&RdmaIOProtocolFactory::rejected, this, _1, _2, failed));
+
+    SocketAddress sa(host, port);
+    c->start(poller, sa);
+}
+
+}} // namespace qpid::sys
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/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 52bc40e352..52bc40e352 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 bfcd08fd0f..bfcd08fd0f 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 7f66cfec14..7f66cfec14 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/qpid/cpp/src/qpid/sys/Socket.h b/qpid/cpp/src/qpid/sys/Socket.h
new file mode 100644
index 0000000000..9f62f3be1c
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/Socket.h
@@ -0,0 +1,103 @@
+#ifndef _sys_Socket_h
+#define _sys_Socket_h
+
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/IOHandle.h"
+#include "qpid/sys/IntegerTypes.h"
+#include "qpid/CommonImportExport.h"
+#include <string>
+
+namespace qpid {
+namespace sys {
+
+class Duration;
+class SocketAddress;
+
+class QPID_COMMON_CLASS_EXTERN Socket : public IOHandle
+{
+public:
+    /** Create a socket wrapper for descriptor. */
+    QPID_COMMON_EXTERN Socket();
+
+    /** Set socket non blocking */
+    void setNonblocking() const;
+
+    QPID_COMMON_EXTERN void setTcpNoDelay() const;
+
+    QPID_COMMON_EXTERN void connect(const std::string& host, const std::string& port) const;
+    QPID_COMMON_EXTERN void connect(const SocketAddress&) const;
+
+    QPID_COMMON_EXTERN void close() const;
+
+    /** Bind to a port and start listening.
+     *@param port 0 means choose an available port.
+     *@param backlog maximum number of pending connections.
+     *@return The bound port.
+     */
+    QPID_COMMON_EXTERN int listen(const std::string& host = "", const std::string& port = "0", int backlog = 10) const;
+    QPID_COMMON_EXTERN int listen(const SocketAddress&, int backlog = 10) const;
+
+    /**
+     * Returns an address (host and port) for the remote end of the
+     * socket
+     */
+    QPID_COMMON_EXTERN std::string getPeerAddress() const;
+    /**
+     * Returns an address (host and port) for the local end of the
+     * socket
+     */
+    QPID_COMMON_EXTERN std::string getLocalAddress() const;
+
+    /**
+     * Returns the full address of the connection: local and remote host and port.
+     */
+    QPID_COMMON_INLINE_EXTERN std::string getFullAddress() const { return getLocalAddress()+"-"+getPeerAddress(); }
+
+    /**
+     * Returns the error code stored in the socket.  This may be used
+     * to determine the result of a non-blocking connect.
+     */
+    int getError() const;
+
+    /** Accept a connection from a socket that is already listening
+     * and has an incoming connection
+     */
+    QPID_COMMON_EXTERN Socket* accept() const;
+
+    // TODO The following are raw operations, maybe they need better wrapping?
+    QPID_COMMON_EXTERN int read(void *buf, size_t count) const;
+    QPID_COMMON_EXTERN int write(const void *buf, size_t count) const;
+
+private:
+    /** Create socket */
+    void createSocket(const SocketAddress&) const;
+
+    Socket(IOHandlePrivate*);
+    mutable std::string localname;
+    mutable std::string peername;
+    mutable bool nonblocking;
+    mutable bool nodelay;
+};
+
+}}
+#endif  /*!_sys_Socket_h*/
diff --git a/qpid/cpp/src/qpid/sys/SocketAddress.h b/qpid/cpp/src/qpid/sys/SocketAddress.h
new file mode 100644
index 0000000000..c2120338cf
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/SocketAddress.h
@@ -0,0 +1,53 @@
+#ifndef _sys_SocketAddress_h
+#define _sys_SocketAddress_h
+
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/IntegerTypes.h"
+#include "qpid/CommonImportExport.h"
+#include <string>
+
+struct addrinfo;
+
+namespace qpid {
+namespace sys {
+
+class SocketAddress {
+    friend const ::addrinfo& getAddrInfo(const SocketAddress&);
+
+public:
+    /** Create a SocketAddress from hostname and port*/
+    QPID_COMMON_EXTERN SocketAddress(const std::string& host, const std::string& port);
+    QPID_COMMON_EXTERN SocketAddress(const SocketAddress&);
+    QPID_COMMON_EXTERN SocketAddress& operator=(const SocketAddress&);
+    QPID_COMMON_EXTERN ~SocketAddress();
+
+    std::string asString(bool numeric=true) const;
+
+private:
+    std::string host;
+    std::string port;
+    mutable ::addrinfo* addrInfo;
+};
+
+}}
+#endif  /*!_sys_SocketAddress_h*/
diff --git a/qpid/cpp/src/qpid/sys/SslPlugin.cpp b/qpid/cpp/src/qpid/sys/SslPlugin.cpp
new file mode 100644
index 0000000000..471a0cef60
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/SslPlugin.cpp
@@ -0,0 +1,186 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/ProtocolFactory.h"
+
+#include "qpid/Plugin.h"
+#include "qpid/sys/ssl/check.h"
+#include "qpid/sys/ssl/util.h"
+#include "qpid/sys/ssl/SslHandler.h"
+#include "qpid/sys/ssl/SslIo.h"
+#include "qpid/sys/ssl/SslSocket.h"
+#include "qpid/broker/Broker.h"
+#include "qpid/log/Statement.h"
+
+#include <boost/bind.hpp>
+#include <memory>
+
+
+namespace qpid {
+namespace sys {
+
+struct SslServerOptions : ssl::SslOptions
+{
+    uint16_t port;
+    bool clientAuth;
+    bool nodict;
+
+    SslServerOptions() : port(5671),
+                         clientAuth(false),
+                         nodict(false)
+    {
+        addOptions()
+            ("ssl-port", optValue(port, "PORT"), "Port on which to listen for SSL connections")
+            ("ssl-require-client-authentication", optValue(clientAuth), 
+             "Forces clients to authenticate in order to establish an SSL connection")
+            ("ssl-sasl-no-dict", optValue(nodict), 
+             "Disables SASL mechanisms that are vulnerable to passive dictionary-based password attacks");
+    }
+};
+
+class SslProtocolFactory : public ProtocolFactory {
+    const bool tcpNoDelay;
+    qpid::sys::ssl::SslSocket listener;
+    const uint16_t listeningPort;
+    std::auto_ptr<qpid::sys::ssl::SslAcceptor> acceptor;
+    bool nodict;
+
+  public:
+    SslProtocolFactory(const SslServerOptions&, int backlog, bool nodelay);
+    void accept(Poller::shared_ptr, ConnectionCodec::Factory*);
+    void connect(Poller::shared_ptr, const std::string& host, const std::string& port,
+                 ConnectionCodec::Factory*,
+                 boost::function2<void, int, std::string> failed);
+
+    uint16_t getPort() const;
+    bool supports(const std::string& capability);
+
+  private:
+    void established(Poller::shared_ptr, const qpid::sys::ssl::SslSocket&, ConnectionCodec::Factory*,
+                     bool isClient);
+};
+
+// Static instance to initialise plugin
+static struct SslPlugin : public Plugin {
+    SslServerOptions options;
+
+    Options* getOptions() { return &options; }
+
+    ~SslPlugin() { ssl::shutdownNSS(); }
+
+    void earlyInitialize(Target&) {
+    }
+    
+    void initialize(Target& target) {
+        broker::Broker* broker = dynamic_cast<broker::Broker*>(&target);
+        // Only provide to a Broker
+        if (broker) {
+            if (options.certDbPath.empty()) {
+                QPID_LOG(notice, "SSL plugin not enabled, you must set --ssl-cert-db to enable it.");
+            } else {
+                try {
+                    ssl::initNSS(options, true);
+                    
+                    const broker::Broker::Options& opts = broker->getOptions();
+                    ProtocolFactory::shared_ptr protocol(new SslProtocolFactory(options,
+                                                                                opts.connectionBacklog,
+                                                                                opts.tcpNoDelay));
+                    QPID_LOG(notice, "Listening for SSL connections on TCP port " << protocol->getPort());
+                    broker->registerProtocolFactory("ssl", protocol);
+                } catch (const std::exception& e) {
+                    QPID_LOG(error, "Failed to initialise SSL plugin: " << e.what());
+                }
+            }
+        }
+    }
+} sslPlugin;
+
+SslProtocolFactory::SslProtocolFactory(const SslServerOptions& options, int backlog, bool nodelay) :
+    tcpNoDelay(nodelay), listeningPort(listener.listen(options.port, backlog, options.certName, options.clientAuth)),
+    nodict(options.nodict)
+{}
+
+void SslProtocolFactory::established(Poller::shared_ptr poller, const qpid::sys::ssl::SslSocket& s,
+                                          ConnectionCodec::Factory* f, bool isClient) {
+    qpid::sys::ssl::SslHandler* async = new qpid::sys::ssl::SslHandler(s.getFullAddress(), f, nodict);
+
+    if (tcpNoDelay) {
+        s.setTcpNoDelay(tcpNoDelay);
+        QPID_LOG(info, "Set TCP_NODELAY on connection to " << s.getPeerAddress());
+    }
+
+    if (isClient)
+        async->setClient();
+    qpid::sys::ssl::SslIO* aio = new qpid::sys::ssl::SslIO(s,
+                                 boost::bind(&qpid::sys::ssl::SslHandler::readbuff, async, _1, _2),
+                                 boost::bind(&qpid::sys::ssl::SslHandler::eof, async, _1),
+                                 boost::bind(&qpid::sys::ssl::SslHandler::disconnect, async, _1),
+                                 boost::bind(&qpid::sys::ssl::SslHandler::closedSocket, async, _1, _2),
+                                 boost::bind(&qpid::sys::ssl::SslHandler::nobuffs, async, _1),
+                                 boost::bind(&qpid::sys::ssl::SslHandler::idle, async, _1));
+
+    async->init(aio, 4);
+    aio->start(poller);
+}
+
+uint16_t SslProtocolFactory::getPort() const {
+    return listeningPort; // Immutable no need for lock.
+}
+
+void SslProtocolFactory::accept(Poller::shared_ptr poller,
+                                     ConnectionCodec::Factory* fact) {
+    acceptor.reset(
+        new qpid::sys::ssl::SslAcceptor(listener,
+                           boost::bind(&SslProtocolFactory::established, this, poller, _1, fact, false)));
+    acceptor->start(poller);
+}
+
+void SslProtocolFactory::connect(
+    Poller::shared_ptr poller,
+    const std::string& host, const std::string& port,
+    ConnectionCodec::Factory* fact,
+    ConnectFailedCallback failed)
+{
+    // Note that the following logic does not cause a memory leak.
+    // The allocated Socket is freed either by the SslConnector
+    // upon connection failure or by the SslIoHandle upon connection
+    // shutdown.  The allocated SslConnector frees itself when it
+    // is no longer needed.
+
+    qpid::sys::ssl::SslSocket* socket = new qpid::sys::ssl::SslSocket();
+    new qpid::sys::ssl::SslConnector (*socket, poller, host, port,
+                         boost::bind(&SslProtocolFactory::established, this, poller, _1, fact, true),
+                         failed);
+}
+
+namespace
+{
+const std::string SSL = "ssl";
+}
+
+bool SslProtocolFactory::supports(const std::string& capability)
+{
+    std::string s = capability;
+    transform(s.begin(), s.end(), s.begin(), tolower);
+    return s == SSL;
+}
+
+}} // namespace qpid::sys
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/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp b/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
new file mode 100644
index 0000000000..34338ce434
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
@@ -0,0 +1,152 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/ProtocolFactory.h"
+#include "qpid/sys/AsynchIOHandler.h"
+#include "qpid/sys/AsynchIO.h"
+
+#include "qpid/Plugin.h"
+#include "qpid/sys/Socket.h"
+#include "qpid/sys/Poller.h"
+#include "qpid/broker/Broker.h"
+#include "qpid/log/Statement.h"
+
+#include <boost/bind.hpp>
+#include <memory>
+
+namespace qpid {
+namespace sys {
+
+class AsynchIOProtocolFactory : public ProtocolFactory {
+    const bool tcpNoDelay;
+    Socket listener;
+    const uint16_t listeningPort;
+    std::auto_ptr<AsynchAcceptor> acceptor;
+
+  public:
+    AsynchIOProtocolFactory(const std::string& host, const std::string& port, int backlog, bool nodelay);
+    void accept(Poller::shared_ptr, ConnectionCodec::Factory*);
+    void connect(Poller::shared_ptr, const std::string& host, const std::string& port,
+                 ConnectionCodec::Factory*,
+                 ConnectFailedCallback);
+
+    uint16_t getPort() const;
+
+  private:
+    void established(Poller::shared_ptr, const Socket&, ConnectionCodec::Factory*,
+                     bool isClient);
+    void connectFailed(const Socket&, int, const std::string&, ConnectFailedCallback);
+};
+
+// Static instance to initialise plugin
+static class TCPIOPlugin : public Plugin {
+    void earlyInitialize(Target&) {
+    }
+
+    void initialize(Target& target) {
+        broker::Broker* broker = dynamic_cast<broker::Broker*>(&target);
+        // Only provide to a Broker
+        if (broker) {
+            const broker::Broker::Options& opts = broker->getOptions();
+            ProtocolFactory::shared_ptr protocolt(
+                new AsynchIOProtocolFactory(
+                    "", boost::lexical_cast<std::string>(opts.port),
+                    opts.connectionBacklog,
+                    opts.tcpNoDelay));
+            QPID_LOG(notice, "Listening on TCP port " << protocolt->getPort());
+            broker->registerProtocolFactory("tcp", protocolt);
+        }
+    }
+} tcpPlugin;
+
+AsynchIOProtocolFactory::AsynchIOProtocolFactory(const std::string& host, const std::string& port, int backlog, bool nodelay) :
+    tcpNoDelay(nodelay), listeningPort(listener.listen(host, port, backlog))
+{}
+
+void AsynchIOProtocolFactory::established(Poller::shared_ptr poller, const Socket& s,
+                                          ConnectionCodec::Factory* f, bool isClient) {
+    AsynchIOHandler* async = new AsynchIOHandler(s.getFullAddress(), f);
+
+    if (tcpNoDelay) {
+        s.setTcpNoDelay();
+        QPID_LOG(info, "Set TCP_NODELAY on connection to " << s.getPeerAddress());
+    }
+
+    if (isClient)
+        async->setClient();
+    AsynchIO* aio = AsynchIO::create
+      (s,
+       boost::bind(&AsynchIOHandler::readbuff, async, _1, _2),
+       boost::bind(&AsynchIOHandler::eof, async, _1),
+       boost::bind(&AsynchIOHandler::disconnect, async, _1),
+       boost::bind(&AsynchIOHandler::closedSocket, async, _1, _2),
+       boost::bind(&AsynchIOHandler::nobuffs, async, _1),
+       boost::bind(&AsynchIOHandler::idle, async, _1));
+
+    async->init(aio, 4);
+    aio->start(poller);
+}
+
+uint16_t AsynchIOProtocolFactory::getPort() const {
+    return listeningPort; // Immutable no need for lock.
+}
+
+void AsynchIOProtocolFactory::accept(Poller::shared_ptr poller,
+                                     ConnectionCodec::Factory* fact) {
+    acceptor.reset(
+        AsynchAcceptor::create(listener,
+                           boost::bind(&AsynchIOProtocolFactory::established, this, poller, _1, fact, false)));
+    acceptor->start(poller);
+}
+
+void AsynchIOProtocolFactory::connectFailed(
+    const Socket& s, int ec, const std::string& emsg,
+    ConnectFailedCallback failedCb)
+{
+    failedCb(ec, emsg);
+    s.close();
+    delete &s;
+}
+
+void AsynchIOProtocolFactory::connect(
+    Poller::shared_ptr poller,
+    const std::string& host, const std::string& port,
+    ConnectionCodec::Factory* fact,
+    ConnectFailedCallback failed)
+{
+    // Note that the following logic does not cause a memory leak.
+    // The allocated Socket is freed either by the AsynchConnector
+    // upon connection failure or by the AsynchIO upon connection
+    // shutdown.  The allocated AsynchConnector frees itself when it
+    // is no longer needed.
+    Socket* socket = new Socket();
+    AsynchConnector* c = AsynchConnector::create(
+        *socket,
+        host,
+        port,
+        boost::bind(&AsynchIOProtocolFactory::established,
+                    this, poller, _1, fact, true),
+        boost::bind(&AsynchIOProtocolFactory::connectFailed,
+                    this, _1, _2, _3, failed));
+    c->start(poller);
+}
+
+}} // namespace qpid::sys
diff --git a/cpp/src/qpid/sys/TimeoutHandler.h b/qpid/cpp/src/qpid/sys/TimeoutHandler.h
index 0c10709bbf..0c10709bbf 100644
--- a/cpp/src/qpid/sys/TimeoutHandler.h
+++ b/qpid/cpp/src/qpid/sys/TimeoutHandler.h
diff --git a/cpp/src/qpid/sys/Timer.cpp b/qpid/cpp/src/qpid/sys/Timer.cpp
index fdb2e8c6bb..fdb2e8c6bb 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 98ba39ce38..98ba39ce38 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 87c3169456..87c3169456 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/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/alloca.h b/qpid/cpp/src/qpid/sys/alloca.h
index 0f58920908..0f58920908 100644
--- a/cpp/src/qpid/sys/alloca.h
+++ b/qpid/cpp/src/qpid/sys/alloca.h
diff --git a/cpp/src/qpid/sys/apr/APRBase.cpp b/qpid/cpp/src/qpid/sys/apr/APRBase.cpp
index 8bdba66bdc..8bdba66bdc 100644
--- a/cpp/src/qpid/sys/apr/APRBase.cpp
+++ b/qpid/cpp/src/qpid/sys/apr/APRBase.cpp
diff --git a/cpp/src/qpid/sys/apr/APRBase.h b/qpid/cpp/src/qpid/sys/apr/APRBase.h
index 7b5644a129..7b5644a129 100644
--- a/cpp/src/qpid/sys/apr/APRBase.h
+++ b/qpid/cpp/src/qpid/sys/apr/APRBase.h
diff --git a/cpp/src/qpid/sys/apr/APRPool.cpp b/qpid/cpp/src/qpid/sys/apr/APRPool.cpp
index e221bfc2f1..e221bfc2f1 100644
--- a/cpp/src/qpid/sys/apr/APRPool.cpp
+++ b/qpid/cpp/src/qpid/sys/apr/APRPool.cpp
diff --git a/cpp/src/qpid/sys/apr/APRPool.h b/qpid/cpp/src/qpid/sys/apr/APRPool.h
index da7661fcfa..da7661fcfa 100644
--- a/cpp/src/qpid/sys/apr/APRPool.h
+++ b/qpid/cpp/src/qpid/sys/apr/APRPool.h
diff --git a/cpp/src/qpid/sys/apr/Condition.h b/qpid/cpp/src/qpid/sys/apr/Condition.h
index 66d465ca75..66d465ca75 100644
--- a/cpp/src/qpid/sys/apr/Condition.h
+++ b/qpid/cpp/src/qpid/sys/apr/Condition.h
diff --git a/cpp/src/qpid/sys/apr/Mutex.h b/qpid/cpp/src/qpid/sys/apr/Mutex.h
index cb75f5b339..cb75f5b339 100644
--- a/cpp/src/qpid/sys/apr/Mutex.h
+++ b/qpid/cpp/src/qpid/sys/apr/Mutex.h
diff --git a/cpp/src/qpid/sys/apr/Shlib.cpp b/qpid/cpp/src/qpid/sys/apr/Shlib.cpp
index b7ee13a03b..b7ee13a03b 100644
--- a/cpp/src/qpid/sys/apr/Shlib.cpp
+++ b/qpid/cpp/src/qpid/sys/apr/Shlib.cpp
diff --git a/cpp/src/qpid/sys/apr/Socket.cpp b/qpid/cpp/src/qpid/sys/apr/Socket.cpp
index d9024d11c1..d9024d11c1 100644
--- a/cpp/src/qpid/sys/apr/Socket.cpp
+++ b/qpid/cpp/src/qpid/sys/apr/Socket.cpp
diff --git a/cpp/src/qpid/sys/apr/Thread.cpp b/qpid/cpp/src/qpid/sys/apr/Thread.cpp
index b52d0e6ace..b52d0e6ace 100644
--- a/cpp/src/qpid/sys/apr/Thread.cpp
+++ b/qpid/cpp/src/qpid/sys/apr/Thread.cpp
diff --git a/cpp/src/qpid/sys/apr/Thread.h b/qpid/cpp/src/qpid/sys/apr/Thread.h
index 6cc63db5c9..6cc63db5c9 100644
--- a/cpp/src/qpid/sys/apr/Thread.h
+++ b/qpid/cpp/src/qpid/sys/apr/Thread.h
diff --git a/cpp/src/qpid/sys/apr/Time.cpp b/qpid/cpp/src/qpid/sys/apr/Time.cpp
index 34e740b144..34e740b144 100644
--- a/cpp/src/qpid/sys/apr/Time.cpp
+++ b/qpid/cpp/src/qpid/sys/apr/Time.cpp
diff --git a/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp b/qpid/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp
index 3d868da64b..3d868da64b 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 1645cf1a58..1645cf1a58 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 9ad05c71a3..9ad05c71a3 100644
--- a/cpp/src/qpid/sys/epoll/EpollPoller.cpp
+++ b/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp
diff --git a/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp b/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
new file mode 100644
index 0000000000..b5a0b0bf32
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
@@ -0,0 +1,611 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/AsynchIO.h"
+#include "qpid/sys/Socket.h"
+#include "qpid/sys/SocketAddress.h"
+#include "qpid/sys/Poller.h"
+#include "qpid/sys/DispatchHandle.h"
+#include "qpid/sys/Time.h"
+#include "qpid/log/Statement.h"
+
+#include "qpid/sys/posix/check.h"
+
+// TODO The basic algorithm here is not really POSIX specific and with a
+// bit more abstraction could (should) be promoted to be platform portable
+#include <unistd.h>
+#include <sys/socket.h>
+#include <signal.h>
+#include <errno.h>
+#include <string.h>
+
+#include <boost/bind.hpp>
+#include <boost/lexical_cast.hpp>
+
+using namespace qpid::sys;
+
+namespace {
+
+struct StaticInit {
+    StaticInit() {
+        /**
+         * Make *process* not generate SIGPIPE when writing to closed
+         * pipe/socket (necessary as default action is to terminate process)
+         */
+        ::signal(SIGPIPE, SIG_IGN);
+    };
+} init;
+
+/*
+ * We keep per thread state to avoid locking overhead. The assumption is that
+ * on average all the connections are serviced by all the threads so the state
+ * recorded in each thread is about the same. If this turns out not to be the
+ * case we could rebalance the info occasionally.  
+ */
+__thread int threadReadTotal = 0;
+__thread int threadMaxRead = 0;
+__thread int threadReadCount = 0;
+__thread int threadWriteTotal = 0;
+__thread int threadWriteCount = 0;
+__thread int64_t threadMaxReadTimeNs = 2 * 1000000; // start at 2ms
+}
+
+/*
+ * Asynch Acceptor
+ */
+namespace qpid {
+namespace sys {
+namespace posix {
+
+class AsynchAcceptor : public qpid::sys::AsynchAcceptor {
+public:
+    AsynchAcceptor(const Socket& s, AsynchAcceptor::Callback callback);
+    ~AsynchAcceptor();
+    void start(Poller::shared_ptr poller);
+
+private:
+    void readable(DispatchHandle& handle);
+
+private:
+    AsynchAcceptor::Callback acceptedCallback;
+    DispatchHandle handle;
+    const Socket& socket;
+
+};
+
+AsynchAcceptor::AsynchAcceptor(const Socket& s,
+                               AsynchAcceptor::Callback callback) :
+    acceptedCallback(callback),
+    handle(s, boost::bind(&AsynchAcceptor::readable, this, _1), 0, 0),
+    socket(s) {
+
+    s.setNonblocking();
+}
+
+AsynchAcceptor::~AsynchAcceptor() {
+    handle.stopWatch();
+}
+
+void AsynchAcceptor::start(Poller::shared_ptr poller) {
+    handle.startWatch(poller);
+}
+
+/*
+ * We keep on accepting as long as there is something to accept
+ */
+void AsynchAcceptor::readable(DispatchHandle& h) {
+    Socket* s;
+    do {
+        errno = 0;
+        // TODO: Currently we ignore the peers address, perhaps we should
+        // log it or use it for connection acceptance.
+        try {
+            s = socket.accept();
+            if (s) {
+                acceptedCallback(*s);
+            } else {
+                break;
+            }
+        } catch (const std::exception& e) {
+            QPID_LOG(error, "Could not accept socket: " << e.what());
+            break;
+        }
+    } while (true);
+
+    h.rewatch();
+}
+
+/*
+ * POSIX version of AsynchIO TCP socket connector.
+ *
+ * The class is implemented in terms of DispatchHandle to allow it to be
+ * deleted by deleting the contained DispatchHandle.
+ */
+class AsynchConnector : public qpid::sys::AsynchConnector,
+                        private DispatchHandle {
+
+private:
+    void connComplete(DispatchHandle& handle);
+
+private:
+    ConnectedCallback connCallback;
+    FailedCallback failCallback;
+    const Socket& socket;
+
+public:
+    AsynchConnector(const Socket& socket,
+                    const std::string& hostname,
+                    const std::string& port,
+                    ConnectedCallback connCb,
+                    FailedCallback failCb);
+    void start(Poller::shared_ptr poller);
+    void stop();
+};
+
+AsynchConnector::AsynchConnector(const Socket& s,
+                                 const std::string& hostname,
+                                 const std::string& port,
+                                 ConnectedCallback connCb,
+                                 FailedCallback failCb) :
+    DispatchHandle(s,
+                   0,
+                   boost::bind(&AsynchConnector::connComplete, this, _1),
+                   boost::bind(&AsynchConnector::connComplete, this, _1)),
+    connCallback(connCb),
+    failCallback(failCb),
+    socket(s)
+{
+    socket.setNonblocking();
+    SocketAddress sa(hostname, port);
+    // Note, not catching any exceptions here, also has effect of destructing
+    socket.connect(sa);
+}
+
+void AsynchConnector::start(Poller::shared_ptr poller)
+{
+    startWatch(poller);
+}
+
+void AsynchConnector::stop()
+{
+    stopWatch();
+}
+
+void AsynchConnector::connComplete(DispatchHandle& h)
+{
+    h.stopWatch();
+    int errCode = socket.getError();
+    if (errCode == 0) {
+        connCallback(socket);
+    } else {
+        failCallback(socket, errCode, strError(errCode));
+    }
+    DispatchHandle::doDelete();
+}
+
+/*
+ * POSIX version of AsynchIO reader/writer
+ *
+ * The class is implemented in terms of DispatchHandle to allow it to be
+ * deleted by deleting the contained DispatchHandle.
+ */
+class AsynchIO : public qpid::sys::AsynchIO, private DispatchHandle {
+
+public:
+    AsynchIO(const Socket& s,
+             ReadCallback rCb,
+             EofCallback eofCb,
+             DisconnectCallback disCb,
+             ClosedCallback cCb = 0,
+             BuffersEmptyCallback eCb = 0,
+             IdleCallback iCb = 0);
+
+    // Methods inherited from qpid::sys::AsynchIO
+
+    virtual void queueForDeletion();
+
+    virtual void start(Poller::shared_ptr poller);
+    virtual void queueReadBuffer(BufferBase* buff);
+    virtual void unread(BufferBase* buff);
+    virtual void queueWrite(BufferBase* buff);
+    virtual void notifyPendingWrite();
+    virtual void queueWriteClose();
+    virtual bool writeQueueEmpty();
+    virtual void startReading();
+    virtual void stopReading();
+    virtual void requestCallback(RequestCallback);
+    virtual BufferBase* getQueuedBuffer();
+
+private:
+    ~AsynchIO();
+
+    // Methods that are callback targets from Dispatcher.
+    void readable(DispatchHandle& handle);
+    void writeable(DispatchHandle& handle);
+    void disconnected(DispatchHandle& handle);
+    void requestedCall(RequestCallback);
+    void close(DispatchHandle& handle);
+
+private:
+    ReadCallback readCallback;
+    EofCallback eofCallback;
+    DisconnectCallback disCallback;
+    ClosedCallback closedCallback;
+    BuffersEmptyCallback emptyCallback;
+    IdleCallback idleCallback;
+    const Socket& socket;
+    std::deque<BufferBase*> bufferQueue;
+    std::deque<BufferBase*> writeQueue;
+    bool queuedClose;
+    /**
+     * This flag is used to detect and handle concurrency between
+     * calls to notifyPendingWrite() (which can be made from any thread) and
+     * the execution of the writeable() method (which is always on the
+     * thread processing this handle.
+     */
+    volatile bool writePending;
+    /**
+     * This records whether we've been reading is flow controlled:
+     * it's safe as a simple boolean as the only way to be stopped
+     * is in calls only allowed in the callback context, the only calls
+     * checking it are also in calls only allowed in callback context.
+     */
+    volatile bool readingStopped;
+};
+
+AsynchIO::AsynchIO(const Socket& s,
+                   ReadCallback rCb, EofCallback eofCb, DisconnectCallback disCb,
+                   ClosedCallback cCb, BuffersEmptyCallback eCb, IdleCallback iCb) :
+
+    DispatchHandle(s, 
+                   boost::bind(&AsynchIO::readable, this, _1),
+                   boost::bind(&AsynchIO::writeable, this, _1),
+                   boost::bind(&AsynchIO::disconnected, this, _1)),
+    readCallback(rCb),
+    eofCallback(eofCb),
+    disCallback(disCb),
+    closedCallback(cCb),
+    emptyCallback(eCb),
+    idleCallback(iCb),
+    socket(s),
+    queuedClose(false),
+    writePending(false),
+    readingStopped(false) {
+
+    s.setNonblocking();
+}
+
+struct deleter
+{
+    template <typename T>
+    void operator()(T *ptr){ delete ptr;}
+};
+
+AsynchIO::~AsynchIO() {
+    std::for_each( bufferQueue.begin(), bufferQueue.end(), deleter());
+    std::for_each( writeQueue.begin(), writeQueue.end(), deleter());
+}
+
+void AsynchIO::queueForDeletion() {
+    DispatchHandle::doDelete();
+}
+
+void AsynchIO::start(Poller::shared_ptr poller) {
+    DispatchHandle::startWatch(poller);
+}
+
+void AsynchIO::queueReadBuffer(BufferBase* buff) {
+    assert(buff);
+    buff->dataStart = 0;
+    buff->dataCount = 0;
+
+    bool queueWasEmpty = bufferQueue.empty();
+    bufferQueue.push_back(buff);
+    if (queueWasEmpty && !readingStopped)
+        DispatchHandle::rewatchRead();
+}
+
+void AsynchIO::unread(BufferBase* buff) {
+    assert(buff);
+    buff->squish();
+
+    bool queueWasEmpty = bufferQueue.empty();
+    bufferQueue.push_front(buff);
+    if (queueWasEmpty && !readingStopped)
+        DispatchHandle::rewatchRead();
+}
+
+void AsynchIO::queueWrite(BufferBase* buff) {
+    assert(buff);
+    // If we've already closed the socket then throw the write away
+    if (queuedClose) {
+        queueReadBuffer(buff);
+        return;
+    } else {
+        writeQueue.push_front(buff);
+    }
+    writePending = false;
+    DispatchHandle::rewatchWrite();
+}
+
+// This can happen outside the callback context
+void AsynchIO::notifyPendingWrite() {
+    writePending = true;
+    DispatchHandle::rewatchWrite();
+}
+
+void AsynchIO::queueWriteClose() {
+    queuedClose = true;
+    DispatchHandle::rewatchWrite();
+}
+
+bool AsynchIO::writeQueueEmpty() {
+    return writeQueue.empty();
+}
+
+// This can happen outside the callback context
+void AsynchIO::startReading() {
+    readingStopped = false;
+    DispatchHandle::rewatchRead();
+}
+
+void AsynchIO::stopReading() {
+    readingStopped = true;
+    DispatchHandle::unwatchRead();
+}
+
+void AsynchIO::requestCallback(RequestCallback callback) {
+    // TODO creating a function object every time isn't all that
+    // efficient - if this becomes heavily used do something better (what?)
+    assert(callback);
+    DispatchHandle::call(boost::bind(&AsynchIO::requestedCall, this, callback));
+}
+
+void AsynchIO::requestedCall(RequestCallback callback) {
+    assert(callback);
+    callback(*this);
+}
+
+/** Return a queued buffer if there are enough
+ * to spare
+ */
+AsynchIO::BufferBase* AsynchIO::getQueuedBuffer() {
+    // Always keep at least one buffer (it might have data that was "unread" in it)
+    if (bufferQueue.size()<=1)
+        return 0;
+    BufferBase* buff = bufferQueue.back();
+    assert(buff);
+    buff->dataStart = 0;
+    buff->dataCount = 0;
+    bufferQueue.pop_back();
+    return buff;
+}
+
+/*
+ * We keep on reading as long as we have something to read, a buffer
+ * to put it in and reading is not stopped by flow control.
+ */
+void AsynchIO::readable(DispatchHandle& h) {
+    if (readingStopped) {
+        // We have been flow controlled.
+        return;
+    }
+    int readTotal = 0;
+    AbsTime readStartTime = AbsTime::now();
+    do {
+        // (Try to) get a buffer
+        if (!bufferQueue.empty()) {
+            // Read into buffer
+            BufferBase* buff = bufferQueue.front();
+            assert(buff);
+            bufferQueue.pop_front();
+            errno = 0;
+            int readCount = buff->byteCount-buff->dataCount;
+            int rc = socket.read(buff->bytes + buff->dataCount, readCount);
+            if (rc > 0) {
+                buff->dataCount += rc;
+                threadReadTotal += rc;
+                readTotal += rc;
+
+                readCallback(*this, buff);
+                if (readingStopped) {
+                    // We have been flow controlled.
+                    break;
+                }
+
+                if (rc != readCount) {
+                    // If we didn't fill the read buffer then time to stop reading
+                    break;
+                }
+                
+                // Stop reading if we've overrun our timeslot
+                if (Duration(readStartTime, AbsTime::now()) > threadMaxReadTimeNs) {
+                    break;
+                }
+                
+            } else {
+                // Put buffer back (at front so it doesn't interfere with unread buffers)
+                bufferQueue.push_front(buff);
+                assert(buff);
+                
+                // Eof or other side has gone away
+                if (rc == 0 || errno == ECONNRESET) {
+                    eofCallback(*this);
+                    h.unwatchRead();
+                    break;
+                } else if (errno == EAGAIN) {
+                    // We have just put a buffer back so we know
+                    // we can carry on watching for reads
+                    break;
+                } else {
+                    // Report error then just treat as a socket disconnect
+                    QPID_LOG(error, "Error reading socket: " << qpid::sys::strError(errno) << "(" << errno << ")" );
+                    eofCallback(*this);
+                    h.unwatchRead();
+                    break;
+                }
+            }
+        } else {
+            // Something to read but no buffer
+            if (emptyCallback) {
+                emptyCallback(*this);
+            }
+            // If we still have no buffers we can't do anything more
+            if (bufferQueue.empty()) {
+                h.unwatchRead();
+                break;
+            }
+            
+        }
+    } while (true);
+
+    ++threadReadCount;
+    threadMaxRead = std::max(threadMaxRead, readTotal);
+    return;
+}
+
+/*
+ * We carry on writing whilst we have data to write and we can write
+ */
+void AsynchIO::writeable(DispatchHandle& h) {
+    int writeTotal = 0;
+    do {
+        // See if we've got something to write
+        if (!writeQueue.empty()) {
+            // Write buffer
+            BufferBase* buff = writeQueue.back();
+            writeQueue.pop_back();
+            errno = 0;
+            assert(buff->dataStart+buff->dataCount <= buff->byteCount);
+            int rc = socket.write(buff->bytes+buff->dataStart, buff->dataCount);
+            if (rc >= 0) {
+                threadWriteTotal += rc;
+                writeTotal += rc;
+
+                // If we didn't write full buffer put rest back
+                if (rc != buff->dataCount) {
+                    buff->dataStart += rc;
+                    buff->dataCount -= rc;
+                    writeQueue.push_back(buff);
+                    break;
+                }
+                
+                // Recycle the buffer
+                queueReadBuffer(buff);
+                
+                // If we've already written more than the max for reading then stop
+                // (this is to stop writes dominating reads) 
+                if (writeTotal > threadMaxRead)
+                    break;
+            } else {
+                // Put buffer back
+                writeQueue.push_back(buff);
+                if (errno == ECONNRESET || errno == EPIPE) {
+                    // Just stop watching for write here - we'll get a
+                    // disconnect callback soon enough
+                    h.unwatchWrite();
+                    break;
+                } else if (errno == EAGAIN) {
+                    // We have just put a buffer back so we know
+                    // we can carry on watching for writes
+                    break;
+                } else {
+                    // Report error then just treat as a socket disconnect
+                    QPID_LOG(error, "Error writing socket: " << qpid::sys::strError(errno) << "(" << errno << ")" );
+                    h.unwatchWrite();
+                    break;
+                }
+            }
+        } else {
+            // If we're waiting to close the socket then can do it now as there is nothing to write
+            if (queuedClose) {
+                close(h);
+                break;
+            }
+            // Fd is writable, but nothing to write
+            if (idleCallback) {
+                writePending = false;
+                idleCallback(*this);
+            }
+            // If we still have no buffers to write we can't do anything more
+            if (writeQueue.empty() && !writePending && !queuedClose) {
+                h.unwatchWrite();
+                // The following handles the case where writePending is
+                // set to true after the test above; in this case its
+                // possible that the unwatchWrite overwrites the
+                // desired rewatchWrite so we correct that here
+                if (writePending)
+                    h.rewatchWrite();
+                break;
+            }
+        }
+    } while (true);
+
+    ++threadWriteCount;
+    return;
+}
+        
+void AsynchIO::disconnected(DispatchHandle& h) {
+    // If we have not already queued close then call disconnected callback before closing
+    if (!queuedClose && disCallback) disCallback(*this);
+    close(h);
+}
+
+/*
+ * Close the socket and callback to say we've done it
+ */
+void AsynchIO::close(DispatchHandle& h) {
+    h.stopWatch();
+    socket.close();
+    if (closedCallback) {
+        closedCallback(*this, socket);
+    }
+}
+
+} // namespace posix
+
+AsynchAcceptor* AsynchAcceptor::create(const Socket& s, 
+                                       Callback callback)
+{
+    return new posix::AsynchAcceptor(s, callback);
+}
+
+AsynchConnector* AsynchConnector::create(const Socket& s,
+                                         const std::string& hostname,
+                                         const std::string& port,
+                                         ConnectedCallback connCb,
+                                         FailedCallback failCb)
+{
+    return new posix::AsynchConnector(s, hostname, port, connCb, failCb);
+}
+
+AsynchIO* AsynchIO::create(const Socket& s,
+                           AsynchIO::ReadCallback rCb,
+                           AsynchIO::EofCallback eofCb,
+                           AsynchIO::DisconnectCallback disCb,
+                           AsynchIO::ClosedCallback cCb,
+                           AsynchIO::BuffersEmptyCallback eCb,
+                           AsynchIO::IdleCallback iCb)
+{
+    return new posix::AsynchIO(s, rCb, eofCb, disCb, cCb, eCb, iCb);
+}
+
+}} // namespace qpid::sys
diff --git a/cpp/src/qpid/sys/posix/FileSysDir.cpp b/qpid/cpp/src/qpid/sys/posix/FileSysDir.cpp
index 22dc487e74..22dc487e74 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 9c049ee1de..9c049ee1de 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 1862ff6ac9..1862ff6ac9 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/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/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 b22a615a54..b22a615a54 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/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/qpid/cpp/src/qpid/sys/posix/Socket.cpp b/qpid/cpp/src/qpid/sys/posix/Socket.cpp
new file mode 100644
index 0000000000..aa25f8062d
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/posix/Socket.cpp
@@ -0,0 +1,247 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/Socket.h"
+
+#include "qpid/sys/SocketAddress.h"
+#include "qpid/sys/posix/check.h"
+#include "qpid/sys/posix/PrivatePosix.h"
+
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/errno.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <netdb.h>
+#include <cstdlib>
+#include <string.h>
+#include <iostream>
+
+#include <boost/format.hpp>
+
+namespace qpid {
+namespace sys {
+
+namespace {
+std::string getName(int fd, bool local)
+{
+    ::sockaddr_storage name; // big enough for any socket address
+    ::socklen_t namelen = sizeof(name);
+
+    int result = -1;
+    if (local) {
+        result = ::getsockname(fd, (::sockaddr*)&name, &namelen);
+    } else {
+        result = ::getpeername(fd, (::sockaddr*)&name, &namelen);
+    }
+    QPID_POSIX_CHECK(result);
+
+    char servName[NI_MAXSERV];
+    char dispName[NI_MAXHOST];
+    if (int rc=::getnameinfo((::sockaddr*)&name, namelen, dispName, sizeof(dispName),
+                                servName, sizeof(servName),
+                                NI_NUMERICHOST | NI_NUMERICSERV) != 0)
+        throw QPID_POSIX_ERROR(rc);
+    return std::string(dispName) + ":" + std::string(servName);
+}
+}
+
+Socket::Socket() :
+    IOHandle(new IOHandlePrivate),
+    nonblocking(false),
+    nodelay(false)
+{}
+
+Socket::Socket(IOHandlePrivate* h) :
+    IOHandle(h),
+    nonblocking(false),
+    nodelay(false)
+{}
+
+void Socket::createSocket(const SocketAddress& sa) const
+{
+    int& socket = impl->fd;
+    if (socket != -1) Socket::close();
+    int s = ::socket(getAddrInfo(sa).ai_family, getAddrInfo(sa).ai_socktype, 0);
+    if (s < 0) throw QPID_POSIX_ERROR(errno);
+    socket = s;
+
+    try {
+        if (nonblocking) setNonblocking();
+        if (nodelay) setTcpNoDelay();
+    } catch (std::exception&) {
+        ::close(s);
+        socket = -1;
+        throw;
+    }
+}
+
+void Socket::setNonblocking() const {
+    int& socket = impl->fd;
+    nonblocking = true;
+    if (socket != -1) {
+        QPID_POSIX_CHECK(::fcntl(socket, F_SETFL, O_NONBLOCK));
+    }
+}
+
+void Socket::setTcpNoDelay() const
+{
+    int& socket = impl->fd;
+    nodelay = true;
+    if (socket != -1) {
+        int flag = 1;
+        int result = setsockopt(impl->fd, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(flag));
+        QPID_POSIX_CHECK(result);
+    }
+}
+
+void Socket::connect(const std::string& host, const std::string& port) const
+{
+    SocketAddress sa(host, port);
+    connect(sa);
+}
+
+void Socket::connect(const SocketAddress& addr) const
+{
+    // The display name for an outbound connection needs to be the name that was specified
+    // for the address rather than a resolved IP address as we don't know which of
+    // the IP addresses is actually the one that will be connected to.
+    peername = addr.asString(false);
+
+    // However the string we compare with the local port must be numeric or it might not
+    // match when it should as getLocalAddress() will always be numeric
+    std::string connectname = addr.asString();
+
+    createSocket(addr);
+
+    const int& socket = impl->fd;
+    // TODO the correct thing to do here is loop on failure until you've used all the returned addresses
+    if ((::connect(socket, getAddrInfo(addr).ai_addr, getAddrInfo(addr).ai_addrlen) < 0) &&
+        (errno != EINPROGRESS)) {
+        throw Exception(QPID_MSG(strError(errno) << ": " << peername));
+    }
+    // When connecting to a port on the same host which no longer has
+    // a process associated with it, the OS occasionally chooses the
+    // remote port (which is unoccupied) as the port to bind the local
+    // end of the socket, resulting in a "circular" connection.
+    //
+    // This seems like something the OS should prevent but I have
+    // confirmed that sporadic hangs in
+    // cluster_tests.LongTests.test_failover on RHEL5 are caused by
+    // such a circular connection.
+    //
+    // Raise an error if we see such a connection, since we know there is
+    // no listener on the peer address.
+    //
+    if (getLocalAddress() == connectname) {
+        close();
+        throw Exception(QPID_MSG("Connection refused: " << peername));
+    }
+}
+
+void
+Socket::close() const
+{
+    int& socket = impl->fd;
+    if (socket == -1) return;
+    if (::close(socket) < 0) throw QPID_POSIX_ERROR(errno);
+    socket = -1;
+}
+
+int Socket::listen(const std::string& host, const std::string& port, int backlog) const
+{
+    SocketAddress sa(host, port);
+    return listen(sa, backlog);
+}
+
+int Socket::listen(const SocketAddress& sa, int backlog) const
+{
+    createSocket(sa);
+
+    const int& socket = impl->fd;
+    int yes=1;
+    QPID_POSIX_CHECK(setsockopt(socket,SOL_SOCKET,SO_REUSEADDR,&yes,sizeof(yes)));
+
+    if (::bind(socket, getAddrInfo(sa).ai_addr, getAddrInfo(sa).ai_addrlen) < 0)
+        throw Exception(QPID_MSG("Can't bind to port " << sa.asString() << ": " << strError(errno)));
+    if (::listen(socket, backlog) < 0)
+        throw Exception(QPID_MSG("Can't listen on port " << sa.asString() << ": " << strError(errno)));
+
+    struct sockaddr_in name;
+    socklen_t namelen = sizeof(name);
+    if (::getsockname(socket, (struct sockaddr*)&name, &namelen) < 0)
+        throw QPID_POSIX_ERROR(errno);
+
+    return ntohs(name.sin_port);
+}
+
+Socket* Socket::accept() const
+{
+    int afd = ::accept(impl->fd, 0, 0);
+    if ( afd >= 0) {
+        Socket* s = new Socket(new IOHandlePrivate(afd));
+        s->localname = localname;
+        return s;
+    }
+    else if (errno == EAGAIN)
+        return 0;
+    else throw QPID_POSIX_ERROR(errno);
+}
+
+int Socket::read(void *buf, size_t count) const
+{
+    return ::read(impl->fd, buf, count);
+}
+
+int Socket::write(const void *buf, size_t count) const
+{
+    return ::write(impl->fd, buf, count);
+}
+
+std::string Socket::getPeerAddress() const
+{
+    if (peername.empty()) {
+        peername = getName(impl->fd, false);
+    }
+    return peername;
+}
+
+std::string Socket::getLocalAddress() const
+{
+    if (localname.empty()) {
+        localname = getName(impl->fd, true);
+    }
+    return localname;
+}
+
+int Socket::getError() const
+{
+    int       result;
+    socklen_t rSize = sizeof (result);
+
+    if (::getsockopt(impl->fd, SOL_SOCKET, SO_ERROR, &result, &rSize) < 0)
+        throw QPID_POSIX_ERROR(errno);
+
+    return result;
+}
+
+}} // namespace qpid::sys
diff --git a/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp b/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
new file mode 100644
index 0000000000..10f1c8a563
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
@@ -0,0 +1,107 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/SocketAddress.h"
+
+#include "qpid/sys/posix/check.h"
+
+#include <sys/socket.h>
+#include <string.h>
+#include <netdb.h>
+
+#include <algorithm>
+
+namespace qpid {
+namespace sys {
+
+SocketAddress::SocketAddress(const std::string& host0, const std::string& port0) :
+    host(host0),
+    port(port0),
+    addrInfo(0)
+{
+}
+
+SocketAddress::SocketAddress(const SocketAddress& sa) :
+    host(sa.host),
+    port(sa.port),
+    addrInfo(0)
+{
+}
+
+SocketAddress& SocketAddress::operator=(const SocketAddress& sa)
+{
+    SocketAddress temp(sa);
+
+    std::swap(temp, *this);
+    return *this;
+}
+
+SocketAddress::~SocketAddress()
+{
+    if (addrInfo) {
+        ::freeaddrinfo(addrInfo);
+    }
+}
+
+std::string SocketAddress::asString(bool numeric) const
+{
+    if (!numeric)
+        return host + ":" + port;
+    // Canonicalise into numeric id
+    const ::addrinfo& ai = getAddrInfo(*this);
+    char servName[NI_MAXSERV];
+    char dispName[NI_MAXHOST];
+    if (int rc=::getnameinfo(ai.ai_addr, ai.ai_addrlen,
+                            dispName, sizeof(dispName),
+                            servName, sizeof(servName),
+                            NI_NUMERICHOST | NI_NUMERICSERV) != 0)
+        throw QPID_POSIX_ERROR(rc);
+    std::string s(dispName);
+    s += ":";
+    s += servName;
+    return s;
+}
+
+const ::addrinfo& getAddrInfo(const SocketAddress& sa)
+{
+    if (!sa.addrInfo) {
+        ::addrinfo hints;
+        ::memset(&hints, 0, sizeof(hints));
+        hints.ai_family = AF_INET; // Change this to support IPv6
+        hints.ai_socktype = SOCK_STREAM;
+
+        const char* node = 0;
+        if (sa.host.empty()) {
+            hints.ai_flags |= AI_PASSIVE;
+        } else {
+            node = sa.host.c_str();
+        }
+        const char* service = sa.port.empty() ? "0" : sa.port.c_str();
+
+        int n = ::getaddrinfo(node, service, &hints, &sa.addrInfo);
+        if (n != 0)
+            throw Exception(QPID_MSG("Cannot resolve " << sa.asString(false) << ": " << ::gai_strerror(n)));
+    }
+
+    return *sa.addrInfo;
+}
+
+}}
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 a19ab6885c..a19ab6885c 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 9661f0c5e8..9661f0c5e8 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/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 efe454c5be..efe454c5be 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 8e3429027b..8e3429027b 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/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 765e5a7eb0..765e5a7eb0 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/SslHandler.cpp b/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp
index 5516d72065..5516d72065 100644
--- a/cpp/src/qpid/sys/ssl/SslHandler.cpp
+++ b/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp
diff --git a/cpp/src/qpid/sys/ssl/SslHandler.h b/qpid/cpp/src/qpid/sys/ssl/SslHandler.h
index 400fa317fd..400fa317fd 100644
--- a/cpp/src/qpid/sys/ssl/SslHandler.h
+++ b/qpid/cpp/src/qpid/sys/ssl/SslHandler.h
diff --git a/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp b/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp
new file mode 100644
index 0000000000..734ebb483a
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp
@@ -0,0 +1,447 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/ssl/SslIo.h"
+#include "qpid/sys/ssl/SslSocket.h"
+#include "qpid/sys/ssl/check.h"
+
+#include "qpid/sys/Time.h"
+#include "qpid/sys/posix/check.h"
+#include "qpid/log/Statement.h"
+
+// TODO The basic algorithm here is not really POSIX specific and with a bit more abstraction
+// could (should) be promoted to be platform portable
+#include <unistd.h>
+#include <sys/socket.h>
+#include <signal.h>
+#include <errno.h>
+#include <string.h>
+
+#include <boost/bind.hpp>
+
+using namespace qpid::sys;
+using namespace qpid::sys::ssl;
+
+namespace {
+
+/*
+ * Make *process* not generate SIGPIPE when writing to closed
+ * pipe/socket (necessary as default action is to terminate process)
+ */
+void ignoreSigpipe() {
+    ::signal(SIGPIPE, SIG_IGN);
+}
+
+/*
+ * We keep per thread state to avoid locking overhead. The assumption is that
+ * on average all the connections are serviced by all the threads so the state
+ * recorded in each thread is about the same. If this turns out not to be the
+ * case we could rebalance the info occasionally.  
+ */
+__thread int threadReadTotal = 0;
+__thread int threadMaxRead = 0;
+__thread int threadReadCount = 0;
+__thread int threadWriteTotal = 0;
+__thread int threadWriteCount = 0;
+__thread int64_t threadMaxReadTimeNs = 2 * 1000000; // start at 2ms
+}
+
+/*
+ * Asynch Acceptor
+ */
+
+SslAcceptor::SslAcceptor(const SslSocket& s, Callback callback) :
+    acceptedCallback(callback),
+    handle(s, boost::bind(&SslAcceptor::readable, this, _1), 0, 0),
+    socket(s) {
+
+    s.setNonblocking();
+    ignoreSigpipe();
+}
+
+SslAcceptor::~SslAcceptor() 
+{
+    handle.stopWatch();
+}
+
+void SslAcceptor::start(Poller::shared_ptr poller) {
+    handle.startWatch(poller);
+}
+
+/*
+ * We keep on accepting as long as there is something to accept
+ */
+void SslAcceptor::readable(DispatchHandle& h) {
+    SslSocket* s;
+    do {
+        errno = 0;
+        // TODO: Currently we ignore the peers address, perhaps we should
+        // log it or use it for connection acceptance.
+        try {
+            s = socket.accept();
+            if (s) {
+                acceptedCallback(*s);
+            } else {
+                break;
+            }
+        } catch (const std::exception& e) {
+            QPID_LOG(error, "Could not accept socket: " << e.what());
+        }
+    } while (true);
+
+    h.rewatch();
+}
+
+/*
+ * Asynch Connector
+ */
+
+SslConnector::SslConnector(const SslSocket& s,
+                                 Poller::shared_ptr poller,
+                                 std::string hostname,
+                                 std::string port,
+                                 ConnectedCallback connCb,
+                                 FailedCallback failCb) :
+    DispatchHandle(s,
+                   0,
+                   boost::bind(&SslConnector::connComplete, this, _1),
+                   boost::bind(&SslConnector::connComplete, this, _1)),
+    connCallback(connCb),
+    failCallback(failCb),
+    socket(s)
+{
+    //TODO: would be better for connect to be performed on a
+    //non-blocking socket, but that doesn't work at present so connect
+    //blocks until complete
+    try {
+        socket.connect(hostname, port);
+        socket.setNonblocking();
+        startWatch(poller);
+    } catch(std::exception& e) {
+        failure(-1, std::string(e.what()));
+    }
+}
+
+void SslConnector::connComplete(DispatchHandle& h)
+{
+    int errCode = socket.getError();
+
+    h.stopWatch();
+    if (errCode == 0) {
+        connCallback(socket);
+        DispatchHandle::doDelete();
+    } else {
+        // TODO: This need to be fixed as strerror isn't thread safe
+        failure(errCode, std::string(::strerror(errCode)));
+    }
+}
+
+void SslConnector::failure(int errCode, std::string message)
+{
+    if (failCallback)
+        failCallback(errCode, message);
+
+    socket.close();
+    delete &socket;
+
+    DispatchHandle::doDelete();
+}
+
+/*
+ * Asynch reader/writer
+ */
+SslIO::SslIO(const SslSocket& s,
+                   ReadCallback rCb, EofCallback eofCb, DisconnectCallback disCb,
+                   ClosedCallback cCb, BuffersEmptyCallback eCb, IdleCallback iCb) :
+
+    DispatchHandle(s, 
+                   boost::bind(&SslIO::readable, this, _1),
+                   boost::bind(&SslIO::writeable, this, _1),
+                   boost::bind(&SslIO::disconnected, this, _1)),
+    readCallback(rCb),
+    eofCallback(eofCb),
+    disCallback(disCb),
+    closedCallback(cCb),
+    emptyCallback(eCb),
+    idleCallback(iCb),
+    socket(s),
+    queuedClose(false),
+    writePending(false) {
+
+    s.setNonblocking();
+}
+
+struct deleter
+{
+    template <typename T>
+    void operator()(T *ptr){ delete ptr;}
+};
+
+SslIO::~SslIO() {
+    std::for_each( bufferQueue.begin(), bufferQueue.end(), deleter());
+    std::for_each( writeQueue.begin(), writeQueue.end(), deleter());
+}
+
+void SslIO::queueForDeletion() {
+    DispatchHandle::doDelete();
+}
+
+void SslIO::start(Poller::shared_ptr poller) {
+    DispatchHandle::startWatch(poller);
+}
+
+void SslIO::queueReadBuffer(BufferBase* buff) {
+    assert(buff);
+    buff->dataStart = 0;
+    buff->dataCount = 0;
+    bufferQueue.push_back(buff);
+    DispatchHandle::rewatchRead();
+}
+
+void SslIO::unread(BufferBase* buff) {
+    assert(buff);
+    if (buff->dataStart != 0) {
+        memmove(buff->bytes, buff->bytes+buff->dataStart, buff->dataCount);
+        buff->dataStart = 0;
+    }
+    bufferQueue.push_front(buff);
+    DispatchHandle::rewatchRead();
+}
+
+void SslIO::queueWrite(BufferBase* buff) {
+    assert(buff);
+    // If we've already closed the socket then throw the write away
+    if (queuedClose) {
+        bufferQueue.push_front(buff);
+        return;
+    } else {
+        writeQueue.push_front(buff);
+    }
+    writePending = false;
+    DispatchHandle::rewatchWrite();
+}
+
+void SslIO::notifyPendingWrite() {
+    writePending = true;
+    DispatchHandle::rewatchWrite();
+}
+
+void SslIO::queueWriteClose() {
+    queuedClose = true;
+    DispatchHandle::rewatchWrite();
+}
+
+/** Return a queued buffer if there are enough
+ * to spare
+ */
+SslIO::BufferBase* SslIO::getQueuedBuffer() {
+    // Always keep at least one buffer (it might have data that was "unread" in it)
+    if (bufferQueue.size()<=1)
+        return 0;
+    BufferBase* buff = bufferQueue.back();
+    assert(buff);
+    buff->dataStart = 0;
+    buff->dataCount = 0;
+    bufferQueue.pop_back();
+    return buff;
+}
+
+/*
+ * We keep on reading as long as we have something to read and a buffer to put
+ * it in
+ */
+void SslIO::readable(DispatchHandle& h) {
+    int readTotal = 0;
+    AbsTime readStartTime = AbsTime::now();
+    do {
+        // (Try to) get a buffer
+        if (!bufferQueue.empty()) {
+            // Read into buffer
+            BufferBase* buff = bufferQueue.front();
+            assert(buff);
+            bufferQueue.pop_front();
+            errno = 0;
+            int readCount = buff->byteCount-buff->dataCount;
+            int rc = socket.read(buff->bytes + buff->dataCount, readCount);
+            if (rc > 0) {
+                buff->dataCount += rc;
+                threadReadTotal += rc;
+                readTotal += rc;
+
+                readCallback(*this, buff);
+                if (rc != readCount) {
+                    // If we didn't fill the read buffer then time to stop reading
+                    break;
+                }
+                
+                // Stop reading if we've overrun our timeslot
+                if (Duration(readStartTime, AbsTime::now()) > threadMaxReadTimeNs) {
+                    break;
+                }
+                
+            } else {
+                // Put buffer back (at front so it doesn't interfere with unread buffers)
+                bufferQueue.push_front(buff);
+                assert(buff);
+                
+                // Eof or other side has gone away
+                if (rc == 0 || errno == ECONNRESET) {
+                    eofCallback(*this);
+                    h.unwatchRead();
+                    break;
+                } else if (errno == EAGAIN) {
+                    // We have just put a buffer back so we know
+                    // we can carry on watching for reads
+                    break;
+                } else {
+                    // Report error then just treat as a socket disconnect
+                    QPID_LOG(error, "Error reading socket: " << getErrorString(PR_GetError()));
+                    eofCallback(*this);
+                    h.unwatchRead();
+                    break;
+                }
+            }
+        } else {
+            // Something to read but no buffer
+            if (emptyCallback) {
+                emptyCallback(*this);
+            }
+            // If we still have no buffers we can't do anything more
+            if (bufferQueue.empty()) {
+                h.unwatchRead();
+                break;
+            }
+            
+        }
+    } while (true);
+
+    ++threadReadCount;
+    threadMaxRead = std::max(threadMaxRead, readTotal);
+    return;
+}
+
+/*
+ * We carry on writing whilst we have data to write and we can write
+ */
+void SslIO::writeable(DispatchHandle& h) {
+    int writeTotal = 0;
+    do {
+        // See if we've got something to write
+        if (!writeQueue.empty()) {
+            // Write buffer
+            BufferBase* buff = writeQueue.back();
+            writeQueue.pop_back();
+            errno = 0;
+            assert(buff->dataStart+buff->dataCount <= buff->byteCount);
+            int rc = socket.write(buff->bytes+buff->dataStart, buff->dataCount);
+            if (rc >= 0) {
+                threadWriteTotal += rc;
+                writeTotal += rc;
+
+                // If we didn't write full buffer put rest back
+                if (rc != buff->dataCount) {
+                    buff->dataStart += rc;
+                    buff->dataCount -= rc;
+                    writeQueue.push_back(buff);
+                    break;
+                }
+                
+                // Recycle the buffer
+                queueReadBuffer(buff);
+                
+                // If we've already written more than the max for reading then stop
+                // (this is to stop writes dominating reads) 
+                if (writeTotal > threadMaxRead)
+                    break;
+            } else {
+                // Put buffer back
+                writeQueue.push_back(buff);
+                if (errno == ECONNRESET || errno == EPIPE) {
+                    // Just stop watching for write here - we'll get a
+                    // disconnect callback soon enough
+                    h.unwatchWrite();
+                    break;
+                } else if (errno == EAGAIN) {
+                    // We have just put a buffer back so we know
+                    // we can carry on watching for writes
+                    break;
+                } else {
+                    QPID_LOG(error, "Error writing to socket: " << getErrorString(PR_GetError()));
+                    h.unwatchWrite();
+                    break;
+                }
+            }
+        } else {
+            // If we're waiting to close the socket then can do it now as there is nothing to write
+            if (queuedClose) {
+                close(h);
+                break;
+            }
+            // Fd is writable, but nothing to write
+            if (idleCallback) {
+                writePending = false;
+                idleCallback(*this);
+            }
+            // If we still have no buffers to write we can't do anything more
+            if (writeQueue.empty() && !writePending && !queuedClose) {
+                h.unwatchWrite();
+                // The following handles the case where writePending is
+                // set to true after the test above; in this case its
+                // possible that the unwatchWrite overwrites the
+                // desired rewatchWrite so we correct that here
+                if (writePending)
+                    h.rewatchWrite();
+                break;
+            }
+        }
+    } while (true);
+
+    ++threadWriteCount;
+    return;
+}
+        
+void SslIO::disconnected(DispatchHandle& h) {
+    // If we've already queued close do it instead of disconnected callback
+    if (queuedClose) {
+        close(h);
+    } else if (disCallback) {
+        disCallback(*this);
+        h.unwatch();
+    }
+}
+
+/*
+ * Close the socket and callback to say we've done it
+ */
+void SslIO::close(DispatchHandle& h) {
+    h.stopWatch();
+    socket.close();
+    if (closedCallback) {
+        closedCallback(*this, socket);
+    }
+}
+
+SecuritySettings SslIO::getSecuritySettings() {
+    SecuritySettings settings;
+    settings.ssf = socket.getKeyLen();
+    settings.authid = socket.getClientAuthId();
+    return settings;
+}
diff --git a/qpid/cpp/src/qpid/sys/ssl/SslIo.h b/qpid/cpp/src/qpid/sys/ssl/SslIo.h
new file mode 100644
index 0000000000..8785852c24
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/ssl/SslIo.h
@@ -0,0 +1,172 @@
+#ifndef _sys_ssl_SslIO
+#define _sys_ssl_SslIO
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/DispatchHandle.h"
+#include "qpid/sys/SecuritySettings.h"
+
+#include <boost/function.hpp>
+#include <deque>
+
+namespace qpid {
+namespace sys {
+namespace ssl {
+    
+class SslSocket;
+
+/*
+ * Asynchronous ssl acceptor: accepts connections then does a callback
+ * with the accepted fd
+ */
+class SslAcceptor {
+public:
+    typedef boost::function1<void, const SslSocket&> Callback;
+
+private:
+    Callback acceptedCallback;
+    qpid::sys::DispatchHandle handle;
+    const SslSocket& socket;
+
+public:
+    SslAcceptor(const SslSocket& s, Callback callback);
+    ~SslAcceptor();
+    void start(qpid::sys::Poller::shared_ptr poller);
+
+private:
+    void readable(qpid::sys::DispatchHandle& handle);
+};
+
+/*
+ * Asynchronous ssl connector: starts the process of initiating a
+ * connection and invokes a callback when completed or failed.
+ */
+class SslConnector : private qpid::sys::DispatchHandle {
+public:
+    typedef boost::function1<void, const SslSocket&> ConnectedCallback;
+    typedef boost::function2<void, int, std::string> FailedCallback;
+
+private:
+    ConnectedCallback connCallback;
+    FailedCallback failCallback;
+    const SslSocket& socket;
+
+public:
+    SslConnector(const SslSocket& socket,
+                    Poller::shared_ptr poller,
+                    std::string hostname,
+                    std::string port,
+                    ConnectedCallback connCb,
+                    FailedCallback failCb = 0);
+
+private:
+    void connComplete(DispatchHandle& handle);
+    void failure(int, std::string);
+};
+
+struct SslIOBufferBase {
+    char* const bytes;
+    const int32_t byteCount;
+    int32_t dataStart;
+    int32_t dataCount;
+    
+    SslIOBufferBase(char* const b, const int32_t s) :
+        bytes(b),
+        byteCount(s),
+        dataStart(0),
+        dataCount(0)
+    {}
+    
+    virtual ~SslIOBufferBase()
+    {}
+};
+
+/*
+ * Asychronous reader/writer: 
+ * Reader accepts buffers to read into; reads into the provided buffers
+ * and then does a callback with the buffer and amount read. Optionally it can callback
+ * when there is something to read but no buffer to read it into.
+ * 
+ * Writer accepts a buffer and queues it for writing; can also be given
+ * a callback for when writing is "idle" (ie fd is writable, but nothing to write)
+ * 
+ * The class is implemented in terms of DispatchHandle to allow it to be deleted by deleting
+ * the contained DispatchHandle
+ */
+class SslIO : private qpid::sys::DispatchHandle {
+public:
+    typedef SslIOBufferBase BufferBase;
+
+    typedef boost::function2<void, SslIO&, BufferBase*> ReadCallback;
+    typedef boost::function1<void, SslIO&> EofCallback;
+    typedef boost::function1<void, SslIO&> DisconnectCallback;
+    typedef boost::function2<void, SslIO&, const SslSocket&> ClosedCallback;
+    typedef boost::function1<void, SslIO&> BuffersEmptyCallback;
+    typedef boost::function1<void, SslIO&> IdleCallback;
+
+
+private:
+    ReadCallback readCallback;
+    EofCallback eofCallback;
+    DisconnectCallback disCallback;
+    ClosedCallback closedCallback;
+    BuffersEmptyCallback emptyCallback;
+    IdleCallback idleCallback;
+    const SslSocket& socket;
+    std::deque<BufferBase*> bufferQueue;
+    std::deque<BufferBase*> writeQueue;
+    bool queuedClose;
+    /**
+     * This flag is used to detect and handle concurrency between
+     * calls to notifyPendingWrite() (which can be made from any thread) and
+     * the execution of the writeable() method (which is always on the
+     * thread processing this handle.
+     */
+    volatile bool writePending;
+
+public:
+    SslIO(const SslSocket& s,
+        ReadCallback rCb, EofCallback eofCb, DisconnectCallback disCb,
+        ClosedCallback cCb = 0, BuffersEmptyCallback eCb = 0, IdleCallback iCb = 0);
+    void queueForDeletion();
+
+    void start(qpid::sys::Poller::shared_ptr poller);
+    void queueReadBuffer(BufferBase* buff);
+    void unread(BufferBase* buff);
+    void queueWrite(BufferBase* buff);
+    void notifyPendingWrite();
+    void queueWriteClose();
+    bool writeQueueEmpty() { return writeQueue.empty(); }
+    BufferBase* getQueuedBuffer();
+
+    qpid::sys::SecuritySettings getSecuritySettings();
+
+private:
+    ~SslIO();
+    void readable(qpid::sys::DispatchHandle& handle);
+    void writeable(qpid::sys::DispatchHandle& handle);
+    void disconnected(qpid::sys::DispatchHandle& handle);
+    void close(qpid::sys::DispatchHandle& handle);
+};
+
+}}}
+
+#endif // _sys_ssl_SslIO
diff --git a/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp b/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
new file mode 100644
index 0000000000..f7483a220c
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
@@ -0,0 +1,360 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/ssl/SslSocket.h"
+#include "qpid/sys/ssl/check.h"
+#include "qpid/sys/ssl/util.h"
+#include "qpid/Exception.h"
+#include "qpid/sys/posix/check.h"
+#include "qpid/sys/posix/PrivatePosix.h"
+
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/errno.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <netdb.h>
+#include <cstdlib>
+#include <string.h>
+#include <iostream>
+
+#include <private/pprio.h>
+#include <nss.h>
+#include <pk11pub.h>
+#include <ssl.h>
+#include <key.h>
+
+#include <boost/format.hpp>
+
+namespace qpid {
+namespace sys {
+namespace ssl {
+
+namespace {
+std::string getName(int fd, bool local, bool includeService = false)
+{
+    ::sockaddr_storage name; // big enough for any socket address
+    ::socklen_t namelen = sizeof(name);
+
+    int result = -1;
+    if (local) {
+        result = ::getsockname(fd, (::sockaddr*)&name, &namelen);
+    } else {
+        result = ::getpeername(fd, (::sockaddr*)&name, &namelen);
+    }
+
+    QPID_POSIX_CHECK(result);
+
+    char servName[NI_MAXSERV];
+    char dispName[NI_MAXHOST];
+    if (includeService) {
+        if (int rc=::getnameinfo((::sockaddr*)&name, namelen, dispName, sizeof(dispName),
+                                 servName, sizeof(servName),
+                                 NI_NUMERICHOST | NI_NUMERICSERV) != 0)
+            throw QPID_POSIX_ERROR(rc);
+        return std::string(dispName) + ":" + std::string(servName);
+
+    } else {
+        if (int rc=::getnameinfo((::sockaddr*)&name, namelen, dispName, sizeof(dispName), 0, 0, NI_NUMERICHOST) != 0)
+            throw QPID_POSIX_ERROR(rc);
+        return dispName;
+    }
+}
+
+std::string getService(int fd, bool local)
+{
+    ::sockaddr_storage name; // big enough for any socket address
+    ::socklen_t namelen = sizeof(name);
+
+    int result = -1;
+    if (local) {
+        result = ::getsockname(fd, (::sockaddr*)&name, &namelen);
+    } else {
+        result = ::getpeername(fd, (::sockaddr*)&name, &namelen);
+    }
+
+    QPID_POSIX_CHECK(result);
+
+    char servName[NI_MAXSERV];
+    if (int rc=::getnameinfo((::sockaddr*)&name, namelen, 0, 0,
+                                 servName, sizeof(servName),
+                                 NI_NUMERICHOST | NI_NUMERICSERV) != 0)
+        throw QPID_POSIX_ERROR(rc);
+    return servName;
+}
+
+const std::string DOMAIN_SEPARATOR("@");
+const std::string DC_SEPARATOR(".");
+const std::string DC("DC");
+const std::string DN_DELIMS(" ,=");
+
+std::string getDomainFromSubject(std::string subject)
+{
+    std::string::size_type last = subject.find_first_not_of(DN_DELIMS, 0);
+    std::string::size_type i = subject.find_first_of(DN_DELIMS, last);
+
+    std::string domain;
+    bool nextTokenIsDC = false;
+    while (std::string::npos != i || std::string::npos != last)
+    {
+        std::string token = subject.substr(last, i - last);
+        if (nextTokenIsDC) {
+            if (domain.size()) domain += DC_SEPARATOR;
+            domain += token;
+            nextTokenIsDC = false;
+        } else if (token == DC) {
+            nextTokenIsDC = true;
+        }
+        last = subject.find_first_not_of(DN_DELIMS, i);
+        i = subject.find_first_of(DN_DELIMS, last);
+    }
+    return domain;
+}
+
+}
+
+SslSocket::SslSocket() : IOHandle(new IOHandlePrivate()), socket(0), prototype(0)
+{
+    impl->fd = ::socket (PF_INET, SOCK_STREAM, 0);
+    if (impl->fd < 0) throw QPID_POSIX_ERROR(errno);
+    socket = SSL_ImportFD(0, PR_ImportTCPSocket(impl->fd));
+}
+
+/**
+ * This form of the constructor is used with the server-side sockets
+ * returned from accept. Because we use posix accept rather than
+ * PR_Accept, we have to reset the handshake.
+ */
+SslSocket::SslSocket(IOHandlePrivate* ioph, PRFileDesc* model) : IOHandle(ioph), socket(0), prototype(0)
+{
+    socket = SSL_ImportFD(model, PR_ImportTCPSocket(impl->fd));
+    NSS_CHECK(SSL_ResetHandshake(socket, true));
+}
+
+void SslSocket::setNonblocking() const
+{
+    PRSocketOptionData option;
+    option.option = PR_SockOpt_Nonblocking;
+    option.value.non_blocking = true;
+    PR_SetSocketOption(socket, &option);
+}
+
+void SslSocket::connect(const std::string& host, const std::string& port) const
+{
+    std::stringstream namestream;
+    namestream << host << ":" << port;
+    connectname = namestream.str();
+
+    void* arg;
+    // Use the connection's cert-name if it has one; else use global cert-name
+    if (certname != "") {
+        arg = const_cast<char*>(certname.c_str());
+    } else if (SslOptions::global.certName.empty()) {
+        arg = 0;
+    } else {
+        arg = const_cast<char*>(SslOptions::global.certName.c_str());
+    }
+    NSS_CHECK(SSL_GetClientAuthDataHook(socket, NSS_GetClientAuthData, arg));
+    NSS_CHECK(SSL_SetURL(socket, host.data()));
+
+    char hostBuffer[PR_NETDB_BUF_SIZE];
+    PRHostEnt hostEntry;
+    PR_CHECK(PR_GetHostByName(host.data(), hostBuffer, PR_NETDB_BUF_SIZE, &hostEntry));
+    PRNetAddr address;
+    int value = PR_EnumerateHostEnt(0, &hostEntry, boost::lexical_cast<PRUint16>(port), &address);
+    if (value < 0) {
+        throw Exception(QPID_MSG("Error getting address for host: " << ErrorString()));
+    } else if (value == 0) {
+        throw Exception(QPID_MSG("Could not resolve address for host."));
+    }
+    PR_CHECK(PR_Connect(socket, &address, PR_INTERVAL_NO_TIMEOUT));
+    NSS_CHECK(SSL_ForceHandshake(socket));
+}
+
+void SslSocket::close() const
+{
+    if (impl->fd > 0) {
+        PR_Close(socket);
+        impl->fd = -1;
+    }
+}
+
+int SslSocket::listen(uint16_t port, int backlog, const std::string& certName, bool clientAuth) const
+{
+    //configure prototype socket:
+    prototype = SSL_ImportFD(0, PR_NewTCPSocket());
+    if (clientAuth) {
+        NSS_CHECK(SSL_OptionSet(prototype, SSL_REQUEST_CERTIFICATE, PR_TRUE));
+        NSS_CHECK(SSL_OptionSet(prototype, SSL_REQUIRE_CERTIFICATE, PR_TRUE));
+    }
+
+    //get certificate and key (is this the correct way?)
+    CERTCertificate *cert = PK11_FindCertFromNickname(const_cast<char*>(certName.c_str()), 0);
+    if (!cert) throw Exception(QPID_MSG("Failed to load certificate '" << certName << "'"));
+    SECKEYPrivateKey *key = PK11_FindKeyByAnyCert(cert, 0);
+    if (!key) throw Exception(QPID_MSG("Failed to retrieve private key from certificate"));
+    NSS_CHECK(SSL_ConfigSecureServer(prototype, cert, key, NSS_FindCertKEAType(cert)));
+    SECKEY_DestroyPrivateKey(key);
+    CERT_DestroyCertificate(cert);
+
+    //bind and listen
+    const int& socket = impl->fd;
+    int yes=1;
+    QPID_POSIX_CHECK(setsockopt(socket,SOL_SOCKET,SO_REUSEADDR,&yes,sizeof(yes)));
+    struct sockaddr_in name;
+    name.sin_family = AF_INET;
+    name.sin_port = htons(port);
+    name.sin_addr.s_addr = 0;
+    if (::bind(socket, (struct sockaddr*)&name, sizeof(name)) < 0)
+        throw Exception(QPID_MSG("Can't bind to port " << port << ": " << strError(errno)));
+    if (::listen(socket, backlog) < 0)
+        throw Exception(QPID_MSG("Can't listen on port " << port << ": " << strError(errno)));
+
+    socklen_t namelen = sizeof(name);
+    if (::getsockname(socket, (struct sockaddr*)&name, &namelen) < 0)
+        throw QPID_POSIX_ERROR(errno);
+
+    return ntohs(name.sin_port);
+}
+
+SslSocket* SslSocket::accept() const
+{
+    int afd = ::accept(impl->fd, 0, 0);
+    if ( afd >= 0) {
+        return new SslSocket(new IOHandlePrivate(afd), prototype);
+    } else if (errno == EAGAIN) {
+        return 0;
+    } else {
+        throw QPID_POSIX_ERROR(errno);
+    }
+}
+
+int SslSocket::read(void *buf, size_t count) const
+{
+    return PR_Read(socket, buf, count);
+}
+
+int SslSocket::write(const void *buf, size_t count) const
+{
+    return PR_Write(socket, buf, count);
+}
+
+std::string SslSocket::getSockname() const
+{
+    return getName(impl->fd, true);
+}
+
+std::string SslSocket::getPeername() const
+{
+    return getName(impl->fd, false);
+}
+
+std::string SslSocket::getPeerAddress() const
+{
+    if (!connectname.empty())
+        return connectname;
+    return getName(impl->fd, false, true);
+}
+
+std::string SslSocket::getLocalAddress() const
+{
+    return getName(impl->fd, true, true);
+}
+
+uint16_t SslSocket::getLocalPort() const
+{
+    return std::atoi(getService(impl->fd, true).c_str());
+}
+
+uint16_t SslSocket::getRemotePort() const
+{
+    return atoi(getService(impl->fd, true).c_str());
+}
+
+int SslSocket::getError() const
+{
+    int       result;
+    socklen_t rSize = sizeof (result);
+
+    if (::getsockopt(impl->fd, SOL_SOCKET, SO_ERROR, &result, &rSize) < 0)
+        throw QPID_POSIX_ERROR(errno);
+
+    return result;
+}
+
+void SslSocket::setTcpNoDelay(bool nodelay) const
+{
+    if (nodelay) {
+        PRSocketOptionData option;
+        option.option = PR_SockOpt_NoDelay;
+        option.value.no_delay = true;
+        PR_SetSocketOption(socket, &option);
+    }
+}
+
+void SslSocket::setCertName(const std::string& name)
+{
+    certname = name;
+}
+
+
+/** get the bit length of the current cipher's key */
+int SslSocket::getKeyLen() const
+{
+    int enabled = 0;
+    int keySize = 0;
+    SECStatus   rc;
+
+    rc = SSL_SecurityStatus( socket,
+                             &enabled,
+                             NULL,
+                             NULL,
+                             &keySize,
+                             NULL, NULL );
+    if (rc == SECSuccess && enabled) {
+        return keySize;
+    }
+    return 0;
+}
+
+std::string SslSocket::getClientAuthId() const
+{
+    std::string authId;
+    CERTCertificate* cert = SSL_PeerCertificate(socket);
+    if (cert) {
+        authId = CERT_GetCommonName(&(cert->subject));
+        /*
+         * The NSS function CERT_GetDomainComponentName only returns
+         * the last component of the domain name, so we have to parse
+         * the subject manually to extract the full domain.
+         */
+        std::string domain = getDomainFromSubject(cert->subjectName);
+        if (!domain.empty()) {
+            authId += DOMAIN_SEPARATOR;
+            authId += domain;
+        }
+        CERT_DestroyCertificate(cert);
+    }
+    return authId;
+}
+
+}}} // namespace qpid::sys::ssl
diff --git a/qpid/cpp/src/qpid/sys/ssl/SslSocket.h b/qpid/cpp/src/qpid/sys/ssl/SslSocket.h
new file mode 100644
index 0000000000..993859495b
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/ssl/SslSocket.h
@@ -0,0 +1,132 @@
+#ifndef _sys_ssl_Socket_h
+#define _sys_ssl_Socket_h
+
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/IOHandle.h"
+#include <nspr.h>
+
+#include <string>
+
+struct sockaddr;
+
+namespace qpid {
+namespace sys {
+
+class Duration;
+
+namespace ssl {
+
+class SslSocket : public qpid::sys::IOHandle
+{
+public:
+    /** Create a socket wrapper for descriptor. */
+    SslSocket();
+
+    /** Set socket non blocking */
+    void setNonblocking() const;
+
+    /** Set tcp-nodelay */
+    void setTcpNoDelay(bool nodelay) const;
+
+    /** Set SSL cert-name. Allows the cert-name to be set per
+     * connection, overriding global cert-name settings from
+     * NSSInit().*/
+    void setCertName(const std::string& certName);
+
+    void connect(const std::string& host, const std::string& port) const;
+
+    void close() const;
+
+    /** Bind to a port and start listening.
+     *@param port 0 means choose an available port.
+     *@param backlog maximum number of pending connections.
+     *@param certName name of certificate to use to identify the server
+     *@return The bound port.
+     */
+    int listen(uint16_t port = 0, int backlog = 10, const std::string& certName = "localhost.localdomain", bool clientAuth = false) const;
+
+    /**
+     * Accept a connection from a socket that is already listening
+     * and has an incoming connection
+     */
+    SslSocket* accept() const;
+
+    // TODO The following are raw operations, maybe they need better wrapping?
+    int read(void *buf, size_t count) const;
+    int write(const void *buf, size_t count) const;
+
+    /** Returns the "socket name" ie the address bound to
+     * the near end of the socket
+     */
+    std::string getSockname() const;
+
+    /** Returns the "peer name" ie the address bound to
+     * the remote end of the socket
+     */
+    std::string getPeername() const;
+
+    /**
+     * Returns an address (host and port) for the remote end of the
+     * socket
+     */
+    std::string getPeerAddress() const;
+    /**
+     * Returns an address (host and port) for the local end of the
+     * socket
+     */
+    std::string getLocalAddress() const;
+
+    /**
+     * Returns the full address of the connection: local and remote host and port.
+     */
+    std::string getFullAddress() const { return getLocalAddress()+"-"+getPeerAddress(); }
+
+    uint16_t getLocalPort() const;
+    uint16_t getRemotePort() const;
+
+    /**
+     * Returns the error code stored in the socket.  This may be used
+     * to determine the result of a non-blocking connect.
+     */
+    int getError() const;
+
+    int getKeyLen() const;
+    std::string getClientAuthId() const;
+
+private:
+    mutable std::string connectname;
+    mutable PRFileDesc* socket;
+    std::string certname;
+
+    /**
+     * 'model' socket, with configuration to use when importing
+     * accepted sockets for use as ssl sockets. Set on listen(), used
+     * in accept to pass through to newly created socket instances.
+     */
+    mutable PRFileDesc* prototype;
+
+    SslSocket(IOHandlePrivate* ioph, PRFileDesc* model);
+};
+
+}}}
+#endif  /*!_sys_ssl_Socket_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 3078e894df..3078e894df 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/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/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp b/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
new file mode 100644
index 0000000000..8d84fdb7b2
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
@@ -0,0 +1,755 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/sys/windows/AsynchIoResult.h"
+#include "qpid/sys/windows/IoHandlePrivate.h"
+#include "qpid/sys/AsynchIO.h"
+#include "qpid/sys/Mutex.h"
+#include "qpid/sys/Socket.h"
+#include "qpid/sys/Poller.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/sys/Time.h"
+#include "qpid/log/Statement.h"
+
+#include "qpid/sys/windows/check.h"
+#include "qpid/sys/windows/mingw32_compat.h"
+
+#include <boost/thread/once.hpp>
+
+#include <queue>
+#include <winsock2.h>
+#include <mswsock.h>
+#include <windows.h>
+
+#include <boost/bind.hpp>
+
+namespace {
+
+    typedef qpid::sys::ScopedLock<qpid::sys::Mutex>  QLock;
+
+/*
+ * The function pointers for AcceptEx and ConnectEx need to be looked up
+ * at run time. Make sure this is done only once.
+ */
+boost::once_flag lookUpAcceptExOnce = BOOST_ONCE_INIT;
+LPFN_ACCEPTEX fnAcceptEx = 0;
+typedef void (*lookUpFunc)(const qpid::sys::Socket &);
+
+void lookUpAcceptEx() {
+    SOCKET h = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    GUID guidAcceptEx = WSAID_ACCEPTEX;
+    DWORD dwBytes = 0;
+    WSAIoctl(h,
+             SIO_GET_EXTENSION_FUNCTION_POINTER,
+             &guidAcceptEx,
+             sizeof(guidAcceptEx),
+             &fnAcceptEx,
+             sizeof(fnAcceptEx),
+             &dwBytes,
+             NULL,
+             NULL);
+    closesocket(h);
+    if (fnAcceptEx == 0)
+        throw qpid::Exception(QPID_MSG("Failed to look up AcceptEx"));
+}
+
+}
+
+namespace qpid {
+namespace sys {
+namespace windows {
+
+/*
+ * Asynch Acceptor
+ *
+ */
+class AsynchAcceptor : public qpid::sys::AsynchAcceptor {
+
+    friend class AsynchAcceptResult;
+
+public:
+    AsynchAcceptor(const Socket& s, AsynchAcceptor::Callback callback);
+    ~AsynchAcceptor();
+    void start(Poller::shared_ptr poller);
+
+private:
+    void restart(void);
+
+    AsynchAcceptor::Callback acceptedCallback;
+    const Socket& socket;
+};
+
+AsynchAcceptor::AsynchAcceptor(const Socket& s, Callback callback)
+  : acceptedCallback(callback),
+    socket(s) {
+
+    s.setNonblocking();
+#if (BOOST_VERSION >= 103500)   /* boost 1.35 or later reversed the args */
+    boost::call_once(lookUpAcceptExOnce, lookUpAcceptEx);
+#else
+    boost::call_once(lookUpAcceptEx, lookUpAcceptExOnce);
+#endif
+}
+
+AsynchAcceptor::~AsynchAcceptor()
+{
+    socket.close();
+}
+
+void AsynchAcceptor::start(Poller::shared_ptr poller) {
+    PollerHandle ph = PollerHandle(socket);
+    poller->monitorHandle(ph, Poller::INPUT);
+    restart ();
+}
+
+void AsynchAcceptor::restart(void) {
+    DWORD bytesReceived = 0;  // Not used, needed for AcceptEx API
+    AsynchAcceptResult *result = new AsynchAcceptResult(acceptedCallback,
+                                                        this,
+                                                        toSocketHandle(socket));
+    BOOL status;
+    status = ::fnAcceptEx(toSocketHandle(socket),
+                          toSocketHandle(*result->newSocket),
+                          result->addressBuffer,
+                          0,
+                          AsynchAcceptResult::SOCKADDRMAXLEN,
+                          AsynchAcceptResult::SOCKADDRMAXLEN,
+                          &bytesReceived,
+                          result->overlapped());
+    QPID_WINDOWS_CHECK_ASYNC_START(status);
+}
+
+
+AsynchAcceptResult::AsynchAcceptResult(AsynchAcceptor::Callback cb,
+                                       AsynchAcceptor *acceptor,
+                                       SOCKET listener)
+  : callback(cb), acceptor(acceptor), listener(listener) {
+    newSocket.reset (new Socket());
+}
+
+void AsynchAcceptResult::success(size_t /*bytesTransferred*/) {
+    ::setsockopt (toSocketHandle(*newSocket),
+                  SOL_SOCKET,
+                  SO_UPDATE_ACCEPT_CONTEXT,
+                  (char*)&listener,
+                  sizeof (listener));
+    callback(*(newSocket.release()));
+    acceptor->restart ();
+    delete this;
+}
+
+void AsynchAcceptResult::failure(int /*status*/) {
+    //if (status != WSA_OPERATION_ABORTED)
+    // Can there be anything else?  ;
+    delete this;
+}
+
+/*
+ * AsynchConnector does synchronous connects for now... to do asynch the
+ * IocpPoller will need some extension to register an event handle as a
+ * CONNECT-type "direction", the connect completion/result will need an
+ * event handle to associate with the connecting handle. But there's no
+ * time for that right now...
+ */
+class AsynchConnector : public qpid::sys::AsynchConnector {
+private:
+    ConnectedCallback connCallback;
+    FailedCallback failCallback;
+    const Socket& socket;
+    const std::string hostname;
+    const std::string port;
+
+public:
+    AsynchConnector(const Socket& socket,
+                    const std::string& hostname,
+                    const std::string& port,
+                    ConnectedCallback connCb,
+                    FailedCallback failCb = 0);
+    void start(Poller::shared_ptr poller);
+};
+
+AsynchConnector::AsynchConnector(const Socket& sock,
+                                 const std::string& hname,
+                                 const std::string& p,
+                                 ConnectedCallback connCb,
+                                 FailedCallback failCb) :
+    connCallback(connCb), failCallback(failCb), socket(sock),
+    hostname(hname), port(p)
+{
+}
+
+void AsynchConnector::start(Poller::shared_ptr)
+{
+    try {
+        socket.connect(hostname, port);
+        socket.setNonblocking();
+        connCallback(socket);
+    } catch(std::exception& e) {
+        if (failCallback)
+            failCallback(socket, -1, std::string(e.what()));
+        socket.close();
+    }
+}
+
+} // namespace windows
+
+AsynchAcceptor* AsynchAcceptor::create(const Socket& s, 
+                                       Callback callback)
+{
+    return new windows::AsynchAcceptor(s, callback);
+}
+
+AsynchConnector* qpid::sys::AsynchConnector::create(const Socket& s,
+                                                    const std::string& hostname,
+                                                    const std::string& port,
+                                                    ConnectedCallback connCb,
+                                                    FailedCallback failCb)
+{
+    return new windows::AsynchConnector(s,
+                                        hostname,
+                                        port,
+                                        connCb,
+                                        failCb);
+}
+
+
+/*
+ * Asynch reader/writer
+ */
+
+namespace windows {
+
+class AsynchIO : public qpid::sys::AsynchIO {
+public:
+    AsynchIO(const Socket& s,
+             ReadCallback rCb,
+             EofCallback eofCb,
+             DisconnectCallback disCb,
+             ClosedCallback cCb = 0,
+             BuffersEmptyCallback eCb = 0,
+             IdleCallback iCb = 0);
+    ~AsynchIO();
+
+    // Methods inherited from qpid::sys::AsynchIO
+
+    /**
+     * Notify the object is should delete itself as soon as possible.
+     */
+    virtual void queueForDeletion();
+
+    /// Take any actions needed to prepare for working with the poller.
+    virtual void start(Poller::shared_ptr poller);
+    virtual void queueReadBuffer(BufferBase* buff);
+    virtual void unread(BufferBase* buff);
+    virtual void queueWrite(BufferBase* buff);
+    virtual void notifyPendingWrite();
+    virtual void queueWriteClose();
+    virtual bool writeQueueEmpty();
+    virtual void startReading();
+    virtual void stopReading();
+    virtual void requestCallback(RequestCallback);
+
+    /**
+     * getQueuedBuffer returns a buffer from the buffer queue, if one is
+     * available.
+     *
+     * @retval Pointer to BufferBase buffer; 0 if none is available.
+     */
+    virtual BufferBase* getQueuedBuffer();
+
+private:
+    ReadCallback readCallback;
+    EofCallback eofCallback;
+    DisconnectCallback disCallback;
+    ClosedCallback closedCallback;
+    BuffersEmptyCallback emptyCallback;
+    IdleCallback idleCallback;
+    const Socket& socket;
+    Poller::shared_ptr poller;
+
+    std::deque<BufferBase*> bufferQueue;
+    std::deque<BufferBase*> writeQueue;
+    /* The MSVC-supplied deque is not thread-safe; keep locks to serialize
+     * access to the buffer queue and write queue.
+     */
+    Mutex bufferQueueLock;
+
+    // Number of outstanding I/O operations.
+    volatile LONG opsInProgress;
+    // Is there a write in progress?
+    volatile bool writeInProgress;
+    // Deletion requested, but there are callbacks in progress.
+    volatile bool queuedDelete;
+    // Socket close requested, but there are operations in progress.
+    volatile bool queuedClose;
+
+private:
+    // Dispatch events that have completed.
+    void notifyEof(void);
+    void notifyDisconnect(void);
+    void notifyClosed(void);
+    void notifyBuffersEmpty(void);
+    void notifyIdle(void);
+
+    /**
+     * Initiate a write of the specified buffer. There's no callback for
+     * write completion to the AsynchIO object.
+     */
+    void startWrite(AsynchIO::BufferBase* buff);
+
+    void close(void);
+
+    /**
+     * readComplete is called when a read request is complete.
+     *
+     * @param result Results of the operation.
+     */
+    void readComplete(AsynchReadResult *result);
+
+    /**
+     * writeComplete is called when a write request is complete.
+     *
+     * @param result Results of the operation.
+     */
+    void writeComplete(AsynchWriteResult *result);
+
+    /**
+     * Queue of completions to run. This queue enforces the requirement
+     * from upper layers that only one thread at a time is allowed to act
+     * on any given connection. Once a thread is busy processing a completion
+     * on this object, other threads that dispatch completions queue the
+     * completions here for the in-progress thread to handle when done.
+     * Thus, any threads can dispatch a completion from the IocpPoller, but
+     * this class ensures that actual processing at the connection level is
+     * only on one thread at a time.
+     */
+    std::queue<AsynchIoResult *> completionQueue;
+    volatile bool working;
+    Mutex completionLock;
+
+    /**
+     * Called when there's a completion to process.
+     */
+    void completion(AsynchIoResult *result);
+};
+
+// This is used to encapsulate pure callbacks into a handle
+class CallbackHandle : public IOHandle {
+public:
+    CallbackHandle(AsynchIoResult::Completer completeCb,
+                   AsynchIO::RequestCallback reqCb = 0) :
+    IOHandle(new IOHandlePrivate (INVALID_SOCKET, completeCb, reqCb))
+    {}
+};
+
+AsynchIO::AsynchIO(const Socket& s,
+                   ReadCallback rCb,
+                   EofCallback eofCb,
+                   DisconnectCallback disCb,
+                   ClosedCallback cCb,
+                   BuffersEmptyCallback eCb,
+                   IdleCallback iCb) :
+
+    readCallback(rCb),
+    eofCallback(eofCb),
+    disCallback(disCb),
+    closedCallback(cCb),
+    emptyCallback(eCb),
+    idleCallback(iCb),
+    socket(s),
+    opsInProgress(0),
+    writeInProgress(false),
+    queuedDelete(false),
+    queuedClose(false),
+    working(false) {
+}
+
+struct deleter
+{
+    template <typename T>
+    void operator()(T *ptr){ delete ptr;}
+};
+
+AsynchIO::~AsynchIO() {
+    std::for_each( bufferQueue.begin(), bufferQueue.end(), deleter());
+    std::for_each( writeQueue.begin(), writeQueue.end(), deleter());
+}
+
+void AsynchIO::queueForDeletion() {
+    queuedDelete = true;
+    if (opsInProgress > 0) {
+        QPID_LOG(info, "Delete AsynchIO queued; ops in progress");
+        // AsynchIOHandler calls this then deletes itself; don't do any more
+        // callbacks.
+        readCallback = 0;
+        eofCallback = 0;
+        disCallback = 0;
+        closedCallback = 0;
+        emptyCallback = 0;
+        idleCallback = 0;
+    }
+    else {
+        delete this;
+    }
+}
+
+void AsynchIO::start(Poller::shared_ptr poller0) {
+    PollerHandle ph = PollerHandle(socket);
+    poller = poller0;
+    poller->monitorHandle(ph, Poller::INPUT);
+    if (writeQueue.size() > 0)  // Already have data queued for write
+        notifyPendingWrite();
+    startReading();
+}
+
+void AsynchIO::queueReadBuffer(AsynchIO::BufferBase* buff) {
+    assert(buff);
+    buff->dataStart = 0;
+    buff->dataCount = 0;
+    QLock l(bufferQueueLock);
+    bufferQueue.push_back(buff);
+}
+
+void AsynchIO::unread(AsynchIO::BufferBase* buff) {
+    assert(buff);
+    buff->squish();
+    QLock l(bufferQueueLock);
+    bufferQueue.push_front(buff);
+}
+
+void AsynchIO::queueWrite(AsynchIO::BufferBase* buff) {
+    assert(buff);
+    QLock l(bufferQueueLock);
+    writeQueue.push_back(buff);
+    if (!writeInProgress)
+        notifyPendingWrite();
+}
+
+void AsynchIO::notifyPendingWrite() {
+    // This method is generally called from a processing thread; transfer
+    // work on this to an I/O thread. Much of the upper layer code assumes
+    // that all I/O-related things happen in an I/O thread.
+    if (poller == 0)    // Not really going yet...
+        return;
+
+    InterlockedIncrement(&opsInProgress);
+    PollerHandle ph(CallbackHandle(boost::bind(&AsynchIO::completion, this, _1)));
+    poller->monitorHandle(ph, Poller::OUTPUT);
+}
+
+void AsynchIO::queueWriteClose() {
+    queuedClose = true;
+    if (!writeInProgress)
+        notifyPendingWrite();
+}
+
+bool AsynchIO::writeQueueEmpty() {
+    QLock l(bufferQueueLock);
+    return writeQueue.size() == 0;
+}
+
+/*
+ * Initiate a read operation. AsynchIO::readComplete() will be
+ * called when the read is complete and data is available.
+ */
+void AsynchIO::startReading() {
+    if (queuedDelete)
+        return;
+
+    // (Try to) get a buffer; look on the front since there may be an
+    // "unread" one there with data remaining from last time.
+    AsynchIO::BufferBase *buff = 0;
+    {
+        QLock l(bufferQueueLock);
+
+        if (!bufferQueue.empty()) {
+            buff = bufferQueue.front();
+            assert(buff);
+            bufferQueue.pop_front();
+        }
+    }
+    if (buff != 0) {
+        int readCount = buff->byteCount - buff->dataCount;
+        AsynchReadResult *result =
+            new AsynchReadResult(boost::bind(&AsynchIO::completion, this, _1),
+                                 buff,
+                                 readCount);
+        DWORD bytesReceived = 0, flags = 0;
+        InterlockedIncrement(&opsInProgress);
+        int status = WSARecv(toSocketHandle(socket),
+                             const_cast<LPWSABUF>(result->getWSABUF()), 1,
+                             &bytesReceived,
+                             &flags,
+                             result->overlapped(),
+                             0);
+        if (status != 0) {
+            int error = WSAGetLastError();
+            if (error != WSA_IO_PENDING) {
+                result->failure(error);
+                result = 0;   // result is invalid here
+                return;
+            }
+        }
+        // On status 0 or WSA_IO_PENDING, completion will handle the rest.
+    }
+    else {
+        notifyBuffersEmpty();
+    }
+    return;
+}
+
+// stopReading was added to prevent a race condition with read-credit on Linux.
+// It may or may not be required on windows.
+// 
+// AsynchIOHandler::readbuff() calls stopReading() inside the same
+// critical section that protects startReading() in
+// AsynchIOHandler::giveReadCredit().
+// 
+void AsynchIO::stopReading() {}
+
+// Queue the specified callback for invocation from an I/O thread.
+void AsynchIO::requestCallback(RequestCallback callback) {
+    // This method is generally called from a processing thread; transfer
+    // work on this to an I/O thread. Much of the upper layer code assumes
+    // that all I/O-related things happen in an I/O thread.
+    if (poller == 0)    // Not really going yet...
+        return;
+
+    InterlockedIncrement(&opsInProgress);
+    PollerHandle ph(CallbackHandle(
+        boost::bind(&AsynchIO::completion, this, _1),
+        callback));
+    poller->monitorHandle(ph, Poller::INPUT);
+}
+
+/**
+ * Return a queued buffer if there are enough to spare.
+ */
+AsynchIO::BufferBase* AsynchIO::getQueuedBuffer() {
+    QLock l(bufferQueueLock);
+    // Always keep at least one buffer (it might have data that was
+    // "unread" in it).
+    if (bufferQueue.size() <= 1)
+        return 0;
+    BufferBase* buff = bufferQueue.back();
+    assert(buff);
+    bufferQueue.pop_back();
+    return buff;
+}
+
+void AsynchIO::notifyEof(void) {
+    if (eofCallback)
+        eofCallback(*this);
+}
+
+void AsynchIO::notifyDisconnect(void) {
+    if (disCallback)
+        disCallback(*this);
+}
+
+void AsynchIO::notifyClosed(void) {
+    if (closedCallback)
+        closedCallback(*this, socket);
+}
+
+void AsynchIO::notifyBuffersEmpty(void) {
+    if (emptyCallback)
+        emptyCallback(*this);
+}
+
+void AsynchIO::notifyIdle(void) {
+    if (idleCallback)
+        idleCallback(*this);
+}
+
+/*
+ * Asynch reader/writer using overlapped I/O
+ */
+
+void AsynchIO::startWrite(AsynchIO::BufferBase* buff) {
+    writeInProgress = true;
+    InterlockedIncrement(&opsInProgress);
+    AsynchWriteResult *result =
+        new AsynchWriteResult(boost::bind(&AsynchIO::completion, this, _1),
+                              buff,
+                              buff->dataCount);
+    DWORD bytesSent = 0;
+    int status = WSASend(toSocketHandle(socket),
+                         const_cast<LPWSABUF>(result->getWSABUF()), 1,
+                         &bytesSent,
+                         0,
+                         result->overlapped(),
+                         0);
+    if (status != 0) {
+        int error = WSAGetLastError();
+        if (error != WSA_IO_PENDING) {
+            result->failure(error);   // Also decrements in-progress count
+            result = 0;   // result is invalid here
+            return;
+        }
+    }
+    // On status 0 or WSA_IO_PENDING, completion will handle the rest.
+    return;
+}
+
+/*
+ * Close the socket and callback to say we've done it
+ */
+void AsynchIO::close(void) {
+    socket.close();
+    notifyClosed();
+}
+
+void AsynchIO::readComplete(AsynchReadResult *result) {
+    int status = result->getStatus();
+    size_t bytes = result->getTransferred();
+    if (status == 0 && bytes > 0) {
+        bool restartRead = true;     // May not if receiver doesn't want more
+        if (readCallback)
+            readCallback(*this, result->getBuff());
+        if (restartRead)
+            startReading();
+    }
+    else {
+        // No data read, so put the buffer back. It may be partially filled,
+        // so "unread" it back to the front of the queue.
+        unread(result->getBuff());
+        notifyEof();
+        if (status != 0)
+        {
+            notifyDisconnect();
+        }
+    }
+}
+
+/*
+ * NOTE - this completion is called for completed writes and also when 
+ * a write is desired. The difference is in the buff - if a write is desired
+ * the buff is 0.
+ */
+void AsynchIO::writeComplete(AsynchWriteResult *result) {
+    int status = result->getStatus();
+    size_t bytes = result->getTransferred();
+    AsynchIO::BufferBase *buff = result->getBuff();
+    if (buff != 0) {
+        writeInProgress = false;
+        if (status == 0 && bytes > 0) {
+            if (bytes < result->getRequested()) // Still more to go; resubmit
+                startWrite(buff);
+            else
+                queueReadBuffer(buff);     // All done; back to the pool
+        }
+        else {
+            // An error... if it's a connection close, ignore it - it will be
+            // noticed and handled on a read completion any moment now.
+            // What to do with real error??? Save the Buffer?
+        }
+    }
+
+    // If there are no writes outstanding, check for more writes to initiate
+    // (either queued or via idle). The opsInProgress count is handled in
+    // completion()
+    if (!writeInProgress) {
+        bool writing = false;
+        {
+            QLock l(bufferQueueLock);
+            if (writeQueue.size() > 0) {
+                buff = writeQueue.front();
+                assert(buff);
+                writeQueue.pop_front();
+                startWrite(buff);
+                writing = true;
+            }
+        }
+        if (!writing && !queuedClose) {
+            notifyIdle();
+        }
+    }
+    return;
+}
+
+void AsynchIO::completion(AsynchIoResult *result) {
+    {
+        ScopedLock<Mutex> l(completionLock);
+        if (working) {
+            completionQueue.push(result);
+            return;
+        }
+
+        // First thread in with something to do; note we're working then keep
+        // handling completions.
+        working = true;
+        while (result != 0) {
+            // New scope to unlock temporarily.
+            {
+                ScopedUnlock<Mutex> ul(completionLock);
+                AsynchReadResult *r = dynamic_cast<AsynchReadResult*>(result);
+                if (r != 0)
+                    readComplete(r);
+                else {
+                    AsynchWriteResult *w =
+                        dynamic_cast<AsynchWriteResult*>(result);
+                    if (w != 0)
+                        writeComplete(w);
+                    else {
+                        AsynchCallbackRequest *req =
+                          dynamic_cast<AsynchCallbackRequest*>(result);
+                        req->reqCallback(*this);
+                    }
+                }
+                delete result;
+                result = 0;
+                InterlockedDecrement(&opsInProgress);
+            }
+            // Lock is held again.
+            if (completionQueue.empty())
+                continue;
+            result = completionQueue.front();
+            completionQueue.pop();
+        }
+        working = false;
+    }
+    // Lock released; ok to close if ops are done and close requested.
+    // Layer above will call back to queueForDeletion() if it hasn't
+    // already been done. If it already has, go ahead and delete.
+    if (opsInProgress == 0) {
+        if (queuedClose)
+            // close() may cause a delete; don't trust 'this' on return
+            close();
+        else if (queuedDelete)
+            delete this;
+    }
+}
+
+} // namespace windows
+
+AsynchIO* qpid::sys::AsynchIO::create(const Socket& s,
+                                      AsynchIO::ReadCallback rCb,
+                                      AsynchIO::EofCallback eofCb,
+                                      AsynchIO::DisconnectCallback disCb,
+                                      AsynchIO::ClosedCallback cCb,
+                                      AsynchIO::BuffersEmptyCallback eCb,
+                                      AsynchIO::IdleCallback iCb)
+{
+    return new qpid::sys::windows::AsynchIO(s, rCb, eofCb, disCb, cCb, eCb, iCb);
+}
+
+}}  // namespace qpid::sys
diff --git a/cpp/src/qpid/sys/windows/AsynchIoResult.h b/qpid/cpp/src/qpid/sys/windows/AsynchIoResult.h
index b11324918b..b11324918b 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/FileSysDir.cpp b/qpid/cpp/src/qpid/sys/windows/FileSysDir.cpp
index 88f1637d48..88f1637d48 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 250737cb99..250737cb99 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 5943db5cc7..5943db5cc7 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 1805dd2cd8..1805dd2cd8 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/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 6a1d9045b4..6a1d9045b4 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/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/qpid/cpp/src/qpid/sys/windows/Socket.cpp b/qpid/cpp/src/qpid/sys/windows/Socket.cpp
new file mode 100755
index 0000000000..baa80f04e0
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/windows/Socket.cpp
@@ -0,0 +1,289 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+// Ensure we get all of winsock2.h
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
+
+#include "qpid/sys/Socket.h"
+#include "qpid/sys/SocketAddress.h"
+#include "qpid/sys/windows/IoHandlePrivate.h"
+#include "qpid/sys/windows/check.h"
+#include "qpid/sys/Time.h"
+
+#include <cstdlib>
+#include <string.h>
+
+#include <winsock2.h>
+
+#include <boost/format.hpp>
+#include <boost/lexical_cast.hpp>
+
+// Need to initialize WinSock. Ideally, this would be a singleton or embedded
+// in some one-time initialization function. I tried boost singleton and could
+// not get it to compile (and others located in google had the same problem).
+// So, this simple static with an interlocked increment will do for known
+// use cases at this time. Since this will only shut down winsock at process
+// termination, there may be some problems with client programs that also
+// expect to load and unload winsock, but we'll see...
+// If someone does get an easy-to-use singleton sometime, converting to it
+// may be preferable.
+
+namespace {
+
+static LONG volatile initialized = 0;
+
+class WinSockSetup {
+    //  : public boost::details::pool::singleton_default<WinSockSetup> {
+
+public:
+    WinSockSetup() {
+        LONG timesEntered = InterlockedIncrement(&initialized);
+        if (timesEntered > 1)
+          return;
+        err = 0;
+        WORD wVersionRequested;
+        WSADATA wsaData;
+
+        /* Request WinSock 2.2 */
+        wVersionRequested = MAKEWORD(2, 2);
+        err = WSAStartup(wVersionRequested, &wsaData);
+    }
+
+    ~WinSockSetup() {
+        WSACleanup();
+    }
+
+public:
+    int error(void) const { return err; }
+
+protected:
+    DWORD err;
+};
+
+static WinSockSetup setup;
+
+} /* namespace */
+
+namespace qpid {
+namespace sys {
+
+namespace {
+
+std::string getName(SOCKET fd, bool local)
+{
+    sockaddr_in name; // big enough for any socket address    
+    socklen_t namelen = sizeof(name);
+    if (local) {
+        QPID_WINSOCK_CHECK(::getsockname(fd, (sockaddr*)&name, &namelen));
+    } else {
+        QPID_WINSOCK_CHECK(::getpeername(fd, (sockaddr*)&name, &namelen));
+    }
+
+    char servName[NI_MAXSERV];
+    char dispName[NI_MAXHOST];
+    if (int rc = ::getnameinfo((sockaddr*)&name, namelen,
+                               dispName, sizeof(dispName), 
+                               servName, sizeof(servName), 
+                               NI_NUMERICHOST | NI_NUMERICSERV) != 0)
+        throw qpid::Exception(QPID_MSG(gai_strerror(rc)));
+    return std::string(dispName) + ":" + std::string(servName);
+}
+}  // namespace
+
+Socket::Socket() :
+    IOHandle(new IOHandlePrivate),
+    nonblocking(false),
+    nodelay(false)
+{
+    SOCKET& socket = impl->fd;
+    if (socket != INVALID_SOCKET) Socket::close();
+    SOCKET s = ::socket (PF_INET, SOCK_STREAM, 0);
+    if (s == INVALID_SOCKET) throw QPID_WINDOWS_ERROR(WSAGetLastError());
+    socket = s;
+}
+
+Socket::Socket(IOHandlePrivate* h) :
+    IOHandle(h),
+    nonblocking(false),
+    nodelay(false)
+{}
+
+void
+Socket::createSocket(const SocketAddress& sa) const
+{
+    SOCKET& socket = impl->fd;
+    if (socket != INVALID_SOCKET) Socket::close();
+
+    SOCKET s = ::socket (getAddrInfo(sa).ai_family,
+                         getAddrInfo(sa).ai_socktype,
+                         0);
+    if (s == INVALID_SOCKET) throw QPID_WINDOWS_ERROR(WSAGetLastError());
+    socket = s;
+
+    try {
+        if (nonblocking) setNonblocking();
+        if (nodelay) setTcpNoDelay();
+    } catch (std::exception&) {
+        closesocket(s);
+        socket = INVALID_SOCKET;
+        throw;
+    }
+}
+
+void Socket::setNonblocking() const {
+    u_long nonblock = 1;
+    QPID_WINSOCK_CHECK(ioctlsocket(impl->fd, FIONBIO, &nonblock));
+}
+
+void Socket::connect(const std::string& host, const std::string& port) const
+{
+    SocketAddress sa(host, port);
+    connect(sa);
+}
+
+void
+Socket::connect(const SocketAddress& addr) const
+{
+    peername = addr.asString(false);
+
+    const SOCKET& socket = impl->fd;
+    const addrinfo *addrs = &(getAddrInfo(addr));
+    int error = 0;
+    WSASetLastError(0);
+    while (addrs != 0) {
+        if ((::connect(socket, addrs->ai_addr, addrs->ai_addrlen) == 0) ||
+            (WSAGetLastError() == WSAEWOULDBLOCK))
+            break;
+        // Error... save this error code and see if there are other address
+        // to try before throwing the exception.
+        error = WSAGetLastError();
+        addrs = addrs->ai_next;
+    }
+    if (error)
+        throw qpid::Exception(QPID_MSG(strError(error) << ": " << peername));
+}
+
+void
+Socket::close() const
+{
+    SOCKET& socket = impl->fd;
+    if (socket == INVALID_SOCKET) return;
+    QPID_WINSOCK_CHECK(closesocket(socket));
+    socket = INVALID_SOCKET;
+}
+
+
+int Socket::write(const void *buf, size_t count) const
+{
+    const SOCKET& socket = impl->fd;
+    int sent = ::send(socket, (const char *)buf, count, 0);
+    if (sent == SOCKET_ERROR)
+        return -1;
+    return sent;
+}
+
+int Socket::read(void *buf, size_t count) const
+{
+    const SOCKET& socket = impl->fd;
+    int received = ::recv(socket, (char *)buf, count, 0);
+    if (received == SOCKET_ERROR)
+        return -1;
+    return received;
+}
+
+int Socket::listen(const std::string&, const std::string& port, int backlog) const
+{
+    const SOCKET& socket = impl->fd;
+    BOOL yes=1;
+    QPID_WINSOCK_CHECK(setsockopt(socket, SOL_SOCKET, SO_REUSEADDR, (char *)&yes, sizeof(yes)));
+    struct sockaddr_in name;
+    memset(&name, 0, sizeof(name));
+    name.sin_family = AF_INET;
+    name.sin_port = htons(boost::lexical_cast<uint16_t>(port));
+    name.sin_addr.s_addr = 0;
+    if (::bind(socket, (struct sockaddr*)&name, sizeof(name)) == SOCKET_ERROR)
+        throw Exception(QPID_MSG("Can't bind to port " << port << ": " << strError(WSAGetLastError())));
+    if (::listen(socket, backlog) == SOCKET_ERROR)
+        throw Exception(QPID_MSG("Can't listen on port " << port << ": " << strError(WSAGetLastError())));
+    
+    socklen_t namelen = sizeof(name);
+    QPID_WINSOCK_CHECK(::getsockname(socket, (struct sockaddr*)&name, &namelen));
+    return ntohs(name.sin_port);
+}
+
+Socket* Socket::accept() const
+{
+  SOCKET afd = ::accept(impl->fd, 0, 0);
+    if (afd != INVALID_SOCKET)
+        return new Socket(new IOHandlePrivate(afd));
+    else if (WSAGetLastError() == EAGAIN)
+        return 0;
+    else throw QPID_WINDOWS_ERROR(WSAGetLastError());
+}
+
+std::string Socket::getPeerAddress() const
+{
+    if (peername.empty())
+        peername = getName(impl->fd, false);
+    return peername;
+}
+
+std::string Socket::getLocalAddress() const
+{
+    if (localname.empty())
+        localname = getName(impl->fd, true);
+    return localname;
+}
+
+int Socket::getError() const
+{
+    int       result;
+    socklen_t rSize = sizeof (result);
+
+    QPID_WINSOCK_CHECK(::getsockopt(impl->fd, SOL_SOCKET, SO_ERROR, (char *)&result, &rSize));
+    return result;
+}
+
+void Socket::setTcpNoDelay() const
+{
+    int flag = 1;
+    int result = setsockopt(impl->fd,
+                            IPPROTO_TCP,
+                            TCP_NODELAY,
+                            (char *)&flag,
+                            sizeof(flag));
+    QPID_WINSOCK_CHECK(result);
+    nodelay = true;
+}
+
+inline IOHandlePrivate* IOHandlePrivate::getImpl(const qpid::sys::IOHandle &h)
+{
+    return h.impl;
+}
+
+SOCKET toSocketHandle(const Socket& s)
+{
+    return IOHandlePrivate::getImpl(s)->fd;
+}
+
+}} // namespace qpid::sys
diff --git a/qpid/cpp/src/qpid/sys/windows/SocketAddress.cpp b/qpid/cpp/src/qpid/sys/windows/SocketAddress.cpp
new file mode 100644
index 0000000000..ac43cd2d23
--- /dev/null
+++ b/qpid/cpp/src/qpid/sys/windows/SocketAddress.cpp
@@ -0,0 +1,76 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+// Ensure we get all of winsock2.h
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
+
+#include "qpid/sys/SocketAddress.h"
+
+#include "qpid/sys/windows/check.h"
+
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <string.h>
+
+namespace qpid {
+namespace sys {
+
+SocketAddress::SocketAddress(const std::string& host0, const std::string& port0) :
+    host(host0),
+    port(port0),
+    addrInfo(0)
+{
+    ::addrinfo hints;
+    ::memset(&hints, 0, sizeof(hints));
+    hints.ai_family = AF_INET; // In order to allow AF_INET6 we'd have to change createTcp() as well
+    hints.ai_socktype = SOCK_STREAM;
+
+    const char* node = 0;
+    if (host.empty()) {
+        hints.ai_flags |= AI_PASSIVE;
+    } else {
+        node = host.c_str();
+    }
+    const char* service = port.empty() ? "0" : port.c_str();
+
+    int n = ::getaddrinfo(node, service, &hints, &addrInfo);
+    if (n != 0)
+        throw Exception(QPID_MSG("Cannot resolve " << host << ": " << ::gai_strerror(n)));
+}
+
+SocketAddress::~SocketAddress()
+{
+    ::freeaddrinfo(addrInfo);
+}
+
+std::string SocketAddress::asString(bool) const
+{
+    return host + ":" + port;
+}
+
+const ::addrinfo& getAddrInfo(const SocketAddress& sa)
+{
+    return *sa.addrInfo;
+}
+
+}}
diff --git a/cpp/src/qpid/sys/windows/SslAsynchIO.cpp b/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.cpp
index 11a3389e45..11a3389e45 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 3cdf2c8f08..3cdf2c8f08 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 4da440bdd4..4da440bdd4 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 583a9613a3..583a9613a3 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 25c50819cd..25c50819cd 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/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/uuid.cpp b/qpid/cpp/src/qpid/sys/windows/uuid.cpp
index 3316ecbc00..3316ecbc00 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 9face4e5d2..9face4e5d2 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 0b28234025..0b28234025 100644
--- a/cpp/src/qpid/types/Variant.cpp
+++ b/qpid/cpp/src/qpid/types/Variant.cpp
diff --git a/cpp/src/qpid/xml/XmlExchange.cpp b/qpid/cpp/src/qpid/xml/XmlExchange.cpp
index b7ff5d211d..b7ff5d211d 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 958bad4931..958bad4931 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 742b878e86..742b878e86 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 a7c1dbe8a6..a7c1dbe8a6 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 c702270e80..c702270e80 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 e020cb84a9..e020cb84a9 100644
--- a/cpp/src/rdma.cmake
+++ b/qpid/cpp/src/rdma.cmake
diff --git a/cpp/src/replication.mk b/qpid/cpp/src/replication.mk
index e5da32f88b..e5da32f88b 100644
--- a/cpp/src/replication.mk
+++ b/qpid/cpp/src/replication.mk
diff --git a/cpp/src/ssl.cmake b/qpid/cpp/src/ssl.cmake
index c205845388..c205845388 100644
--- a/cpp/src/ssl.cmake
+++ b/qpid/cpp/src/ssl.cmake
diff --git a/cpp/src/ssl.mk b/qpid/cpp/src/ssl.mk
index 4dba9bb61c..4dba9bb61c 100644
--- a/cpp/src/ssl.mk
+++ b/qpid/cpp/src/ssl.mk
diff --git a/cpp/src/tests/.valgrind.supp b/qpid/cpp/src/tests/.valgrind.supp
index 2c6a1509ff..2c6a1509ff 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 f41f27b6df..f41f27b6df 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 7622b89d15..7622b89d15 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 672d954572..672d954572 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 d0c6668b72..d0c6668b72 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/CMakeLists.txt b/qpid/cpp/src/tests/CMakeLists.txt
index 405718f12b..405718f12b 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/qpid/cpp/src/tests/ClientSessionTest.cpp b/qpid/cpp/src/tests/ClientSessionTest.cpp
new file mode 100644
index 0000000000..3c0cff7350
--- /dev/null
+++ b/qpid/cpp/src/tests/ClientSessionTest.cpp
@@ -0,0 +1,682 @@
+/*
+ *
+ * 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.
+ *
+ */
+#include "unit_test.h"
+#include "test_tools.h"
+#include "BrokerFixture.h"
+#include "qpid/client/QueueOptions.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/SubscriptionManager.h"
+#include "qpid/client/AsyncSession.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/sys/Runnable.h"
+#include "qpid/sys/Time.h"
+#include "qpid/client/Session.h"
+#include "qpid/client/Message.h"
+#include "qpid/framing/reply_exceptions.h"
+
+#include <boost/optional.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/bind.hpp>
+#include <boost/ptr_container/ptr_vector.hpp>
+
+#include <vector>
+
+namespace qpid {
+namespace tests {
+
+QPID_AUTO_TEST_SUITE(ClientSessionTest)
+
+using namespace qpid::client;
+using namespace qpid::framing;
+using namespace qpid;
+using qpid::sys::Monitor;
+using qpid::sys::Thread;
+using qpid::sys::TIME_SEC;
+using qpid::broker::Broker;
+using std::string;
+using std::cout;
+using std::endl;
+
+
+struct DummyListener : public sys::Runnable, public MessageListener {
+    std::vector<Message> messages;
+    string name;
+    uint expected;
+    SubscriptionManager submgr;
+
+    DummyListener(Session& session, const string& n, uint ex) :
+        name(n), expected(ex), submgr(session) {}
+
+    void run()
+    {
+        submgr.subscribe(*this, name);
+        submgr.run();
+    }
+
+    void received(Message& msg)
+    {
+        messages.push_back(msg);
+        if (--expected == 0) {
+            submgr.stop();
+        }
+    }
+};
+
+struct SimpleListener : public MessageListener
+{
+    Monitor lock;
+    std::vector<Message> messages;
+
+    void received(Message& msg)
+    {
+        Monitor::ScopedLock l(lock);
+        messages.push_back(msg);
+        lock.notifyAll();
+    }
+
+    void waitFor(const uint n)
+    {
+        Monitor::ScopedLock l(lock);
+        while (messages.size() < n) {
+            lock.wait();
+        }
+    }
+};
+
+struct ClientSessionFixture : public ProxySessionFixture
+{
+    ClientSessionFixture(Broker::Options opts = Broker::Options()) : ProxySessionFixture(opts) {
+        session.queueDeclare(arg::queue="my-queue");
+    }
+};
+
+QPID_AUTO_TEST_CASE(testQueueQuery) {
+    ClientSessionFixture fix;
+    fix.session = fix.connection.newSession();
+    fix.session.queueDeclare(arg::queue="q", arg::alternateExchange="amq.fanout",
+                             arg::exclusive=true, arg::autoDelete=true);
+    QueueQueryResult result = fix.session.queueQuery("q");
+    BOOST_CHECK_EQUAL(false, result.getDurable());
+    BOOST_CHECK_EQUAL(true, result.getExclusive());
+    BOOST_CHECK_EQUAL("amq.fanout", result.getAlternateExchange());
+}
+
+QPID_AUTO_TEST_CASE(testDispatcher)
+{
+    ClientSessionFixture fix;
+    fix.session =fix.connection.newSession();
+    size_t count = 100;
+    for (size_t i = 0; i < count; ++i)
+        fix.session.messageTransfer(arg::content=Message(boost::lexical_cast<string>(i), "my-queue"));
+    DummyListener listener(fix.session, "my-queue", count);
+    listener.run();
+    BOOST_CHECK_EQUAL(count, listener.messages.size());
+    for (size_t i = 0; i < count; ++i)
+        BOOST_CHECK_EQUAL(boost::lexical_cast<string>(i), listener.messages[i].getData());
+}
+
+QPID_AUTO_TEST_CASE(testDispatcherThread)
+{
+    ClientSessionFixture fix;
+    fix.session =fix.connection.newSession();
+    size_t count = 10;
+    DummyListener listener(fix.session, "my-queue", count);
+    sys::Thread t(listener);
+    for (size_t i = 0; i < count; ++i) {
+        fix.session.messageTransfer(arg::content=Message(boost::lexical_cast<string>(i), "my-queue"));
+    }
+    t.join();
+    BOOST_CHECK_EQUAL(count, listener.messages.size());
+    for (size_t i = 0; i < count; ++i)
+        BOOST_CHECK_EQUAL(boost::lexical_cast<string>(i), listener.messages[i].getData());
+}
+
+// FIXME aconway 2009-06-17: test for unimplemented feature, enable when implemented.
+void testSuspend0Timeout() {
+    ClientSessionFixture fix;
+    fix.session.suspend();  // session has 0 timeout.
+    try {
+        fix.connection.resume(fix.session);
+        BOOST_FAIL("Expected InvalidArgumentException.");
+    } catch(const InternalErrorException&) {}
+}
+
+QPID_AUTO_TEST_CASE(testUseSuspendedError)
+{
+    ClientSessionFixture fix;
+    fix.session.timeout(60);
+    fix.session.suspend();
+    try {
+        fix.session.exchangeQuery(arg::exchange="amq.fanout");
+        BOOST_FAIL("Expected session suspended exception");
+    } catch(const NotAttachedException&) {}
+}
+
+// FIXME aconway 2009-06-17: test for unimplemented feature, enable when implemented.
+void testSuspendResume() {
+    ClientSessionFixture fix;
+    fix.session.timeout(60);
+    fix.session.suspend();
+    // Make sure we are still subscribed after resume.
+    fix.connection.resume(fix.session);
+    fix.session.messageTransfer(arg::content=Message("my-message", "my-queue"));
+    BOOST_CHECK_EQUAL("my-message", fix.subs.get("my-queue", TIME_SEC).getData());
+}
+
+
+QPID_AUTO_TEST_CASE(testSendToSelf) {
+    ClientSessionFixture fix;
+    SimpleListener mylistener;
+    fix.session.queueDeclare(arg::queue="myq", arg::exclusive=true, arg::autoDelete=true);
+    fix.subs.subscribe(mylistener, "myq");
+    sys::Thread runner(fix.subs);//start dispatcher thread
+    string data("msg");
+    Message msg(data, "myq");
+    const uint count=10;
+    for (uint i = 0; i < count; ++i) {
+        fix.session.messageTransfer(arg::content=msg);
+    }
+    mylistener.waitFor(count);
+    fix.subs.cancel("myq");
+    fix.subs.stop();
+    runner.join();
+    fix.session.close();
+    BOOST_CHECK_EQUAL(mylistener.messages.size(), count);
+    for (uint j = 0; j < count; ++j) {
+        BOOST_CHECK_EQUAL(mylistener.messages[j].getData(), data);
+    }
+}
+
+QPID_AUTO_TEST_CASE(testLocalQueue) {
+    ClientSessionFixture fix;
+    fix.session.queueDeclare(arg::queue="lq", arg::exclusive=true, arg::autoDelete=true);
+    LocalQueue lq;
+    fix.subs.subscribe(lq, "lq", FlowControl(2, FlowControl::UNLIMITED, false));
+    fix.session.messageTransfer(arg::content=Message("foo0", "lq"));
+    fix.session.messageTransfer(arg::content=Message("foo1", "lq"));
+    fix.session.messageTransfer(arg::content=Message("foo2", "lq"));
+    BOOST_CHECK_EQUAL("foo0", lq.pop().getData());
+    BOOST_CHECK_EQUAL("foo1", lq.pop().getData());
+    BOOST_CHECK(lq.empty());    // Credit exhausted.
+    fix.subs.getSubscription("lq").setFlowControl(FlowControl::unlimited());
+    BOOST_CHECK_EQUAL("foo2", lq.pop().getData());
+}
+
+struct DelayedTransfer : sys::Runnable
+{
+    ClientSessionFixture& fixture;
+
+    DelayedTransfer(ClientSessionFixture& f) : fixture(f) {}
+
+    void run()
+    {
+        qpid::sys::sleep(1);
+        fixture.session.messageTransfer(arg::content=Message("foo2", "getq"));
+    }
+};
+
+QPID_AUTO_TEST_CASE(testGet) {
+    ClientSessionFixture fix;
+    fix.session.queueDeclare(arg::queue="getq", arg::exclusive=true, arg::autoDelete=true);
+    fix.session.messageTransfer(arg::content=Message("foo0", "getq"));
+    fix.session.messageTransfer(arg::content=Message("foo1", "getq"));
+    Message got;
+    BOOST_CHECK(fix.subs.get(got, "getq", TIME_SEC));
+    BOOST_CHECK_EQUAL("foo0", got.getData());
+    BOOST_CHECK(fix.subs.get(got, "getq", TIME_SEC));
+    BOOST_CHECK_EQUAL("foo1", got.getData());
+    BOOST_CHECK(!fix.subs.get(got, "getq"));
+    DelayedTransfer sender(fix);
+    Thread t(sender);
+    //test timed get where message shows up after a short delay
+    BOOST_CHECK(fix.subs.get(got, "getq", 5*TIME_SEC));
+    BOOST_CHECK_EQUAL("foo2", got.getData());
+    t.join();
+}
+
+QPID_AUTO_TEST_CASE(testOpenFailure) {
+    BrokerFixture b;
+    Connection c;
+    string host("unknowable-host");
+    try {
+        c.open(host);
+    } catch (const Exception&) {
+        BOOST_CHECK(!c.isOpen());
+    }
+    b.open(c);
+    BOOST_CHECK(c.isOpen());
+    c.close();
+    BOOST_CHECK(!c.isOpen());
+}
+
+QPID_AUTO_TEST_CASE(testPeriodicExpiration) {
+    Broker::Options opts;
+    opts.queueCleanInterval = 1;
+    opts.queueFlowStopRatio = 0;
+    opts.queueFlowResumeRatio = 0;
+    ClientSessionFixture fix(opts);
+    FieldTable args;
+    args.setInt("qpid.max_count",10);
+    fix.session.queueDeclare(arg::queue="my-queue", arg::exclusive=true, arg::autoDelete=true, arg::arguments=args);
+
+    for (uint i = 0; i < 10; i++) {
+        Message m((boost::format("Message_%1%") % (i+1)).str(), "my-queue");
+        if (i % 2) m.getDeliveryProperties().setTtl(500);
+        fix.session.messageTransfer(arg::content=m);
+    }
+
+    BOOST_CHECK_EQUAL(fix.session.queueQuery(string("my-queue")).getMessageCount(), 10u);
+    qpid::sys::sleep(2);
+    BOOST_CHECK_EQUAL(fix.session.queueQuery(string("my-queue")).getMessageCount(), 5u);
+    fix.session.messageTransfer(arg::content=Message("Message_11", "my-queue"));//ensure policy is also updated
+}
+
+QPID_AUTO_TEST_CASE(testExpirationOnPop) {
+    ClientSessionFixture fix;
+    fix.session.queueDeclare(arg::queue="my-queue", arg::exclusive=true, arg::autoDelete=true);
+
+    for (uint i = 0; i < 10; i++) {
+        Message m((boost::format("Message_%1%") % (i+1)).str(), "my-queue");
+        if (i % 2) m.getDeliveryProperties().setTtl(200);
+        fix.session.messageTransfer(arg::content=m);
+    }
+
+    qpid::sys::usleep(300* 1000);
+
+    for (uint i = 0; i < 10; i++) {
+        if (i % 2) continue;
+        Message m;
+        BOOST_CHECK(fix.subs.get(m, "my-queue", TIME_SEC));
+        BOOST_CHECK_EQUAL((boost::format("Message_%1%") % (i+1)).str(), m.getData());
+    }
+}
+
+QPID_AUTO_TEST_CASE(testRelease) {
+    ClientSessionFixture fix;
+
+    const uint count=10;
+    for (uint i = 0; i < count; i++) {
+        Message m((boost::format("Message_%1%") % (i+1)).str(), "my-queue");
+        fix.session.messageTransfer(arg::content=m);
+    }
+
+    fix.subs.setAutoStop(false);
+    fix.subs.start();
+    SubscriptionSettings settings;
+    settings.autoAck = 0;
+
+    SimpleListener l1;
+    Subscription s1 = fix.subs.subscribe(l1, "my-queue", settings);
+    l1.waitFor(count);
+    s1.cancel();
+
+    for (uint i = 0; i < count; i++) {
+        BOOST_CHECK_EQUAL((boost::format("Message_%1%") % (i+1)).str(), l1.messages[i].getData());
+    }
+    s1.release(s1.getUnaccepted());
+
+    //check that released messages are redelivered
+    settings.autoAck = 1;
+    SimpleListener l2;
+    Subscription s2 = fix.subs.subscribe(l2, "my-queue", settings);
+    l2.waitFor(count);
+    for (uint i = 0; i < count; i++) {
+        BOOST_CHECK_EQUAL((boost::format("Message_%1%") % (i+1)).str(), l2.messages[i].getData());
+    }
+
+    fix.subs.stop();
+    fix.subs.wait();
+    fix.session.close();
+}
+
+QPID_AUTO_TEST_CASE(testCompleteOnAccept) {
+    ClientSessionFixture fix;
+    const uint count = 8;
+    const uint chunk = 4;
+    for (uint i = 0; i < count; i++) {
+        Message m((boost::format("Message_%1%") % (i+1)).str(), "my-queue");
+        fix.session.messageTransfer(arg::content=m);
+    }
+
+    SubscriptionSettings settings;
+    settings.autoAck = 0;
+    settings.completionMode = COMPLETE_ON_ACCEPT;
+    settings.flowControl = FlowControl::messageWindow(chunk);
+
+    LocalQueue q;
+    Subscription s = fix.subs.subscribe(q, "my-queue", settings);
+    fix.session.messageFlush(arg::destination=s.getName());
+    SequenceSet accepted;
+    for (uint i = 0; i < chunk; i++) {
+        Message m;
+        BOOST_CHECK(q.get(m));
+        BOOST_CHECK_EQUAL((boost::format("Message_%1%") % (i+1)).str(), m.getData());
+        accepted.add(m.getId());
+    }
+    Message m;
+    BOOST_CHECK(!q.get(m));
+
+    s.accept(accepted);
+    fix.session.messageFlush(arg::destination=s.getName());
+    accepted.clear();
+
+    for (uint i = chunk; i < count; i++) {
+        Message m;
+        BOOST_CHECK(q.get(m));
+        BOOST_CHECK_EQUAL((boost::format("Message_%1%") % (i+1)).str(), m.getData());
+        accepted.add(m.getId());
+    }
+    fix.session.messageAccept(accepted);
+}
+
+namespace
+{
+struct Publisher : qpid::sys::Runnable
+{
+    AsyncSession session;
+    Message message;
+    uint count;
+    Thread thread;
+
+    Publisher(Connection& con, Message m, uint c) : session(con.newSession()), message(m), count(c) {}
+
+    void start()
+    {
+        thread = Thread(*this);
+    }
+
+    void join()
+    {
+        thread.join();
+    }
+
+    void run()
+    {
+        for (uint i = 0; i < count; i++) {
+            session.messageTransfer(arg::content=message);
+        }
+        session.sync();
+        session.close();
+    }
+};
+}
+
+QPID_AUTO_TEST_CASE(testConcurrentSenders)
+{
+    //Ensure concurrent publishing sessions on a connection don't
+    //cause assertions, deadlocks or other undesirables:
+    BrokerFixture fix;
+    Connection connection;
+    ConnectionSettings settings;
+    settings.maxFrameSize = 1024;
+    settings.port = fix.broker->getPort(qpid::broker::Broker::TCP_TRANSPORT);
+    connection.open(settings);
+    AsyncSession session = connection.newSession();
+    Message message(string(512, 'X'));
+
+    boost::ptr_vector<Publisher> publishers;
+    for (size_t i = 0; i < 5; i++) {
+        publishers.push_back(new Publisher(connection, message, 100));
+    }
+    std::for_each(publishers.begin(), publishers.end(), boost::bind(&Publisher::start, _1));
+    std::for_each(publishers.begin(), publishers.end(), boost::bind(&Publisher::join, _1));
+    connection.close();
+}
+
+
+QPID_AUTO_TEST_CASE(testExclusiveSubscribe)
+{
+    ClientSessionFixture fix;
+    fix.session.queueDeclare(arg::queue="myq", arg::exclusive=true, arg::autoDelete=true);
+    SubscriptionSettings settings;
+    settings.exclusive = true;
+    LocalQueue q;
+    fix.subs.subscribe(q, "myq", settings, "first");
+    //attempt to create new subscriber should fail
+    ScopedSuppressLogging sl;
+    BOOST_CHECK_THROW(fix.subs.subscribe(q, "myq", "second"), ResourceLockedException);
+    ;
+
+}
+
+QPID_AUTO_TEST_CASE(testExclusiveBinding) {
+    FieldTable options;
+    options.setString("qpid.exclusive-binding", "anything");
+    ClientSessionFixture fix;
+    fix.session.queueDeclare(arg::queue="queue-1", arg::exclusive=true, arg::autoDelete=true);
+    fix.session.queueDeclare(arg::queue="queue-2", arg::exclusive=true, arg::autoDelete=true);
+    fix.session.exchangeBind(arg::exchange="amq.direct", arg::queue="queue-1", arg::bindingKey="my-key", arg::arguments=options);
+    fix.session.messageTransfer(arg::destination="amq.direct", arg::content=Message("message1", "my-key"));
+    fix.session.exchangeBind(arg::exchange="amq.direct", arg::queue="queue-2", arg::bindingKey="my-key", arg::arguments=options);
+    fix.session.messageTransfer(arg::destination="amq.direct", arg::content=Message("message2", "my-key"));
+
+    Message got;
+    BOOST_CHECK(fix.subs.get(got, "queue-1"));
+    BOOST_CHECK_EQUAL("message1", got.getData());
+    BOOST_CHECK(!fix.subs.get(got, "queue-1"));
+
+    BOOST_CHECK(fix.subs.get(got, "queue-2"));
+    BOOST_CHECK_EQUAL("message2", got.getData());
+    BOOST_CHECK(!fix.subs.get(got, "queue-2"));
+}
+
+QPID_AUTO_TEST_CASE(testResubscribeWithLocalQueue) {
+    ClientSessionFixture fix;
+    fix.session.queueDeclare(arg::queue="some-queue", arg::exclusive=true, arg::autoDelete=true);
+    LocalQueue p, q;
+    fix.subs.subscribe(p, "some-queue");
+    fix.subs.cancel("some-queue");
+    fix.subs.subscribe(q, "some-queue");
+
+    fix.session.messageTransfer(arg::content=Message("some-data", "some-queue"));
+    fix.session.messageFlush(arg::destination="some-queue");
+
+    Message got;
+    BOOST_CHECK(!p.get(got));
+
+    BOOST_CHECK(q.get(got));
+    BOOST_CHECK_EQUAL("some-data", got.getData());
+    BOOST_CHECK(!q.get(got));
+}
+
+QPID_AUTO_TEST_CASE(testReliableDispatch) {
+    ClientSessionFixture fix;
+    std::string queue("a-queue");
+    fix.session.queueDeclare(arg::queue=queue, arg::autoDelete=true);
+
+    ConnectionSettings settings;
+    settings.port = fix.broker->getPort(qpid::broker::Broker::TCP_TRANSPORT);
+
+    Connection c1;
+    c1.open(settings);
+    Session s1 = c1.newSession();
+    SubscriptionManager subs1(s1);
+    LocalQueue q1;
+    subs1.subscribe(q1, queue, FlowControl());//first subscriber has no credit
+
+    Connection c2;
+    c2.open(settings);
+    Session s2 = c2.newSession();
+    SubscriptionManager subs2(s2);
+    LocalQueue q2;
+    subs2.subscribe(q2, queue);//second subscriber has credit
+
+    fix.session.messageTransfer(arg::content=Message("my-message", queue));
+
+    //check that the second consumer gets the message
+    Message got;
+    BOOST_CHECK(q2.get(got, 1*TIME_SEC));
+    BOOST_CHECK_EQUAL("my-message", got.getData());
+
+    c1.close();
+    c2.close();
+}
+
+QPID_AUTO_TEST_CASE(testSessionCloseOnInvalidSession) {
+    Session session;
+    session.close();
+}
+
+QPID_AUTO_TEST_CASE(testLVQVariedSize) {
+    ClientSessionFixture fix;
+    std::string queue("my-lvq");
+    QueueOptions args;
+    args.setOrdering(LVQ_NO_BROWSE);
+    fix.session.queueDeclare(arg::queue=queue, arg::exclusive=true, arg::autoDelete=true, arg::arguments=args);
+
+    std::string key;
+    args.getLVQKey(key);
+
+    for (size_t i = 0; i < 10; i++) {
+        std::ostringstream data;
+        size_t size = 100 - ((i % 10) * 10);
+        data << std::string(size, 'x');
+
+        Message m(data.str(), queue);
+        m.getHeaders().setString(key, "abc");
+        fix.session.messageTransfer(arg::content=m);
+    }
+}
+
+QPID_AUTO_TEST_CASE(testSessionManagerSetFlowControl) {
+    ClientSessionFixture fix;
+    std::string name("dummy");
+    LocalQueue queue;
+    SubscriptionSettings settings;
+    settings.flowControl = FlowControl();
+    fix.session.queueDeclare(arg::queue=name, arg::exclusive=true, arg::autoDelete=true);
+    fix.subs.subscribe(queue, name, settings);
+    fix.session.messageTransfer(arg::content=Message("my-message", name));
+    fix.subs.setFlowControl(name, 1, FlowControl::UNLIMITED, false);
+    fix.session.messageFlush(name);
+    Message got;
+    BOOST_CHECK(queue.get(got, 0));
+    BOOST_CHECK_EQUAL("my-message", got.getData());
+}
+
+QPID_AUTO_TEST_CASE(testGetThenSubscribe) {
+    ClientSessionFixture fix;
+    std::string name("myqueue");
+    fix.session.queueDeclare(arg::queue=name, arg::exclusive=true, arg::autoDelete=true);
+    fix.session.messageTransfer(arg::content=Message("one", name));
+    fix.session.messageTransfer(arg::content=Message("two", name));
+    Message got;
+    BOOST_CHECK(fix.subs.get(got, name));
+    BOOST_CHECK_EQUAL("one", got.getData());
+
+    DummyListener listener(fix.session, name, 1);
+    listener.run();
+    BOOST_CHECK_EQUAL(1u, listener.messages.size());
+    if (!listener.messages.empty()) {
+        BOOST_CHECK_EQUAL("two", listener.messages[0].getData());
+    }
+}
+
+QPID_AUTO_TEST_CASE(testSessionIsValid) {
+    ClientSessionFixture fix;
+    BOOST_CHECK(fix.session.isValid());
+    Session session;
+    BOOST_CHECK(!session.isValid());
+}
+
+QPID_AUTO_TEST_CASE(testExpirationNotAltered) {
+    ClientSessionFixture fix;
+    fix.session.queueDeclare(arg::queue="my-queue", arg::exclusive=true, arg::autoDelete=true);
+
+    Message m("my-message", "my-queue");
+    m.getDeliveryProperties().setTtl(60000);
+    m.getDeliveryProperties().setExpiration(12345);
+    fix.session.messageTransfer(arg::content=m);
+    Message got;
+    BOOST_CHECK(fix.subs.get(got, "my-queue"));
+    BOOST_CHECK_EQUAL("my-message", got.getData());
+    BOOST_CHECK_EQUAL(12345u, got.getDeliveryProperties().getExpiration());
+}
+
+QPID_AUTO_TEST_CASE(testGetConnectionFromSession) {
+    ClientSessionFixture fix;
+    FieldTable options;
+    options.setInt("no-local", 1);
+    fix.session.queueDeclare(arg::queue="a", arg::exclusive=true, arg::autoDelete=true, arg::arguments=options);
+    fix.session.queueDeclare(arg::queue="b", arg::exclusive=true, arg::autoDelete=true);
+
+    Connection c = fix.session.getConnection();
+    Session s = c.newSession();
+    //If this new session was created as expected on the same connection as
+    //fix.session, then the no-local behaviour means that queue 'a'
+    //will not enqueue messages from this new session but queue 'b'
+    //will.
+    s.messageTransfer(arg::content=Message("a", "a"));
+    s.messageTransfer(arg::content=Message("b", "b"));
+
+    Message got;
+    BOOST_CHECK(fix.subs.get(got, "b"));
+    BOOST_CHECK_EQUAL("b", got.getData());
+    BOOST_CHECK(!fix.subs.get(got, "a"));
+}
+
+
+QPID_AUTO_TEST_CASE(testQueueDeleted)
+{
+    ClientSessionFixture fix;
+    fix.session.queueDeclare(arg::queue="my-queue");
+    LocalQueue queue;
+    fix.subs.subscribe(queue, "my-queue");
+    
+    ScopedSuppressLogging sl;
+    fix.session.queueDelete(arg::queue="my-queue");
+    BOOST_CHECK_THROW(queue.get(1*qpid::sys::TIME_SEC), qpid::framing::ResourceDeletedException);
+}
+
+QPID_AUTO_TEST_CASE(testTtl)
+{
+    const uint64_t ms = 1000ULL;           // convert sec to ms
+    const uint64_t us = 1000ULL * 1000ULL; // convert sec to us
+
+    ClientSessionFixture fix;
+    fix.session.queueDeclare(arg::queue="ttl-test", arg::exclusive=true, arg::autoDelete=true);
+    Message msg1 = Message("AAA", "ttl-test");
+    uint64_t ttl = 2 * ms; // 2 sec
+    msg1.getDeliveryProperties().setTtl(ttl);
+    Connection c = fix.session.getConnection();
+    Session s = c.newSession();
+    s.messageTransfer(arg::content=msg1);
+
+    Message msg2 = Message("BBB", "ttl-test");
+    ttl = 10 * ms; // 10 sec
+    msg2.getDeliveryProperties().setTtl(ttl);
+    s.messageTransfer(arg::content=msg2);
+
+    qpid::sys::usleep(5 * us); // 5 sec
+
+    // Message "AAA" should be expired and never be delivered
+    // Check "BBB" has ttl somewhere between 1 and 5 secs
+    Message got;
+    BOOST_CHECK(fix.subs.get(got, "ttl-test"));
+    BOOST_CHECK_EQUAL("BBB", got.getData());
+    BOOST_CHECK(got.getDeliveryProperties().getTtl() > 1 * ms);
+    BOOST_CHECK(got.getDeliveryProperties().getTtl() < ttl - (5 * ms));
+}
+
+QPID_AUTO_TEST_SUITE_END()
+
+}} // namespace qpid::tests
diff --git a/cpp/src/tests/ClusterFailover.cpp b/qpid/cpp/src/tests/ClusterFailover.cpp
index bf5c147f19..bf5c147f19 100644
--- a/cpp/src/tests/ClusterFailover.cpp
+++ b/qpid/cpp/src/tests/ClusterFailover.cpp
diff --git a/cpp/src/tests/ClusterFixture.cpp b/qpid/cpp/src/tests/ClusterFixture.cpp
index 6b62cb6fc7..6b62cb6fc7 100644
--- a/cpp/src/tests/ClusterFixture.cpp
+++ b/qpid/cpp/src/tests/ClusterFixture.cpp
diff --git a/cpp/src/tests/ClusterFixture.h b/qpid/cpp/src/tests/ClusterFixture.h
index f548ff9376..f548ff9376 100644
--- a/cpp/src/tests/ClusterFixture.h
+++ b/qpid/cpp/src/tests/ClusterFixture.h
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/ConsoleTest.cpp b/qpid/cpp/src/tests/ConsoleTest.cpp
index 107472ed9e..107472ed9e 100644
--- a/cpp/src/tests/ConsoleTest.cpp
+++ b/qpid/cpp/src/tests/ConsoleTest.cpp
diff --git a/cpp/src/tests/DeliveryRecordTest.cpp b/qpid/cpp/src/tests/DeliveryRecordTest.cpp
index f7013014ff..f7013014ff 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 e1691db584..e1691db584 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 9d7666dca4..9d7666dca4 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 88a1cd99c2..88a1cd99c2 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 fe2a14ec03..fe2a14ec03 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/ForkedBroker.cpp b/qpid/cpp/src/tests/ForkedBroker.cpp
index 53eaa7e1ce..53eaa7e1ce 100644
--- a/cpp/src/tests/ForkedBroker.cpp
+++ b/qpid/cpp/src/tests/ForkedBroker.cpp
diff --git a/cpp/src/tests/ForkedBroker.h b/qpid/cpp/src/tests/ForkedBroker.h
index 87e141a425..87e141a425 100644
--- a/cpp/src/tests/ForkedBroker.h
+++ b/qpid/cpp/src/tests/ForkedBroker.h
diff --git a/cpp/src/tests/Frame.cpp b/qpid/cpp/src/tests/Frame.cpp
index 1270eabba3..1270eabba3 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 f8795316cc..f8795316cc 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 40deb59c86..40deb59c86 100644
--- a/cpp/src/tests/HeadersExchangeTest.cpp
+++ b/qpid/cpp/src/tests/HeadersExchangeTest.cpp
diff --git a/cpp/src/tests/InitialStatusMap.cpp b/qpid/cpp/src/tests/InitialStatusMap.cpp
index ecbe2d4161..ecbe2d4161 100644
--- a/cpp/src/tests/InitialStatusMap.cpp
+++ b/qpid/cpp/src/tests/InitialStatusMap.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/Makefile.am b/qpid/cpp/src/tests/Makefile.am
index ed97c41bff..ed97c41bff 100644
--- a/cpp/src/tests/Makefile.am
+++ b/qpid/cpp/src/tests/Makefile.am
diff --git a/cpp/src/tests/ManagementTest.cpp b/qpid/cpp/src/tests/ManagementTest.cpp
index 8944c084c0..8944c084c0 100644
--- a/cpp/src/tests/ManagementTest.cpp
+++ b/qpid/cpp/src/tests/ManagementTest.cpp
diff --git a/cpp/src/tests/MessageBuilderTest.cpp b/qpid/cpp/src/tests/MessageBuilderTest.cpp
index c3d40ed88a..c3d40ed88a 100644
--- a/cpp/src/tests/MessageBuilderTest.cpp
+++ b/qpid/cpp/src/tests/MessageBuilderTest.cpp
diff --git a/cpp/src/tests/MessageReplayTracker.cpp b/qpid/cpp/src/tests/MessageReplayTracker.cpp
index 3d79ee53c2..3d79ee53c2 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 7d67c92b37..7d67c92b37 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 a1b140d484..a1b140d484 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 2312a87e9d..2312a87e9d 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 6aa4c63ed7..6aa4c63ed7 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/PartialFailure.cpp b/qpid/cpp/src/tests/PartialFailure.cpp
index 63ee28017a..63ee28017a 100644
--- a/cpp/src/tests/PartialFailure.cpp
+++ b/qpid/cpp/src/tests/PartialFailure.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 9fa5689c5f..9fa5689c5f 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 66c774accd..66c774accd 100644
--- a/cpp/src/tests/Qmf2.cpp
+++ b/qpid/cpp/src/tests/Qmf2.cpp
diff --git a/cpp/src/tests/QueueEvents.cpp b/qpid/cpp/src/tests/QueueEvents.cpp
index bd18fa45fb..bd18fa45fb 100644
--- a/cpp/src/tests/QueueEvents.cpp
+++ b/qpid/cpp/src/tests/QueueEvents.cpp
diff --git a/cpp/src/tests/QueueFlowLimitTest.cpp b/qpid/cpp/src/tests/QueueFlowLimitTest.cpp
index 8a6923fb09..8a6923fb09 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 f2fbaba2c1..f2fbaba2c1 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 5455105078..5455105078 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 ae555539a4..ae555539a4 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 34e4592a15..34e4592a15 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 0f4edee493..0f4edee493 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 db3a964086..db3a964086 100644
--- a/cpp/src/tests/RangeSet.cpp
+++ b/qpid/cpp/src/tests/RangeSet.cpp
diff --git a/cpp/src/tests/RateFlowcontrolTest.cpp b/qpid/cpp/src/tests/RateFlowcontrolTest.cpp
index 80ad06af8c..80ad06af8c 100644
--- a/cpp/src/tests/RateFlowcontrolTest.cpp
+++ b/qpid/cpp/src/tests/RateFlowcontrolTest.cpp
diff --git a/cpp/src/tests/RefCounted.cpp b/qpid/cpp/src/tests/RefCounted.cpp
index e4c1da5696..e4c1da5696 100644
--- a/cpp/src/tests/RefCounted.cpp
+++ b/qpid/cpp/src/tests/RefCounted.cpp
diff --git a/cpp/src/tests/ReplicationTest.cpp b/qpid/cpp/src/tests/ReplicationTest.cpp
index 7310a3fe20..7310a3fe20 100644
--- a/cpp/src/tests/ReplicationTest.cpp
+++ b/qpid/cpp/src/tests/ReplicationTest.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/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 157cabfb63..157cabfb63 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 d8ad4c14d8..d8ad4c14d8 100644
--- a/cpp/src/tests/Shlib.cpp
+++ b/qpid/cpp/src/tests/Shlib.cpp
diff --git a/qpid/cpp/src/tests/SocketProxy.h b/qpid/cpp/src/tests/SocketProxy.h
new file mode 100644
index 0000000000..d195f11aa9
--- /dev/null
+++ b/qpid/cpp/src/tests/SocketProxy.h
@@ -0,0 +1,183 @@
+#ifndef SOCKETPROXY_H
+#define SOCKETPROXY_H
+
+/*
+ * 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.
+ *
+ */
+
+#include "qpid/sys/IOHandle.h"
+#ifdef _WIN32
+#  include "qpid/sys/windows/IoHandlePrivate.h"
+   typedef SOCKET FdType;
+#else
+#  include "qpid/sys/posix/PrivatePosix.h"
+   typedef int FdType;
+#endif
+#include "qpid/sys/Socket.h"
+#include "qpid/sys/Runnable.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/sys/Mutex.h"
+#include "qpid/log/Statement.h"
+
+#include <boost/lexical_cast.hpp>
+
+namespace qpid {
+namespace tests {
+
+/**
+ * A simple socket proxy that forwards to another socket.
+ * Used between client & local broker to simulate network failures.
+ */
+class SocketProxy : private qpid::sys::Runnable
+{
+    // Need a Socket we can get the fd from
+    class LowSocket : public qpid::sys::Socket {
+    public:
+#ifdef _WIN32
+        FdType getFd() { return toSocketHandle(*this); }
+#else
+        FdType getFd() { return toFd(impl); }
+#endif
+    };
+
+  public:
+    /** Connect to connectPort on host, start a forwarding thread.
+     * Listen for connection on getPort().
+     */
+    SocketProxy(int connectPort, const std::string host="localhost")
+      : closed(false), joined(true),
+        port(listener.listen()), dropClient(), dropServer()
+    {
+        client.connect(host, boost::lexical_cast<std::string>(connectPort));
+        joined = false;
+        thread = qpid::sys::Thread(static_cast<qpid::sys::Runnable*>(this));
+    }
+
+      ~SocketProxy() { close(); if (!joined) thread.join(); }
+
+    /** Simulate a network disconnect. */
+    void close() {
+        {
+            qpid::sys::Mutex::ScopedLock l(lock);
+            if (closed) { return; }
+            closed=true;
+        }
+        if (thread && thread != qpid::sys::Thread::current()) {
+            thread.join();
+            joined = true;
+        }
+        client.close();
+    }
+
+    /** Simulate lost packets, drop data from client */
+    void dropClientData(bool drop=true) { dropClient=drop; }
+
+    /** Simulate lost packets, drop data from server */
+    void dropServerData(bool drop=true) { dropServer=drop; }
+
+    bool isClosed() const {
+        qpid::sys::Mutex::ScopedLock l(lock);
+        return closed;
+    }
+
+    uint16_t getPort() const { return port; }
+
+  private:
+    static void throwErrno(const std::string& msg) {
+        throw qpid::Exception(msg+":"+qpid::sys::strError(errno));
+    }
+    static void throwIf(bool condition, const std::string& msg) {
+        if (condition) throw qpid::Exception(msg);
+    }
+
+    void run() {
+        std::auto_ptr<LowSocket> server;
+        try {
+            fd_set socks;
+            FdType maxFd = listener.getFd();
+            struct timeval tmo;
+            for (;;) {
+                FD_ZERO(&socks);
+                FD_SET(maxFd, &socks);
+                tmo.tv_sec = 0;
+                tmo.tv_usec = 500 * 1000;
+                if (select(maxFd+1, &socks, 0, 0, &tmo) == 0) {
+                    qpid::sys::Mutex::ScopedLock l(lock);
+                    throwIf(closed, "SocketProxy: Closed by close()");
+                    continue;
+                }
+                throwIf(!FD_ISSET(maxFd, &socks), "SocketProxy: Accept failed");
+                break;   // Accept ready... go to next step
+            }
+            server.reset(reinterpret_cast<LowSocket *>(listener.accept()));
+            maxFd = server->getFd();
+            if (client.getFd() > maxFd)
+                maxFd = client.getFd();
+            char buffer[1024];
+            for (;;) {
+                FD_ZERO(&socks);
+                tmo.tv_sec = 0;
+                tmo.tv_usec = 500 * 1000;
+                FD_SET(client.getFd(), &socks);
+                FD_SET(server->getFd(), &socks);
+                if (select(maxFd+1, &socks, 0, 0, &tmo) == 0) {
+                    qpid::sys::Mutex::ScopedLock l(lock);
+                    throwIf(closed, "SocketProxy: Closed by close()");
+                    continue;
+                }
+                // Something is set; relay data as needed until something closes
+                if (FD_ISSET(server->getFd(), &socks)) {
+                    int n = server->read(buffer, sizeof(buffer));
+                    throwIf(n <= 0, "SocketProxy: server disconnected");
+                    if (!dropServer) client.write(buffer, n);
+                }
+                if (FD_ISSET(client.getFd(), &socks)) {
+                    int n = client.read(buffer, sizeof(buffer));
+                    throwIf(n <= 0, "SocketProxy: client disconnected");
+                    if (!dropServer) server->write(buffer, n);
+                }
+                if (!FD_ISSET(client.getFd(), &socks) &&
+                    !FD_ISSET(server->getFd(), &socks))
+                    throwIf(true, "SocketProxy: No handle ready");
+            }
+        }
+        catch (const std::exception& e) {
+            QPID_LOG(debug, "SocketProxy::run exception: " << e.what());
+        }
+        try {
+            if (server.get()) server->close();
+            close();
+        }
+        catch (const std::exception& e) {
+            QPID_LOG(debug, "SocketProxy::run exception in client/server close()" << e.what());
+        }
+    }
+
+    mutable qpid::sys::Mutex lock;
+    mutable bool closed;
+    bool joined;
+    LowSocket client, listener;
+    uint16_t port;
+    qpid::sys::Thread thread;
+    bool dropClient, dropServer;
+};
+
+}} // namespace qpid::tests
+
+#endif
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/StoreStatus.cpp b/qpid/cpp/src/tests/StoreStatus.cpp
index 43d4cfd920..43d4cfd920 100644
--- a/cpp/src/tests/StoreStatus.cpp
+++ b/qpid/cpp/src/tests/StoreStatus.cpp
diff --git a/cpp/src/tests/StringUtils.cpp b/qpid/cpp/src/tests/StringUtils.cpp
index 6a19119288..6a19119288 100644
--- a/cpp/src/tests/StringUtils.cpp
+++ b/qpid/cpp/src/tests/StringUtils.cpp
diff --git a/cpp/src/tests/TestMessageStore.h b/qpid/cpp/src/tests/TestMessageStore.h
index 20e0b755b2..20e0b755b2 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 6a0a196f4e..6a0a196f4e 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 ff8931f9c9..ff8931f9c9 100644
--- a/cpp/src/tests/TopicExchangeTest.cpp
+++ b/qpid/cpp/src/tests/TopicExchangeTest.cpp
diff --git a/cpp/src/tests/TxBufferTest.cpp b/qpid/cpp/src/tests/TxBufferTest.cpp
index 4807026ab7..4807026ab7 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 72cb50cd21..72cb50cd21 100644
--- a/cpp/src/tests/TxMocks.h
+++ b/qpid/cpp/src/tests/TxMocks.h
diff --git a/cpp/src/tests/TxPublishTest.cpp b/qpid/cpp/src/tests/TxPublishTest.cpp
index 210abf0a5b..210abf0a5b 100644
--- a/cpp/src/tests/TxPublishTest.cpp
+++ b/qpid/cpp/src/tests/TxPublishTest.cpp
diff --git a/cpp/src/tests/Url.cpp b/qpid/cpp/src/tests/Url.cpp
index 234a62ee91..234a62ee91 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 0195455ca3..0195455ca3 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 40f1c0cf75..40f1c0cf75 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 b3b7f12b53..b3b7f12b53 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 5e9a150d8f..5e9a150d8f 100755
--- a/cpp/src/tests/acl.py
+++ b/qpid/cpp/src/tests/acl.py
diff --git a/cpp/src/tests/ais_check b/qpid/cpp/src/tests/ais_check
index 92eaa9dd39..92eaa9dd39 100755
--- a/cpp/src/tests/ais_check
+++ b/qpid/cpp/src/tests/ais_check
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 e43571aed4..e43571aed4 100755
--- a/cpp/src/tests/allhosts
+++ b/qpid/cpp/src/tests/allhosts
diff --git a/cpp/src/tests/amqp_0_10/Map.cpp b/qpid/cpp/src/tests/amqp_0_10/Map.cpp
index ffb235829e..ffb235829e 100644
--- a/cpp/src/tests/amqp_0_10/Map.cpp
+++ b/qpid/cpp/src/tests/amqp_0_10/Map.cpp
diff --git a/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp b/qpid/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp
index f54ee0da22..f54ee0da22 100644
--- a/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp
+++ b/qpid/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp
diff --git a/cpp/src/tests/amqp_0_10/apply.cpp b/qpid/cpp/src/tests/amqp_0_10/apply.cpp
index 0aa4421791..0aa4421791 100644
--- a/cpp/src/tests/amqp_0_10/apply.cpp
+++ b/qpid/cpp/src/tests/amqp_0_10/apply.cpp
diff --git a/cpp/src/tests/amqp_0_10/handlers.cpp b/qpid/cpp/src/tests/amqp_0_10/handlers.cpp
index 91bb304a17..91bb304a17 100644
--- a/cpp/src/tests/amqp_0_10/handlers.cpp
+++ b/qpid/cpp/src/tests/amqp_0_10/handlers.cpp
diff --git a/cpp/src/tests/amqp_0_10/serialize.cpp b/qpid/cpp/src/tests/amqp_0_10/serialize.cpp
index 975d6206ec..975d6206ec 100644
--- a/cpp/src/tests/amqp_0_10/serialize.cpp
+++ b/qpid/cpp/src/tests/amqp_0_10/serialize.cpp
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/benchmark b/qpid/cpp/src/tests/benchmark
index c075837847..c075837847 100755
--- a/cpp/src/tests/benchmark
+++ b/qpid/cpp/src/tests/benchmark
diff --git a/cpp/src/tests/brokermgmt.mk b/qpid/cpp/src/tests/brokermgmt.mk
index cf9a47200c..cf9a47200c 100644
--- a/cpp/src/tests/brokermgmt.mk
+++ b/qpid/cpp/src/tests/brokermgmt.mk
diff --git a/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py
index a19dd305e5..a19dd305e5 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 6c75927461..6c75927461 100755
--- a/cpp/src/tests/cli_tests.py
+++ b/qpid/cpp/src/tests/cli_tests.py
diff --git a/cpp/src/tests/cluster.cmake b/qpid/cpp/src/tests/cluster.cmake
index 3471173e97..3471173e97 100644
--- a/cpp/src/tests/cluster.cmake
+++ b/qpid/cpp/src/tests/cluster.cmake
diff --git a/cpp/src/tests/cluster.mk b/qpid/cpp/src/tests/cluster.mk
index 7d17dd7bde..7d17dd7bde 100644
--- a/cpp/src/tests/cluster.mk
+++ b/qpid/cpp/src/tests/cluster.mk
diff --git a/cpp/src/tests/cluster_authentication_soak.cpp b/qpid/cpp/src/tests/cluster_authentication_soak.cpp
index b8e8a22693..b8e8a22693 100644
--- a/cpp/src/tests/cluster_authentication_soak.cpp
+++ b/qpid/cpp/src/tests/cluster_authentication_soak.cpp
diff --git a/cpp/src/tests/cluster_python_tests b/qpid/cpp/src/tests/cluster_python_tests
index 9d9137ed57..9d9137ed57 100755
--- a/cpp/src/tests/cluster_python_tests
+++ b/qpid/cpp/src/tests/cluster_python_tests
diff --git a/cpp/src/tests/cluster_python_tests_failing.txt b/qpid/cpp/src/tests/cluster_python_tests_failing.txt
index 7ba8089946..7ba8089946 100644
--- a/cpp/src/tests/cluster_python_tests_failing.txt
+++ b/qpid/cpp/src/tests/cluster_python_tests_failing.txt
diff --git a/cpp/src/tests/cluster_read_credit b/qpid/cpp/src/tests/cluster_read_credit
index 370d4098c5..370d4098c5 100755
--- a/cpp/src/tests/cluster_read_credit
+++ b/qpid/cpp/src/tests/cluster_read_credit
diff --git a/cpp/src/tests/cluster_test.cpp b/qpid/cpp/src/tests/cluster_test.cpp
index f2ccd0ba84..f2ccd0ba84 100644
--- a/cpp/src/tests/cluster_test.cpp
+++ b/qpid/cpp/src/tests/cluster_test.cpp
diff --git a/cpp/src/tests/cluster_test_logs.py b/qpid/cpp/src/tests/cluster_test_logs.py
index 9f7d1e2f6c..9f7d1e2f6c 100755
--- a/cpp/src/tests/cluster_test_logs.py
+++ b/qpid/cpp/src/tests/cluster_test_logs.py
diff --git a/cpp/src/tests/cluster_test_scripts/README.txt b/qpid/cpp/src/tests/cluster_test_scripts/README.txt
index e861a2f397..e861a2f397 100644
--- a/cpp/src/tests/cluster_test_scripts/README.txt
+++ b/qpid/cpp/src/tests/cluster_test_scripts/README.txt
diff --git a/cpp/src/tests/cluster_test_scripts/cluster_check b/qpid/cpp/src/tests/cluster_test_scripts/cluster_check
index 05fcc1bcd2..05fcc1bcd2 100755
--- a/cpp/src/tests/cluster_test_scripts/cluster_check
+++ b/qpid/cpp/src/tests/cluster_test_scripts/cluster_check
diff --git a/cpp/src/tests/cluster_test_scripts/cluster_start b/qpid/cpp/src/tests/cluster_test_scripts/cluster_start
index 8911358f7e..8911358f7e 100755
--- a/cpp/src/tests/cluster_test_scripts/cluster_start
+++ b/qpid/cpp/src/tests/cluster_test_scripts/cluster_start
diff --git a/cpp/src/tests/cluster_test_scripts/cluster_stop b/qpid/cpp/src/tests/cluster_test_scripts/cluster_stop
index 09aa8f3b21..09aa8f3b21 100755
--- a/cpp/src/tests/cluster_test_scripts/cluster_stop
+++ b/qpid/cpp/src/tests/cluster_test_scripts/cluster_stop
diff --git a/cpp/src/tests/cluster_test_scripts/config_example.sh b/qpid/cpp/src/tests/cluster_test_scripts/config_example.sh
index d47c9a9c77..d47c9a9c77 100755
--- a/cpp/src/tests/cluster_test_scripts/config_example.sh
+++ b/qpid/cpp/src/tests/cluster_test_scripts/config_example.sh
diff --git a/cpp/src/tests/cluster_test_scripts/perftest b/qpid/cpp/src/tests/cluster_test_scripts/perftest
index 984761eb5f..984761eb5f 100755
--- a/cpp/src/tests/cluster_test_scripts/perftest
+++ b/qpid/cpp/src/tests/cluster_test_scripts/perftest
diff --git a/cpp/src/tests/cluster_tests.fail b/qpid/cpp/src/tests/cluster_tests.fail
index b28b04f643..b28b04f643 100644
--- a/cpp/src/tests/cluster_tests.fail
+++ b/qpid/cpp/src/tests/cluster_tests.fail
diff --git a/cpp/src/tests/cluster_tests.py b/qpid/cpp/src/tests/cluster_tests.py
index 593791297a..593791297a 100755
--- a/cpp/src/tests/cluster_tests.py
+++ b/qpid/cpp/src/tests/cluster_tests.py
diff --git a/cpp/src/tests/clustered_replication_test b/qpid/cpp/src/tests/clustered_replication_test
index d6c72d9d1b..d6c72d9d1b 100755
--- a/cpp/src/tests/clustered_replication_test
+++ b/qpid/cpp/src/tests/clustered_replication_test
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_level_test b/qpid/cpp/src/tests/dynamic_log_level_test
index 990e56b1b1..990e56b1b1 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 3536ffddbe..3536ffddbe 100644
--- a/cpp/src/tests/exception_test.cpp
+++ b/qpid/cpp/src/tests/exception_test.cpp
diff --git a/cpp/src/tests/failover_soak.cpp b/qpid/cpp/src/tests/failover_soak.cpp
index c2ac36a757..c2ac36a757 100644
--- a/cpp/src/tests/failover_soak.cpp
+++ b/qpid/cpp/src/tests/failover_soak.cpp
diff --git a/cpp/src/tests/fanout_perftest b/qpid/cpp/src/tests/fanout_perftest
index d8a7661f49..d8a7661f49 100755
--- a/cpp/src/tests/fanout_perftest
+++ b/qpid/cpp/src/tests/fanout_perftest
diff --git a/cpp/src/tests/federated_cluster_test b/qpid/cpp/src/tests/federated_cluster_test
index 70bec5e703..70bec5e703 100755
--- a/cpp/src/tests/federated_cluster_test
+++ b/qpid/cpp/src/tests/federated_cluster_test
diff --git a/cpp/src/tests/federated_cluster_test_with_node_failure b/qpid/cpp/src/tests/federated_cluster_test_with_node_failure
index f144a676de..f144a676de 100755
--- a/cpp/src/tests/federated_cluster_test_with_node_failure
+++ b/qpid/cpp/src/tests/federated_cluster_test_with_node_failure
diff --git a/cpp/src/tests/federated_topic_test b/qpid/cpp/src/tests/federated_topic_test
index b1063c7e8c..b1063c7e8c 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 201b06a4a2..201b06a4a2 100755
--- a/cpp/src/tests/federation.py
+++ b/qpid/cpp/src/tests/federation.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/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 2231954cb8..2231954cb8 100644
--- a/cpp/src/tests/install_env.sh.in
+++ b/qpid/cpp/src/tests/install_env.sh.in
diff --git a/cpp/src/tests/logging.cpp b/qpid/cpp/src/tests/logging.cpp
index fc55d642c3..fc55d642c3 100644
--- a/cpp/src/tests/logging.cpp
+++ b/qpid/cpp/src/tests/logging.cpp
diff --git a/cpp/src/tests/long_cluster_tests.py b/qpid/cpp/src/tests/long_cluster_tests.py
index f77837f0c4..f77837f0c4 100755
--- a/cpp/src/tests/long_cluster_tests.py
+++ b/qpid/cpp/src/tests/long_cluster_tests.py
diff --git a/cpp/src/tests/multiq_perftest b/qpid/cpp/src/tests/multiq_perftest
index 10f9edd2a6..10f9edd2a6 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 59548b23f7..59548b23f7 100755
--- a/cpp/src/tests/perfdist
+++ b/qpid/cpp/src/tests/perfdist
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 0216b5ca7b..0216b5ca7b 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 9f8b9890c4..9f8b9890c4 100644
--- a/cpp/src/tests/python_tests.ps1
+++ b/qpid/cpp/src/tests/python_tests.ps1
diff --git a/cpp/src/tests/qpid-build-rinstall b/qpid/cpp/src/tests/qpid-build-rinstall
index 1a92f8750a..1a92f8750a 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 2f5e8e5afe..2f5e8e5afe 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 ff787a46dd..ff787a46dd 100755
--- a/cpp/src/tests/qpid-cluster-benchmark
+++ b/qpid/cpp/src/tests/qpid-cluster-benchmark
diff --git a/cpp/src/tests/qpid-cluster-lag.py b/qpid/cpp/src/tests/qpid-cluster-lag.py
index 5b24353241..5b24353241 100755
--- a/cpp/src/tests/qpid-cluster-lag.py
+++ b/qpid/cpp/src/tests/qpid-cluster-lag.py
diff --git a/cpp/src/tests/qpid-cpp-benchmark b/qpid/cpp/src/tests/qpid-cpp-benchmark
index 6138108558..6138108558 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 20eb4568f3..20eb4568f3 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 8a5cf05775..8a5cf05775 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 0cb4afa0ee..0cb4afa0ee 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 9c713e872a..9c713e872a 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 ef5e98e2a0..ef5e98e2a0 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 5e69e0ade1..5e69e0ade1 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-test-cluster b/qpid/cpp/src/tests/qpid-test-cluster
index 9887406ef9..9887406ef9 100755
--- a/cpp/src/tests/qpid-test-cluster
+++ b/qpid/cpp/src/tests/qpid-test-cluster
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 d0ba2f1245..d0ba2f1245 100644
--- a/cpp/src/tests/qpid-txtest.cpp
+++ b/qpid/cpp/src/tests/qpid-txtest.cpp
diff --git a/cpp/src/tests/queue_flow_limit_tests.py b/qpid/cpp/src/tests/queue_flow_limit_tests.py
index dec7cfb3af..dec7cfb3af 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/quick_perftest b/qpid/cpp/src/tests/quick_perftest
index 362f9ee96a..362f9ee96a 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 0a6b29b33f..0a6b29b33f 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 c872fcec12..c872fcec12 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/reliable_replication_test b/qpid/cpp/src/tests/reliable_replication_test
index f57d11a263..f57d11a263 100755
--- a/cpp/src/tests/reliable_replication_test
+++ b/qpid/cpp/src/tests/reliable_replication_test
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/replication_test b/qpid/cpp/src/tests/replication_test
index 8c37568875..8c37568875 100755
--- a/cpp/src/tests/replication_test
+++ b/qpid/cpp/src/tests/replication_test
diff --git a/cpp/src/tests/restart_cluster b/qpid/cpp/src/tests/restart_cluster
index 6a6abc8042..6a6abc8042 100755
--- a/cpp/src/tests/restart_cluster
+++ b/qpid/cpp/src/tests/restart_cluster
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 553746eb49..553746eb49 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 56ee57e898..56ee57e898 100755
--- a/cpp/src/tests/rsynchosts
+++ b/qpid/cpp/src/tests/rsynchosts
diff --git a/cpp/src/tests/run-unit-tests b/qpid/cpp/src/tests/run-unit-tests
index 862a76c4f5..862a76c4f5 100755
--- a/cpp/src/tests/run-unit-tests
+++ b/qpid/cpp/src/tests/run-unit-tests
diff --git a/cpp/src/tests/run_acl_tests b/qpid/cpp/src/tests/run_acl_tests
index 41f41e20e1..41f41e20e1 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 a1848779c7..a1848779c7 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 ec5c71b646..ec5c71b646 100755
--- a/cpp/src/tests/run_cli_tests
+++ b/qpid/cpp/src/tests/run_cli_tests
diff --git a/cpp/src/tests/run_cluster_authentication_soak b/qpid/cpp/src/tests/run_cluster_authentication_soak
index 7bc406c4ca..7bc406c4ca 100755
--- a/cpp/src/tests/run_cluster_authentication_soak
+++ b/qpid/cpp/src/tests/run_cluster_authentication_soak
diff --git a/cpp/src/tests/run_cluster_authentication_test b/qpid/cpp/src/tests/run_cluster_authentication_test
index 647200b869..647200b869 100755
--- a/cpp/src/tests/run_cluster_authentication_test
+++ b/qpid/cpp/src/tests/run_cluster_authentication_test
diff --git a/cpp/src/tests/run_cluster_test b/qpid/cpp/src/tests/run_cluster_test
index c022eea1fe..c022eea1fe 100755
--- a/cpp/src/tests/run_cluster_test
+++ b/qpid/cpp/src/tests/run_cluster_test
diff --git a/cpp/src/tests/run_cluster_tests b/qpid/cpp/src/tests/run_cluster_tests
index e136d3810a..e136d3810a 100755
--- a/cpp/src/tests/run_cluster_tests
+++ b/qpid/cpp/src/tests/run_cluster_tests
diff --git a/cpp/src/tests/run_failover_soak b/qpid/cpp/src/tests/run_failover_soak
index cce8b07a26..cce8b07a26 100755
--- a/cpp/src/tests/run_failover_soak
+++ b/qpid/cpp/src/tests/run_failover_soak
diff --git a/cpp/src/tests/run_federation_tests b/qpid/cpp/src/tests/run_federation_tests
index 590f74746e..590f74746e 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 35353a870f..35353a870f 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_header_test b/qpid/cpp/src/tests/run_header_test
index 34008132cc..34008132cc 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 7d3e43a30f..7d3e43a30f 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 a4584e6884..a4584e6884 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_long_cluster_tests b/qpid/cpp/src/tests/run_long_cluster_tests
index 5dce0be585..5dce0be585 100755
--- a/cpp/src/tests/run_long_cluster_tests
+++ b/qpid/cpp/src/tests/run_long_cluster_tests
diff --git a/cpp/src/tests/run_perftest b/qpid/cpp/src/tests/run_perftest
index 5ad7c1ff4f..5ad7c1ff4f 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 f921cf5e7e..f921cf5e7e 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_ring_queue_test b/qpid/cpp/src/tests/run_ring_queue_test
index 7ca870841e..7ca870841e 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 76b46737f0..76b46737f0 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 6ec1fd892b..6ec1fd892b 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 ca990bc057..ca990bc057 100644
--- a/cpp/src/tests/run_test.ps1
+++ b/qpid/cpp/src/tests/run_test.ps1
diff --git a/cpp/src/tests/sasl.mk b/qpid/cpp/src/tests/sasl.mk
index 20eaa7c7a5..20eaa7c7a5 100644
--- a/cpp/src/tests/sasl.mk
+++ b/qpid/cpp/src/tests/sasl.mk
diff --git a/cpp/src/tests/sasl_fed b/qpid/cpp/src/tests/sasl_fed
index 884c44177c..884c44177c 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 716a806874..716a806874 100755
--- a/cpp/src/tests/sasl_fed_ex
+++ b/qpid/cpp/src/tests/sasl_fed_ex
diff --git a/cpp/src/tests/sasl_fed_ex_dynamic b/qpid/cpp/src/tests/sasl_fed_ex_dynamic
index c20b8d69a0..c20b8d69a0 100755
--- a/cpp/src/tests/sasl_fed_ex_dynamic
+++ b/qpid/cpp/src/tests/sasl_fed_ex_dynamic
diff --git a/cpp/src/tests/sasl_fed_ex_dynamic_cluster b/qpid/cpp/src/tests/sasl_fed_ex_dynamic_cluster
index b0cceccecb..b0cceccecb 100755
--- a/cpp/src/tests/sasl_fed_ex_dynamic_cluster
+++ b/qpid/cpp/src/tests/sasl_fed_ex_dynamic_cluster
diff --git a/cpp/src/tests/sasl_fed_ex_link b/qpid/cpp/src/tests/sasl_fed_ex_link
index 7b232d4874..7b232d4874 100755
--- a/cpp/src/tests/sasl_fed_ex_link
+++ b/qpid/cpp/src/tests/sasl_fed_ex_link
diff --git a/cpp/src/tests/sasl_fed_ex_link_cluster b/qpid/cpp/src/tests/sasl_fed_ex_link_cluster
index 4139300b12..4139300b12 100755
--- a/cpp/src/tests/sasl_fed_ex_link_cluster
+++ b/qpid/cpp/src/tests/sasl_fed_ex_link_cluster
diff --git a/cpp/src/tests/sasl_fed_ex_queue b/qpid/cpp/src/tests/sasl_fed_ex_queue
index be0c10cf63..be0c10cf63 100755
--- a/cpp/src/tests/sasl_fed_ex_queue
+++ b/qpid/cpp/src/tests/sasl_fed_ex_queue
diff --git a/cpp/src/tests/sasl_fed_ex_queue_cluster b/qpid/cpp/src/tests/sasl_fed_ex_queue_cluster
index f251420e08..f251420e08 100755
--- a/cpp/src/tests/sasl_fed_ex_queue_cluster
+++ b/qpid/cpp/src/tests/sasl_fed_ex_queue_cluster
diff --git a/cpp/src/tests/sasl_fed_ex_route b/qpid/cpp/src/tests/sasl_fed_ex_route
index dd5c4f3cac..dd5c4f3cac 100755
--- a/cpp/src/tests/sasl_fed_ex_route
+++ b/qpid/cpp/src/tests/sasl_fed_ex_route
diff --git a/cpp/src/tests/sasl_fed_ex_route_cluster b/qpid/cpp/src/tests/sasl_fed_ex_route_cluster
index a5d1542def..a5d1542def 100755
--- a/cpp/src/tests/sasl_fed_ex_route_cluster
+++ b/qpid/cpp/src/tests/sasl_fed_ex_route_cluster
diff --git a/cpp/src/tests/sasl_test_setup.sh b/qpid/cpp/src/tests/sasl_test_setup.sh
index 6395ba6ec3..6395ba6ec3 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 cc192d25bd..cc192d25bd 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.mk b/qpid/cpp/src/tests/ssl.mk
index 435db0c55b..435db0c55b 100644
--- a/cpp/src/tests/ssl.mk
+++ b/qpid/cpp/src/tests/ssl.mk
diff --git a/cpp/src/tests/ssl_test b/qpid/cpp/src/tests/ssl_test
index cbf75eb237..cbf75eb237 100755
--- a/cpp/src/tests/ssl_test
+++ b/qpid/cpp/src/tests/ssl_test
diff --git a/cpp/src/tests/start_broker b/qpid/cpp/src/tests/start_broker
index 093c44051a..093c44051a 100755
--- a/cpp/src/tests/start_broker
+++ b/qpid/cpp/src/tests/start_broker
diff --git a/cpp/src/tests/start_broker.ps1 b/qpid/cpp/src/tests/start_broker.ps1
index 9263262b9f..9263262b9f 100644
--- a/cpp/src/tests/start_broker.ps1
+++ b/qpid/cpp/src/tests/start_broker.ps1
diff --git a/cpp/src/tests/start_cluster b/qpid/cpp/src/tests/start_cluster
index bc35a2eddc..bc35a2eddc 100755
--- a/cpp/src/tests/start_cluster
+++ b/qpid/cpp/src/tests/start_cluster
diff --git a/cpp/src/tests/start_cluster_hosts b/qpid/cpp/src/tests/start_cluster_hosts
index 778b4248da..778b4248da 100755
--- a/cpp/src/tests/start_cluster_hosts
+++ b/qpid/cpp/src/tests/start_cluster_hosts
diff --git a/cpp/src/tests/stop_broker b/qpid/cpp/src/tests/stop_broker
index 248fd1fc5c..248fd1fc5c 100755
--- a/cpp/src/tests/stop_broker
+++ b/qpid/cpp/src/tests/stop_broker
diff --git a/cpp/src/tests/stop_broker.ps1 b/qpid/cpp/src/tests/stop_broker.ps1
index 4fdeb26e2b..4fdeb26e2b 100644
--- a/cpp/src/tests/stop_broker.ps1
+++ b/qpid/cpp/src/tests/stop_broker.ps1
diff --git a/cpp/src/tests/stop_cluster b/qpid/cpp/src/tests/stop_cluster
index d598a2255a..d598a2255a 100755
--- a/cpp/src/tests/stop_cluster
+++ b/qpid/cpp/src/tests/stop_cluster
diff --git a/cpp/src/tests/store.py b/qpid/cpp/src/tests/store.py
index 77e8a78e5d..77e8a78e5d 100755
--- a/cpp/src/tests/store.py
+++ b/qpid/cpp/src/tests/store.py
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.sh.in b/qpid/cpp/src/tests/test_env.sh.in
index 842d7729cb..842d7729cb 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_store.cpp b/qpid/cpp/src/tests/test_store.cpp
index 257e77b6b4..257e77b6b4 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 de672f938a..de672f938a 100644
--- a/cpp/src/tests/test_tools.h
+++ b/qpid/cpp/src/tests/test_tools.h
diff --git a/cpp/src/tests/test_watchdog b/qpid/cpp/src/tests/test_watchdog
index 2b4ae9246e..2b4ae9246e 100755
--- a/cpp/src/tests/test_watchdog
+++ b/qpid/cpp/src/tests/test_watchdog
diff --git a/cpp/src/tests/test_wrap b/qpid/cpp/src/tests/test_wrap
index dd43c5a2e2..dd43c5a2e2 100755
--- a/cpp/src/tests/test_wrap
+++ b/qpid/cpp/src/tests/test_wrap
diff --git a/cpp/src/tests/testagent.cpp b/qpid/cpp/src/tests/testagent.cpp
index 98520b424a..98520b424a 100644
--- a/cpp/src/tests/testagent.cpp
+++ b/qpid/cpp/src/tests/testagent.cpp
diff --git a/cpp/src/tests/testagent.mk b/qpid/cpp/src/tests/testagent.mk
index 19d91ccab9..19d91ccab9 100644
--- a/cpp/src/tests/testagent.mk
+++ b/qpid/cpp/src/tests/testagent.mk
diff --git a/cpp/src/tests/testagent.xml b/qpid/cpp/src/tests/testagent.xml
index 0b1436f999..0b1436f999 100644
--- a/cpp/src/tests/testagent.xml
+++ b/qpid/cpp/src/tests/testagent.xml
diff --git a/cpp/src/tests/testlib.py b/qpid/cpp/src/tests/testlib.py
index fe57a84a81..fe57a84a81 100644
--- a/cpp/src/tests/testlib.py
+++ b/qpid/cpp/src/tests/testlib.py
diff --git a/cpp/src/tests/topic_perftest b/qpid/cpp/src/tests/topic_perftest
index cd440b2458..cd440b2458 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 257c24bd81..257c24bd81 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 59a483c2d5..59a483c2d5 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 a7a905c1b7..a7a905c1b7 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 882d3716d8..882d3716d8 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 ed9623bcc0..ed9623bcc0 100644
--- a/cpp/src/tests/unit_test.h
+++ b/qpid/cpp/src/tests/unit_test.h
diff --git a/cpp/src/tests/verify_cluster_objects b/qpid/cpp/src/tests/verify_cluster_objects
index 94661cf6b9..94661cf6b9 100755
--- a/cpp/src/tests/verify_cluster_objects
+++ b/qpid/cpp/src/tests/verify_cluster_objects
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 024f20b147..024f20b147 100644
--- a/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp
+++ b/qpid/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp
diff --git a/cpp/src/windows/QpiddBroker.cpp b/qpid/cpp/src/windows/QpiddBroker.cpp
index 50bb45979c..50bb45979c 100644
--- a/cpp/src/windows/QpiddBroker.cpp
+++ b/qpid/cpp/src/windows/QpiddBroker.cpp
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 725d1c9391..725d1c9391 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/cpp/src/xml.mk b/qpid/cpp/src/xml.mk
index baf3803647..baf3803647 100644
--- a/cpp/src/xml.mk
+++ b/qpid/cpp/src/xml.mk
diff --git a/cpp/versions b/qpid/cpp/versions
index 6f838e14b8..6f838e14b8 100755
--- a/cpp/versions
+++ b/qpid/cpp/versions
diff --git a/cpp/xml/cluster.xml b/qpid/cpp/xml/cluster.xml
index 4d83c5b5de..4d83c5b5de 100644
--- a/cpp/xml/cluster.xml
+++ b/qpid/cpp/xml/cluster.xml
diff --git a/cpp/xml/extra.xml b/qpid/cpp/xml/extra.xml
index 5cb37ae65f..5cb37ae65f 100644
--- a/cpp/xml/extra.xml
+++ b/qpid/cpp/xml/extra.xml
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 db160ac6f8..db160ac6f8 100644
--- a/doc/book/Makefile
+++ b/qpid/doc/book/Makefile
diff --git a/doc/book/README.txt b/qpid/doc/book/README.txt
index 1fc99c94a0..1fc99c94a0 100644
--- a/doc/book/README.txt
+++ b/qpid/doc/book/README.txt
diff --git a/doc/book/build-book.sh b/qpid/doc/book/build-book.sh
index 74a2ec963d..74a2ec963d 100755
--- a/doc/book/build-book.sh
+++ b/qpid/doc/book/build-book.sh
diff --git a/doc/book/build-chapter.sh b/qpid/doc/book/build-chapter.sh
index a2c2ad3b0c..a2c2ad3b0c 100755
--- a/doc/book/build-chapter.sh
+++ b/qpid/doc/book/build-chapter.sh
diff --git a/doc/book/build.sh b/qpid/doc/book/build.sh
index 249d2c7439..249d2c7439 100755
--- a/doc/book/build.sh
+++ b/qpid/doc/book/build.sh
diff --git a/doc/book/build.xml b/qpid/doc/book/build.xml
index 5acd97f982..5acd97f982 100644
--- a/doc/book/build.xml
+++ b/qpid/doc/book/build.xml
diff --git a/doc/book/src/ACL.xml b/qpid/doc/book/src/ACL.xml
index ceb7cecb23..ceb7cecb23 100644
--- a/doc/book/src/ACL.xml
+++ b/qpid/doc/book/src/ACL.xml
diff --git a/doc/book/src/AMQP-.NET-Messaging-Client.xml b/qpid/doc/book/src/AMQP-.NET-Messaging-Client.xml
index 1d4001942b..1d4001942b 100644
--- a/doc/book/src/AMQP-.NET-Messaging-Client.xml
+++ b/qpid/doc/book/src/AMQP-.NET-Messaging-Client.xml
diff --git a/doc/book/src/AMQP-C++-Messaging-Client.xml b/qpid/doc/book/src/AMQP-C++-Messaging-Client.xml
index 73a2cd6c0b..73a2cd6c0b 100644
--- a/doc/book/src/AMQP-C++-Messaging-Client.xml
+++ b/qpid/doc/book/src/AMQP-C++-Messaging-Client.xml
diff --git a/doc/book/src/AMQP-Compatibility.xml b/qpid/doc/book/src/AMQP-Compatibility.xml
index e5aa98cf96..e5aa98cf96 100644
--- a/doc/book/src/AMQP-Compatibility.xml
+++ b/qpid/doc/book/src/AMQP-Compatibility.xml
diff --git a/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml b/qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml
index 8c14d67e14..8c14d67e14 100644
--- a/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml
+++ b/qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml
diff --git a/doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml b/qpid/doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml
index 6c27d7c668..6c27d7c668 100644
--- a/doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml
+++ b/qpid/doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml
diff --git a/doc/book/src/AMQP-Messaging-Broker-CPP.xml b/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml
index 15f5660455..15f5660455 100644
--- a/doc/book/src/AMQP-Messaging-Broker-CPP.xml
+++ b/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml
diff --git a/doc/book/src/AMQP-Messaging-Broker-Java-Book.xml b/qpid/doc/book/src/AMQP-Messaging-Broker-Java-Book.xml
index 8d2e2218ff..8d2e2218ff 100644
--- a/doc/book/src/AMQP-Messaging-Broker-Java-Book.xml
+++ b/qpid/doc/book/src/AMQP-Messaging-Broker-Java-Book.xml
diff --git a/doc/book/src/AMQP-Messaging-Broker-Java.xml b/qpid/doc/book/src/AMQP-Messaging-Broker-Java.xml
index d2a3427674..d2a3427674 100644
--- a/doc/book/src/AMQP-Messaging-Broker-Java.xml
+++ b/qpid/doc/book/src/AMQP-Messaging-Broker-Java.xml
diff --git a/doc/book/src/AMQP-Python-Messaging-Client.xml b/qpid/doc/book/src/AMQP-Python-Messaging-Client.xml
index 15baf214ec..15baf214ec 100644
--- a/doc/book/src/AMQP-Python-Messaging-Client.xml
+++ b/qpid/doc/book/src/AMQP-Python-Messaging-Client.xml
diff --git a/doc/book/src/AMQP-Ruby-Messaging-Client.xml b/qpid/doc/book/src/AMQP-Ruby-Messaging-Client.xml
index 45318c0beb..45318c0beb 100644
--- a/doc/book/src/AMQP-Ruby-Messaging-Client.xml
+++ b/qpid/doc/book/src/AMQP-Ruby-Messaging-Client.xml
diff --git a/doc/book/src/AMQP.xml b/qpid/doc/book/src/AMQP.xml
index 1a609649bb..1a609649bb 100644
--- a/doc/book/src/AMQP.xml
+++ b/qpid/doc/book/src/AMQP.xml
diff --git a/doc/book/src/Add-New-Users.xml b/qpid/doc/book/src/Add-New-Users.xml
index dc34bcc5c9..dc34bcc5c9 100644
--- a/doc/book/src/Add-New-Users.xml
+++ b/qpid/doc/book/src/Add-New-Users.xml
diff --git a/doc/book/src/Binding-URL-Format.xml b/qpid/doc/book/src/Binding-URL-Format.xml
index 3d938b740a..3d938b740a 100644
--- a/doc/book/src/Binding-URL-Format.xml
+++ b/qpid/doc/book/src/Binding-URL-Format.xml
diff --git a/doc/book/src/Book-Info.xml b/qpid/doc/book/src/Book-Info.xml
index 2e02fbe8ea..2e02fbe8ea 100644
--- a/doc/book/src/Book-Info.xml
+++ b/qpid/doc/book/src/Book-Info.xml
diff --git a/doc/book/src/Book.xml b/qpid/doc/book/src/Book.xml
index ee69532152..ee69532152 100644
--- a/doc/book/src/Book.xml
+++ b/qpid/doc/book/src/Book.xml
diff --git a/doc/book/src/Broker-CPP.xml b/qpid/doc/book/src/Broker-CPP.xml
index 99584be23d..99584be23d 100644
--- a/doc/book/src/Broker-CPP.xml
+++ b/qpid/doc/book/src/Broker-CPP.xml
diff --git a/doc/book/src/Broker-Configuration-Guide.xml b/qpid/doc/book/src/Broker-Configuration-Guide.xml
index c52e1fbfd4..c52e1fbfd4 100644
--- a/doc/book/src/Broker-Configuration-Guide.xml
+++ b/qpid/doc/book/src/Broker-Configuration-Guide.xml
diff --git a/doc/book/src/Broker-Java.xml b/qpid/doc/book/src/Broker-Java.xml
index f8ce89b185..f8ce89b185 100644
--- a/doc/book/src/Broker-Java.xml
+++ b/qpid/doc/book/src/Broker-Java.xml
diff --git a/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml b/qpid/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml
index fccdae1b9a..fccdae1b9a 100644
--- a/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml
+++ b/qpid/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml
diff --git a/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml b/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
index d50948e0cc..d50948e0cc 100644
--- a/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
+++ b/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
diff --git a/doc/book/src/Clients.xml b/qpid/doc/book/src/Clients.xml
index 3dc2d38e86..3dc2d38e86 100644
--- a/doc/book/src/Clients.xml
+++ b/qpid/doc/book/src/Clients.xml
diff --git a/doc/book/src/Configure-ACLs.xml b/qpid/doc/book/src/Configure-ACLs.xml
index ec3aaa8465..ec3aaa8465 100644
--- a/doc/book/src/Configure-ACLs.xml
+++ b/qpid/doc/book/src/Configure-ACLs.xml
diff --git a/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml b/qpid/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml
index c09923711d..c09923711d 100644
--- a/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml
+++ b/qpid/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml
diff --git a/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml b/qpid/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml
index 2c21f9e76d..2c21f9e76d 100644
--- a/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml
+++ b/qpid/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml
diff --git a/doc/book/src/Configure-the-Broker-via-config.xml.xml b/qpid/doc/book/src/Configure-the-Broker-via-config.xml.xml
index b91e0796b8..b91e0796b8 100644
--- a/doc/book/src/Configure-the-Broker-via-config.xml.xml
+++ b/qpid/doc/book/src/Configure-the-Broker-via-config.xml.xml
diff --git a/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml b/qpid/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml
index 690175d57e..690175d57e 100644
--- a/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml
+++ b/qpid/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml
diff --git a/doc/book/src/Configuring-Management-Users.xml b/qpid/doc/book/src/Configuring-Management-Users.xml
index a2a8d46d88..a2a8d46d88 100644
--- a/doc/book/src/Configuring-Management-Users.xml
+++ b/qpid/doc/book/src/Configuring-Management-Users.xml
diff --git a/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml b/qpid/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml
index 72e4ba8969..72e4ba8969 100644
--- a/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml
+++ b/qpid/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml
diff --git a/doc/book/src/Connection-URL-Format.xml b/qpid/doc/book/src/Connection-URL-Format.xml
index cb772487cd..cb772487cd 100644
--- a/doc/book/src/Connection-URL-Format.xml
+++ b/qpid/doc/book/src/Connection-URL-Format.xml
diff --git a/doc/book/src/Debug-using-log4j.xml b/qpid/doc/book/src/Debug-using-log4j.xml
index c4ec107cd0..c4ec107cd0 100644
--- a/doc/book/src/Debug-using-log4j.xml
+++ b/qpid/doc/book/src/Debug-using-log4j.xml
diff --git a/doc/book/src/Download.xml b/qpid/doc/book/src/Download.xml
index 7bc08143ac..7bc08143ac 100644
--- a/doc/book/src/Download.xml
+++ b/qpid/doc/book/src/Download.xml
diff --git a/doc/book/src/Excel-AddIn.xml b/qpid/doc/book/src/Excel-AddIn.xml
index e38f620bd8..e38f620bd8 100644
--- a/doc/book/src/Excel-AddIn.xml
+++ b/qpid/doc/book/src/Excel-AddIn.xml
diff --git a/doc/book/src/FAQ.xml b/qpid/doc/book/src/FAQ.xml
index 5647f18f69..5647f18f69 100644
--- a/doc/book/src/FAQ.xml
+++ b/qpid/doc/book/src/FAQ.xml
diff --git a/doc/book/src/Getting-Started.xml b/qpid/doc/book/src/Getting-Started.xml
index 216a52170e..216a52170e 100644
--- a/doc/book/src/Getting-Started.xml
+++ b/qpid/doc/book/src/Getting-Started.xml
diff --git a/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml b/qpid/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml
index f7fffbaceb..f7fffbaceb 100644
--- a/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml
+++ b/qpid/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml
diff --git a/doc/book/src/How-to-Use-JNDI.xml b/qpid/doc/book/src/How-to-Use-JNDI.xml
index 74506dde0f..74506dde0f 100644
--- a/doc/book/src/How-to-Use-JNDI.xml
+++ b/qpid/doc/book/src/How-to-Use-JNDI.xml
diff --git a/doc/book/src/How-to-Use-SlowConsumerDisconnect.xml b/qpid/doc/book/src/How-to-Use-SlowConsumerDisconnect.xml
index 5f4c627430..5f4c627430 100644
--- a/doc/book/src/How-to-Use-SlowConsumerDisconnect.xml
+++ b/qpid/doc/book/src/How-to-Use-SlowConsumerDisconnect.xml
diff --git a/doc/book/src/InfoPlugin.xml b/qpid/doc/book/src/InfoPlugin.xml
index aebcd08c02..aebcd08c02 100644
--- a/doc/book/src/InfoPlugin.xml
+++ b/qpid/doc/book/src/InfoPlugin.xml
diff --git a/doc/book/src/Introduction.xml b/qpid/doc/book/src/Introduction.xml
index 8f92c207cf..8f92c207cf 100644
--- a/doc/book/src/Introduction.xml
+++ b/qpid/doc/book/src/Introduction.xml
diff --git a/doc/book/src/Java-Broker-Feature-Guide.xml b/qpid/doc/book/src/Java-Broker-Feature-Guide.xml
index bbc2a1aaf0..bbc2a1aaf0 100644
--- a/doc/book/src/Java-Broker-Feature-Guide.xml
+++ b/qpid/doc/book/src/Java-Broker-Feature-Guide.xml
diff --git a/doc/book/src/Java-Broker-StatusLogMessages.xml b/qpid/doc/book/src/Java-Broker-StatusLogMessages.xml
index e905f9ff10..e905f9ff10 100644
--- a/doc/book/src/Java-Broker-StatusLogMessages.xml
+++ b/qpid/doc/book/src/Java-Broker-StatusLogMessages.xml
diff --git a/doc/book/src/Java-Environment-Variables.xml b/qpid/doc/book/src/Java-Environment-Variables.xml
index e4da38a260..e4da38a260 100644
--- a/doc/book/src/Java-Environment-Variables.xml
+++ b/qpid/doc/book/src/Java-Environment-Variables.xml
diff --git a/doc/book/src/Java-JMS-Selector-Syntax.xml b/qpid/doc/book/src/Java-JMS-Selector-Syntax.xml
index 870e277b66..870e277b66 100644
--- a/doc/book/src/Java-JMS-Selector-Syntax.xml
+++ b/qpid/doc/book/src/Java-JMS-Selector-Syntax.xml
diff --git a/doc/book/src/LVQ.xml b/qpid/doc/book/src/LVQ.xml
index 7c9f588c51..7c9f588c51 100644
--- a/doc/book/src/LVQ.xml
+++ b/qpid/doc/book/src/LVQ.xml
diff --git a/doc/book/src/Management-Console-Security.xml b/qpid/doc/book/src/Management-Console-Security.xml
index aa7bebb09e..aa7bebb09e 100644
--- a/doc/book/src/Management-Console-Security.xml
+++ b/qpid/doc/book/src/Management-Console-Security.xml
diff --git a/doc/book/src/Management-Design-notes.xml b/qpid/doc/book/src/Management-Design-notes.xml
index 76f0dac926..76f0dac926 100644
--- a/doc/book/src/Management-Design-notes.xml
+++ b/qpid/doc/book/src/Management-Design-notes.xml
diff --git a/doc/book/src/Managing-CPP-Broker.xml b/qpid/doc/book/src/Managing-CPP-Broker.xml
index 2cb4def764..2cb4def764 100644
--- a/doc/book/src/Managing-CPP-Broker.xml
+++ b/qpid/doc/book/src/Managing-CPP-Broker.xml
diff --git a/doc/book/src/MessageStore-Tool.xml b/qpid/doc/book/src/MessageStore-Tool.xml
index fdcb3cd560..fdcb3cd560 100644
--- a/doc/book/src/MessageStore-Tool.xml
+++ b/qpid/doc/book/src/MessageStore-Tool.xml
diff --git a/doc/book/src/NET-User-Guide.xml b/qpid/doc/book/src/NET-User-Guide.xml
index 7bfa20b8c8..7bfa20b8c8 100644
--- a/doc/book/src/NET-User-Guide.xml
+++ b/qpid/doc/book/src/NET-User-Guide.xml
diff --git a/doc/book/src/Programming-In-Apache-Qpid.xml b/qpid/doc/book/src/Programming-In-Apache-Qpid.xml
index 6fae2f0bc7..6fae2f0bc7 100644
--- a/doc/book/src/Programming-In-Apache-Qpid.xml
+++ b/qpid/doc/book/src/Programming-In-Apache-Qpid.xml
diff --git a/doc/book/src/PythonBrokerTest.xml b/qpid/doc/book/src/PythonBrokerTest.xml
index ae7edade40..ae7edade40 100644
--- a/doc/book/src/PythonBrokerTest.xml
+++ b/qpid/doc/book/src/PythonBrokerTest.xml
diff --git a/doc/book/src/QMF-Python-Console-Tutorial.xml b/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml
index 2cb802671b..2cb802671b 100644
--- a/doc/book/src/QMF-Python-Console-Tutorial.xml
+++ b/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml
diff --git a/doc/book/src/QMan-Qpid-Management-bridge.xml b/qpid/doc/book/src/QMan-Qpid-Management-bridge.xml
index f2c366dcbb..f2c366dcbb 100644
--- a/doc/book/src/QMan-Qpid-Management-bridge.xml
+++ b/qpid/doc/book/src/QMan-Qpid-Management-bridge.xml
diff --git a/doc/book/src/QmfBook.xml b/qpid/doc/book/src/QmfBook.xml
index 64a6545fb5..64a6545fb5 100644
--- a/doc/book/src/QmfBook.xml
+++ b/qpid/doc/book/src/QmfBook.xml
diff --git a/doc/book/src/QmfIntroduction.xml b/qpid/doc/book/src/QmfIntroduction.xml
index db7b8949a5..db7b8949a5 100644
--- a/doc/book/src/QmfIntroduction.xml
+++ b/qpid/doc/book/src/QmfIntroduction.xml
diff --git a/doc/book/src/Qpid-ACLs.xml b/qpid/doc/book/src/Qpid-ACLs.xml
index a2b64061c3..a2b64061c3 100644
--- a/doc/book/src/Qpid-ACLs.xml
+++ b/qpid/doc/book/src/Qpid-ACLs.xml
diff --git a/doc/book/src/Qpid-Book.xml b/qpid/doc/book/src/Qpid-Book.xml
index ee69532152..ee69532152 100644
--- a/doc/book/src/Qpid-Book.xml
+++ b/qpid/doc/book/src/Qpid-Book.xml
diff --git a/doc/book/src/Qpid-Compatibility-And-Interoperability-Book.xml b/qpid/doc/book/src/Qpid-Compatibility-And-Interoperability-Book.xml
index f382f390c7..f382f390c7 100644
--- a/doc/book/src/Qpid-Compatibility-And-Interoperability-Book.xml
+++ b/qpid/doc/book/src/Qpid-Compatibility-And-Interoperability-Book.xml
diff --git a/doc/book/src/Qpid-Interoperability-Documentation.xml b/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml
index 74546693df..74546693df 100644
--- a/doc/book/src/Qpid-Interoperability-Documentation.xml
+++ b/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml
diff --git a/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml b/qpid/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml
index 1806ab01b1..1806ab01b1 100644
--- a/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml
+++ b/qpid/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml
diff --git a/doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml b/qpid/doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml
index 55e1f8e829..55e1f8e829 100644
--- a/doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml
+++ b/qpid/doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml
diff --git a/doc/book/src/Qpid-JMX-Management-Console.xml b/qpid/doc/book/src/Qpid-JMX-Management-Console.xml
index fb46f4a01a..fb46f4a01a 100644
--- a/doc/book/src/Qpid-JMX-Management-Console.xml
+++ b/qpid/doc/book/src/Qpid-JMX-Management-Console.xml
diff --git a/doc/book/src/Qpid-Java-Broker-Management-CLI.xml b/qpid/doc/book/src/Qpid-Java-Broker-Management-CLI.xml
index 3042e53a3f..3042e53a3f 100644
--- a/doc/book/src/Qpid-Java-Broker-Management-CLI.xml
+++ b/qpid/doc/book/src/Qpid-Java-Broker-Management-CLI.xml
diff --git a/doc/book/src/Qpid-Java-Build-How-To.xml b/qpid/doc/book/src/Qpid-Java-Build-How-To.xml
index f38109a3fb..f38109a3fb 100644
--- a/doc/book/src/Qpid-Java-Build-How-To.xml
+++ b/qpid/doc/book/src/Qpid-Java-Build-How-To.xml
diff --git a/doc/book/src/Qpid-Java-FAQ.xml b/qpid/doc/book/src/Qpid-Java-FAQ.xml
index 7a28703774..7a28703774 100644
--- a/doc/book/src/Qpid-Java-FAQ.xml
+++ b/qpid/doc/book/src/Qpid-Java-FAQ.xml
diff --git a/doc/book/src/Qpid-Management-Features.xml b/qpid/doc/book/src/Qpid-Management-Features.xml
index c90d7e97c6..c90d7e97c6 100644
--- a/doc/book/src/Qpid-Management-Features.xml
+++ b/qpid/doc/book/src/Qpid-Management-Features.xml
diff --git a/doc/book/src/Qpid-Management-Framework.xml b/qpid/doc/book/src/Qpid-Management-Framework.xml
index 89bfe9d95e..89bfe9d95e 100644
--- a/doc/book/src/Qpid-Management-Framework.xml
+++ b/qpid/doc/book/src/Qpid-Management-Framework.xml
diff --git a/doc/book/src/Qpid-Troubleshooting-Guide.xml b/qpid/doc/book/src/Qpid-Troubleshooting-Guide.xml
index cc642f2cdb..cc642f2cdb 100644
--- a/doc/book/src/Qpid-Troubleshooting-Guide.xml
+++ b/qpid/doc/book/src/Qpid-Troubleshooting-Guide.xml
diff --git a/doc/book/src/Running-CPP-Broker.xml b/qpid/doc/book/src/Running-CPP-Broker.xml
index 151f0cfa33..151f0cfa33 100644
--- a/doc/book/src/Running-CPP-Broker.xml
+++ b/qpid/doc/book/src/Running-CPP-Broker.xml
diff --git a/doc/book/src/SASL-Compatibility.xml b/qpid/doc/book/src/SASL-Compatibility.xml
index ad223792b5..ad223792b5 100644
--- a/doc/book/src/SASL-Compatibility.xml
+++ b/qpid/doc/book/src/SASL-Compatibility.xml
diff --git a/doc/book/src/SSL.xml b/qpid/doc/book/src/SSL.xml
index a9a5cb953a..a9a5cb953a 100644
--- a/doc/book/src/SSL.xml
+++ b/qpid/doc/book/src/SSL.xml
diff --git a/doc/book/src/Security-Plugins.xml b/qpid/doc/book/src/Security-Plugins.xml
index 55cd651bb5..55cd651bb5 100644
--- a/doc/book/src/Security-Plugins.xml
+++ b/qpid/doc/book/src/Security-Plugins.xml
diff --git a/doc/book/src/Security.xml b/qpid/doc/book/src/Security.xml
index 49abfbebca..49abfbebca 100644
--- a/doc/book/src/Security.xml
+++ b/qpid/doc/book/src/Security.xml
diff --git a/doc/book/src/Starting-a-cluster.xml b/qpid/doc/book/src/Starting-a-cluster.xml
index 036e571649..036e571649 100644
--- a/doc/book/src/Starting-a-cluster.xml
+++ b/qpid/doc/book/src/Starting-a-cluster.xml
diff --git a/doc/book/src/System-Properties.xml b/qpid/doc/book/src/System-Properties.xml
index d61673f234..d61673f234 100644
--- a/doc/book/src/System-Properties.xml
+++ b/qpid/doc/book/src/System-Properties.xml
diff --git a/doc/book/src/Use-Priority-Queues.xml b/qpid/doc/book/src/Use-Priority-Queues.xml
index eeac3de06d..eeac3de06d 100644
--- a/doc/book/src/Use-Priority-Queues.xml
+++ b/qpid/doc/book/src/Use-Priority-Queues.xml
diff --git a/doc/book/src/Using-Broker-Federation.xml b/qpid/doc/book/src/Using-Broker-Federation.xml
index f5fedf814c..f5fedf814c 100644
--- a/doc/book/src/Using-Broker-Federation.xml
+++ b/qpid/doc/book/src/Using-Broker-Federation.xml
diff --git a/doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml b/qpid/doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml
index 2bd7d761ef..2bd7d761ef 100644
--- a/doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml
+++ b/qpid/doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml
diff --git a/doc/book/src/WCF.xml b/qpid/doc/book/src/WCF.xml
index aaf54463db..aaf54463db 100644
--- a/doc/book/src/WCF.xml
+++ b/qpid/doc/book/src/WCF.xml
diff --git a/doc/book/src/amqp-advanced-message-queueing-protocol.html b/qpid/doc/book/src/amqp-advanced-message-queueing-protocol.html
index 9d46429d03..9d46429d03 100644
--- a/doc/book/src/amqp-advanced-message-queueing-protocol.html
+++ b/qpid/doc/book/src/amqp-advanced-message-queueing-protocol.html
diff --git a/doc/book/src/images/jmx_console/3113098.png b/qpid/doc/book/src/images/jmx_console/3113098.png
index 7de85030c6..7de85030c6 100644
--- a/doc/book/src/images/jmx_console/3113098.png
+++ b/qpid/doc/book/src/images/jmx_console/3113098.png
diff --git a/doc/book/src/images/jmx_console/3113099.png b/qpid/doc/book/src/images/jmx_console/3113099.png
index fb6fc65d73..fb6fc65d73 100644
--- a/doc/book/src/images/jmx_console/3113099.png
+++ b/qpid/doc/book/src/images/jmx_console/3113099.png
diff --git a/doc/book/src/images/jmx_console/3113100.png b/qpid/doc/book/src/images/jmx_console/3113100.png
index a7d727b854..a7d727b854 100644
--- a/doc/book/src/images/jmx_console/3113100.png
+++ b/qpid/doc/book/src/images/jmx_console/3113100.png
diff --git a/doc/book/src/images/jmx_console/3113101.png b/qpid/doc/book/src/images/jmx_console/3113101.png
index 30731277c2..30731277c2 100644
--- a/doc/book/src/images/jmx_console/3113101.png
+++ b/qpid/doc/book/src/images/jmx_console/3113101.png
diff --git a/doc/book/src/images/jmx_console/3113102.png b/qpid/doc/book/src/images/jmx_console/3113102.png
index f150a21b10..f150a21b10 100644
--- a/doc/book/src/images/jmx_console/3113102.png
+++ b/qpid/doc/book/src/images/jmx_console/3113102.png
diff --git a/doc/book/src/images/jmx_console/3113103.png b/qpid/doc/book/src/images/jmx_console/3113103.png
index a91efb4306..a91efb4306 100644
--- a/doc/book/src/images/jmx_console/3113103.png
+++ b/qpid/doc/book/src/images/jmx_console/3113103.png
diff --git a/doc/book/src/images/jmx_console/3113104.png b/qpid/doc/book/src/images/jmx_console/3113104.png
index c5ef12d8b1..c5ef12d8b1 100644
--- a/doc/book/src/images/jmx_console/3113104.png
+++ b/qpid/doc/book/src/images/jmx_console/3113104.png
diff --git a/doc/book/src/images/jmx_console/3113105.png b/qpid/doc/book/src/images/jmx_console/3113105.png
index b155f9d9a1..b155f9d9a1 100644
--- a/doc/book/src/images/jmx_console/3113105.png
+++ b/qpid/doc/book/src/images/jmx_console/3113105.png
diff --git a/doc/book/src/images/jmx_console/3113106.png b/qpid/doc/book/src/images/jmx_console/3113106.png
index 22bcdd084e..22bcdd084e 100644
--- a/doc/book/src/images/jmx_console/3113106.png
+++ b/qpid/doc/book/src/images/jmx_console/3113106.png
diff --git a/doc/book/src/images/jmx_console/3113107.png b/qpid/doc/book/src/images/jmx_console/3113107.png
index cf5dd97e89..cf5dd97e89 100644
--- a/doc/book/src/images/jmx_console/3113107.png
+++ b/qpid/doc/book/src/images/jmx_console/3113107.png
diff --git a/doc/book/src/images/jmx_console/3113108.png b/qpid/doc/book/src/images/jmx_console/3113108.png
index c0e5eafde2..c0e5eafde2 100644
--- a/doc/book/src/images/jmx_console/3113108.png
+++ b/qpid/doc/book/src/images/jmx_console/3113108.png
diff --git a/doc/book/src/images/jmx_console/3113109.png b/qpid/doc/book/src/images/jmx_console/3113109.png
index 139d81d849..139d81d849 100644
--- a/doc/book/src/images/jmx_console/3113109.png
+++ b/qpid/doc/book/src/images/jmx_console/3113109.png
diff --git a/doc/book/src/images/jmx_console/3113110.png b/qpid/doc/book/src/images/jmx_console/3113110.png
index 2207f15cd7..2207f15cd7 100644
--- a/doc/book/src/images/jmx_console/3113110.png
+++ b/qpid/doc/book/src/images/jmx_console/3113110.png
diff --git a/doc/book/src/images/jmx_console/3113111.png b/qpid/doc/book/src/images/jmx_console/3113111.png
index 5737f41caf..5737f41caf 100644
--- a/doc/book/src/images/jmx_console/3113111.png
+++ b/qpid/doc/book/src/images/jmx_console/3113111.png
diff --git a/doc/book/src/images/jmx_console/3113112.png b/qpid/doc/book/src/images/jmx_console/3113112.png
index d9ee094ab4..d9ee094ab4 100644
--- a/doc/book/src/images/jmx_console/3113112.png
+++ b/qpid/doc/book/src/images/jmx_console/3113112.png
diff --git a/doc/book/src/images/jmx_console/3113113.png b/qpid/doc/book/src/images/jmx_console/3113113.png
index e80812f83c..e80812f83c 100644
--- a/doc/book/src/images/jmx_console/3113113.png
+++ b/qpid/doc/book/src/images/jmx_console/3113113.png
diff --git a/doc/book/src/images/jmx_console/3113114.png b/qpid/doc/book/src/images/jmx_console/3113114.png
index b237181150..b237181150 100644
--- a/doc/book/src/images/jmx_console/3113114.png
+++ b/qpid/doc/book/src/images/jmx_console/3113114.png
diff --git a/doc/book/src/images/jmx_console/3113115.png b/qpid/doc/book/src/images/jmx_console/3113115.png
index 84ad42b567..84ad42b567 100644
--- a/doc/book/src/images/jmx_console/3113115.png
+++ b/qpid/doc/book/src/images/jmx_console/3113115.png
diff --git a/doc/book/src/images/jmx_console/3113116.png b/qpid/doc/book/src/images/jmx_console/3113116.png
index 18b979792f..18b979792f 100644
--- a/doc/book/src/images/jmx_console/3113116.png
+++ b/qpid/doc/book/src/images/jmx_console/3113116.png
diff --git a/doc/book/src/images/jmx_console/3113117.png b/qpid/doc/book/src/images/jmx_console/3113117.png
index 3b33ef67ac..3b33ef67ac 100644
--- a/doc/book/src/images/jmx_console/3113117.png
+++ b/qpid/doc/book/src/images/jmx_console/3113117.png
diff --git a/doc/book/src/images/jmx_console/3113118.png b/qpid/doc/book/src/images/jmx_console/3113118.png
index 60451f88cf..60451f88cf 100644
--- a/doc/book/src/images/jmx_console/3113118.png
+++ b/qpid/doc/book/src/images/jmx_console/3113118.png
diff --git a/doc/book/src/images/jmx_console/3113119.png b/qpid/doc/book/src/images/jmx_console/3113119.png
index 16ded074bd..16ded074bd 100644
--- a/doc/book/src/images/jmx_console/3113119.png
+++ b/qpid/doc/book/src/images/jmx_console/3113119.png
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/configuration/Topic-Configuration.xml b/qpid/doc/book/src/java/broker/configuration/Topic-Configuration.xml
index 1f73bbd7a4..1f73bbd7a4 100644
--- a/doc/book/src/java/broker/configuration/Topic-Configuration.xml
+++ b/qpid/doc/book/src/java/broker/configuration/Topic-Configuration.xml
diff --git a/doc/book/src/producer-flow-control.xml b/qpid/doc/book/src/producer-flow-control.xml
index fd44f51e81..fd44f51e81 100644
--- a/doc/book/src/producer-flow-control.xml
+++ b/qpid/doc/book/src/producer-flow-control.xml
diff --git a/doc/book/src/queue-state-replication.xml b/qpid/doc/book/src/queue-state-replication.xml
index 3ffac805eb..3ffac805eb 100644
--- a/doc/book/src/queue-state-replication.xml
+++ b/qpid/doc/book/src/queue-state-replication.xml
diff --git a/doc/book/src/schemas.xml b/qpid/doc/book/src/schemas.xml
index d0bec81aed..d0bec81aed 100644
--- a/doc/book/src/schemas.xml
+++ b/qpid/doc/book/src/schemas.xml
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 6a0c2876ab..6a0c2876ab 100644
--- a/doc/website/README.txt
+++ b/qpid/doc/website/README.txt
diff --git a/doc/website/build.sh b/qpid/doc/website/build.sh
index 25162b4de0..25162b4de0 100755
--- a/doc/website/build.sh
+++ b/qpid/doc/website/build.sh
diff --git a/doc/website/content/.htaccess b/qpid/doc/website/content/.htaccess
index a6ab32531b..a6ab32531b 100644
--- a/doc/website/content/.htaccess
+++ b/qpid/doc/website/content/.htaccess
diff --git a/doc/website/content/acknowledgements.html b/qpid/doc/website/content/acknowledgements.html
index daeb21c172..daeb21c172 100644
--- a/doc/website/content/acknowledgements.html
+++ b/qpid/doc/website/content/acknowledgements.html
diff --git a/doc/website/content/amqp.html b/qpid/doc/website/content/amqp.html
index a251164d07..a251164d07 100644
--- a/doc/website/content/amqp.html
+++ b/qpid/doc/website/content/amqp.html
diff --git a/doc/website/content/compatibility.html b/qpid/doc/website/content/compatibility.html
index a213665ba6..a213665ba6 100644
--- a/doc/website/content/compatibility.html
+++ b/qpid/doc/website/content/compatibility.html
diff --git a/doc/website/content/documentation.html b/qpid/doc/website/content/documentation.html
index 304c9ea26f..304c9ea26f 100644
--- a/doc/website/content/documentation.html
+++ b/qpid/doc/website/content/documentation.html
diff --git a/doc/website/content/download.cgi b/qpid/doc/website/content/download.cgi
index c4e25082c8..c4e25082c8 100644
--- a/doc/website/content/download.cgi
+++ b/qpid/doc/website/content/download.cgi
diff --git a/doc/website/content/download.html b/qpid/doc/website/content/download.html
index 477e7aa0cf..477e7aa0cf 100644
--- a/doc/website/content/download.html
+++ b/qpid/doc/website/content/download.html
diff --git a/doc/website/content/getting_involved.html b/qpid/doc/website/content/getting_involved.html
index 033abdc443..033abdc443 100644
--- a/doc/website/content/getting_involved.html
+++ b/qpid/doc/website/content/getting_involved.html
diff --git a/doc/website/content/getting_started.html b/qpid/doc/website/content/getting_started.html
index 5706d77781..5706d77781 100644
--- a/doc/website/content/getting_started.html
+++ b/qpid/doc/website/content/getting_started.html
diff --git a/doc/website/content/images/README.txt b/qpid/doc/website/content/images/README.txt
index c53909bfd2..c53909bfd2 100644
--- a/doc/website/content/images/README.txt
+++ b/qpid/doc/website/content/images/README.txt
diff --git a/doc/website/content/images/jprofiler.png b/qpid/doc/website/content/images/jprofiler.png
index 7c5da2cf94..7c5da2cf94 100644
--- a/doc/website/content/images/jprofiler.png
+++ b/qpid/doc/website/content/images/jprofiler.png
diff --git a/doc/website/content/images/structure101.jpg b/qpid/doc/website/content/images/structure101.jpg
index 9242ea9176..9242ea9176 100644
--- a/doc/website/content/images/structure101.jpg
+++ b/qpid/doc/website/content/images/structure101.jpg
diff --git a/doc/website/content/index.html b/qpid/doc/website/content/index.html
index 16e96ebc7a..16e96ebc7a 100644
--- a/doc/website/content/index.html
+++ b/qpid/doc/website/content/index.html
diff --git a/doc/website/content/mailing_lists.html b/qpid/doc/website/content/mailing_lists.html
index b1c5266e40..b1c5266e40 100644
--- a/doc/website/content/mailing_lists.html
+++ b/qpid/doc/website/content/mailing_lists.html
diff --git a/doc/website/content/people.html b/qpid/doc/website/content/people.html
index 23cafa2b53..23cafa2b53 100644
--- a/doc/website/content/people.html
+++ b/qpid/doc/website/content/people.html
diff --git a/doc/website/content/qpid_integrated_with.html b/qpid/doc/website/content/qpid_integrated_with.html
index a2b53209c7..a2b53209c7 100644
--- a/doc/website/content/qpid_integrated_with.html
+++ b/qpid/doc/website/content/qpid_integrated_with.html
diff --git a/doc/website/content/qpid_project_etiquette_guide.html b/qpid/doc/website/content/qpid_project_etiquette_guide.html
index 7ce69c327a..7ce69c327a 100644
--- a/doc/website/content/qpid_project_etiquette_guide.html
+++ b/qpid/doc/website/content/qpid_project_etiquette_guide.html
diff --git a/doc/website/content/release_notes_0.10.html b/qpid/doc/website/content/release_notes_0.10.html
index 5a93082b87..5a93082b87 100644
--- a/doc/website/content/release_notes_0.10.html
+++ b/qpid/doc/website/content/release_notes_0.10.html
diff --git a/doc/website/content/release_notes_0.8.html b/qpid/doc/website/content/release_notes_0.8.html
index 2e0bb1fd7a..2e0bb1fd7a 100644
--- a/doc/website/content/release_notes_0.8.html
+++ b/qpid/doc/website/content/release_notes_0.8.html
diff --git a/doc/website/content/source_repository.html b/qpid/doc/website/content/source_repository.html
index 147669991e..147669991e 100644
--- a/doc/website/content/source_repository.html
+++ b/qpid/doc/website/content/source_repository.html
diff --git a/doc/website/example/images/asf-logo.png b/qpid/doc/website/example/images/asf-logo.png
index d824fab768..d824fab768 100644
--- a/doc/website/example/images/asf-logo.png
+++ b/qpid/doc/website/example/images/asf-logo.png
diff --git a/doc/website/example/images/asf_logo.gif b/qpid/doc/website/example/images/asf_logo.gif
index 22eb9d7358..22eb9d7358 100644
--- a/doc/website/example/images/asf_logo.gif
+++ b/qpid/doc/website/example/images/asf_logo.gif
diff --git a/doc/website/example/images/header.png b/qpid/doc/website/example/images/header.png
index 9cd149fb29..9cd149fb29 100644
--- a/doc/website/example/images/header.png
+++ b/qpid/doc/website/example/images/header.png
diff --git a/doc/website/example/images/main_body.png b/qpid/doc/website/example/images/main_body.png
index a29bdeecd6..a29bdeecd6 100644
--- a/doc/website/example/images/main_body.png
+++ b/qpid/doc/website/example/images/main_body.png
diff --git a/doc/website/example/images/main_bottom.png b/qpid/doc/website/example/images/main_bottom.png
index 319288a717..319288a717 100644
--- a/doc/website/example/images/main_bottom.png
+++ b/qpid/doc/website/example/images/main_bottom.png
diff --git a/doc/website/example/images/main_top.png b/qpid/doc/website/example/images/main_top.png
index ffefe05a8d..ffefe05a8d 100644
--- a/doc/website/example/images/main_top.png
+++ b/qpid/doc/website/example/images/main_top.png
diff --git a/doc/website/example/images/menu_body.png b/qpid/doc/website/example/images/menu_body.png
index 39b2e22205..39b2e22205 100644
--- a/doc/website/example/images/menu_body.png
+++ b/qpid/doc/website/example/images/menu_body.png
diff --git a/doc/website/example/images/menu_bottom.png b/qpid/doc/website/example/images/menu_bottom.png
index 21bd16aeba..21bd16aeba 100644
--- a/doc/website/example/images/menu_bottom.png
+++ b/qpid/doc/website/example/images/menu_bottom.png
diff --git a/doc/website/example/images/menu_top.png b/qpid/doc/website/example/images/menu_top.png
index dea7164ef0..dea7164ef0 100644
--- a/doc/website/example/images/menu_top.png
+++ b/qpid/doc/website/example/images/menu_top.png
diff --git a/doc/website/example/images/qpid-logo-900x480.png b/qpid/doc/website/example/images/qpid-logo-900x480.png
index 3e12816142..3e12816142 100644
--- a/doc/website/example/images/qpid-logo-900x480.png
+++ b/qpid/doc/website/example/images/qpid-logo-900x480.png
diff --git a/doc/website/example/images/qpid-logo.png b/qpid/doc/website/example/images/qpid-logo.png
index f6d4bfdbad..f6d4bfdbad 100644
--- a/doc/website/example/images/qpid-logo.png
+++ b/qpid/doc/website/example/images/qpid-logo.png
diff --git a/doc/website/example/index.html b/qpid/doc/website/example/index.html
index 308ac94765..308ac94765 100644
--- a/doc/website/example/index.html
+++ b/qpid/doc/website/example/index.html
diff --git a/doc/website/example/style.css b/qpid/doc/website/example/style.css
index 1e05052a03..1e05052a03 100644
--- a/doc/website/example/style.css
+++ b/qpid/doc/website/example/style.css
diff --git a/doc/website/template/images/asf-logo.png b/qpid/doc/website/template/images/asf-logo.png
index d824fab768..d824fab768 100644
--- a/doc/website/template/images/asf-logo.png
+++ b/qpid/doc/website/template/images/asf-logo.png
diff --git a/doc/website/template/images/asf_logo.gif b/qpid/doc/website/template/images/asf_logo.gif
index 22eb9d7358..22eb9d7358 100644
--- a/doc/website/template/images/asf_logo.gif
+++ b/qpid/doc/website/template/images/asf_logo.gif
diff --git a/doc/website/template/images/header.png b/qpid/doc/website/template/images/header.png
index 66e35d7e37..66e35d7e37 100644
--- a/doc/website/template/images/header.png
+++ b/qpid/doc/website/template/images/header.png
diff --git a/doc/website/template/images/main_body.png b/qpid/doc/website/template/images/main_body.png
index a29bdeecd6..a29bdeecd6 100644
--- a/doc/website/template/images/main_body.png
+++ b/qpid/doc/website/template/images/main_body.png
diff --git a/doc/website/template/images/main_bottom.png b/qpid/doc/website/template/images/main_bottom.png
index 319288a717..319288a717 100644
--- a/doc/website/template/images/main_bottom.png
+++ b/qpid/doc/website/template/images/main_bottom.png
diff --git a/doc/website/template/images/main_top.png b/qpid/doc/website/template/images/main_top.png
index ffefe05a8d..ffefe05a8d 100644
--- a/doc/website/template/images/main_top.png
+++ b/qpid/doc/website/template/images/main_top.png
diff --git a/doc/website/template/images/menu_body.png b/qpid/doc/website/template/images/menu_body.png
index 39b2e22205..39b2e22205 100644
--- a/doc/website/template/images/menu_body.png
+++ b/qpid/doc/website/template/images/menu_body.png
diff --git a/doc/website/template/images/menu_bottom.png b/qpid/doc/website/template/images/menu_bottom.png
index 21bd16aeba..21bd16aeba 100644
--- a/doc/website/template/images/menu_bottom.png
+++ b/qpid/doc/website/template/images/menu_bottom.png
diff --git a/doc/website/template/images/menu_top.png b/qpid/doc/website/template/images/menu_top.png
index dea7164ef0..dea7164ef0 100644
--- a/doc/website/template/images/menu_top.png
+++ b/qpid/doc/website/template/images/menu_top.png
diff --git a/doc/website/template/images/qpid-logo-900x480.png b/qpid/doc/website/template/images/qpid-logo-900x480.png
index 3e12816142..3e12816142 100644
--- a/doc/website/template/images/qpid-logo-900x480.png
+++ b/qpid/doc/website/template/images/qpid-logo-900x480.png
diff --git a/doc/website/template/images/qpid-logo.png b/qpid/doc/website/template/images/qpid-logo.png
index 95d49ea469..95d49ea469 100644
--- a/doc/website/template/images/qpid-logo.png
+++ b/qpid/doc/website/template/images/qpid-logo.png
diff --git a/doc/website/template/style.css b/qpid/doc/website/template/style.css
index 57dc571425..57dc571425 100644
--- a/doc/website/template/style.css
+++ b/qpid/doc/website/template/style.css
diff --git a/doc/website/template/template.html b/qpid/doc/website/template/template.html
index fab61a4ffa..fab61a4ffa 100644
--- a/doc/website/template/template.html
+++ b/qpid/doc/website/template/template.html
diff --git a/doc/website/tools/generate b/qpid/doc/website/tools/generate
index a45e803793..a45e803793 100755
--- a/doc/website/tools/generate
+++ b/qpid/doc/website/tools/generate
diff --git a/doc/website/tools/wrap b/qpid/doc/website/tools/wrap
index d756da7335..d756da7335 100755
--- a/doc/website/tools/wrap
+++ b/qpid/doc/website/tools/wrap
diff --git a/dotnet/Consumer/Program.cs b/qpid/dotnet/Consumer/Program.cs
index d9a6224a42..d9a6224a42 100644
--- a/dotnet/Consumer/Program.cs
+++ b/qpid/dotnet/Consumer/Program.cs
diff --git a/dotnet/Consumer/default.build b/qpid/dotnet/Consumer/default.build
index 5b1e3166c5..5b1e3166c5 100644
--- a/dotnet/Consumer/default.build
+++ b/qpid/dotnet/Consumer/default.build
diff --git a/dotnet/LICENSE.txt b/qpid/dotnet/LICENSE.txt
index 981d2f83c3..981d2f83c3 100644
--- a/dotnet/LICENSE.txt
+++ b/qpid/dotnet/LICENSE.txt
diff --git a/dotnet/NOTICE.txt b/qpid/dotnet/NOTICE.txt
index 0b22ed3ab2..0b22ed3ab2 100644
--- a/dotnet/NOTICE.txt
+++ b/qpid/dotnet/NOTICE.txt
diff --git a/dotnet/Producer/Program.cs b/qpid/dotnet/Producer/Program.cs
index 83dbf597ed..83dbf597ed 100644
--- a/dotnet/Producer/Program.cs
+++ b/qpid/dotnet/Producer/Program.cs
diff --git a/dotnet/Producer/default.build b/qpid/dotnet/Producer/default.build
index 72d2a3fa8d..72d2a3fa8d 100644
--- a/dotnet/Producer/default.build
+++ b/qpid/dotnet/Producer/default.build
diff --git a/dotnet/Program.cs b/qpid/dotnet/Program.cs
index d9a6224a42..d9a6224a42 100644
--- a/dotnet/Program.cs
+++ b/qpid/dotnet/Program.cs
diff --git a/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
index 2f49033c2d..2f49033c2d 100644
--- a/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj b/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
index 72d3ccc82f..72d3ccc82f 100644
--- a/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
+++ b/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
diff --git a/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs b/qpid/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs
index b028bdb1ee..b028bdb1ee 100644
--- a/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs
+++ b/qpid/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs
diff --git a/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs b/qpid/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs
index 7dec7c390f..7dec7c390f 100644
--- a/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs
+++ b/qpid/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs
diff --git a/dotnet/Qpid.Buffer.Tests/default.build b/qpid/dotnet/Qpid.Buffer.Tests/default.build
index 77e95fb9d9..77e95fb9d9 100644
--- a/dotnet/Qpid.Buffer.Tests/default.build
+++ b/qpid/dotnet/Qpid.Buffer.Tests/default.build
diff --git a/dotnet/Qpid.Buffer/BufferOverflowException.cs b/qpid/dotnet/Qpid.Buffer/BufferOverflowException.cs
index 5a2fff74a7..5a2fff74a7 100644
--- a/dotnet/Qpid.Buffer/BufferOverflowException.cs
+++ b/qpid/dotnet/Qpid.Buffer/BufferOverflowException.cs
diff --git a/dotnet/Qpid.Buffer/BufferUnderflowException.cs b/qpid/dotnet/Qpid.Buffer/BufferUnderflowException.cs
index 13939b77a8..13939b77a8 100644
--- a/dotnet/Qpid.Buffer/BufferUnderflowException.cs
+++ b/qpid/dotnet/Qpid.Buffer/BufferUnderflowException.cs
diff --git a/dotnet/Qpid.Buffer/ByteBuffer.cs b/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs
index 67f0edd440..67f0edd440 100644
--- a/dotnet/Qpid.Buffer/ByteBuffer.cs
+++ b/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs
diff --git a/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs b/qpid/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs
index 4c2856c333..4c2856c333 100644
--- a/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs
+++ b/qpid/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs
diff --git a/dotnet/Qpid.Buffer/IByteBufferAllocator.cs b/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs
index 74944f7e69..74944f7e69 100644
--- a/dotnet/Qpid.Buffer/IByteBufferAllocator.cs
+++ b/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs
diff --git a/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
index b692af7ce5..b692af7ce5 100644
--- a/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Buffer/Qpid.Buffer.csproj b/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
index d13f399196..d13f399196 100644
--- a/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
+++ b/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
diff --git a/dotnet/Qpid.Buffer/SimpleByteBuffer.cs b/qpid/dotnet/Qpid.Buffer/SimpleByteBuffer.cs
index 956c59aa45..956c59aa45 100644
--- a/dotnet/Qpid.Buffer/SimpleByteBuffer.cs
+++ b/qpid/dotnet/Qpid.Buffer/SimpleByteBuffer.cs
diff --git a/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs b/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
index e772e59ae3..e772e59ae3 100644
--- a/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
+++ b/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
diff --git a/dotnet/Qpid.Buffer/SlicedByteBuffer.cs b/qpid/dotnet/Qpid.Buffer/SlicedByteBuffer.cs
index 890e2a3c7a..890e2a3c7a 100644
--- a/dotnet/Qpid.Buffer/SlicedByteBuffer.cs
+++ b/qpid/dotnet/Qpid.Buffer/SlicedByteBuffer.cs
diff --git a/dotnet/Qpid.Buffer/default.build b/qpid/dotnet/Qpid.Buffer/default.build
index efb5a8fc89..efb5a8fc89 100644
--- a/dotnet/Qpid.Buffer/default.build
+++ b/qpid/dotnet/Qpid.Buffer/default.build
diff --git a/dotnet/Qpid.Client.Tests/App.config b/qpid/dotnet/Qpid.Client.Tests/App.config
index e71a468a3a..e71a468a3a 100644
--- a/dotnet/Qpid.Client.Tests/App.config
+++ b/qpid/dotnet/Qpid.Client.Tests/App.config
diff --git a/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs b/qpid/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs
index 56269c0f9d..56269c0f9d 100644
--- a/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs
diff --git a/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs b/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs
index f4f217c2a0..f4f217c2a0 100644
--- a/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs
diff --git a/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs b/qpid/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs
index 4db3c91cb5..4db3c91cb5 100644
--- a/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs
diff --git a/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
index c710818053..c710818053 100644
--- a/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
index 73eabfa1f8..73eabfa1f8 100644
--- a/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
+++ b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
diff --git a/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs b/qpid/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs
index f1446a9aa6..f1446a9aa6 100644
--- a/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs
diff --git a/dotnet/Qpid.Client.Tests/default.build b/qpid/dotnet/Qpid.Client.Tests/default.build
index 5116e651e1..5116e651e1 100644
--- a/dotnet/Qpid.Client.Tests/default.build
+++ b/qpid/dotnet/Qpid.Client.Tests/default.build
diff --git a/dotnet/Qpid.Client.Tests/interop/Consumer.cs b/qpid/dotnet/Qpid.Client.Tests/interop/Consumer.cs
index d60514ae4c..d60514ae4c 100644
--- a/dotnet/Qpid.Client.Tests/interop/Consumer.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/interop/Consumer.cs
diff --git a/dotnet/Qpid.Client.Tests/interop/Producer.cs b/qpid/dotnet/Qpid.Client.Tests/interop/Producer.cs
index d775080fc3..d775080fc3 100644
--- a/dotnet/Qpid.Client.Tests/interop/Producer.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/interop/Producer.cs
diff --git a/dotnet/Qpid.Client.Tests/interop/TopicListener.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs
index e5daa64a89..e5daa64a89 100644
--- a/dotnet/Qpid.Client.Tests/interop/TopicListener.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs
diff --git a/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs
index 4fd0419e9c..4fd0419e9c 100644
--- a/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs
diff --git a/dotnet/Qpid.Client.Tests/lib/nunit/nunit-licence.txt b/qpid/dotnet/Qpid.Client.Tests/lib/nunit/nunit-licence.txt
index b2316295d3..b2316295d3 100644
--- a/dotnet/Qpid.Client.Tests/lib/nunit/nunit-licence.txt
+++ b/qpid/dotnet/Qpid.Client.Tests/lib/nunit/nunit-licence.txt
diff --git a/dotnet/Qpid.Client.Tests/lib/nunit/nunit.framework.dll b/qpid/dotnet/Qpid.Client.Tests/lib/nunit/nunit.framework.dll
index 53666e74c9..53666e74c9 100644
--- a/dotnet/Qpid.Client.Tests/lib/nunit/nunit.framework.dll
+++ b/qpid/dotnet/Qpid.Client.Tests/lib/nunit/nunit.framework.dll
diff --git a/dotnet/Qpid.Client.Tests/log4net.config b/qpid/dotnet/Qpid.Client.Tests/log4net.config
index 0ad25c4185..0ad25c4185 100644
--- a/dotnet/Qpid.Client.Tests/log4net.config
+++ b/qpid/dotnet/Qpid.Client.Tests/log4net.config
diff --git a/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs b/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
index 3c9f8dd4e2..3c9f8dd4e2 100644
--- a/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs
index b62b11a3db..b62b11a3db 100644
--- a/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs
+++ b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs
index 17f911fb6d..17f911fb6d 100644
--- a/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs
+++ b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs
index 5f67e99838..5f67e99838 100644
--- a/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs
+++ b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
index 19599b0833..19599b0833 100644
--- a/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj
index 6a0b1cd8e6..6a0b1cd8e6 100644
--- a/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj
+++ b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp
index 54c3be76e5..54c3be76e5 100644
--- a/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp
+++ b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp
diff --git a/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs b/qpid/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs
index 7bb64e3fff..7bb64e3fff 100644
--- a/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs
+++ b/qpid/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs
diff --git a/dotnet/Qpid.Client/Client/AMQConnection.cs b/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs
index 41d4e089b6..41d4e089b6 100644
--- a/dotnet/Qpid.Client/Client/AMQConnection.cs
+++ b/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs
diff --git a/dotnet/Qpid.Client/Client/AMQConnectionException.cs b/qpid/dotnet/Qpid.Client/Client/AMQConnectionException.cs
index c8a48814bb..c8a48814bb 100644
--- a/dotnet/Qpid.Client/Client/AMQConnectionException.cs
+++ b/qpid/dotnet/Qpid.Client/Client/AMQConnectionException.cs
diff --git a/dotnet/Qpid.Client/Client/AMQDestination.cs b/qpid/dotnet/Qpid.Client/Client/AMQDestination.cs
index 07ce3c2354..07ce3c2354 100644
--- a/dotnet/Qpid.Client/Client/AMQDestination.cs
+++ b/qpid/dotnet/Qpid.Client/Client/AMQDestination.cs
diff --git a/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs b/qpid/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs
index 5c9dd86c53..5c9dd86c53 100644
--- a/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs
+++ b/qpid/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs
diff --git a/dotnet/Qpid.Client/Client/AMQNoRouteException.cs b/qpid/dotnet/Qpid.Client/Client/AMQNoRouteException.cs
index 5868d78f32..5868d78f32 100644
--- a/dotnet/Qpid.Client/Client/AMQNoRouteException.cs
+++ b/qpid/dotnet/Qpid.Client/Client/AMQNoRouteException.cs
diff --git a/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs b/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
index 591c5b941f..591c5b941f 100644
--- a/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
+++ b/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
diff --git a/dotnet/Qpid.Client/Client/AmqChannel.cs b/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs
index 84c7c06fe1..84c7c06fe1 100644
--- a/dotnet/Qpid.Client/Client/AmqChannel.cs
+++ b/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs
diff --git a/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs b/qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
index fdac5e75f2..fdac5e75f2 100644
--- a/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
+++ b/qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
diff --git a/dotnet/Qpid.Client/Client/BasicMessageProducer.cs b/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs
index f33afc452e..f33afc452e 100644
--- a/dotnet/Qpid.Client/Client/BasicMessageProducer.cs
+++ b/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs
diff --git a/dotnet/Qpid.Client/Client/Closeable.cs b/qpid/dotnet/Qpid.Client/Client/Closeable.cs
index b9664ccea3..b9664ccea3 100644
--- a/dotnet/Qpid.Client/Client/Closeable.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Closeable.cs
diff --git a/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs b/qpid/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs
index 8d289fa956..8d289fa956 100644
--- a/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs
diff --git a/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs b/qpid/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs
index b21486bfa8..b21486bfa8 100644
--- a/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs
+++ b/qpid/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs
diff --git a/dotnet/Qpid.Client/Client/Failover/FailoverException.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverException.cs
index 7013746414..7013746414 100644
--- a/dotnet/Qpid.Client/Client/Failover/FailoverException.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverException.cs
diff --git a/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs
index 83c69b7d25..83c69b7d25 100644
--- a/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Failover/FailoverState.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverState.cs
index 3058cdcd69..3058cdcd69 100644
--- a/dotnet/Qpid.Client/Client/Failover/FailoverState.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverState.cs
diff --git a/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs
index afa5301f39..afa5301f39 100644
--- a/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs
index def1e78e8c..def1e78e8c 100644
--- a/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs
index f413dfc9c6..f413dfc9c6 100644
--- a/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs
index 9ed09a0d01..9ed09a0d01 100644
--- a/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs
index 66cff3bc65..66cff3bc65 100644
--- a/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs
index 038da15731..038da15731 100644
--- a/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs
index a12e4ead60..a12e4ead60 100644
--- a/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs
index 08cc580b17..08cc580b17 100644
--- a/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs
index 9333d4d0a6..9333d4d0a6 100644
--- a/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
index c54662286b..c54662286b 100644
--- a/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs
index 15a1d908b7..15a1d908b7 100644
--- a/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs
index 70aa3e1078..70aa3e1078 100644
--- a/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs
index 22db70575d..22db70575d 100644
--- a/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Message/AMQMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/AMQMessage.cs
index e58de2ab96..e58de2ab96 100644
--- a/dotnet/Qpid.Client/Client/Message/AMQMessage.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Message/AMQMessage.cs
diff --git a/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs
index f352d62c11..f352d62c11 100644
--- a/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs
diff --git a/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
index 34b47137e5..34b47137e5 100644
--- a/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
diff --git a/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs
index bed379290f..bed379290f 100644
--- a/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs
diff --git a/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs b/qpid/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs
index fdb5e14aa6..fdb5e14aa6 100644
--- a/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs
diff --git a/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
index fb3efb1b0f..fb3efb1b0f 100644
--- a/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
diff --git a/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs
index 3cc96cbddc..3cc96cbddc 100644
--- a/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs
diff --git a/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs
index 9ad1c26867..9ad1c26867 100644
--- a/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs
diff --git a/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
index 24aef92aa5..24aef92aa5 100644
--- a/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
diff --git a/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs
index 79871e85ca..79871e85ca 100644
--- a/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs
diff --git a/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs b/qpid/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs
index 4317ef3474..4317ef3474 100644
--- a/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs
diff --git a/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs
index d329712334..d329712334 100644
--- a/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs
index a7ce808862..a7ce808862 100644
--- a/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs
index c51538b70e..c51538b70e 100644
--- a/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs
index 1fb3d407eb..1fb3d407eb 100644
--- a/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs
index 2f23a1571d..2f23a1571d 100644
--- a/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs
index e3298200c4..e3298200c4 100644
--- a/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs
index 3b53f015f8..3b53f015f8 100644
--- a/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs
index 9cc9f8cee5..9cc9f8cee5 100644
--- a/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs
index b5450d00f7..b5450d00f7 100644
--- a/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs
index 8cdc1dbba9..8cdc1dbba9 100644
--- a/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs
index 11918f1ea2..11918f1ea2 100644
--- a/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs
diff --git a/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs b/qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
index ede8966f37..ede8966f37 100644
--- a/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
+++ b/qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
diff --git a/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs b/qpid/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs
index 9ac0381850..9ac0381850 100644
--- a/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs
diff --git a/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs b/qpid/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs
index 6ff45be04a..6ff45be04a 100644
--- a/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs b/qpid/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs
index 743ade77c9..743ade77c9 100644
--- a/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs
diff --git a/dotnet/Qpid.Client/Client/SslOptions.cs b/qpid/dotnet/Qpid.Client/Client/SslOptions.cs
index 4630121828..4630121828 100644
--- a/dotnet/Qpid.Client/Client/SslOptions.cs
+++ b/qpid/dotnet/Qpid.Client/Client/SslOptions.cs
diff --git a/dotnet/Qpid.Client/Client/State/AMQState.cs b/qpid/dotnet/Qpid.Client/Client/State/AMQState.cs
index 67f8427fb2..67f8427fb2 100644
--- a/dotnet/Qpid.Client/Client/State/AMQState.cs
+++ b/qpid/dotnet/Qpid.Client/Client/State/AMQState.cs
diff --git a/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs b/qpid/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs
index a464bbb6f5..a464bbb6f5 100644
--- a/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs
+++ b/qpid/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs
diff --git a/dotnet/Qpid.Client/Client/State/AMQStateManager.cs b/qpid/dotnet/Qpid.Client/Client/State/AMQStateManager.cs
index 881e01e697..881e01e697 100644
--- a/dotnet/Qpid.Client/Client/State/AMQStateManager.cs
+++ b/qpid/dotnet/Qpid.Client/Client/State/AMQStateManager.cs
diff --git a/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs b/qpid/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs
index 31e4b5046d..31e4b5046d 100644
--- a/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs
+++ b/qpid/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs
diff --git a/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs b/qpid/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs
index 0874f39665..0874f39665 100644
--- a/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs
+++ b/qpid/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs
diff --git a/dotnet/Qpid.Client/Client/State/IStateListener.cs b/qpid/dotnet/Qpid.Client/Client/State/IStateListener.cs
index edd7382f93..edd7382f93 100644
--- a/dotnet/Qpid.Client/Client/State/IStateListener.cs
+++ b/qpid/dotnet/Qpid.Client/Client/State/IStateListener.cs
diff --git a/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs b/qpid/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs
index 81de622617..81de622617 100644
--- a/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs
+++ b/qpid/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs
diff --git a/dotnet/Qpid.Client/Client/State/StateWaiter.cs b/qpid/dotnet/Qpid.Client/Client/State/StateWaiter.cs
index e739d0cb44..e739d0cb44 100644
--- a/dotnet/Qpid.Client/Client/State/StateWaiter.cs
+++ b/qpid/dotnet/Qpid.Client/Client/State/StateWaiter.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs b/qpid/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs
index dd0bb404cb..dd0bb404cb 100644
--- a/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs
index 1e217e755b..1e217e755b 100644
--- a/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs
index 35806f2a6e..35806f2a6e 100644
--- a/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs
index 0b59ee8799..0b59ee8799 100644
--- a/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs
index 592dff3a19..592dff3a19 100644
--- a/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs
index e0e890fc5a..e0e890fc5a 100644
--- a/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/ITransport.cs b/qpid/dotnet/Qpid.Client/Client/Transport/ITransport.cs
index 693a9a9534..693a9a9534 100644
--- a/dotnet/Qpid.Client/Client/Transport/ITransport.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/ITransport.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/IoHandler.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IoHandler.cs
index 0475236d92..0475236d92 100644
--- a/dotnet/Qpid.Client/Client/Transport/IoHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/IoHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs b/qpid/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs
index 9fa313152f..9fa313152f 100644
--- a/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs b/qpid/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs
index a1aa889ba0..a1aa889ba0 100644
--- a/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
index f336d8a80a..f336d8a80a 100644
--- a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs
index 4540f01f4e..4540f01f4e 100644
--- a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs
index 137fa19c0d..137fa19c0d 100644
--- a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs
index b6dd8c3be1..b6dd8c3be1 100644
--- a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs
index 8436e6fc4f..8436e6fc4f 100644
--- a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs
diff --git a/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs b/qpid/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs
index a06de9eac8..a06de9eac8 100644
--- a/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs
diff --git a/dotnet/Qpid.Client/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
index 670a4f90b2..670a4f90b2 100644
--- a/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Client/Qpid.Client.csproj b/qpid/dotnet/Qpid.Client/Qpid.Client.csproj
index 303f885149..303f885149 100644
--- a/dotnet/Qpid.Client/Qpid.Client.csproj
+++ b/qpid/dotnet/Qpid.Client/Qpid.Client.csproj
diff --git a/dotnet/Qpid.Client/default.build b/qpid/dotnet/Qpid.Client/default.build
index 9a0ec2ea6d..9a0ec2ea6d 100644
--- a/dotnet/Qpid.Client/default.build
+++ b/qpid/dotnet/Qpid.Client/default.build
diff --git a/dotnet/Qpid.Client/qms/BrokerInfo.cs b/qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs
index 93c00af6e0..93c00af6e0 100644
--- a/dotnet/Qpid.Client/qms/BrokerInfo.cs
+++ b/qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs
diff --git a/dotnet/Qpid.Client/qms/ConnectionInfo.cs b/qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs
index 4d3f7698b5..4d3f7698b5 100644
--- a/dotnet/Qpid.Client/qms/ConnectionInfo.cs
+++ b/qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs
diff --git a/dotnet/Qpid.Client/qms/FailoverPolicy.cs b/qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs
index 179a695bf9..179a695bf9 100644
--- a/dotnet/Qpid.Client/qms/FailoverPolicy.cs
+++ b/qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs
diff --git a/dotnet/Qpid.Client/qms/UrlSyntaxException.cs b/qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs
index ab3de325d4..ab3de325d4 100644
--- a/dotnet/Qpid.Client/qms/UrlSyntaxException.cs
+++ b/qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs
diff --git a/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs b/qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs
index f32b275e84..f32b275e84 100644
--- a/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs
+++ b/qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs
diff --git a/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs b/qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
index 8103940fb4..8103940fb4 100644
--- a/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
+++ b/qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
diff --git a/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs b/qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
index 5e502b897e..5e502b897e 100644
--- a/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
+++ b/qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
diff --git a/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs b/qpid/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs
index 6cfd75c851..6cfd75c851 100644
--- a/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs
+++ b/qpid/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs
diff --git a/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs b/qpid/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs
index 78276202d6..78276202d6 100644
--- a/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs
+++ b/qpid/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs
diff --git a/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs
index 5892673440..5892673440 100644
--- a/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs
+++ b/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs
diff --git a/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs
index 9e333d670f..9e333d670f 100644
--- a/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs
+++ b/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs
diff --git a/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs
index 75ae23592b..75ae23592b 100644
--- a/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs
+++ b/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs
diff --git a/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs
index 3001d1a963..3001d1a963 100644
--- a/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs
+++ b/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs
diff --git a/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs b/qpid/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs
index ab01864bc0..ab01864bc0 100644
--- a/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs
+++ b/qpid/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs
diff --git a/dotnet/Qpid.Codec/IProtocolCodecFactory.cs b/qpid/dotnet/Qpid.Codec/IProtocolCodecFactory.cs
index a26b91b16c..a26b91b16c 100644
--- a/dotnet/Qpid.Codec/IProtocolCodecFactory.cs
+++ b/qpid/dotnet/Qpid.Codec/IProtocolCodecFactory.cs
diff --git a/dotnet/Qpid.Codec/IProtocolDecoder.cs b/qpid/dotnet/Qpid.Codec/IProtocolDecoder.cs
index 3cccb0f7da..3cccb0f7da 100644
--- a/dotnet/Qpid.Codec/IProtocolDecoder.cs
+++ b/qpid/dotnet/Qpid.Codec/IProtocolDecoder.cs
diff --git a/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs b/qpid/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs
index 77a1aea9db..77a1aea9db 100644
--- a/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs
+++ b/qpid/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs
diff --git a/dotnet/Qpid.Codec/IProtocolEncoder.cs b/qpid/dotnet/Qpid.Codec/IProtocolEncoder.cs
index a16f2ad9d6..a16f2ad9d6 100644
--- a/dotnet/Qpid.Codec/IProtocolEncoder.cs
+++ b/qpid/dotnet/Qpid.Codec/IProtocolEncoder.cs
diff --git a/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs b/qpid/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs
index 70f9be38dc..70f9be38dc 100644
--- a/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs
+++ b/qpid/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs
diff --git a/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
index 5261a62ec5..5261a62ec5 100644
--- a/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Codec/ProtocolCodecException.cs b/qpid/dotnet/Qpid.Codec/ProtocolCodecException.cs
index 49678d2c11..49678d2c11 100644
--- a/dotnet/Qpid.Codec/ProtocolCodecException.cs
+++ b/qpid/dotnet/Qpid.Codec/ProtocolCodecException.cs
diff --git a/dotnet/Qpid.Codec/ProtocolDecoderException.cs b/qpid/dotnet/Qpid.Codec/ProtocolDecoderException.cs
index 8e7e6da145..8e7e6da145 100644
--- a/dotnet/Qpid.Codec/ProtocolDecoderException.cs
+++ b/qpid/dotnet/Qpid.Codec/ProtocolDecoderException.cs
diff --git a/dotnet/Qpid.Codec/ProtocolEncoderException.cs b/qpid/dotnet/Qpid.Codec/ProtocolEncoderException.cs
index ac565a308b..ac565a308b 100644
--- a/dotnet/Qpid.Codec/ProtocolEncoderException.cs
+++ b/qpid/dotnet/Qpid.Codec/ProtocolEncoderException.cs
diff --git a/dotnet/Qpid.Codec/Qpid.Codec.csproj b/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj
index a0217cffa3..a0217cffa3 100644
--- a/dotnet/Qpid.Codec/Qpid.Codec.csproj
+++ b/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj
diff --git a/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs b/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs
index 0a4ff10ff0..0a4ff10ff0 100644
--- a/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs
+++ b/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs
diff --git a/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs b/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs
index 2e4224ef98..2e4224ef98 100644
--- a/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs
+++ b/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs
diff --git a/dotnet/Qpid.Codec/default.build b/qpid/dotnet/Qpid.Codec/default.build
index dd59df7d6a..dd59df7d6a 100644
--- a/dotnet/Qpid.Codec/default.build
+++ b/qpid/dotnet/Qpid.Codec/default.build
diff --git a/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
index 2516a73035..2516a73035 100644
--- a/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj b/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
index c99217cc51..c99217cc51 100644
--- a/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
+++ b/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
diff --git a/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs
index 3e19508bac..3e19508bac 100644
--- a/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs
+++ b/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs
diff --git a/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs
index dbbc98a2e6..dbbc98a2e6 100644
--- a/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs
+++ b/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs
diff --git a/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs
index 23cb71c9f8..23cb71c9f8 100644
--- a/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs
+++ b/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs
diff --git a/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs
index a8202dc70d..a8202dc70d 100644
--- a/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs
+++ b/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs
diff --git a/dotnet/Qpid.Common.Tests/default.build b/qpid/dotnet/Qpid.Common.Tests/default.build
index a97c0282c2..a97c0282c2 100644
--- a/dotnet/Qpid.Common.Tests/default.build
+++ b/qpid/dotnet/Qpid.Common.Tests/default.build
diff --git a/dotnet/Qpid.Common/AMQChannelClosedException.cs b/qpid/dotnet/Qpid.Common/AMQChannelClosedException.cs
index 98c6966cd1..98c6966cd1 100644
--- a/dotnet/Qpid.Common/AMQChannelClosedException.cs
+++ b/qpid/dotnet/Qpid.Common/AMQChannelClosedException.cs
diff --git a/dotnet/Qpid.Common/AMQConnectionClosedException.cs b/qpid/dotnet/Qpid.Common/AMQConnectionClosedException.cs
index 136131144b..136131144b 100644
--- a/dotnet/Qpid.Common/AMQConnectionClosedException.cs
+++ b/qpid/dotnet/Qpid.Common/AMQConnectionClosedException.cs
diff --git a/dotnet/Qpid.Common/AMQDisconnectedException.cs b/qpid/dotnet/Qpid.Common/AMQDisconnectedException.cs
index b5c4d544cd..b5c4d544cd 100644
--- a/dotnet/Qpid.Common/AMQDisconnectedException.cs
+++ b/qpid/dotnet/Qpid.Common/AMQDisconnectedException.cs
diff --git a/dotnet/Qpid.Common/AMQException.cs b/qpid/dotnet/Qpid.Common/AMQException.cs
index f9f7158a26..f9f7158a26 100644
--- a/dotnet/Qpid.Common/AMQException.cs
+++ b/qpid/dotnet/Qpid.Common/AMQException.cs
diff --git a/dotnet/Qpid.Common/AMQInvalidArgumentException.cs b/qpid/dotnet/Qpid.Common/AMQInvalidArgumentException.cs
index 831f7bab0e..831f7bab0e 100644
--- a/dotnet/Qpid.Common/AMQInvalidArgumentException.cs
+++ b/qpid/dotnet/Qpid.Common/AMQInvalidArgumentException.cs
diff --git a/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs b/qpid/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
index a3ce813d1b..a3ce813d1b 100644
--- a/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
+++ b/qpid/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
diff --git a/dotnet/Qpid.Common/AMQUndeliveredException.cs b/qpid/dotnet/Qpid.Common/AMQUndeliveredException.cs
index 70ad86c8a3..70ad86c8a3 100644
--- a/dotnet/Qpid.Common/AMQUndeliveredException.cs
+++ b/qpid/dotnet/Qpid.Common/AMQUndeliveredException.cs
diff --git a/dotnet/Qpid.Common/AssemblySettings.cs b/qpid/dotnet/Qpid.Common/AssemblySettings.cs
index 888de692e8..888de692e8 100644
--- a/dotnet/Qpid.Common/AssemblySettings.cs
+++ b/qpid/dotnet/Qpid.Common/AssemblySettings.cs
diff --git a/dotnet/Qpid.Common/Collections/BlockingQueue.cs b/qpid/dotnet/Qpid.Common/Collections/BlockingQueue.cs
index dcfacf8474..dcfacf8474 100644
--- a/dotnet/Qpid.Common/Collections/BlockingQueue.cs
+++ b/qpid/dotnet/Qpid.Common/Collections/BlockingQueue.cs
diff --git a/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs b/qpid/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs
index 131f316da6..131f316da6 100644
--- a/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs
+++ b/qpid/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs
diff --git a/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs b/qpid/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs
index be92576951..be92576951 100644
--- a/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs
+++ b/qpid/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs
diff --git a/dotnet/Qpid.Common/Collections/LinkedHashtable.cs b/qpid/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
index 10ab5c674d..10ab5c674d 100644
--- a/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
+++ b/qpid/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
diff --git a/dotnet/Qpid.Common/Collections/SynchronousQueue.cs b/qpid/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
index 3c12df6067..3c12df6067 100644
--- a/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
+++ b/qpid/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs b/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
index 7867650e50..7867650e50 100644
--- a/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs b/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs
index e2645c630e..e2645c630e 100644
--- a/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQFrame.cs b/qpid/dotnet/Qpid.Common/Framing/AMQFrame.cs
index 912be72d30..912be72d30 100644
--- a/dotnet/Qpid.Common/Framing/AMQFrame.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/AMQFrame.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs b/qpid/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs
index cda8c84ecf..cda8c84ecf 100644
--- a/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQMethodBody.cs b/qpid/dotnet/Qpid.Common/Framing/AMQMethodBody.cs
index a3c4337147..a3c4337147 100644
--- a/dotnet/Qpid.Common/Framing/AMQMethodBody.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/AMQMethodBody.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs
index c1fd3f887a..c1fd3f887a 100644
--- a/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs b/qpid/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs
index 379e5d00ba..379e5d00ba 100644
--- a/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQType.cs b/qpid/dotnet/Qpid.Common/Framing/AMQType.cs
index 95da72b907..95da72b907 100644
--- a/dotnet/Qpid.Common/Framing/AMQType.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/AMQType.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQTypeMap.cs b/qpid/dotnet/Qpid.Common/Framing/AMQTypeMap.cs
index 8497c283f9..8497c283f9 100644
--- a/dotnet/Qpid.Common/Framing/AMQTypeMap.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/AMQTypeMap.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQTypedValue.cs b/qpid/dotnet/Qpid.Common/Framing/AMQTypedValue.cs
index 3d2e313fa6..3d2e313fa6 100644
--- a/dotnet/Qpid.Common/Framing/AMQTypedValue.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/AMQTypedValue.cs
diff --git a/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs b/qpid/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs
index 47db7b0887..47db7b0887 100644
--- a/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs
diff --git a/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs b/qpid/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs
index d2b7f606b2..d2b7f606b2 100644
--- a/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs
diff --git a/dotnet/Qpid.Common/Framing/ContentBody.cs b/qpid/dotnet/Qpid.Common/Framing/ContentBody.cs
index 7a2142985d..7a2142985d 100644
--- a/dotnet/Qpid.Common/Framing/ContentBody.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/ContentBody.cs
diff --git a/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs
index 400b2aec08..400b2aec08 100644
--- a/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs
diff --git a/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs
index 82889c23c8..82889c23c8 100644
--- a/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs
diff --git a/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs
index c95a10871d..c95a10871d 100644
--- a/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs
diff --git a/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs
index bac5d10fd4..bac5d10fd4 100644
--- a/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs
diff --git a/dotnet/Qpid.Common/Framing/EncodingUtils.cs b/qpid/dotnet/Qpid.Common/Framing/EncodingUtils.cs
index 4d424656f9..4d424656f9 100644
--- a/dotnet/Qpid.Common/Framing/EncodingUtils.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/EncodingUtils.cs
diff --git a/dotnet/Qpid.Common/Framing/FieldTable.cs b/qpid/dotnet/Qpid.Common/Framing/FieldTable.cs
index 6567bf58ab..6567bf58ab 100644
--- a/dotnet/Qpid.Common/Framing/FieldTable.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/FieldTable.cs
diff --git a/dotnet/Qpid.Common/Framing/HeartbeatBody.cs b/qpid/dotnet/Qpid.Common/Framing/HeartbeatBody.cs
index a8906f5ba8..a8906f5ba8 100644
--- a/dotnet/Qpid.Common/Framing/HeartbeatBody.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/HeartbeatBody.cs
diff --git a/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs
index 90e5c7768e..90e5c7768e 100644
--- a/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs
diff --git a/dotnet/Qpid.Common/Framing/IBody.cs b/qpid/dotnet/Qpid.Common/Framing/IBody.cs
index 97b4459e5c..97b4459e5c 100644
--- a/dotnet/Qpid.Common/Framing/IBody.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/IBody.cs
diff --git a/dotnet/Qpid.Common/Framing/IBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/IBodyFactory.cs
index dd7960ddbe..dd7960ddbe 100644
--- a/dotnet/Qpid.Common/Framing/IBodyFactory.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/IBodyFactory.cs
diff --git a/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs b/qpid/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs
index 676d0910d4..676d0910d4 100644
--- a/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs
diff --git a/dotnet/Qpid.Common/Framing/IDataBlock.cs b/qpid/dotnet/Qpid.Common/Framing/IDataBlock.cs
index c61ed90d10..c61ed90d10 100644
--- a/dotnet/Qpid.Common/Framing/IDataBlock.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/IDataBlock.cs
diff --git a/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs b/qpid/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs
index da8bf9fef9..da8bf9fef9 100644
--- a/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs
diff --git a/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs b/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
index 5407bc08d5..5407bc08d5 100644
--- a/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
+++ b/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
diff --git a/dotnet/Qpid.Common/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
index 3847429519..3847429519 100644
--- a/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Common/Protocol/AMQConstant.cs b/qpid/dotnet/Qpid.Common/Protocol/AMQConstant.cs
index 9400b1bd80..9400b1bd80 100644
--- a/dotnet/Qpid.Common/Protocol/AMQConstant.cs
+++ b/qpid/dotnet/Qpid.Common/Protocol/AMQConstant.cs
diff --git a/dotnet/Qpid.Common/Qpid.Common.csproj b/qpid/dotnet/Qpid.Common/Qpid.Common.csproj
index 09f0a96ba9..09f0a96ba9 100644
--- a/dotnet/Qpid.Common/Qpid.Common.csproj
+++ b/qpid/dotnet/Qpid.Common/Qpid.Common.csproj
diff --git a/dotnet/Qpid.Common/amqp.xml b/qpid/dotnet/Qpid.Common/amqp.xml
index ddd4b5be4b..ddd4b5be4b 100644
--- a/dotnet/Qpid.Common/amqp.xml
+++ b/qpid/dotnet/Qpid.Common/amqp.xml
diff --git a/dotnet/Qpid.Common/build.xml b/qpid/dotnet/Qpid.Common/build.xml
index 96dd877722..96dd877722 100644
--- a/dotnet/Qpid.Common/build.xml
+++ b/qpid/dotnet/Qpid.Common/build.xml
diff --git a/dotnet/Qpid.Common/default.build b/qpid/dotnet/Qpid.Common/default.build
index df07397d0b..df07397d0b 100644
--- a/dotnet/Qpid.Common/default.build
+++ b/qpid/dotnet/Qpid.Common/default.build
diff --git a/dotnet/Qpid.Common/lib/log4net/log4net-licence.txt b/qpid/dotnet/Qpid.Common/lib/log4net/log4net-licence.txt
index 261eeb9e9f..261eeb9e9f 100644
--- a/dotnet/Qpid.Common/lib/log4net/log4net-licence.txt
+++ b/qpid/dotnet/Qpid.Common/lib/log4net/log4net-licence.txt
diff --git a/dotnet/Qpid.Common/lib/log4net/log4net.dll b/qpid/dotnet/Qpid.Common/lib/log4net/log4net.dll
index 995816f27b..995816f27b 100644
--- a/dotnet/Qpid.Common/lib/log4net/log4net.dll
+++ b/qpid/dotnet/Qpid.Common/lib/log4net/log4net.dll
diff --git a/dotnet/Qpid.Common/lib/log4net/log4net.xml b/qpid/dotnet/Qpid.Common/lib/log4net/log4net.xml
index 5beb669ab0..5beb669ab0 100644
--- a/dotnet/Qpid.Common/lib/log4net/log4net.xml
+++ b/qpid/dotnet/Qpid.Common/lib/log4net/log4net.xml
diff --git a/dotnet/Qpid.Common/lib/saxon/saxon-licence.txt b/qpid/dotnet/Qpid.Common/lib/saxon/saxon-licence.txt
index 1bf2b1279d..1bf2b1279d 100644
--- a/dotnet/Qpid.Common/lib/saxon/saxon-licence.txt
+++ b/qpid/dotnet/Qpid.Common/lib/saxon/saxon-licence.txt
diff --git a/dotnet/Qpid.Common/lib/saxon/saxon8.jar b/qpid/dotnet/Qpid.Common/lib/saxon/saxon8.jar
index 197ce75c5b..197ce75c5b 100644
--- a/dotnet/Qpid.Common/lib/saxon/saxon8.jar
+++ b/qpid/dotnet/Qpid.Common/lib/saxon/saxon8.jar
diff --git a/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll b/qpid/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll
index c3b95d71ba..c3b95d71ba 100644
--- a/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll
+++ b/qpid/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll
diff --git a/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt b/qpid/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt
index e837183135..e837183135 100644
--- a/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt
+++ b/qpid/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt
diff --git a/dotnet/Qpid.Common/resources/registry.template b/qpid/dotnet/Qpid.Common/resources/registry.template
index d870ef3866..d870ef3866 100644
--- a/dotnet/Qpid.Common/resources/registry.template
+++ b/qpid/dotnet/Qpid.Common/resources/registry.template
diff --git a/dotnet/Qpid.Common/stylesheets/csharp.xsl b/qpid/dotnet/Qpid.Common/stylesheets/csharp.xsl
index ed04a40403..ed04a40403 100644
--- a/dotnet/Qpid.Common/stylesheets/csharp.xsl
+++ b/qpid/dotnet/Qpid.Common/stylesheets/csharp.xsl
diff --git a/dotnet/Qpid.Common/stylesheets/framing.xsl b/qpid/dotnet/Qpid.Common/stylesheets/framing.xsl
index 119f439599..119f439599 100644
--- a/dotnet/Qpid.Common/stylesheets/framing.xsl
+++ b/qpid/dotnet/Qpid.Common/stylesheets/framing.xsl
diff --git a/dotnet/Qpid.Common/stylesheets/java.xsl b/qpid/dotnet/Qpid.Common/stylesheets/java.xsl
index 7297c6ae62..7297c6ae62 100644
--- a/dotnet/Qpid.Common/stylesheets/java.xsl
+++ b/qpid/dotnet/Qpid.Common/stylesheets/java.xsl
diff --git a/dotnet/Qpid.Common/stylesheets/prepare1.xsl b/qpid/dotnet/Qpid.Common/stylesheets/prepare1.xsl
index e266b0a9cc..e266b0a9cc 100644
--- a/dotnet/Qpid.Common/stylesheets/prepare1.xsl
+++ b/qpid/dotnet/Qpid.Common/stylesheets/prepare1.xsl
diff --git a/dotnet/Qpid.Common/stylesheets/prepare2.xsl b/qpid/dotnet/Qpid.Common/stylesheets/prepare2.xsl
index 0a64eb6f86..0a64eb6f86 100644
--- a/dotnet/Qpid.Common/stylesheets/prepare2.xsl
+++ b/qpid/dotnet/Qpid.Common/stylesheets/prepare2.xsl
diff --git a/dotnet/Qpid.Common/stylesheets/prepare3.xsl b/qpid/dotnet/Qpid.Common/stylesheets/prepare3.xsl
index a921160dd0..a921160dd0 100644
--- a/dotnet/Qpid.Common/stylesheets/prepare3.xsl
+++ b/qpid/dotnet/Qpid.Common/stylesheets/prepare3.xsl
diff --git a/dotnet/Qpid.Common/stylesheets/readme.txt b/qpid/dotnet/Qpid.Common/stylesheets/readme.txt
index c2f98050a6..c2f98050a6 100644
--- a/dotnet/Qpid.Common/stylesheets/readme.txt
+++ b/qpid/dotnet/Qpid.Common/stylesheets/readme.txt
diff --git a/dotnet/Qpid.Common/stylesheets/registry.xsl b/qpid/dotnet/Qpid.Common/stylesheets/registry.xsl
index 47a2a29069..47a2a29069 100644
--- a/dotnet/Qpid.Common/stylesheets/registry.xsl
+++ b/qpid/dotnet/Qpid.Common/stylesheets/registry.xsl
diff --git a/dotnet/Qpid.Common/stylesheets/utils.xsl b/qpid/dotnet/Qpid.Common/stylesheets/utils.xsl
index d097bbc4eb..d097bbc4eb 100644
--- a/dotnet/Qpid.Common/stylesheets/utils.xsl
+++ b/qpid/dotnet/Qpid.Common/stylesheets/utils.xsl
diff --git a/dotnet/Qpid.Integration.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Integration.Tests/Properties/AssemblyInfo.cs
index e19650559f..e19650559f 100644
--- a/dotnet/Qpid.Integration.Tests/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Integration.Tests/Qpid.Integration.Tests.csproj b/qpid/dotnet/Qpid.Integration.Tests/Qpid.Integration.Tests.csproj
index e7d6e59cf5..e7d6e59cf5 100755
--- a/dotnet/Qpid.Integration.Tests/Qpid.Integration.Tests.csproj
+++ b/qpid/dotnet/Qpid.Integration.Tests/Qpid.Integration.Tests.csproj
diff --git a/dotnet/Qpid.Integration.Tests/README.txt b/qpid/dotnet/Qpid.Integration.Tests/README.txt
index 389e3b2c6c..389e3b2c6c 100644
--- a/dotnet/Qpid.Integration.Tests/README.txt
+++ b/qpid/dotnet/Qpid.Integration.Tests/README.txt
diff --git a/dotnet/Qpid.Integration.Tests/default.build b/qpid/dotnet/Qpid.Integration.Tests/default.build
index 187aa15894..187aa15894 100644
--- a/dotnet/Qpid.Integration.Tests/default.build
+++ b/qpid/dotnet/Qpid.Integration.Tests/default.build
diff --git a/dotnet/Qpid.Integration.Tests/framework/Assertion.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/Assertion.cs
index de12de6522..de12de6522 100644
--- a/dotnet/Qpid.Integration.Tests/framework/Assertion.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/Assertion.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/Assertion.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/Assertion.csx
index 183315fec1..183315fec1 100644
--- a/dotnet/Qpid.Integration.Tests/framework/Assertion.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/Assertion.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/AssertionBase.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/AssertionBase.csx
index 7de3f6c4a5..7de3f6c4a5 100644
--- a/dotnet/Qpid.Integration.Tests/framework/AssertionBase.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/AssertionBase.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/BrokerLifecycleAware.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/BrokerLifecycleAware.csx
index 9ef1f54064..9ef1f54064 100644
--- a/dotnet/Qpid.Integration.Tests/framework/BrokerLifecycleAware.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/BrokerLifecycleAware.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/CauseFailure.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/CauseFailure.csx
index 1fe8918e60..1fe8918e60 100644
--- a/dotnet/Qpid.Integration.Tests/framework/CauseFailure.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/CauseFailure.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/CauseFailureUserPrompt.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/CauseFailureUserPrompt.csx
index 96f4ec53d0..96f4ec53d0 100644
--- a/dotnet/Qpid.Integration.Tests/framework/CauseFailureUserPrompt.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/CauseFailureUserPrompt.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/Circuit.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/Circuit.cs
index aae9ca0496..aae9ca0496 100644
--- a/dotnet/Qpid.Integration.Tests/framework/Circuit.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/Circuit.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/Circuit.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/Circuit.csx
index bf2c623cff..bf2c623cff 100644
--- a/dotnet/Qpid.Integration.Tests/framework/Circuit.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/Circuit.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/CircuitEnd.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/CircuitEnd.csx
index 6edaf428de..6edaf428de 100644
--- a/dotnet/Qpid.Integration.Tests/framework/CircuitEnd.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/CircuitEnd.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/CircuitEndBase.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/CircuitEndBase.csx
index db7fbde6ea..db7fbde6ea 100644
--- a/dotnet/Qpid.Integration.Tests/framework/CircuitEndBase.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/CircuitEndBase.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/ExceptionMonitor.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/ExceptionMonitor.csx
index b2a989b940..b2a989b940 100644
--- a/dotnet/Qpid.Integration.Tests/framework/ExceptionMonitor.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/ExceptionMonitor.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.cs
index 77c1cae0ad..77c1cae0ad 100644
--- a/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.csx
index 00ed572603..00ed572603 100644
--- a/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/LocalCircuitFactory.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/LocalCircuitFactory.csx
index 45ecf26ffe..45ecf26ffe 100644
--- a/dotnet/Qpid.Integration.Tests/framework/LocalCircuitFactory.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/LocalCircuitFactory.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/MessageMonitor.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/MessageMonitor.csx
index 440d0761e5..440d0761e5 100644
--- a/dotnet/Qpid.Integration.Tests/framework/MessageMonitor.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/MessageMonitor.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/MessagingTestConfigProperties.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/MessagingTestConfigProperties.csx
index db19b5c2e0..db19b5c2e0 100644
--- a/dotnet/Qpid.Integration.Tests/framework/MessagingTestConfigProperties.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/MessagingTestConfigProperties.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/NotApplicableAssertion.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/NotApplicableAssertion.csx
index 3e3505725f..3e3505725f 100644
--- a/dotnet/Qpid.Integration.Tests/framework/NotApplicableAssertion.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/NotApplicableAssertion.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/Publisher.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/Publisher.cs
index 5fbdc7a907..5fbdc7a907 100644
--- a/dotnet/Qpid.Integration.Tests/framework/Publisher.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/Publisher.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/Publisher.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/Publisher.csx
index b23b8c1e59..b23b8c1e59 100644
--- a/dotnet/Qpid.Integration.Tests/framework/Publisher.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/Publisher.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/README.txt b/qpid/dotnet/Qpid.Integration.Tests/framework/README.txt
index 927c3415e5..927c3415e5 100644
--- a/dotnet/Qpid.Integration.Tests/framework/README.txt
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/README.txt
diff --git a/dotnet/Qpid.Integration.Tests/framework/Receiver.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/Receiver.cs
index 96820b5980..96820b5980 100644
--- a/dotnet/Qpid.Integration.Tests/framework/Receiver.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/Receiver.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/Receiver.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/Receiver.csx
index bafa57b34b..bafa57b34b 100644
--- a/dotnet/Qpid.Integration.Tests/framework/Receiver.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/Receiver.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.cs
index 8be8de3d96..8be8de3d96 100644
--- a/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.csx
index 877367c762..877367c762 100644
--- a/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/TestModel.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/TestModel.cs
index 88bea1e5ad..88bea1e5ad 100644
--- a/dotnet/Qpid.Integration.Tests/framework/TestModel.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/TestModel.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/TestUtils.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/TestUtils.csx
index bb00bf2683..bb00bf2683 100644
--- a/dotnet/Qpid.Integration.Tests/framework/TestUtils.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/TestUtils.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/alljava.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/alljava.csx
index 23ebd53a5b..23ebd53a5b 100644
--- a/dotnet/Qpid.Integration.Tests/framework/alljava.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/alljava.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchFailureException.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchFailureException.csx
index a2bcc49b97..a2bcc49b97 100644
--- a/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchFailureException.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchFailureException.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchThread.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchThread.csx
index 7d2fcae058..7d2fcae058 100644
--- a/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchThread.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchThread.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchronizer.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchronizer.csx
index 665b804b21..665b804b21 100644
--- a/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchronizer.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchronizer.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/clocksynch/LocalClockSynchronizer.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/LocalClockSynchronizer.csx
index 1d19b92d90..1d19b92d90 100644
--- a/dotnet/Qpid.Integration.Tests/framework/clocksynch/LocalClockSynchronizer.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/LocalClockSynchronizer.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/clocksynch/UDPClockSynchronizer.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/UDPClockSynchronizer.csx
index 98b02a043b..98b02a043b 100644
--- a/dotnet/Qpid.Integration.Tests/framework/clocksynch/UDPClockSynchronizer.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/UDPClockSynchronizer.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClient.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClient.csx
index 1126fec520..1126fec520 100644
--- a/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClient.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClient.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientCircuitEnd.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientCircuitEnd.csx
index 5ac2c4bf5b..5ac2c4bf5b 100644
--- a/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientCircuitEnd.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientCircuitEnd.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientControlledTest.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientControlledTest.csx
index cfb06aa642..cfb06aa642 100644
--- a/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientControlledTest.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientControlledTest.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalCircuitImpl.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalCircuitImpl.csx
index 0594e4d781..0594e4d781 100644
--- a/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalCircuitImpl.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalCircuitImpl.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalPublisherImpl.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalPublisherImpl.csx
index ecc94067ae..ecc94067ae 100644
--- a/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalPublisherImpl.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalPublisherImpl.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalReceiverImpl.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalReceiverImpl.csx
index b174a4c912..b174a4c912 100644
--- a/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalReceiverImpl.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalReceiverImpl.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/sequencers/BaseCircuitFactory.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/BaseCircuitFactory.csx
index 79ddfd878f..79ddfd878f 100644
--- a/dotnet/Qpid.Integration.Tests/framework/sequencers/BaseCircuitFactory.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/BaseCircuitFactory.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.cs
index 4be08c3f38..4be08c3f38 100644
--- a/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.csx
index 26632266a4..26632266a4 100644
--- a/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.csx
+++ b/qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.csx
diff --git a/dotnet/Qpid.Integration.Tests/interactive/FailoverTest.cs b/qpid/dotnet/Qpid.Integration.Tests/interactive/FailoverTest.cs
index 142ac40b27..142ac40b27 100644
--- a/dotnet/Qpid.Integration.Tests/interactive/FailoverTest.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/interactive/FailoverTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/interactive/SendReceiveTest.cs b/qpid/dotnet/Qpid.Integration.Tests/interactive/SendReceiveTest.cs
index 68d7a2ae68..68d7a2ae68 100644
--- a/dotnet/Qpid.Integration.Tests/interactive/SendReceiveTest.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/interactive/SendReceiveTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/interop/InteropClientTestCase.cs b/qpid/dotnet/Qpid.Integration.Tests/interop/InteropClientTestCase.cs
index 09361b33e8..09361b33e8 100644
--- a/dotnet/Qpid.Integration.Tests/interop/InteropClientTestCase.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/interop/InteropClientTestCase.cs
diff --git a/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase1DummyRun.cs b/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase1DummyRun.cs
index d908b7af0b..d908b7af0b 100644
--- a/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase1DummyRun.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase1DummyRun.cs
diff --git a/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase2BasicP2P.cs b/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase2BasicP2P.cs
index 8993da832e..8993da832e 100644
--- a/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase2BasicP2P.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase2BasicP2P.cs
diff --git a/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase3BasicPubSub.cs b/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase3BasicPubSub.cs
index 79c0322bcd..79c0322bcd 100644
--- a/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase3BasicPubSub.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase3BasicPubSub.cs
diff --git a/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase4P2PMessageSize.cs b/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase4P2PMessageSize.cs
index fd83825a61..fd83825a61 100644
--- a/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase4P2PMessageSize.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase4P2PMessageSize.cs
diff --git a/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase5PubSubMessageSize.cs b/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase5PubSubMessageSize.cs
index 8fddaeafa2..8fddaeafa2 100644
--- a/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase5PubSubMessageSize.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase5PubSubMessageSize.cs
diff --git a/dotnet/Qpid.Integration.Tests/interop/TestClient.cs b/qpid/dotnet/Qpid.Integration.Tests/interop/TestClient.cs
index 0def89c6da..0def89c6da 100644
--- a/dotnet/Qpid.Integration.Tests/interop/TestClient.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/interop/TestClient.cs
diff --git a/dotnet/Qpid.Integration.Tests/log4net.config b/qpid/dotnet/Qpid.Integration.Tests/log4net.config
index 73bfc77a3e..73bfc77a3e 100644
--- a/dotnet/Qpid.Integration.Tests/log4net.config
+++ b/qpid/dotnet/Qpid.Integration.Tests/log4net.config
diff --git a/dotnet/Qpid.Integration.Tests/old/ServiceProvidingClient.tmp b/qpid/dotnet/Qpid.Integration.Tests/old/ServiceProvidingClient.tmp
index b1e7a50aaa..b1e7a50aaa 100644
--- a/dotnet/Qpid.Integration.Tests/old/ServiceProvidingClient.tmp
+++ b/qpid/dotnet/Qpid.Integration.Tests/old/ServiceProvidingClient.tmp
diff --git a/dotnet/Qpid.Integration.Tests/old/ServiceRequestingClient.tmp b/qpid/dotnet/Qpid.Integration.Tests/old/ServiceRequestingClient.tmp
index da0f764bcd..da0f764bcd 100644
--- a/dotnet/Qpid.Integration.Tests/old/ServiceRequestingClient.tmp
+++ b/qpid/dotnet/Qpid.Integration.Tests/old/ServiceRequestingClient.tmp
diff --git a/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
index e67d96f188..e67d96f188 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/ChannelQueueTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/ChannelQueueTest.cs
index 4692e7ecb1..4692e7ecb1 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/ChannelQueueTest.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/testcases/ChannelQueueTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/CommitRollbackTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/CommitRollbackTest.cs
index dbb3f70aec..dbb3f70aec 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/CommitRollbackTest.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/testcases/CommitRollbackTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/ConnectionTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/ConnectionTest.cs
index d7b4a4ddd2..d7b4a4ddd2 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/ConnectionTest.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/testcases/ConnectionTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/DurableSubscriptionTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/DurableSubscriptionTest.cs
index b7973ae3f5..b7973ae3f5 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/DurableSubscriptionTest.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/testcases/DurableSubscriptionTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/HeadersExchangeTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/HeadersExchangeTest.cs
index 2094aa3b1b..2094aa3b1b 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/HeadersExchangeTest.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/testcases/HeadersExchangeTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/MandatoryMessageTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/MandatoryMessageTest.cs
index 4abc56905f..4abc56905f 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/MandatoryMessageTest.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/testcases/MandatoryMessageTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/ProducerMultiConsumerTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/ProducerMultiConsumerTest.cs
index bae6c76818..bae6c76818 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/ProducerMultiConsumerTest.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/testcases/ProducerMultiConsumerTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/Qpid.Integration.Tests.csproj b/qpid/dotnet/Qpid.Integration.Tests/testcases/Qpid.Integration.Tests.csproj
index 01ca2cc5bd..01ca2cc5bd 100755
--- a/dotnet/Qpid.Integration.Tests/testcases/Qpid.Integration.Tests.csproj
+++ b/qpid/dotnet/Qpid.Integration.Tests/testcases/Qpid.Integration.Tests.csproj
diff --git a/dotnet/Qpid.Integration.Tests/testcases/QueueBrowsingTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/QueueBrowsingTest.cs
index 536439a44b..536439a44b 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/QueueBrowsingTest.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/testcases/QueueBrowsingTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/SslConnectionTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/SslConnectionTest.cs
index 5f953e1470..5f953e1470 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/SslConnectionTest.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/testcases/SslConnectionTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/SustainedTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/SustainedTest.cs
index 4074055eba..4074055eba 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/SustainedTest.cs
+++ b/qpid/dotnet/Qpid.Integration.Tests/testcases/SustainedTest.cs
diff --git a/dotnet/Qpid.Messaging/AcknowledgeMode.cs b/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs
index 4896b64f68..4896b64f68 100644
--- a/dotnet/Qpid.Messaging/AcknowledgeMode.cs
+++ b/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs
diff --git a/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs b/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
index 8b43422f5c..8b43422f5c 100644
--- a/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
+++ b/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
diff --git a/dotnet/Qpid.Messaging/DeliveryMode.cs b/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs
index 3c4713ee2a..3c4713ee2a 100644
--- a/dotnet/Qpid.Messaging/DeliveryMode.cs
+++ b/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs
diff --git a/dotnet/Qpid.Messaging/ExchangeClassConstants.cs b/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
index 984e8b0f17..984e8b0f17 100644
--- a/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
+++ b/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
diff --git a/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs b/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
index 2689fb5e46..2689fb5e46 100644
--- a/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
+++ b/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
diff --git a/dotnet/Qpid.Messaging/IBytesMessage.cs b/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs
index 5be942423d..5be942423d 100644
--- a/dotnet/Qpid.Messaging/IBytesMessage.cs
+++ b/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs
diff --git a/dotnet/Qpid.Messaging/IChannel.cs b/qpid/dotnet/Qpid.Messaging/IChannel.cs
index 1db8b5fbdb..1db8b5fbdb 100644
--- a/dotnet/Qpid.Messaging/IChannel.cs
+++ b/qpid/dotnet/Qpid.Messaging/IChannel.cs
diff --git a/dotnet/Qpid.Messaging/ICloseable.cs b/qpid/dotnet/Qpid.Messaging/ICloseable.cs
index 658a5ed5a4..658a5ed5a4 100644
--- a/dotnet/Qpid.Messaging/ICloseable.cs
+++ b/qpid/dotnet/Qpid.Messaging/ICloseable.cs
diff --git a/dotnet/Qpid.Messaging/IConnection.cs b/qpid/dotnet/Qpid.Messaging/IConnection.cs
index f664137e02..f664137e02 100644
--- a/dotnet/Qpid.Messaging/IConnection.cs
+++ b/qpid/dotnet/Qpid.Messaging/IConnection.cs
diff --git a/dotnet/Qpid.Messaging/IConnectionFactory.cs b/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs
index f141d509be..f141d509be 100644
--- a/dotnet/Qpid.Messaging/IConnectionFactory.cs
+++ b/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs
diff --git a/dotnet/Qpid.Messaging/IConnectionListener.cs b/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs
index 02d9eb38da..02d9eb38da 100644
--- a/dotnet/Qpid.Messaging/IConnectionListener.cs
+++ b/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs
diff --git a/dotnet/Qpid.Messaging/IFieldTable.cs b/qpid/dotnet/Qpid.Messaging/IFieldTable.cs
index 730ce399d4..730ce399d4 100644
--- a/dotnet/Qpid.Messaging/IFieldTable.cs
+++ b/qpid/dotnet/Qpid.Messaging/IFieldTable.cs
diff --git a/dotnet/Qpid.Messaging/IHeaders.cs b/qpid/dotnet/Qpid.Messaging/IHeaders.cs
index 7fdf26ebda..7fdf26ebda 100644
--- a/dotnet/Qpid.Messaging/IHeaders.cs
+++ b/qpid/dotnet/Qpid.Messaging/IHeaders.cs
diff --git a/dotnet/Qpid.Messaging/IMessage.cs b/qpid/dotnet/Qpid.Messaging/IMessage.cs
index 20ae5ee130..20ae5ee130 100644
--- a/dotnet/Qpid.Messaging/IMessage.cs
+++ b/qpid/dotnet/Qpid.Messaging/IMessage.cs
diff --git a/dotnet/Qpid.Messaging/IMessageConsumer.cs b/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs
index 86b5405707..86b5405707 100644
--- a/dotnet/Qpid.Messaging/IMessageConsumer.cs
+++ b/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs
diff --git a/dotnet/Qpid.Messaging/IMessagePublisher.cs b/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs
index d895a9749b..d895a9749b 100644
--- a/dotnet/Qpid.Messaging/IMessagePublisher.cs
+++ b/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs
diff --git a/dotnet/Qpid.Messaging/ITextMessage.cs b/qpid/dotnet/Qpid.Messaging/ITextMessage.cs
index 902beb70f8..902beb70f8 100644
--- a/dotnet/Qpid.Messaging/ITextMessage.cs
+++ b/qpid/dotnet/Qpid.Messaging/ITextMessage.cs
diff --git a/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs b/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
index 91a2371788..91a2371788 100644
--- a/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
+++ b/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
diff --git a/dotnet/Qpid.Messaging/MessageNotReadableException.cs b/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs
index 2afcffd531..2afcffd531 100644
--- a/dotnet/Qpid.Messaging/MessageNotReadableException.cs
+++ b/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs
diff --git a/dotnet/Qpid.Messaging/MessageNotWritableException.cs b/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs
index 9b00f01948..9b00f01948 100644
--- a/dotnet/Qpid.Messaging/MessageNotWritableException.cs
+++ b/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs
diff --git a/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs b/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
index 79c7575d0a..79c7575d0a 100644
--- a/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
+++ b/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
diff --git a/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
index d9dff07f3f..d9dff07f3f 100644
--- a/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Messaging/Qpid.Messaging.csproj b/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
index 37b80d1515..37b80d1515 100644
--- a/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
+++ b/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
diff --git a/dotnet/Qpid.Messaging/QpidException.cs b/qpid/dotnet/Qpid.Messaging/QpidException.cs
index 3e39f2293d..3e39f2293d 100644
--- a/dotnet/Qpid.Messaging/QpidException.cs
+++ b/qpid/dotnet/Qpid.Messaging/QpidException.cs
diff --git a/dotnet/Qpid.Messaging/ResourceAllocationException.cs b/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs
index 954dcdd94c..954dcdd94c 100644
--- a/dotnet/Qpid.Messaging/ResourceAllocationException.cs
+++ b/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs
diff --git a/dotnet/Qpid.Messaging/default.build b/qpid/dotnet/Qpid.Messaging/default.build
index e351def886..e351def886 100644
--- a/dotnet/Qpid.Messaging/default.build
+++ b/qpid/dotnet/Qpid.Messaging/default.build
diff --git a/dotnet/Qpid.NET.FxCop b/qpid/dotnet/Qpid.NET.FxCop
index ba6b3e3ac5..ba6b3e3ac5 100644
--- a/dotnet/Qpid.NET.FxCop
+++ b/qpid/dotnet/Qpid.NET.FxCop
diff --git a/dotnet/Qpid.NET.sln b/qpid/dotnet/Qpid.NET.sln
index a6417aaad1..a6417aaad1 100644
--- a/dotnet/Qpid.NET.sln
+++ b/qpid/dotnet/Qpid.NET.sln
diff --git a/dotnet/Qpid.Sasl.Tests/App.config b/qpid/dotnet/Qpid.Sasl.Tests/App.config
index 021399939e..021399939e 100644
--- a/dotnet/Qpid.Sasl.Tests/App.config
+++ b/qpid/dotnet/Qpid.Sasl.Tests/App.config
diff --git a/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs
index 5839f310e1..5839f310e1 100644
--- a/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs
+++ b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs
diff --git a/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs
index baeeafb2d2..baeeafb2d2 100644
--- a/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs
+++ b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs
diff --git a/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
index 5a18ebaefd..5a18ebaefd 100644
--- a/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
+++ b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
diff --git a/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
index 57efcf7614..57efcf7614 100644
--- a/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
+++ b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
diff --git a/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs
index f4fc00e038..f4fc00e038 100644
--- a/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs
+++ b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs
diff --git a/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
index e795c267a7..e795c267a7 100644
--- a/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj b/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
index f1a7b07e5a..f1a7b07e5a 100644
--- a/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
+++ b/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
diff --git a/dotnet/Qpid.Sasl.Tests/SaslTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/SaslTests.cs
index e7ae91d6b6..e7ae91d6b6 100644
--- a/dotnet/Qpid.Sasl.Tests/SaslTests.cs
+++ b/qpid/dotnet/Qpid.Sasl.Tests/SaslTests.cs
diff --git a/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs b/qpid/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs
index 62099237e9..62099237e9 100644
--- a/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs
+++ b/qpid/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs
diff --git a/dotnet/Qpid.Sasl.Tests/default.build b/qpid/dotnet/Qpid.Sasl.Tests/default.build
index 5b51c0a6fa..5b51c0a6fa 100644
--- a/dotnet/Qpid.Sasl.Tests/default.build
+++ b/qpid/dotnet/Qpid.Sasl.Tests/default.build
diff --git a/dotnet/Qpid.Sasl/Callbacks.cs b/qpid/dotnet/Qpid.Sasl/Callbacks.cs
index f4fcc1c54b..f4fcc1c54b 100644
--- a/dotnet/Qpid.Sasl/Callbacks.cs
+++ b/qpid/dotnet/Qpid.Sasl/Callbacks.cs
diff --git a/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs b/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs
index 7a71ec28da..7a71ec28da 100644
--- a/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs
+++ b/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs
diff --git a/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs b/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs
index ea8669f8c4..ea8669f8c4 100644
--- a/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs
+++ b/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs
diff --git a/dotnet/Qpid.Sasl/DefaultClientFactory.cs b/qpid/dotnet/Qpid.Sasl/DefaultClientFactory.cs
index 744d7cae40..744d7cae40 100644
--- a/dotnet/Qpid.Sasl/DefaultClientFactory.cs
+++ b/qpid/dotnet/Qpid.Sasl/DefaultClientFactory.cs
diff --git a/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs b/qpid/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs
index c2638f245e..c2638f245e 100644
--- a/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs
+++ b/qpid/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs
diff --git a/dotnet/Qpid.Sasl/ISaslClient.cs b/qpid/dotnet/Qpid.Sasl/ISaslClient.cs
index 668ca05d26..668ca05d26 100644
--- a/dotnet/Qpid.Sasl/ISaslClient.cs
+++ b/qpid/dotnet/Qpid.Sasl/ISaslClient.cs
diff --git a/dotnet/Qpid.Sasl/ISaslClientFactory.cs b/qpid/dotnet/Qpid.Sasl/ISaslClientFactory.cs
index f052e07ad9..f052e07ad9 100644
--- a/dotnet/Qpid.Sasl/ISaslClientFactory.cs
+++ b/qpid/dotnet/Qpid.Sasl/ISaslClientFactory.cs
diff --git a/dotnet/Qpid.Sasl/MD5HMAC.cs b/qpid/dotnet/Qpid.Sasl/MD5HMAC.cs
index 7e310c5364..7e310c5364 100644
--- a/dotnet/Qpid.Sasl/MD5HMAC.cs
+++ b/qpid/dotnet/Qpid.Sasl/MD5HMAC.cs
diff --git a/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs
index e550d10d97..e550d10d97 100644
--- a/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs
+++ b/qpid/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs
diff --git a/dotnet/Qpid.Sasl/Mechanisms/CramMD5HexSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5HexSaslClient.cs
index 3cce0e3a2d..3cce0e3a2d 100644
--- a/dotnet/Qpid.Sasl/Mechanisms/CramMD5HexSaslClient.cs
+++ b/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5HexSaslClient.cs
diff --git a/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs
index 56b0f6ecd4..56b0f6ecd4 100644
--- a/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs
+++ b/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs
diff --git a/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs
index 79843587c7..79843587c7 100644
--- a/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs
+++ b/qpid/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs
diff --git a/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs
index fec0d2d3c2..fec0d2d3c2 100644
--- a/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs
+++ b/qpid/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs
diff --git a/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs
index 534be171b7..534be171b7 100644
--- a/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs
+++ b/qpid/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs
diff --git a/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
index 5245b97d1f..5245b97d1f 100644
--- a/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Sasl/Qpid.Sasl.csproj b/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
index 8c1d568aa3..8c1d568aa3 100644
--- a/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
+++ b/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
diff --git a/dotnet/Qpid.Sasl/Sasl.cs b/qpid/dotnet/Qpid.Sasl/Sasl.cs
index 2f7bacb939..2f7bacb939 100644
--- a/dotnet/Qpid.Sasl/Sasl.cs
+++ b/qpid/dotnet/Qpid.Sasl/Sasl.cs
diff --git a/dotnet/Qpid.Sasl/SaslClient.cs b/qpid/dotnet/Qpid.Sasl/SaslClient.cs
index a22013181b..a22013181b 100644
--- a/dotnet/Qpid.Sasl/SaslClient.cs
+++ b/qpid/dotnet/Qpid.Sasl/SaslClient.cs
diff --git a/dotnet/Qpid.Sasl/SaslException.cs b/qpid/dotnet/Qpid.Sasl/SaslException.cs
index d770ee63fd..d770ee63fd 100644
--- a/dotnet/Qpid.Sasl/SaslException.cs
+++ b/qpid/dotnet/Qpid.Sasl/SaslException.cs
diff --git a/dotnet/Qpid.Sasl/SaslProperties.cs b/qpid/dotnet/Qpid.Sasl/SaslProperties.cs
index f9ad1c68cd..f9ad1c68cd 100644
--- a/dotnet/Qpid.Sasl/SaslProperties.cs
+++ b/qpid/dotnet/Qpid.Sasl/SaslProperties.cs
diff --git a/dotnet/Qpid.Sasl/default.build b/qpid/dotnet/Qpid.Sasl/default.build
index 57049ee2ee..57049ee2ee 100644
--- a/dotnet/Qpid.Sasl/default.build
+++ b/qpid/dotnet/Qpid.Sasl/default.build
diff --git a/dotnet/README.txt b/qpid/dotnet/README.txt
index 70830a625c..70830a625c 100644
--- a/dotnet/README.txt
+++ b/qpid/dotnet/README.txt
diff --git a/dotnet/RELEASE_NOTES.txt b/qpid/dotnet/RELEASE_NOTES.txt
index e824757b42..e824757b42 100644
--- a/dotnet/RELEASE_NOTES.txt
+++ b/qpid/dotnet/RELEASE_NOTES.txt
diff --git a/dotnet/TestClient/Program.cs b/qpid/dotnet/TestClient/Program.cs
index f4b2db568e..f4b2db568e 100644
--- a/dotnet/TestClient/Program.cs
+++ b/qpid/dotnet/TestClient/Program.cs
diff --git a/dotnet/TestClient/Properties/AssemblyInfo.cs b/qpid/dotnet/TestClient/Properties/AssemblyInfo.cs
index e8ffbc5aba..e8ffbc5aba 100644
--- a/dotnet/TestClient/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/TestClient/Properties/AssemblyInfo.cs
diff --git a/dotnet/TestClient/TestClient.csproj b/qpid/dotnet/TestClient/TestClient.csproj
index cc7ab37657..cc7ab37657 100644
--- a/dotnet/TestClient/TestClient.csproj
+++ b/qpid/dotnet/TestClient/TestClient.csproj
diff --git a/dotnet/TestClient/default.build b/qpid/dotnet/TestClient/default.build
index ce1114425e..ce1114425e 100644
--- a/dotnet/TestClient/default.build
+++ b/qpid/dotnet/TestClient/default.build
diff --git a/dotnet/TopicListener/Program.cs b/qpid/dotnet/TopicListener/Program.cs
index 14626d6134..14626d6134 100644
--- a/dotnet/TopicListener/Program.cs
+++ b/qpid/dotnet/TopicListener/Program.cs
diff --git a/dotnet/TopicListener/Properties/AssemblyInfo.cs b/qpid/dotnet/TopicListener/Properties/AssemblyInfo.cs
index 1fe9bb8249..1fe9bb8249 100644
--- a/dotnet/TopicListener/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/TopicListener/Properties/AssemblyInfo.cs
diff --git a/dotnet/TopicListener/TopicListener.csproj b/qpid/dotnet/TopicListener/TopicListener.csproj
index 46da42ea61..46da42ea61 100644
--- a/dotnet/TopicListener/TopicListener.csproj
+++ b/qpid/dotnet/TopicListener/TopicListener.csproj
diff --git a/dotnet/TopicListener/default.build b/qpid/dotnet/TopicListener/default.build
index f9b0f97094..f9b0f97094 100644
--- a/dotnet/TopicListener/default.build
+++ b/qpid/dotnet/TopicListener/default.build
diff --git a/dotnet/TopicPublisher/Program.cs b/qpid/dotnet/TopicPublisher/Program.cs
index b5209b9317..b5209b9317 100644
--- a/dotnet/TopicPublisher/Program.cs
+++ b/qpid/dotnet/TopicPublisher/Program.cs
diff --git a/dotnet/TopicPublisher/Properties/AssemblyInfo.cs b/qpid/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
index 051b34ee37..051b34ee37 100644
--- a/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
diff --git a/dotnet/TopicPublisher/TopicPublisher.csproj b/qpid/dotnet/TopicPublisher/TopicPublisher.csproj
index fbbf77fb8e..fbbf77fb8e 100644
--- a/dotnet/TopicPublisher/TopicPublisher.csproj
+++ b/qpid/dotnet/TopicPublisher/TopicPublisher.csproj
diff --git a/dotnet/TopicPublisher/default.build b/qpid/dotnet/TopicPublisher/default.build
index 9b01c2a1bc..9b01c2a1bc 100644
--- a/dotnet/TopicPublisher/default.build
+++ b/qpid/dotnet/TopicPublisher/default.build
diff --git a/dotnet/build-framing.bat b/qpid/dotnet/build-framing.bat
index ae9bc749a9..ae9bc749a9 100644
--- a/dotnet/build-framing.bat
+++ b/qpid/dotnet/build-framing.bat
diff --git a/dotnet/build-mono b/qpid/dotnet/build-mono
index 71d94ad268..71d94ad268 100755
--- a/dotnet/build-mono
+++ b/qpid/dotnet/build-mono
diff --git a/dotnet/build-msbuild.bat b/qpid/dotnet/build-msbuild.bat
index 1fe4b5d64c..1fe4b5d64c 100644
--- a/dotnet/build-msbuild.bat
+++ b/qpid/dotnet/build-msbuild.bat
diff --git a/dotnet/build-nant-release b/qpid/dotnet/build-nant-release
index a6d73dc40a..a6d73dc40a 100755
--- a/dotnet/build-nant-release
+++ b/qpid/dotnet/build-nant-release
diff --git a/dotnet/build-nant.bat b/qpid/dotnet/build-nant.bat
index 785450a9f7..785450a9f7 100644
--- a/dotnet/build-nant.bat
+++ b/qpid/dotnet/build-nant.bat
diff --git a/dotnet/client-010/App.config b/qpid/dotnet/client-010/App.config
index 36b4ffab3e..36b4ffab3e 100644
--- a/dotnet/client-010/App.config
+++ b/qpid/dotnet/client-010/App.config
diff --git a/dotnet/client-010/LICENSE.txt b/qpid/dotnet/client-010/LICENSE.txt
index 981d2f83c3..981d2f83c3 100644
--- a/dotnet/client-010/LICENSE.txt
+++ b/qpid/dotnet/client-010/LICENSE.txt
diff --git a/dotnet/client-010/NOTICE.txt b/qpid/dotnet/client-010/NOTICE.txt
index 0b22ed3ab2..0b22ed3ab2 100644
--- a/dotnet/client-010/NOTICE.txt
+++ b/qpid/dotnet/client-010/NOTICE.txt
diff --git a/dotnet/client-010/README.txt b/qpid/dotnet/client-010/README.txt
index 74d54a9786..74d54a9786 100644
--- a/dotnet/client-010/README.txt
+++ b/qpid/dotnet/client-010/README.txt
diff --git a/dotnet/client-010/addins/ExcelAddIn/Excel.exe.config b/qpid/dotnet/client-010/addins/ExcelAddIn/Excel.exe.config
index 66bf63532e..66bf63532e 100644
--- a/dotnet/client-010/addins/ExcelAddIn/Excel.exe.config
+++ b/qpid/dotnet/client-010/addins/ExcelAddIn/Excel.exe.config
diff --git a/dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.cs b/qpid/dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.cs
index 66c9b7a8f9..66c9b7a8f9 100644
--- a/dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.cs
+++ b/qpid/dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.cs
diff --git a/dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.csproj b/qpid/dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.csproj
index b44bf9cc69..b44bf9cc69 100644
--- a/dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.csproj
+++ b/qpid/dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.csproj
diff --git a/dotnet/client-010/addins/ExcelAddIn/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/addins/ExcelAddIn/Properties/AssemblyInfo.cs
index 67e95f69a3..67e95f69a3 100644
--- a/dotnet/client-010/addins/ExcelAddIn/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/addins/ExcelAddIn/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/addins/ExcelAddInMessageProcessor/ExcelAddInMessageProcessor.csproj b/qpid/dotnet/client-010/addins/ExcelAddInMessageProcessor/ExcelAddInMessageProcessor.csproj
index 447ded4b55..447ded4b55 100644
--- a/dotnet/client-010/addins/ExcelAddInMessageProcessor/ExcelAddInMessageProcessor.csproj
+++ b/qpid/dotnet/client-010/addins/ExcelAddInMessageProcessor/ExcelAddInMessageProcessor.csproj
diff --git a/dotnet/client-010/addins/ExcelAddInMessageProcessor/Processor.cs b/qpid/dotnet/client-010/addins/ExcelAddInMessageProcessor/Processor.cs
index e414da131f..e414da131f 100644
--- a/dotnet/client-010/addins/ExcelAddInMessageProcessor/Processor.cs
+++ b/qpid/dotnet/client-010/addins/ExcelAddInMessageProcessor/Processor.cs
diff --git a/dotnet/client-010/addins/ExcelAddInMessageProcessor/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/addins/ExcelAddInMessageProcessor/Properties/AssemblyInfo.cs
index 302007674f..302007674f 100644
--- a/dotnet/client-010/addins/ExcelAddInMessageProcessor/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/addins/ExcelAddInMessageProcessor/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/addins/ExcelAddInProducer/ExcelAddInProducer.csproj b/qpid/dotnet/client-010/addins/ExcelAddInProducer/ExcelAddInProducer.csproj
index d9b1b63737..d9b1b63737 100644
--- a/dotnet/client-010/addins/ExcelAddInProducer/ExcelAddInProducer.csproj
+++ b/qpid/dotnet/client-010/addins/ExcelAddInProducer/ExcelAddInProducer.csproj
diff --git a/dotnet/client-010/addins/ExcelAddInProducer/Program.cs b/qpid/dotnet/client-010/addins/ExcelAddInProducer/Program.cs
index a8bbdf2fbd..a8bbdf2fbd 100644
--- a/dotnet/client-010/addins/ExcelAddInProducer/Program.cs
+++ b/qpid/dotnet/client-010/addins/ExcelAddInProducer/Program.cs
diff --git a/dotnet/client-010/addins/ExcelAddInProducer/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/addins/ExcelAddInProducer/Properties/AssemblyInfo.cs
index 28fe3427cb..28fe3427cb 100644
--- a/dotnet/client-010/addins/ExcelAddInProducer/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/addins/ExcelAddInProducer/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/addins/README.txt b/qpid/dotnet/client-010/addins/README.txt
index 5f8df77189..5f8df77189 100644
--- a/dotnet/client-010/addins/README.txt
+++ b/qpid/dotnet/client-010/addins/README.txt
diff --git a/dotnet/client-010/client/Client.csproj b/qpid/dotnet/client-010/client/Client.csproj
index 000407da59..000407da59 100644
--- a/dotnet/client-010/client/Client.csproj
+++ b/qpid/dotnet/client-010/client/Client.csproj
diff --git a/dotnet/client-010/client/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/client/Properties/AssemblyInfo.cs
index 2b6c525b86..2b6c525b86 100644
--- a/dotnet/client-010/client/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/client/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/client/client.sln b/qpid/dotnet/client-010/client/client.sln
index 37455fd177..37455fd177 100644
--- a/dotnet/client-010/client/client.sln
+++ b/qpid/dotnet/client-010/client/client.sln
diff --git a/dotnet/client-010/client/client.suo b/qpid/dotnet/client-010/client/client.suo
index 0640275f99..0640275f99 100644
--- a/dotnet/client-010/client/client.suo
+++ b/qpid/dotnet/client-010/client/client.suo
diff --git a/dotnet/client-010/client/client/Client.cs b/qpid/dotnet/client-010/client/client/Client.cs
index fc9ff22191..fc9ff22191 100644
--- a/dotnet/client-010/client/client/Client.cs
+++ b/qpid/dotnet/client-010/client/client/Client.cs
diff --git a/dotnet/client-010/client/client/ClientConnectionDelegate.cs b/qpid/dotnet/client-010/client/client/ClientConnectionDelegate.cs
index 83aac80e83..83aac80e83 100644
--- a/dotnet/client-010/client/client/ClientConnectionDelegate.cs
+++ b/qpid/dotnet/client-010/client/client/ClientConnectionDelegate.cs
diff --git a/dotnet/client-010/client/client/ClientInterface.cs b/qpid/dotnet/client-010/client/client/ClientInterface.cs
index fcf7ae9f31..fcf7ae9f31 100644
--- a/dotnet/client-010/client/client/ClientInterface.cs
+++ b/qpid/dotnet/client-010/client/client/ClientInterface.cs
diff --git a/dotnet/client-010/client/client/ClientSession.cs b/qpid/dotnet/client-010/client/client/ClientSession.cs
index 190fd7c940..190fd7c940 100644
--- a/dotnet/client-010/client/client/ClientSession.cs
+++ b/qpid/dotnet/client-010/client/client/ClientSession.cs
diff --git a/dotnet/client-010/client/client/ClientSessionDelegate.cs b/qpid/dotnet/client-010/client/client/ClientSessionDelegate.cs
index 7cc4042557..7cc4042557 100644
--- a/dotnet/client-010/client/client/ClientSessionDelegate.cs
+++ b/qpid/dotnet/client-010/client/client/ClientSessionDelegate.cs
diff --git a/dotnet/client-010/client/client/ClosedListenerInterface.cs b/qpid/dotnet/client-010/client/client/ClosedListenerInterface.cs
index 133b00abdd..133b00abdd 100644
--- a/dotnet/client-010/client/client/ClosedListenerInterface.cs
+++ b/qpid/dotnet/client-010/client/client/ClosedListenerInterface.cs
diff --git a/dotnet/client-010/client/client/ErrorCode.cs b/qpid/dotnet/client-010/client/client/ErrorCode.cs
index 74c3daba4b..74c3daba4b 100644
--- a/dotnet/client-010/client/client/ErrorCode.cs
+++ b/qpid/dotnet/client-010/client/client/ErrorCode.cs
diff --git a/dotnet/client-010/client/client/IClient.cs b/qpid/dotnet/client-010/client/client/IClient.cs
index b7b6c26957..b7b6c26957 100644
--- a/dotnet/client-010/client/client/IClient.cs
+++ b/qpid/dotnet/client-010/client/client/IClient.cs
diff --git a/dotnet/client-010/client/client/IClientSession.cs b/qpid/dotnet/client-010/client/client/IClientSession.cs
index 8667db1fb4..8667db1fb4 100644
--- a/dotnet/client-010/client/client/IClientSession.cs
+++ b/qpid/dotnet/client-010/client/client/IClientSession.cs
diff --git a/dotnet/client-010/client/client/IClosedListener.cs b/qpid/dotnet/client-010/client/client/IClosedListener.cs
index 0e2472bba6..0e2472bba6 100644
--- a/dotnet/client-010/client/client/IClosedListener.cs
+++ b/qpid/dotnet/client-010/client/client/IClosedListener.cs
diff --git a/dotnet/client-010/client/client/IMessage.cs b/qpid/dotnet/client-010/client/client/IMessage.cs
index 6eae826a4c..6eae826a4c 100644
--- a/dotnet/client-010/client/client/IMessage.cs
+++ b/qpid/dotnet/client-010/client/client/IMessage.cs
diff --git a/dotnet/client-010/client/client/IMessageListener.cs b/qpid/dotnet/client-010/client/client/IMessageListener.cs
index 44ceb3721e..44ceb3721e 100644
--- a/dotnet/client-010/client/client/IMessageListener.cs
+++ b/qpid/dotnet/client-010/client/client/IMessageListener.cs
diff --git a/dotnet/client-010/client/client/Message.cs b/qpid/dotnet/client-010/client/client/Message.cs
index 6ab62070d2..6ab62070d2 100644
--- a/dotnet/client-010/client/client/Message.cs
+++ b/qpid/dotnet/client-010/client/client/Message.cs
diff --git a/dotnet/client-010/client/default.build b/qpid/dotnet/client-010/client/default.build
index 139796a58d..139796a58d 100644
--- a/dotnet/client-010/client/default.build
+++ b/qpid/dotnet/client-010/client/default.build
diff --git a/dotnet/client-010/client/transport/Binary.cs b/qpid/dotnet/client-010/client/transport/Binary.cs
index f9bd3612dc..f9bd3612dc 100644
--- a/dotnet/client-010/client/transport/Binary.cs
+++ b/qpid/dotnet/client-010/client/transport/Binary.cs
diff --git a/dotnet/client-010/client/transport/Binding.cs b/qpid/dotnet/client-010/client/transport/Binding.cs
index a0899c1066..a0899c1066 100644
--- a/dotnet/client-010/client/transport/Binding.cs
+++ b/qpid/dotnet/client-010/client/transport/Binding.cs
diff --git a/dotnet/client-010/client/transport/Channel.cs b/qpid/dotnet/client-010/client/transport/Channel.cs
index 48ba707182..48ba707182 100644
--- a/dotnet/client-010/client/transport/Channel.cs
+++ b/qpid/dotnet/client-010/client/transport/Channel.cs
diff --git a/dotnet/client-010/client/transport/ChannelDelegate.cs b/qpid/dotnet/client-010/client/transport/ChannelDelegate.cs
index 3a43d6d231..3a43d6d231 100644
--- a/dotnet/client-010/client/transport/ChannelDelegate.cs
+++ b/qpid/dotnet/client-010/client/transport/ChannelDelegate.cs
diff --git a/dotnet/client-010/client/transport/ClientDelegate.cs b/qpid/dotnet/client-010/client/transport/ClientDelegate.cs
index 957324ad41..957324ad41 100644
--- a/dotnet/client-010/client/transport/ClientDelegate.cs
+++ b/qpid/dotnet/client-010/client/transport/ClientDelegate.cs
diff --git a/dotnet/client-010/client/transport/Connection.cs b/qpid/dotnet/client-010/client/transport/Connection.cs
index b97357a96b..b97357a96b 100644
--- a/dotnet/client-010/client/transport/Connection.cs
+++ b/qpid/dotnet/client-010/client/transport/Connection.cs
diff --git a/dotnet/client-010/client/transport/ConnectionDelegate.cs b/qpid/dotnet/client-010/client/transport/ConnectionDelegate.cs
index 5d491bc06f..5d491bc06f 100644
--- a/dotnet/client-010/client/transport/ConnectionDelegate.cs
+++ b/qpid/dotnet/client-010/client/transport/ConnectionDelegate.cs
diff --git a/dotnet/client-010/client/transport/Field.cs b/qpid/dotnet/client-010/client/transport/Field.cs
index 9af8c4a476..9af8c4a476 100644
--- a/dotnet/client-010/client/transport/Field.cs
+++ b/qpid/dotnet/client-010/client/transport/Field.cs
diff --git a/dotnet/client-010/client/transport/Future.cs b/qpid/dotnet/client-010/client/transport/Future.cs
index c0eadfb7ae..c0eadfb7ae 100644
--- a/dotnet/client-010/client/transport/Future.cs
+++ b/qpid/dotnet/client-010/client/transport/Future.cs
diff --git a/dotnet/client-010/client/transport/Header.cs b/qpid/dotnet/client-010/client/transport/Header.cs
index 742531cfd8..742531cfd8 100644
--- a/dotnet/client-010/client/transport/Header.cs
+++ b/qpid/dotnet/client-010/client/transport/Header.cs
diff --git a/dotnet/client-010/client/transport/IBinding.cs b/qpid/dotnet/client-010/client/transport/IBinding.cs
index 607212f1fe..607212f1fe 100644
--- a/dotnet/client-010/client/transport/IBinding.cs
+++ b/qpid/dotnet/client-010/client/transport/IBinding.cs
diff --git a/dotnet/client-010/client/transport/IFuture.cs b/qpid/dotnet/client-010/client/transport/IFuture.cs
index 054b828d13..054b828d13 100644
--- a/dotnet/client-010/client/transport/IFuture.cs
+++ b/qpid/dotnet/client-010/client/transport/IFuture.cs
diff --git a/dotnet/client-010/client/transport/IProtocolDelegate.cs b/qpid/dotnet/client-010/client/transport/IProtocolDelegate.cs
index a9875fd290..a9875fd290 100644
--- a/dotnet/client-010/client/transport/IProtocolDelegate.cs
+++ b/qpid/dotnet/client-010/client/transport/IProtocolDelegate.cs
diff --git a/dotnet/client-010/client/transport/IProtocolEvent.cs b/qpid/dotnet/client-010/client/transport/IProtocolEvent.cs
index 8f915b204a..8f915b204a 100644
--- a/dotnet/client-010/client/transport/IProtocolEvent.cs
+++ b/qpid/dotnet/client-010/client/transport/IProtocolEvent.cs
diff --git a/dotnet/client-010/client/transport/IReceiver.cs b/qpid/dotnet/client-010/client/transport/IReceiver.cs
index 4c4c9572b9..4c4c9572b9 100644
--- a/dotnet/client-010/client/transport/IReceiver.cs
+++ b/qpid/dotnet/client-010/client/transport/IReceiver.cs
diff --git a/dotnet/client-010/client/transport/ISender.cs b/qpid/dotnet/client-010/client/transport/ISender.cs
index d7d1781aec..d7d1781aec 100644
--- a/dotnet/client-010/client/transport/ISender.cs
+++ b/qpid/dotnet/client-010/client/transport/ISender.cs
diff --git a/dotnet/client-010/client/transport/ISession.cs b/qpid/dotnet/client-010/client/transport/ISession.cs
index e843095df6..e843095df6 100644
--- a/dotnet/client-010/client/transport/ISession.cs
+++ b/qpid/dotnet/client-010/client/transport/ISession.cs
diff --git a/dotnet/client-010/client/transport/Method.cs b/qpid/dotnet/client-010/client/transport/Method.cs
index 8540698822..8540698822 100644
--- a/dotnet/client-010/client/transport/Method.cs
+++ b/qpid/dotnet/client-010/client/transport/Method.cs
diff --git a/dotnet/client-010/client/transport/ProtocolDelegate.cs b/qpid/dotnet/client-010/client/transport/ProtocolDelegate.cs
index 32dbd116ff..32dbd116ff 100644
--- a/dotnet/client-010/client/transport/ProtocolDelegate.cs
+++ b/qpid/dotnet/client-010/client/transport/ProtocolDelegate.cs
diff --git a/dotnet/client-010/client/transport/ProtocolError.cs b/qpid/dotnet/client-010/client/transport/ProtocolError.cs
index 2a5bf39565..2a5bf39565 100644
--- a/dotnet/client-010/client/transport/ProtocolError.cs
+++ b/qpid/dotnet/client-010/client/transport/ProtocolError.cs
diff --git a/dotnet/client-010/client/transport/ProtocolEvent.cs b/qpid/dotnet/client-010/client/transport/ProtocolEvent.cs
index 990d5ecc3a..990d5ecc3a 100644
--- a/dotnet/client-010/client/transport/ProtocolEvent.cs
+++ b/qpid/dotnet/client-010/client/transport/ProtocolEvent.cs
diff --git a/dotnet/client-010/client/transport/ProtocolHeader.cs b/qpid/dotnet/client-010/client/transport/ProtocolHeader.cs
index 4adfee25df..4adfee25df 100644
--- a/dotnet/client-010/client/transport/ProtocolHeader.cs
+++ b/qpid/dotnet/client-010/client/transport/ProtocolHeader.cs
diff --git a/dotnet/client-010/client/transport/Range.cs b/qpid/dotnet/client-010/client/transport/Range.cs
index 904b1c1229..904b1c1229 100644
--- a/dotnet/client-010/client/transport/Range.cs
+++ b/qpid/dotnet/client-010/client/transport/Range.cs
diff --git a/dotnet/client-010/client/transport/RangeSet.cs b/qpid/dotnet/client-010/client/transport/RangeSet.cs
index 0a856ee979..0a856ee979 100644
--- a/dotnet/client-010/client/transport/RangeSet.cs
+++ b/qpid/dotnet/client-010/client/transport/RangeSet.cs
diff --git a/dotnet/client-010/client/transport/ReceivedPayload.cs b/qpid/dotnet/client-010/client/transport/ReceivedPayload.cs
index e072ba7493..e072ba7493 100644
--- a/dotnet/client-010/client/transport/ReceivedPayload.cs
+++ b/qpid/dotnet/client-010/client/transport/ReceivedPayload.cs
diff --git a/dotnet/client-010/client/transport/Receiver.cs b/qpid/dotnet/client-010/client/transport/Receiver.cs
index f8d91c3f10..f8d91c3f10 100644
--- a/dotnet/client-010/client/transport/Receiver.cs
+++ b/qpid/dotnet/client-010/client/transport/Receiver.cs
diff --git a/dotnet/client-010/client/transport/Sender.cs b/qpid/dotnet/client-010/client/transport/Sender.cs
index f8b5bdef06..f8b5bdef06 100644
--- a/dotnet/client-010/client/transport/Sender.cs
+++ b/qpid/dotnet/client-010/client/transport/Sender.cs
diff --git a/dotnet/client-010/client/transport/Session.cs b/qpid/dotnet/client-010/client/transport/Session.cs
index 7b4aff9811..7b4aff9811 100644
--- a/dotnet/client-010/client/transport/Session.cs
+++ b/qpid/dotnet/client-010/client/transport/Session.cs
diff --git a/dotnet/client-010/client/transport/SessionDelegate.cs b/qpid/dotnet/client-010/client/transport/SessionDelegate.cs
index 973e22df16..973e22df16 100644
--- a/dotnet/client-010/client/transport/SessionDelegate.cs
+++ b/qpid/dotnet/client-010/client/transport/SessionDelegate.cs
diff --git a/dotnet/client-010/client/transport/Struct.cs b/qpid/dotnet/client-010/client/transport/Struct.cs
index ff8d80fcb1..ff8d80fcb1 100644
--- a/dotnet/client-010/client/transport/Struct.cs
+++ b/qpid/dotnet/client-010/client/transport/Struct.cs
diff --git a/dotnet/client-010/client/transport/codec/AbstractDecoder.cs b/qpid/dotnet/client-010/client/transport/codec/AbstractDecoder.cs
index 2e9e587407..2e9e587407 100644
--- a/dotnet/client-010/client/transport/codec/AbstractDecoder.cs
+++ b/qpid/dotnet/client-010/client/transport/codec/AbstractDecoder.cs
diff --git a/dotnet/client-010/client/transport/codec/AbstractEncoder.cs b/qpid/dotnet/client-010/client/transport/codec/AbstractEncoder.cs
index eb8bdae80a..eb8bdae80a 100644
--- a/dotnet/client-010/client/transport/codec/AbstractEncoder.cs
+++ b/qpid/dotnet/client-010/client/transport/codec/AbstractEncoder.cs
diff --git a/dotnet/client-010/client/transport/codec/Decoder.cs b/qpid/dotnet/client-010/client/transport/codec/Decoder.cs
index 9afc23fd4e..9afc23fd4e 100644
--- a/dotnet/client-010/client/transport/codec/Decoder.cs
+++ b/qpid/dotnet/client-010/client/transport/codec/Decoder.cs
diff --git a/dotnet/client-010/client/transport/codec/Encodable.cs b/qpid/dotnet/client-010/client/transport/codec/Encodable.cs
index 71f4f62458..71f4f62458 100644
--- a/dotnet/client-010/client/transport/codec/Encodable.cs
+++ b/qpid/dotnet/client-010/client/transport/codec/Encodable.cs
diff --git a/dotnet/client-010/client/transport/codec/Encoder.cs b/qpid/dotnet/client-010/client/transport/codec/Encoder.cs
index 282e3ff5b5..282e3ff5b5 100644
--- a/dotnet/client-010/client/transport/codec/Encoder.cs
+++ b/qpid/dotnet/client-010/client/transport/codec/Encoder.cs
diff --git a/dotnet/client-010/client/transport/codec/IDecoder.cs b/qpid/dotnet/client-010/client/transport/codec/IDecoder.cs
index 7de2e93fe7..7de2e93fe7 100644
--- a/dotnet/client-010/client/transport/codec/IDecoder.cs
+++ b/qpid/dotnet/client-010/client/transport/codec/IDecoder.cs
diff --git a/dotnet/client-010/client/transport/codec/IEncodable.cs b/qpid/dotnet/client-010/client/transport/codec/IEncodable.cs
index 5c63e17fdd..5c63e17fdd 100644
--- a/dotnet/client-010/client/transport/codec/IEncodable.cs
+++ b/qpid/dotnet/client-010/client/transport/codec/IEncodable.cs
diff --git a/dotnet/client-010/client/transport/codec/IEncoder.cs b/qpid/dotnet/client-010/client/transport/codec/IEncoder.cs
index 4ffc852052..4ffc852052 100644
--- a/dotnet/client-010/client/transport/codec/IEncoder.cs
+++ b/qpid/dotnet/client-010/client/transport/codec/IEncoder.cs
diff --git a/dotnet/client-010/client/transport/codec/MSDecoder.cs b/qpid/dotnet/client-010/client/transport/codec/MSDecoder.cs
index 59731b739a..59731b739a 100644
--- a/dotnet/client-010/client/transport/codec/MSDecoder.cs
+++ b/qpid/dotnet/client-010/client/transport/codec/MSDecoder.cs
diff --git a/dotnet/client-010/client/transport/codec/MSEncoder.cs b/qpid/dotnet/client-010/client/transport/codec/MSEncoder.cs
index d863c57dee..d863c57dee 100644
--- a/dotnet/client-010/client/transport/codec/MSEncoder.cs
+++ b/qpid/dotnet/client-010/client/transport/codec/MSEncoder.cs
diff --git a/dotnet/client-010/client/transport/exception/ConnectionException.cs b/qpid/dotnet/client-010/client/transport/exception/ConnectionException.cs
index cbf5e39e52..cbf5e39e52 100644
--- a/dotnet/client-010/client/transport/exception/ConnectionException.cs
+++ b/qpid/dotnet/client-010/client/transport/exception/ConnectionException.cs
diff --git a/dotnet/client-010/client/transport/exception/ExceptionArgs.cs b/qpid/dotnet/client-010/client/transport/exception/ExceptionArgs.cs
index 01793a6ad0..01793a6ad0 100644
--- a/dotnet/client-010/client/transport/exception/ExceptionArgs.cs
+++ b/qpid/dotnet/client-010/client/transport/exception/ExceptionArgs.cs
diff --git a/dotnet/client-010/client/transport/exception/ProtocolVersionException.cs b/qpid/dotnet/client-010/client/transport/exception/ProtocolVersionException.cs
index f18fc1173f..f18fc1173f 100644
--- a/dotnet/client-010/client/transport/exception/ProtocolVersionException.cs
+++ b/qpid/dotnet/client-010/client/transport/exception/ProtocolVersionException.cs
diff --git a/dotnet/client-010/client/transport/exception/SessionClosedException.cs b/qpid/dotnet/client-010/client/transport/exception/SessionClosedException.cs
index 89453433ee..89453433ee 100644
--- a/dotnet/client-010/client/transport/exception/SessionClosedException.cs
+++ b/qpid/dotnet/client-010/client/transport/exception/SessionClosedException.cs
diff --git a/dotnet/client-010/client/transport/exception/SessionException.cs b/qpid/dotnet/client-010/client/transport/exception/SessionException.cs
index f02ffa5c2f..f02ffa5c2f 100644
--- a/dotnet/client-010/client/transport/exception/SessionException.cs
+++ b/qpid/dotnet/client-010/client/transport/exception/SessionException.cs
diff --git a/dotnet/client-010/client/transport/exception/TransportException.cs b/qpid/dotnet/client-010/client/transport/exception/TransportException.cs
index d016f90a83..d016f90a83 100644
--- a/dotnet/client-010/client/transport/exception/TransportException.cs
+++ b/qpid/dotnet/client-010/client/transport/exception/TransportException.cs
diff --git a/dotnet/client-010/client/transport/network/Assembler.cs b/qpid/dotnet/client-010/client/transport/network/Assembler.cs
index ff85f11c2f..ff85f11c2f 100644
--- a/dotnet/client-010/client/transport/network/Assembler.cs
+++ b/qpid/dotnet/client-010/client/transport/network/Assembler.cs
diff --git a/dotnet/client-010/client/transport/network/Disassembler.cs b/qpid/dotnet/client-010/client/transport/network/Disassembler.cs
index 3f0a6a8974..3f0a6a8974 100644
--- a/dotnet/client-010/client/transport/network/Disassembler.cs
+++ b/qpid/dotnet/client-010/client/transport/network/Disassembler.cs
diff --git a/dotnet/client-010/client/transport/network/Frame.cs b/qpid/dotnet/client-010/client/transport/network/Frame.cs
index b8ec36d8b6..b8ec36d8b6 100644
--- a/dotnet/client-010/client/transport/network/Frame.cs
+++ b/qpid/dotnet/client-010/client/transport/network/Frame.cs
diff --git a/dotnet/client-010/client/transport/network/IIoSender.cs b/qpid/dotnet/client-010/client/transport/network/IIoSender.cs
index 747b5b9f98..747b5b9f98 100644
--- a/dotnet/client-010/client/transport/network/IIoSender.cs
+++ b/qpid/dotnet/client-010/client/transport/network/IIoSender.cs
diff --git a/dotnet/client-010/client/transport/network/INetworkDelegate.cs b/qpid/dotnet/client-010/client/transport/network/INetworkDelegate.cs
index 9226adc2b7..9226adc2b7 100644
--- a/dotnet/client-010/client/transport/network/INetworkDelegate.cs
+++ b/qpid/dotnet/client-010/client/transport/network/INetworkDelegate.cs
diff --git a/dotnet/client-010/client/transport/network/INetworkEvent.cs b/qpid/dotnet/client-010/client/transport/network/INetworkEvent.cs
index e6f0d6fc8a..e6f0d6fc8a 100644
--- a/dotnet/client-010/client/transport/network/INetworkEvent.cs
+++ b/qpid/dotnet/client-010/client/transport/network/INetworkEvent.cs
diff --git a/dotnet/client-010/client/transport/network/InputHandler.cs b/qpid/dotnet/client-010/client/transport/network/InputHandler.cs
index c5d5f13727..c5d5f13727 100644
--- a/dotnet/client-010/client/transport/network/InputHandler.cs
+++ b/qpid/dotnet/client-010/client/transport/network/InputHandler.cs
diff --git a/dotnet/client-010/client/transport/network/NetworkDelegate.cs b/qpid/dotnet/client-010/client/transport/network/NetworkDelegate.cs
index 69598a43e8..69598a43e8 100644
--- a/dotnet/client-010/client/transport/network/NetworkDelegate.cs
+++ b/qpid/dotnet/client-010/client/transport/network/NetworkDelegate.cs
diff --git a/dotnet/client-010/client/transport/network/NetworkEvent.cs b/qpid/dotnet/client-010/client/transport/network/NetworkEvent.cs
index e5ac6de93a..e5ac6de93a 100644
--- a/dotnet/client-010/client/transport/network/NetworkEvent.cs
+++ b/qpid/dotnet/client-010/client/transport/network/NetworkEvent.cs
diff --git a/dotnet/client-010/client/transport/network/io/IIoSender.cs b/qpid/dotnet/client-010/client/transport/network/io/IIoSender.cs
index acc7724a06..acc7724a06 100644
--- a/dotnet/client-010/client/transport/network/io/IIoSender.cs
+++ b/qpid/dotnet/client-010/client/transport/network/io/IIoSender.cs
diff --git a/dotnet/client-010/client/transport/network/io/IIoTransport.cs b/qpid/dotnet/client-010/client/transport/network/io/IIoTransport.cs
index 41a09e7079..41a09e7079 100644
--- a/dotnet/client-010/client/transport/network/io/IIoTransport.cs
+++ b/qpid/dotnet/client-010/client/transport/network/io/IIoTransport.cs
diff --git a/dotnet/client-010/client/transport/network/io/IoReceiver.cs b/qpid/dotnet/client-010/client/transport/network/io/IoReceiver.cs
index b60444fa29..b60444fa29 100644
--- a/dotnet/client-010/client/transport/network/io/IoReceiver.cs
+++ b/qpid/dotnet/client-010/client/transport/network/io/IoReceiver.cs
diff --git a/dotnet/client-010/client/transport/network/io/IoSSLTransport.cs b/qpid/dotnet/client-010/client/transport/network/io/IoSSLTransport.cs
index b6c7940a1d..b6c7940a1d 100644
--- a/dotnet/client-010/client/transport/network/io/IoSSLTransport.cs
+++ b/qpid/dotnet/client-010/client/transport/network/io/IoSSLTransport.cs
diff --git a/dotnet/client-010/client/transport/network/io/IoSender.cs b/qpid/dotnet/client-010/client/transport/network/io/IoSender.cs
index 025b782a12..025b782a12 100644
--- a/dotnet/client-010/client/transport/network/io/IoSender.cs
+++ b/qpid/dotnet/client-010/client/transport/network/io/IoSender.cs
diff --git a/dotnet/client-010/client/transport/network/io/IoTransport.cs b/qpid/dotnet/client-010/client/transport/network/io/IoTransport.cs
index 483e5428b8..483e5428b8 100644
--- a/dotnet/client-010/client/transport/network/io/IoTransport.cs
+++ b/qpid/dotnet/client-010/client/transport/network/io/IoTransport.cs
diff --git a/dotnet/client-010/client/transport/util/ByteEncoder.cs b/qpid/dotnet/client-010/client/transport/util/ByteEncoder.cs
index 873ca75688..873ca75688 100644
--- a/dotnet/client-010/client/transport/util/ByteEncoder.cs
+++ b/qpid/dotnet/client-010/client/transport/util/ByteEncoder.cs
diff --git a/dotnet/client-010/client/transport/util/CircularBuffer.cs b/qpid/dotnet/client-010/client/transport/util/CircularBuffer.cs
index 00d7b20d4c..00d7b20d4c 100644
--- a/dotnet/client-010/client/transport/util/CircularBuffer.cs
+++ b/qpid/dotnet/client-010/client/transport/util/CircularBuffer.cs
diff --git a/dotnet/client-010/client/transport/util/Functions.cs b/qpid/dotnet/client-010/client/transport/util/Functions.cs
index eee3848386..eee3848386 100644
--- a/dotnet/client-010/client/transport/util/Functions.cs
+++ b/qpid/dotnet/client-010/client/transport/util/Functions.cs
diff --git a/dotnet/client-010/client/transport/util/Logger.cs b/qpid/dotnet/client-010/client/transport/util/Logger.cs
index f889fe2aab..f889fe2aab 100644
--- a/dotnet/client-010/client/transport/util/Logger.cs
+++ b/qpid/dotnet/client-010/client/transport/util/Logger.cs
diff --git a/dotnet/client-010/client/transport/util/ResultFuture.cs b/qpid/dotnet/client-010/client/transport/util/ResultFuture.cs
index 0de2b27656..0de2b27656 100644
--- a/dotnet/client-010/client/transport/util/ResultFuture.cs
+++ b/qpid/dotnet/client-010/client/transport/util/ResultFuture.cs
diff --git a/dotnet/client-010/client/transport/util/Serial.cs b/qpid/dotnet/client-010/client/transport/util/Serial.cs
index 874097084a..874097084a 100644
--- a/dotnet/client-010/client/transport/util/Serial.cs
+++ b/qpid/dotnet/client-010/client/transport/util/Serial.cs
diff --git a/dotnet/client-010/client/transport/util/UUID.cs b/qpid/dotnet/client-010/client/transport/util/UUID.cs
index 07a3d267a5..07a3d267a5 100644
--- a/dotnet/client-010/client/transport/util/UUID.cs
+++ b/qpid/dotnet/client-010/client/transport/util/UUID.cs
diff --git a/dotnet/client-010/default.build b/qpid/dotnet/client-010/default.build
index eb6ee371f7..eb6ee371f7 100644
--- a/dotnet/client-010/default.build
+++ b/qpid/dotnet/client-010/default.build
diff --git a/dotnet/client-010/demo/Demo.csproj b/qpid/dotnet/client-010/demo/Demo.csproj
index 1668314425..1668314425 100644
--- a/dotnet/client-010/demo/Demo.csproj
+++ b/qpid/dotnet/client-010/demo/Demo.csproj
diff --git a/dotnet/client-010/demo/Program.cs b/qpid/dotnet/client-010/demo/Program.cs
index aa748544a0..aa748544a0 100644
--- a/dotnet/client-010/demo/Program.cs
+++ b/qpid/dotnet/client-010/demo/Program.cs
diff --git a/dotnet/client-010/demo/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/demo/Properties/AssemblyInfo.cs
index 58c7baf4b4..58c7baf4b4 100644
--- a/dotnet/client-010/demo/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/demo/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/demo/Properties/Resources.Designer.cs b/qpid/dotnet/client-010/demo/Properties/Resources.Designer.cs
index 912f9e5b81..912f9e5b81 100644
--- a/dotnet/client-010/demo/Properties/Resources.Designer.cs
+++ b/qpid/dotnet/client-010/demo/Properties/Resources.Designer.cs
diff --git a/dotnet/client-010/demo/Properties/Resources.resx b/qpid/dotnet/client-010/demo/Properties/Resources.resx
index af03750170..af03750170 100644
--- a/dotnet/client-010/demo/Properties/Resources.resx
+++ b/qpid/dotnet/client-010/demo/Properties/Resources.resx
diff --git a/dotnet/client-010/demo/Properties/Settings.Designer.cs b/qpid/dotnet/client-010/demo/Properties/Settings.Designer.cs
index fc41e577fe..fc41e577fe 100644
--- a/dotnet/client-010/demo/Properties/Settings.Designer.cs
+++ b/qpid/dotnet/client-010/demo/Properties/Settings.Designer.cs
diff --git a/dotnet/client-010/demo/Properties/Settings.settings b/qpid/dotnet/client-010/demo/Properties/Settings.settings
index 64cfd9241c..64cfd9241c 100644
--- a/dotnet/client-010/demo/Properties/Settings.settings
+++ b/qpid/dotnet/client-010/demo/Properties/Settings.settings
diff --git a/dotnet/client-010/demo/default.build b/qpid/dotnet/client-010/demo/default.build
index f582e392f8..f582e392f8 100644
--- a/dotnet/client-010/demo/default.build
+++ b/qpid/dotnet/client-010/demo/default.build
diff --git a/dotnet/client-010/examples/direct/example-direct-Listener/Listener.cs b/qpid/dotnet/client-010/examples/direct/example-direct-Listener/Listener.cs
index f20090526d..f20090526d 100644
--- a/dotnet/client-010/examples/direct/example-direct-Listener/Listener.cs
+++ b/qpid/dotnet/client-010/examples/direct/example-direct-Listener/Listener.cs
diff --git a/dotnet/client-010/examples/direct/example-direct-Listener/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/direct/example-direct-Listener/Properties/AssemblyInfo.cs
index 2fab6a538a..2fab6a538a 100644
--- a/dotnet/client-010/examples/direct/example-direct-Listener/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/examples/direct/example-direct-Listener/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/direct/example-direct-Listener/default.build b/qpid/dotnet/client-010/examples/direct/example-direct-Listener/default.build
index f5db519af7..f5db519af7 100644
--- a/dotnet/client-010/examples/direct/example-direct-Listener/default.build
+++ b/qpid/dotnet/client-010/examples/direct/example-direct-Listener/default.build
diff --git a/dotnet/client-010/examples/direct/example-direct-Listener/example-direct-Listener.csproj b/qpid/dotnet/client-010/examples/direct/example-direct-Listener/example-direct-Listener.csproj
index ac026b397d..ac026b397d 100644
--- a/dotnet/client-010/examples/direct/example-direct-Listener/example-direct-Listener.csproj
+++ b/qpid/dotnet/client-010/examples/direct/example-direct-Listener/example-direct-Listener.csproj
diff --git a/dotnet/client-010/examples/direct/example-direct-producer/Producer.cs b/qpid/dotnet/client-010/examples/direct/example-direct-producer/Producer.cs
index f62667bf98..f62667bf98 100644
--- a/dotnet/client-010/examples/direct/example-direct-producer/Producer.cs
+++ b/qpid/dotnet/client-010/examples/direct/example-direct-producer/Producer.cs
diff --git a/dotnet/client-010/examples/direct/example-direct-producer/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/direct/example-direct-producer/Properties/AssemblyInfo.cs
index 84590e67c1..84590e67c1 100644
--- a/dotnet/client-010/examples/direct/example-direct-producer/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/examples/direct/example-direct-producer/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/direct/example-direct-producer/default.build b/qpid/dotnet/client-010/examples/direct/example-direct-producer/default.build
index c4e78444c7..c4e78444c7 100644
--- a/dotnet/client-010/examples/direct/example-direct-producer/default.build
+++ b/qpid/dotnet/client-010/examples/direct/example-direct-producer/default.build
diff --git a/dotnet/client-010/examples/direct/example-direct-producer/example-direct-producer.csproj b/qpid/dotnet/client-010/examples/direct/example-direct-producer/example-direct-producer.csproj
index 10d9d96aea..10d9d96aea 100644
--- a/dotnet/client-010/examples/direct/example-direct-producer/example-direct-producer.csproj
+++ b/qpid/dotnet/client-010/examples/direct/example-direct-producer/example-direct-producer.csproj
diff --git a/dotnet/client-010/examples/direct/verify b/qpid/dotnet/client-010/examples/direct/verify
index 7da08480a2..7da08480a2 100644
--- a/dotnet/client-010/examples/direct/verify
+++ b/qpid/dotnet/client-010/examples/direct/verify
diff --git a/dotnet/client-010/examples/direct/verify.in b/qpid/dotnet/client-010/examples/direct/verify.in
index f57d931663..f57d931663 100644
--- a/dotnet/client-010/examples/direct/verify.in
+++ b/qpid/dotnet/client-010/examples/direct/verify.in
diff --git a/dotnet/client-010/examples/direct/verify_cpp_dotnet b/qpid/dotnet/client-010/examples/direct/verify_cpp_dotnet
index 648c8b6bc1..648c8b6bc1 100644
--- a/dotnet/client-010/examples/direct/verify_cpp_dotnet
+++ b/qpid/dotnet/client-010/examples/direct/verify_cpp_dotnet
diff --git a/dotnet/client-010/examples/direct/verify_cpp_dotnet.in b/qpid/dotnet/client-010/examples/direct/verify_cpp_dotnet.in
index b3543cefe5..b3543cefe5 100644
--- a/dotnet/client-010/examples/direct/verify_cpp_dotnet.in
+++ b/qpid/dotnet/client-010/examples/direct/verify_cpp_dotnet.in
diff --git a/dotnet/client-010/examples/direct/verify_dotnet_cpp b/qpid/dotnet/client-010/examples/direct/verify_dotnet_cpp
index 5093da6088..5093da6088 100644
--- a/dotnet/client-010/examples/direct/verify_dotnet_cpp
+++ b/qpid/dotnet/client-010/examples/direct/verify_dotnet_cpp
diff --git a/dotnet/client-010/examples/direct/verify_dotnet_cpp.in b/qpid/dotnet/client-010/examples/direct/verify_dotnet_cpp.in
index fcb6cd66de..fcb6cd66de 100644
--- a/dotnet/client-010/examples/direct/verify_dotnet_cpp.in
+++ b/qpid/dotnet/client-010/examples/direct/verify_dotnet_cpp.in
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Listener/Listener.cs b/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/Listener.cs
index b1967b59be..b1967b59be 100644
--- a/dotnet/client-010/examples/fanout/example-fanout-Listener/Listener.cs
+++ b/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/Listener.cs
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Listener/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/Properties/AssemblyInfo.cs
index 45ff62073e..45ff62073e 100644
--- a/dotnet/client-010/examples/fanout/example-fanout-Listener/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Listener/default.build b/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/default.build
index dde36daf17..dde36daf17 100644
--- a/dotnet/client-010/examples/fanout/example-fanout-Listener/default.build
+++ b/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/default.build
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Listener/example-fanout-Listener.csproj b/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/example-fanout-Listener.csproj
index 3bd0b3d0d0..3bd0b3d0d0 100644
--- a/dotnet/client-010/examples/fanout/example-fanout-Listener/example-fanout-Listener.csproj
+++ b/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/example-fanout-Listener.csproj
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Producer/Producer.cs b/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/Producer.cs
index a781358a7e..a781358a7e 100644
--- a/dotnet/client-010/examples/fanout/example-fanout-Producer/Producer.cs
+++ b/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/Producer.cs
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Producer/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/Properties/AssemblyInfo.cs
index c19bb5b949..c19bb5b949 100644
--- a/dotnet/client-010/examples/fanout/example-fanout-Producer/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Producer/default.build b/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/default.build
index c4d39e41da..c4d39e41da 100644
--- a/dotnet/client-010/examples/fanout/example-fanout-Producer/default.build
+++ b/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/default.build
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Producer/example-fanout-Producer.csproj b/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/example-fanout-Producer.csproj
index 8b04dd8199..8b04dd8199 100644
--- a/dotnet/client-010/examples/fanout/example-fanout-Producer/example-fanout-Producer.csproj
+++ b/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/example-fanout-Producer.csproj
diff --git a/dotnet/client-010/examples/fanout/verify b/qpid/dotnet/client-010/examples/fanout/verify
index 51b7327243..51b7327243 100644
--- a/dotnet/client-010/examples/fanout/verify
+++ b/qpid/dotnet/client-010/examples/fanout/verify
diff --git a/dotnet/client-010/examples/fanout/verify.in b/qpid/dotnet/client-010/examples/fanout/verify.in
index 37a4a4aaa8..37a4a4aaa8 100644
--- a/dotnet/client-010/examples/fanout/verify.in
+++ b/qpid/dotnet/client-010/examples/fanout/verify.in
diff --git a/dotnet/client-010/examples/fanout/verify_cpp_dotnet b/qpid/dotnet/client-010/examples/fanout/verify_cpp_dotnet
index 5716d3119b..5716d3119b 100644
--- a/dotnet/client-010/examples/fanout/verify_cpp_dotnet
+++ b/qpid/dotnet/client-010/examples/fanout/verify_cpp_dotnet
diff --git a/dotnet/client-010/examples/fanout/verify_cpp_dotnet.in b/qpid/dotnet/client-010/examples/fanout/verify_cpp_dotnet.in
index 0a72d8fd3c..0a72d8fd3c 100644
--- a/dotnet/client-010/examples/fanout/verify_cpp_dotnet.in
+++ b/qpid/dotnet/client-010/examples/fanout/verify_cpp_dotnet.in
diff --git a/dotnet/client-010/examples/fanout/verify_dotnet_cpp b/qpid/dotnet/client-010/examples/fanout/verify_dotnet_cpp
index c755d1da41..c755d1da41 100644
--- a/dotnet/client-010/examples/fanout/verify_dotnet_cpp
+++ b/qpid/dotnet/client-010/examples/fanout/verify_dotnet_cpp
diff --git a/dotnet/client-010/examples/fanout/verify_dotnet_cpp.in b/qpid/dotnet/client-010/examples/fanout/verify_dotnet_cpp.in
index 588559938f..588559938f 100644
--- a/dotnet/client-010/examples/fanout/verify_dotnet_cpp.in
+++ b/qpid/dotnet/client-010/examples/fanout/verify_dotnet_cpp.in
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Listener.cs b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Listener.cs
index aeaf3f043b..aeaf3f043b 100644
--- a/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Listener.cs
+++ b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Listener.cs
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Properties/AssemblyInfo.cs
index ef791c6738..ef791c6738 100644
--- a/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/default.build b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/default.build
index fe2d9bf4ba..fe2d9bf4ba 100644
--- a/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/default.build
+++ b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/default.build
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/example-pub-sub-Listener.csproj b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/example-pub-sub-Listener.csproj
index 851faa7f21..851faa7f21 100644
--- a/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/example-pub-sub-Listener.csproj
+++ b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/example-pub-sub-Listener.csproj
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Properties/AssemblyInfo.cs
index b6d7f3c818..b6d7f3c818 100644
--- a/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Publisher.cs b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Publisher.cs
index c87985d288..c87985d288 100644
--- a/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Publisher.cs
+++ b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Publisher.cs
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/default.build b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/default.build
index 3f270afe9e..3f270afe9e 100644
--- a/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/default.build
+++ b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/default.build
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/example-pub-sub-Publisher.csproj b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/example-pub-sub-Publisher.csproj
index a9dee76a36..a9dee76a36 100644
--- a/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/example-pub-sub-Publisher.csproj
+++ b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/example-pub-sub-Publisher.csproj
diff --git a/dotnet/client-010/examples/pub-sub/verify b/qpid/dotnet/client-010/examples/pub-sub/verify
index 45d80c4866..45d80c4866 100644
--- a/dotnet/client-010/examples/pub-sub/verify
+++ b/qpid/dotnet/client-010/examples/pub-sub/verify
diff --git a/dotnet/client-010/examples/pub-sub/verify.in b/qpid/dotnet/client-010/examples/pub-sub/verify.in
index 6a5adc4d89..6a5adc4d89 100644
--- a/dotnet/client-010/examples/pub-sub/verify.in
+++ b/qpid/dotnet/client-010/examples/pub-sub/verify.in
diff --git a/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet b/qpid/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet
index 39d92cbb8b..39d92cbb8b 100644
--- a/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet
+++ b/qpid/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet
diff --git a/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet.in b/qpid/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet.in
index 4e058f7645..4e058f7645 100644
--- a/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet.in
+++ b/qpid/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet.in
diff --git a/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp b/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp
index bf99e422a1..bf99e422a1 100644
--- a/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp
+++ b/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp
diff --git a/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp.in b/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp.in
index 64ac27846d..64ac27846d 100644
--- a/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp.in
+++ b/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp.in
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Client/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/Properties/AssemblyInfo.cs
index a438acaa1f..a438acaa1f 100644
--- a/dotnet/client-010/examples/request-response/example-request-response-Client/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Client/RequestResponseClient.cs b/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/RequestResponseClient.cs
index 170008c840..170008c840 100644
--- a/dotnet/client-010/examples/request-response/example-request-response-Client/RequestResponseClient.cs
+++ b/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/RequestResponseClient.cs
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Client/default.build b/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/default.build
index c3d9af9baf..c3d9af9baf 100644
--- a/dotnet/client-010/examples/request-response/example-request-response-Client/default.build
+++ b/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/default.build
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Client/example-request-response-Client.csproj b/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/example-request-response-Client.csproj
index 21dc6ceed4..21dc6ceed4 100644
--- a/dotnet/client-010/examples/request-response/example-request-response-Client/example-request-response-Client.csproj
+++ b/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/example-request-response-Client.csproj
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Server/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/Properties/AssemblyInfo.cs
index ba702a28cc..ba702a28cc 100644
--- a/dotnet/client-010/examples/request-response/example-request-response-Server/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Server/Server.cs b/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/Server.cs
index ea87627dbf..ea87627dbf 100644
--- a/dotnet/client-010/examples/request-response/example-request-response-Server/Server.cs
+++ b/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/Server.cs
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Server/default.build b/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/default.build
index a3e4691d10..a3e4691d10 100644
--- a/dotnet/client-010/examples/request-response/example-request-response-Server/default.build
+++ b/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/default.build
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Server/example-request-response-Server.csproj b/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/example-request-response-Server.csproj
index 3eb2a3c035..3eb2a3c035 100644
--- a/dotnet/client-010/examples/request-response/example-request-response-Server/example-request-response-Server.csproj
+++ b/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/example-request-response-Server.csproj
diff --git a/dotnet/client-010/examples/request-response/verify b/qpid/dotnet/client-010/examples/request-response/verify
index fa69461f68..fa69461f68 100644
--- a/dotnet/client-010/examples/request-response/verify
+++ b/qpid/dotnet/client-010/examples/request-response/verify
diff --git a/dotnet/client-010/examples/request-response/verify.in b/qpid/dotnet/client-010/examples/request-response/verify.in
index 5357591289..5357591289 100644
--- a/dotnet/client-010/examples/request-response/verify.in
+++ b/qpid/dotnet/client-010/examples/request-response/verify.in
diff --git a/dotnet/client-010/examples/request-response/verify_cpp_dotnet b/qpid/dotnet/client-010/examples/request-response/verify_cpp_dotnet
index 791f48fe60..791f48fe60 100644
--- a/dotnet/client-010/examples/request-response/verify_cpp_dotnet
+++ b/qpid/dotnet/client-010/examples/request-response/verify_cpp_dotnet
diff --git a/dotnet/client-010/examples/request-response/verify_cpp_dotnet.in b/qpid/dotnet/client-010/examples/request-response/verify_cpp_dotnet.in
index 0f4b5341b2..0f4b5341b2 100644
--- a/dotnet/client-010/examples/request-response/verify_cpp_dotnet.in
+++ b/qpid/dotnet/client-010/examples/request-response/verify_cpp_dotnet.in
diff --git a/dotnet/client-010/examples/request-response/verify_dotnet_cpp b/qpid/dotnet/client-010/examples/request-response/verify_dotnet_cpp
index 95905c43c9..95905c43c9 100644
--- a/dotnet/client-010/examples/request-response/verify_dotnet_cpp
+++ b/qpid/dotnet/client-010/examples/request-response/verify_dotnet_cpp
diff --git a/dotnet/client-010/examples/request-response/verify_dotnet_cpp.in b/qpid/dotnet/client-010/examples/request-response/verify_dotnet_cpp.in
index 849fad39c6..849fad39c6 100644
--- a/dotnet/client-010/examples/request-response/verify_dotnet_cpp.in
+++ b/qpid/dotnet/client-010/examples/request-response/verify_dotnet_cpp.in
diff --git a/dotnet/client-010/gentool/Composite.tpl b/qpid/dotnet/client-010/gentool/Composite.tpl
index c5a1099ef3..c5a1099ef3 100644
--- a/dotnet/client-010/gentool/Composite.tpl
+++ b/qpid/dotnet/client-010/gentool/Composite.tpl
diff --git a/dotnet/client-010/gentool/Constant.tpl b/qpid/dotnet/client-010/gentool/Constant.tpl
index 191a1dbd6e..191a1dbd6e 100644
--- a/dotnet/client-010/gentool/Constant.tpl
+++ b/qpid/dotnet/client-010/gentool/Constant.tpl
diff --git a/dotnet/client-010/gentool/Enum.tpl b/qpid/dotnet/client-010/gentool/Enum.tpl
index 5d958c7bf6..5d958c7bf6 100644
--- a/dotnet/client-010/gentool/Enum.tpl
+++ b/qpid/dotnet/client-010/gentool/Enum.tpl
diff --git a/dotnet/client-010/gentool/IInvoker.tpl b/qpid/dotnet/client-010/gentool/IInvoker.tpl
index 713d10c610..713d10c610 100644
--- a/dotnet/client-010/gentool/IInvoker.tpl
+++ b/qpid/dotnet/client-010/gentool/IInvoker.tpl
diff --git a/dotnet/client-010/gentool/Invoker.tpl b/qpid/dotnet/client-010/gentool/Invoker.tpl
index 2f69aee66d..2f69aee66d 100644
--- a/dotnet/client-010/gentool/Invoker.tpl
+++ b/qpid/dotnet/client-010/gentool/Invoker.tpl
diff --git a/dotnet/client-010/gentool/MethodDelegate.tpl b/qpid/dotnet/client-010/gentool/MethodDelegate.tpl
index 788d2e29e6..788d2e29e6 100644
--- a/dotnet/client-010/gentool/MethodDelegate.tpl
+++ b/qpid/dotnet/client-010/gentool/MethodDelegate.tpl
diff --git a/dotnet/client-010/gentool/Option.tpl b/qpid/dotnet/client-010/gentool/Option.tpl
index d6e1a44870..d6e1a44870 100644
--- a/dotnet/client-010/gentool/Option.tpl
+++ b/qpid/dotnet/client-010/gentool/Option.tpl
diff --git a/dotnet/client-010/gentool/StructFactory.tpl b/qpid/dotnet/client-010/gentool/StructFactory.tpl
index 2a11e2530c..2a11e2530c 100644
--- a/dotnet/client-010/gentool/StructFactory.tpl
+++ b/qpid/dotnet/client-010/gentool/StructFactory.tpl
diff --git a/dotnet/client-010/gentool/Type.tpl b/qpid/dotnet/client-010/gentool/Type.tpl
index c8ec7ac153..c8ec7ac153 100644
--- a/dotnet/client-010/gentool/Type.tpl
+++ b/qpid/dotnet/client-010/gentool/Type.tpl
diff --git a/dotnet/client-010/gentool/build.xml b/qpid/dotnet/client-010/gentool/build.xml
index 76ddb1571d..76ddb1571d 100644
--- a/dotnet/client-010/gentool/build.xml
+++ b/qpid/dotnet/client-010/gentool/build.xml
diff --git a/dotnet/client-010/gentool/codegen b/qpid/dotnet/client-010/gentool/codegen
index baebf378fd..baebf378fd 100644
--- a/dotnet/client-010/gentool/codegen
+++ b/qpid/dotnet/client-010/gentool/codegen
diff --git a/dotnet/client-010/gentool/dotnetgenutil.py b/qpid/dotnet/client-010/gentool/dotnetgenutil.py
index 4d9c8a69d7..4d9c8a69d7 100644
--- a/dotnet/client-010/gentool/dotnetgenutil.py
+++ b/qpid/dotnet/client-010/gentool/dotnetgenutil.py
diff --git a/dotnet/client-010/lib/log4net/log4net-licence.txt b/qpid/dotnet/client-010/lib/log4net/log4net-licence.txt
index 261eeb9e9f..261eeb9e9f 100644
--- a/dotnet/client-010/lib/log4net/log4net-licence.txt
+++ b/qpid/dotnet/client-010/lib/log4net/log4net-licence.txt
diff --git a/dotnet/client-010/lib/log4net/log4net.dll b/qpid/dotnet/client-010/lib/log4net/log4net.dll
index 995816f27b..995816f27b 100644
--- a/dotnet/client-010/lib/log4net/log4net.dll
+++ b/qpid/dotnet/client-010/lib/log4net/log4net.dll
diff --git a/dotnet/client-010/lib/log4net/log4net.xml b/qpid/dotnet/client-010/lib/log4net/log4net.xml
index 5beb669ab0..5beb669ab0 100644
--- a/dotnet/client-010/lib/log4net/log4net.xml
+++ b/qpid/dotnet/client-010/lib/log4net/log4net.xml
diff --git a/dotnet/client-010/lib/nunit/nunit-licence.txt b/qpid/dotnet/client-010/lib/nunit/nunit-licence.txt
index b2316295d3..b2316295d3 100644
--- a/dotnet/client-010/lib/nunit/nunit-licence.txt
+++ b/qpid/dotnet/client-010/lib/nunit/nunit-licence.txt
diff --git a/dotnet/client-010/lib/nunit/nunit.framework.dll b/qpid/dotnet/client-010/lib/nunit/nunit.framework.dll
index 53666e74c9..53666e74c9 100644
--- a/dotnet/client-010/lib/nunit/nunit.framework.dll
+++ b/qpid/dotnet/client-010/lib/nunit/nunit.framework.dll
diff --git a/dotnet/client-010/lib/plossum/C5-License.txt b/qpid/dotnet/client-010/lib/plossum/C5-License.txt
index 5649c70cf3..5649c70cf3 100644
--- a/dotnet/client-010/lib/plossum/C5-License.txt
+++ b/qpid/dotnet/client-010/lib/plossum/C5-License.txt
diff --git a/dotnet/client-010/lib/plossum/C5.dll b/qpid/dotnet/client-010/lib/plossum/C5.dll
index 08362849c9..08362849c9 100644
--- a/dotnet/client-010/lib/plossum/C5.dll
+++ b/qpid/dotnet/client-010/lib/plossum/C5.dll
diff --git a/dotnet/client-010/lib/plossum/Plossum CommandLine.dll b/qpid/dotnet/client-010/lib/plossum/Plossum CommandLine.dll
index d3aad9485d..d3aad9485d 100644
--- a/dotnet/client-010/lib/plossum/Plossum CommandLine.dll
+++ b/qpid/dotnet/client-010/lib/plossum/Plossum CommandLine.dll
diff --git a/dotnet/client-010/lib/plossum/license.txt b/qpid/dotnet/client-010/lib/plossum/license.txt
index 532b9c11a3..532b9c11a3 100644
--- a/dotnet/client-010/lib/plossum/license.txt
+++ b/qpid/dotnet/client-010/lib/plossum/license.txt
diff --git a/dotnet/client-010/log.xml b/qpid/dotnet/client-010/log.xml
index cda84d7c7b..cda84d7c7b 100644
--- a/dotnet/client-010/log.xml
+++ b/qpid/dotnet/client-010/log.xml
diff --git a/dotnet/client-010/management/console/AbstractConsole.cs b/qpid/dotnet/client-010/management/console/AbstractConsole.cs
index 315b2b6d48..315b2b6d48 100644
--- a/dotnet/client-010/management/console/AbstractConsole.cs
+++ b/qpid/dotnet/client-010/management/console/AbstractConsole.cs
diff --git a/dotnet/client-010/management/console/Agent.cs b/qpid/dotnet/client-010/management/console/Agent.cs
index df544a4dd0..df544a4dd0 100644
--- a/dotnet/client-010/management/console/Agent.cs
+++ b/qpid/dotnet/client-010/management/console/Agent.cs
diff --git a/dotnet/client-010/management/console/Broker.cs b/qpid/dotnet/client-010/management/console/Broker.cs
index 7684da9e12..7684da9e12 100644
--- a/dotnet/client-010/management/console/Broker.cs
+++ b/qpid/dotnet/client-010/management/console/Broker.cs
diff --git a/dotnet/client-010/management/console/BrokerURL.cs b/qpid/dotnet/client-010/management/console/BrokerURL.cs
index 77318e4295..77318e4295 100644
--- a/dotnet/client-010/management/console/BrokerURL.cs
+++ b/qpid/dotnet/client-010/management/console/BrokerURL.cs
diff --git a/dotnet/client-010/management/console/ClassKey.cs b/qpid/dotnet/client-010/management/console/ClassKey.cs
index a3aba2761a..a3aba2761a 100644
--- a/dotnet/client-010/management/console/ClassKey.cs
+++ b/qpid/dotnet/client-010/management/console/ClassKey.cs
diff --git a/dotnet/client-010/management/console/Console.cs b/qpid/dotnet/client-010/management/console/Console.cs
index 8ff201c676..8ff201c676 100644
--- a/dotnet/client-010/management/console/Console.cs
+++ b/qpid/dotnet/client-010/management/console/Console.cs
diff --git a/dotnet/client-010/management/console/MethodResult.cs b/qpid/dotnet/client-010/management/console/MethodResult.cs
index 7215f5dcbc..7215f5dcbc 100644
--- a/dotnet/client-010/management/console/MethodResult.cs
+++ b/qpid/dotnet/client-010/management/console/MethodResult.cs
diff --git a/dotnet/client-010/management/console/ObjectID.cs b/qpid/dotnet/client-010/management/console/ObjectID.cs
index 9532c8e64c..9532c8e64c 100644
--- a/dotnet/client-010/management/console/ObjectID.cs
+++ b/qpid/dotnet/client-010/management/console/ObjectID.cs
diff --git a/dotnet/client-010/management/console/QMFEvent.cs b/qpid/dotnet/client-010/management/console/QMFEvent.cs
index 73e1a34c43..73e1a34c43 100644
--- a/dotnet/client-010/management/console/QMFEvent.cs
+++ b/qpid/dotnet/client-010/management/console/QMFEvent.cs
diff --git a/dotnet/client-010/management/console/QMFObject.cs b/qpid/dotnet/client-010/management/console/QMFObject.cs
index 905422efd9..905422efd9 100644
--- a/dotnet/client-010/management/console/QMFObject.cs
+++ b/qpid/dotnet/client-010/management/console/QMFObject.cs
diff --git a/dotnet/client-010/management/console/SchemaArgument.cs b/qpid/dotnet/client-010/management/console/SchemaArgument.cs
index d3ee508b31..d3ee508b31 100644
--- a/dotnet/client-010/management/console/SchemaArgument.cs
+++ b/qpid/dotnet/client-010/management/console/SchemaArgument.cs
diff --git a/dotnet/client-010/management/console/SchemaClass.cs b/qpid/dotnet/client-010/management/console/SchemaClass.cs
index 320312b61d..320312b61d 100644
--- a/dotnet/client-010/management/console/SchemaClass.cs
+++ b/qpid/dotnet/client-010/management/console/SchemaClass.cs
diff --git a/dotnet/client-010/management/console/SchemaMethod.cs b/qpid/dotnet/client-010/management/console/SchemaMethod.cs
index 0a843262a4..0a843262a4 100644
--- a/dotnet/client-010/management/console/SchemaMethod.cs
+++ b/qpid/dotnet/client-010/management/console/SchemaMethod.cs
diff --git a/dotnet/client-010/management/console/SchemaProperty.cs b/qpid/dotnet/client-010/management/console/SchemaProperty.cs
index 50d3c62f8d..50d3c62f8d 100644
--- a/dotnet/client-010/management/console/SchemaProperty.cs
+++ b/qpid/dotnet/client-010/management/console/SchemaProperty.cs
diff --git a/dotnet/client-010/management/console/SchemaStatistic.cs b/qpid/dotnet/client-010/management/console/SchemaStatistic.cs
index ff96b98388..ff96b98388 100644
--- a/dotnet/client-010/management/console/SchemaStatistic.cs
+++ b/qpid/dotnet/client-010/management/console/SchemaStatistic.cs
diff --git a/dotnet/client-010/management/console/SchemaVariable.cs b/qpid/dotnet/client-010/management/console/SchemaVariable.cs
index 50455ab38a..50455ab38a 100644
--- a/dotnet/client-010/management/console/SchemaVariable.cs
+++ b/qpid/dotnet/client-010/management/console/SchemaVariable.cs
diff --git a/dotnet/client-010/management/console/SequenceManager.cs b/qpid/dotnet/client-010/management/console/SequenceManager.cs
index 29f1ba26b0..29f1ba26b0 100644
--- a/dotnet/client-010/management/console/SequenceManager.cs
+++ b/qpid/dotnet/client-010/management/console/SequenceManager.cs
diff --git a/dotnet/client-010/management/console/Session.cs b/qpid/dotnet/client-010/management/console/Session.cs
index d9c5948e57..d9c5948e57 100644
--- a/dotnet/client-010/management/console/Session.cs
+++ b/qpid/dotnet/client-010/management/console/Session.cs
diff --git a/dotnet/client-010/management/console/Util.cs b/qpid/dotnet/client-010/management/console/Util.cs
index 4a06f4e6af..4a06f4e6af 100644
--- a/dotnet/client-010/management/console/Util.cs
+++ b/qpid/dotnet/client-010/management/console/Util.cs
diff --git a/dotnet/client-010/management/console/XMLUtil.cs b/qpid/dotnet/client-010/management/console/XMLUtil.cs
index b24ad51747..b24ad51747 100644
--- a/dotnet/client-010/management/console/XMLUtil.cs
+++ b/qpid/dotnet/client-010/management/console/XMLUtil.cs
diff --git a/dotnet/client-010/management/console/console.csproj b/qpid/dotnet/client-010/management/console/console.csproj
index 3cc84e6073..3cc84e6073 100644
--- a/dotnet/client-010/management/console/console.csproj
+++ b/qpid/dotnet/client-010/management/console/console.csproj
diff --git a/dotnet/client-010/management/console/console.sln b/qpid/dotnet/client-010/management/console/console.sln
index 1cfc056302..1cfc056302 100644
--- a/dotnet/client-010/management/console/console.sln
+++ b/qpid/dotnet/client-010/management/console/console.sln
diff --git a/dotnet/client-010/management/console/default.build b/qpid/dotnet/client-010/management/console/default.build
index c71e695569..c71e695569 100644
--- a/dotnet/client-010/management/console/default.build
+++ b/qpid/dotnet/client-010/management/console/default.build
diff --git a/dotnet/client-010/perftest/PerfTest.cs b/qpid/dotnet/client-010/perftest/PerfTest.cs
index c94dd865d5..c94dd865d5 100644
--- a/dotnet/client-010/perftest/PerfTest.cs
+++ b/qpid/dotnet/client-010/perftest/PerfTest.cs
diff --git a/dotnet/client-010/perftest/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/perftest/Properties/AssemblyInfo.cs
index 415ad1f1ae..415ad1f1ae 100644
--- a/dotnet/client-010/perftest/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/perftest/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/perftest/README.txt b/qpid/dotnet/client-010/perftest/README.txt
index 1c920a30b6..1c920a30b6 100644
--- a/dotnet/client-010/perftest/README.txt
+++ b/qpid/dotnet/client-010/perftest/README.txt
diff --git a/dotnet/client-010/perftest/default.build b/qpid/dotnet/client-010/perftest/default.build
index 756f6c6493..756f6c6493 100644
--- a/dotnet/client-010/perftest/default.build
+++ b/qpid/dotnet/client-010/perftest/default.build
diff --git a/dotnet/client-010/perftest/perftest.csproj b/qpid/dotnet/client-010/perftest/perftest.csproj
index 90136f18bb..90136f18bb 100644
--- a/dotnet/client-010/perftest/perftest.csproj
+++ b/qpid/dotnet/client-010/perftest/perftest.csproj
diff --git a/dotnet/client-010/test/Helpers/ConfigHelpers.cs b/qpid/dotnet/client-010/test/Helpers/ConfigHelpers.cs
index 883e52c264..883e52c264 100644
--- a/dotnet/client-010/test/Helpers/ConfigHelpers.cs
+++ b/qpid/dotnet/client-010/test/Helpers/ConfigHelpers.cs
diff --git a/dotnet/client-010/test/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/test/Properties/AssemblyInfo.cs
index 871d450240..871d450240 100644
--- a/dotnet/client-010/test/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/test/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/test/Qpid Test.dll.config b/qpid/dotnet/client-010/test/Qpid Test.dll.config
index 2a2fb72b61..2a2fb72b61 100644
--- a/dotnet/client-010/test/Qpid Test.dll.config
+++ b/qpid/dotnet/client-010/test/Qpid Test.dll.config
diff --git a/dotnet/client-010/test/Test.csproj b/qpid/dotnet/client-010/test/Test.csproj
index a9cd7c18af..a9cd7c18af 100644
--- a/dotnet/client-010/test/Test.csproj
+++ b/qpid/dotnet/client-010/test/Test.csproj
diff --git a/dotnet/client-010/test/default.build b/qpid/dotnet/client-010/test/default.build
index f9dadb174b..f9dadb174b 100644
--- a/dotnet/client-010/test/default.build
+++ b/qpid/dotnet/client-010/test/default.build
diff --git a/dotnet/client-010/test/interop/Admin.cs b/qpid/dotnet/client-010/test/interop/Admin.cs
index 163e4cf49a..163e4cf49a 100644
--- a/dotnet/client-010/test/interop/Admin.cs
+++ b/qpid/dotnet/client-010/test/interop/Admin.cs
diff --git a/dotnet/client-010/test/interop/ApplicationHeaders.cs b/qpid/dotnet/client-010/test/interop/ApplicationHeaders.cs
index d932057fd2..d932057fd2 100644
--- a/dotnet/client-010/test/interop/ApplicationHeaders.cs
+++ b/qpid/dotnet/client-010/test/interop/ApplicationHeaders.cs
diff --git a/dotnet/client-010/test/interop/ConnectionTests.cs b/qpid/dotnet/client-010/test/interop/ConnectionTests.cs
index 37fd0e7933..37fd0e7933 100644
--- a/dotnet/client-010/test/interop/ConnectionTests.cs
+++ b/qpid/dotnet/client-010/test/interop/ConnectionTests.cs
diff --git a/dotnet/client-010/test/interop/Message.cs b/qpid/dotnet/client-010/test/interop/Message.cs
index 107e69c287..107e69c287 100644
--- a/dotnet/client-010/test/interop/Message.cs
+++ b/qpid/dotnet/client-010/test/interop/Message.cs
diff --git a/dotnet/client-010/test/interop/TestCase.cs b/qpid/dotnet/client-010/test/interop/TestCase.cs
index 867f082000..867f082000 100644
--- a/dotnet/client-010/test/interop/TestCase.cs
+++ b/qpid/dotnet/client-010/test/interop/TestCase.cs
diff --git a/dotnet/client-010/test/transport/util/ByteEncoderTest.cs b/qpid/dotnet/client-010/test/transport/util/ByteEncoderTest.cs
index f3a05f1c3c..f3a05f1c3c 100644
--- a/dotnet/client-010/test/transport/util/ByteEncoderTest.cs
+++ b/qpid/dotnet/client-010/test/transport/util/ByteEncoderTest.cs
diff --git a/dotnet/client-010/test/transport/util/CircularBufferTest.cs b/qpid/dotnet/client-010/test/transport/util/CircularBufferTest.cs
index 5e39569cf8..5e39569cf8 100644
--- a/dotnet/client-010/test/transport/util/CircularBufferTest.cs
+++ b/qpid/dotnet/client-010/test/transport/util/CircularBufferTest.cs
diff --git a/dotnet/client-010/test/transport/util/ResultFutureTest.cs b/qpid/dotnet/client-010/test/transport/util/ResultFutureTest.cs
index e8e011a1e9..e8e011a1e9 100644
--- a/dotnet/client-010/test/transport/util/ResultFutureTest.cs
+++ b/qpid/dotnet/client-010/test/transport/util/ResultFutureTest.cs
diff --git a/dotnet/client-010/test/transport/util/SerialTest.cs b/qpid/dotnet/client-010/test/transport/util/SerialTest.cs
index 772327c3b0..772327c3b0 100644
--- a/dotnet/client-010/test/transport/util/SerialTest.cs
+++ b/qpid/dotnet/client-010/test/transport/util/SerialTest.cs
diff --git a/dotnet/client-010/test/transport/util/UUIDTest.cs b/qpid/dotnet/client-010/test/transport/util/UUIDTest.cs
index 41104f8873..41104f8873 100644
--- a/dotnet/client-010/test/transport/util/UUIDTest.cs
+++ b/qpid/dotnet/client-010/test/transport/util/UUIDTest.cs
diff --git a/dotnet/client-010/wcf/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/wcf/Properties/AssemblyInfo.cs
index 66f2bb1268..66f2bb1268 100644
--- a/dotnet/client-010/wcf/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/wcf/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/wcf/demo/ConfigDemo.suo b/qpid/dotnet/client-010/wcf/demo/ConfigDemo.suo
index baa935693b..baa935693b 100644
--- a/dotnet/client-010/wcf/demo/ConfigDemo.suo
+++ b/qpid/dotnet/client-010/wcf/demo/ConfigDemo.suo
diff --git a/dotnet/client-010/wcf/demo/Demo.suo b/qpid/dotnet/client-010/wcf/demo/Demo.suo
index ee4cb5d21e..ee4cb5d21e 100644
--- a/dotnet/client-010/wcf/demo/Demo.suo
+++ b/qpid/dotnet/client-010/wcf/demo/Demo.suo
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.Designer.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.Designer.cs
index 9ec3a08359..9ec3a08359 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.Designer.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.Designer.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.cs
index 89205bd6bd..89205bd6bd 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.resx b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.resx
index 7c6a1b6a50..7c6a1b6a50 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.resx
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.resx
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Program.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Program.cs
index 59189bf600..59189bf600 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingClient/Program.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Program.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/AssemblyInfo.cs
index be301395d3..be301395d3 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.Designer.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.Designer.cs
index 42f9731a3d..42f9731a3d 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.Designer.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.Designer.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.resx b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.resx
index af03750170..af03750170 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.resx
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.resx
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.Designer.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.Designer.cs
index 212fb91438..212fb91438 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.Designer.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.Designer.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.settings b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.settings
index 64cfd9241c..64cfd9241c 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.settings
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.settings
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/wcBookingClient.csproj b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/wcBookingClient.csproj
index 1449446ae2..1449446ae2 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingClient/wcBookingClient.csproj
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/wcBookingClient.csproj
diff --git a/dotnet/client-010/wcf/demo/wcfBookingServer/Booking.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Booking.cs
index 7c0fbb39b4..7c0fbb39b4 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingServer/Booking.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Booking.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingServer/IBooking.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/IBooking.cs
index cead4d0471..cead4d0471 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingServer/IBooking.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/IBooking.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingServer/Order.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Order.cs
index aa52908692..aa52908692 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingServer/Order.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Order.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingServer/Program.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Program.cs
index ebb75308cf..ebb75308cf 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingServer/Program.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Program.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingServer/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Properties/AssemblyInfo.cs
index cc0208c9ca..cc0208c9ca 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingServer/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingServer/Receipt.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Receipt.cs
index d5ab0f3eb3..d5ab0f3eb3 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingServer/Receipt.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Receipt.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingServer/wcfBookingServer.csproj b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/wcfBookingServer.csproj
index 2f744f8b6b..2f744f8b6b 100644
--- a/dotnet/client-010/wcf/demo/wcfBookingServer/wcfBookingServer.csproj
+++ b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/wcfBookingServer.csproj
diff --git a/dotnet/client-010/wcf/demo/wcfHelloClient/App.config b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/App.config
index 1545d71d6f..1545d71d6f 100644
--- a/dotnet/client-010/wcf/demo/wcfHelloClient/App.config
+++ b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/App.config
diff --git a/dotnet/client-010/wcf/demo/wcfHelloClient/HelloClient.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/HelloClient.cs
index 31743c62cf..31743c62cf 100644
--- a/dotnet/client-010/wcf/demo/wcfHelloClient/HelloClient.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/HelloClient.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloClient/IHelloService.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/IHelloService.cs
index d3b9a354ba..d3b9a354ba 100644
--- a/dotnet/client-010/wcf/demo/wcfHelloClient/IHelloService.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/IHelloService.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloClient/Program.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/Program.cs
index fc68d2556a..fc68d2556a 100644
--- a/dotnet/client-010/wcf/demo/wcfHelloClient/Program.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/Program.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloClient/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/Properties/AssemblyInfo.cs
index 83dfbcd5f4..83dfbcd5f4 100644
--- a/dotnet/client-010/wcf/demo/wcfHelloClient/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloClient/wcfHelloClient.csproj b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/wcfHelloClient.csproj
index 2e518d0da0..2e518d0da0 100644
--- a/dotnet/client-010/wcf/demo/wcfHelloClient/wcfHelloClient.csproj
+++ b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/wcfHelloClient.csproj
diff --git a/dotnet/client-010/wcf/demo/wcfHelloServer/App.config b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/App.config
index de71f890b5..de71f890b5 100644
--- a/dotnet/client-010/wcf/demo/wcfHelloServer/App.config
+++ b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/App.config
diff --git a/dotnet/client-010/wcf/demo/wcfHelloServer/HelloService.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/HelloService.cs
index 3b7df01ece..3b7df01ece 100644
--- a/dotnet/client-010/wcf/demo/wcfHelloServer/HelloService.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/HelloService.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloServer/IHelloService.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/IHelloService.cs
index 1609439b94..1609439b94 100644
--- a/dotnet/client-010/wcf/demo/wcfHelloServer/IHelloService.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/IHelloService.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloServer/Program.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/Program.cs
index 1b8b8947ee..1b8b8947ee 100644
--- a/dotnet/client-010/wcf/demo/wcfHelloServer/Program.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/Program.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloServer/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/Properties/AssemblyInfo.cs
index a32f32e864..a32f32e864 100644
--- a/dotnet/client-010/wcf/demo/wcfHelloServer/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloServer/wcfHelloServer.csproj b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/wcfHelloServer.csproj
index 3a672a87f4..3a672a87f4 100644
--- a/dotnet/client-010/wcf/demo/wcfHelloServer/wcfHelloServer.csproj
+++ b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/wcfHelloServer.csproj
diff --git a/dotnet/client-010/wcf/demo/wcfRPC/IUpperCase.cs b/qpid/dotnet/client-010/wcf/demo/wcfRPC/IUpperCase.cs
index 668450948d..668450948d 100644
--- a/dotnet/client-010/wcf/demo/wcfRPC/IUpperCase.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfRPC/IUpperCase.cs
diff --git a/dotnet/client-010/wcf/demo/wcfRPC/Program.cs b/qpid/dotnet/client-010/wcf/demo/wcfRPC/Program.cs
index e2b54a0f61..e2b54a0f61 100644
--- a/dotnet/client-010/wcf/demo/wcfRPC/Program.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfRPC/Program.cs
diff --git a/dotnet/client-010/wcf/demo/wcfRPC/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/wcf/demo/wcfRPC/Properties/AssemblyInfo.cs
index 703fb9fcea..703fb9fcea 100644
--- a/dotnet/client-010/wcf/demo/wcfRPC/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfRPC/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/wcf/demo/wcfRPC/QpidBindingConfigurationElement.cs b/qpid/dotnet/client-010/wcf/demo/wcfRPC/QpidBindingConfigurationElement.cs
index 1d12868497..1d12868497 100644
--- a/dotnet/client-010/wcf/demo/wcfRPC/QpidBindingConfigurationElement.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfRPC/QpidBindingConfigurationElement.cs
diff --git a/dotnet/client-010/wcf/demo/wcfRPC/UpperCase.cs b/qpid/dotnet/client-010/wcf/demo/wcfRPC/UpperCase.cs
index 3e10926be4..3e10926be4 100644
--- a/dotnet/client-010/wcf/demo/wcfRPC/UpperCase.cs
+++ b/qpid/dotnet/client-010/wcf/demo/wcfRPC/UpperCase.cs
diff --git a/dotnet/client-010/wcf/demo/wcfRPC/wcfRPC.csproj b/qpid/dotnet/client-010/wcf/demo/wcfRPC/wcfRPC.csproj
index e8f7fee8f5..e8f7fee8f5 100644
--- a/dotnet/client-010/wcf/demo/wcfRPC/wcfRPC.csproj
+++ b/qpid/dotnet/client-010/wcf/demo/wcfRPC/wcfRPC.csproj
diff --git a/dotnet/client-010/wcf/model/CommunicationOperation.cs b/qpid/dotnet/client-010/wcf/model/CommunicationOperation.cs
index 3506d6729c..3506d6729c 100644
--- a/dotnet/client-010/wcf/model/CommunicationOperation.cs
+++ b/qpid/dotnet/client-010/wcf/model/CommunicationOperation.cs
diff --git a/dotnet/client-010/wcf/model/QpidBinding.cs b/qpid/dotnet/client-010/wcf/model/QpidBinding.cs
index 8f4684c1a1..8f4684c1a1 100644
--- a/dotnet/client-010/wcf/model/QpidBinding.cs
+++ b/qpid/dotnet/client-010/wcf/model/QpidBinding.cs
diff --git a/dotnet/client-010/wcf/model/QpidChannelBase.cs b/qpid/dotnet/client-010/wcf/model/QpidChannelBase.cs
index 174c28e108..174c28e108 100644
--- a/dotnet/client-010/wcf/model/QpidChannelBase.cs
+++ b/qpid/dotnet/client-010/wcf/model/QpidChannelBase.cs
diff --git a/dotnet/client-010/wcf/model/QpidChannelFactory.cs b/qpid/dotnet/client-010/wcf/model/QpidChannelFactory.cs
index 84518cb1c3..84518cb1c3 100644
--- a/dotnet/client-010/wcf/model/QpidChannelFactory.cs
+++ b/qpid/dotnet/client-010/wcf/model/QpidChannelFactory.cs
diff --git a/dotnet/client-010/wcf/model/QpidChannelListener.cs b/qpid/dotnet/client-010/wcf/model/QpidChannelListener.cs
index f776fce9a5..f776fce9a5 100644
--- a/dotnet/client-010/wcf/model/QpidChannelListener.cs
+++ b/qpid/dotnet/client-010/wcf/model/QpidChannelListener.cs
diff --git a/dotnet/client-010/wcf/model/QpidChannelListenerBase.cs b/qpid/dotnet/client-010/wcf/model/QpidChannelListenerBase.cs
index bdecb38c9d..bdecb38c9d 100644
--- a/dotnet/client-010/wcf/model/QpidChannelListenerBase.cs
+++ b/qpid/dotnet/client-010/wcf/model/QpidChannelListenerBase.cs
diff --git a/dotnet/client-010/wcf/model/QpidInputChannel.cs b/qpid/dotnet/client-010/wcf/model/QpidInputChannel.cs
index 7a05153df9..7a05153df9 100644
--- a/dotnet/client-010/wcf/model/QpidInputChannel.cs
+++ b/qpid/dotnet/client-010/wcf/model/QpidInputChannel.cs
diff --git a/dotnet/client-010/wcf/model/QpidInputChannelBase.cs b/qpid/dotnet/client-010/wcf/model/QpidInputChannelBase.cs
index 0bd9e85c0a..0bd9e85c0a 100644
--- a/dotnet/client-010/wcf/model/QpidInputChannelBase.cs
+++ b/qpid/dotnet/client-010/wcf/model/QpidInputChannelBase.cs
diff --git a/dotnet/client-010/wcf/model/QpidOutputChannel.cs b/qpid/dotnet/client-010/wcf/model/QpidOutputChannel.cs
index f53ed9b9b8..f53ed9b9b8 100644
--- a/dotnet/client-010/wcf/model/QpidOutputChannel.cs
+++ b/qpid/dotnet/client-010/wcf/model/QpidOutputChannel.cs
diff --git a/dotnet/client-010/wcf/model/QpidOutputChannelBase.cs b/qpid/dotnet/client-010/wcf/model/QpidOutputChannelBase.cs
index a3cd9020ff..a3cd9020ff 100644
--- a/dotnet/client-010/wcf/model/QpidOutputChannelBase.cs
+++ b/qpid/dotnet/client-010/wcf/model/QpidOutputChannelBase.cs
diff --git a/dotnet/client-010/wcf/model/QpidTransportBindingElement.cs b/qpid/dotnet/client-010/wcf/model/QpidTransportBindingElement.cs
index 50cc80422a..50cc80422a 100644
--- a/dotnet/client-010/wcf/model/QpidTransportBindingElement.cs
+++ b/qpid/dotnet/client-010/wcf/model/QpidTransportBindingElement.cs
diff --git a/dotnet/client-010/wcf/model/QpidTransportElement.cs b/qpid/dotnet/client-010/wcf/model/QpidTransportElement.cs
index f531186148..f531186148 100644
--- a/dotnet/client-010/wcf/model/QpidTransportElement.cs
+++ b/qpid/dotnet/client-010/wcf/model/QpidTransportElement.cs
diff --git a/dotnet/client-010/wcf/wcf.csproj b/qpid/dotnet/client-010/wcf/wcf.csproj
index f07c5ab1fd..f07c5ab1fd 100644
--- a/dotnet/client-010/wcf/wcf.csproj
+++ b/qpid/dotnet/client-010/wcf/wcf.csproj
diff --git a/dotnet/client-010/wcf/wcf.sln b/qpid/dotnet/client-010/wcf/wcf.sln
index 8120f44576..8120f44576 100644
--- a/dotnet/client-010/wcf/wcf.sln
+++ b/qpid/dotnet/client-010/wcf/wcf.sln
diff --git a/dotnet/client-010/wcf/wcf.suo b/qpid/dotnet/client-010/wcf/wcf.suo
index 60339d33e4..60339d33e4 100644
--- a/dotnet/client-010/wcf/wcf.suo
+++ b/qpid/dotnet/client-010/wcf/wcf.suo
diff --git a/dotnet/default.build b/qpid/dotnet/default.build
index b038307623..b038307623 100644
--- a/dotnet/default.build
+++ b/qpid/dotnet/default.build
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/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 e7bf4b9717..e7bf4b9717 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 ecb0e1d9d0..ecb0e1d9d0 100644
--- a/extras/qmf/src/py/qmf/console.py
+++ b/qpid/extras/qmf/src/py/qmf/console.py
diff --git a/extras/qmf/src/py/qmf2-prototype/__init__.py b/qpid/extras/qmf/src/py/qmf2-prototype/__init__.py
index 31d5a2ef58..31d5a2ef58 100644
--- a/extras/qmf/src/py/qmf2-prototype/__init__.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/__init__.py
diff --git a/extras/qmf/src/py/qmf2-prototype/agent.py b/qpid/extras/qmf/src/py/qmf2-prototype/agent.py
index 4ec00bd288..4ec00bd288 100644
--- a/extras/qmf/src/py/qmf2-prototype/agent.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/agent.py
diff --git a/extras/qmf/src/py/qmf2-prototype/common.py b/qpid/extras/qmf/src/py/qmf2-prototype/common.py
index 2e5367f54f..2e5367f54f 100644
--- a/extras/qmf/src/py/qmf2-prototype/common.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/common.py
diff --git a/extras/qmf/src/py/qmf2-prototype/console.py b/qpid/extras/qmf/src/py/qmf2-prototype/console.py
index 9227835b3f..9227835b3f 100644
--- a/extras/qmf/src/py/qmf2-prototype/console.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/console.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/__init__.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/__init__.py
index eff9357e1f..eff9357e1f 100644
--- a/extras/qmf/src/py/qmf2-prototype/tests/__init__.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/__init__.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/agent_discovery.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/agent_discovery.py
index 2c20794aaa..2c20794aaa 100644
--- a/extras/qmf/src/py/qmf2-prototype/tests/agent_discovery.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/agent_discovery.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/agent_test.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/agent_test.py
index 14d8ada197..14d8ada197 100644
--- a/extras/qmf/src/py/qmf2-prototype/tests/agent_test.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/agent_test.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/async_method.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/async_method.py
index 2339fc71a9..2339fc71a9 100644
--- a/extras/qmf/src/py/qmf2-prototype/tests/async_method.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/async_method.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/async_query.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/async_query.py
index b1c01611f7..b1c01611f7 100644
--- a/extras/qmf/src/py/qmf2-prototype/tests/async_query.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/async_query.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/basic_method.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/basic_method.py
index 8d038bc4c8..8d038bc4c8 100644
--- a/extras/qmf/src/py/qmf2-prototype/tests/basic_method.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/basic_method.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/basic_query.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/basic_query.py
index 9f5dda6d54..9f5dda6d54 100644
--- a/extras/qmf/src/py/qmf2-prototype/tests/basic_query.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/basic_query.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/console_test.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/console_test.py
index ac0e064f20..ac0e064f20 100644
--- a/extras/qmf/src/py/qmf2-prototype/tests/console_test.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/console_test.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/events.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/events.py
index 624c9b3823..624c9b3823 100644
--- a/extras/qmf/src/py/qmf2-prototype/tests/events.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/events.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/multi_response.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/multi_response.py
index 991fa0114e..991fa0114e 100644
--- a/extras/qmf/src/py/qmf2-prototype/tests/multi_response.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/multi_response.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/obj_gets.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/obj_gets.py
index 695b096973..695b096973 100644
--- a/extras/qmf/src/py/qmf2-prototype/tests/obj_gets.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/obj_gets.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/subscriptions.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/subscriptions.py
index 5c39af4b32..5c39af4b32 100644
--- a/extras/qmf/src/py/qmf2-prototype/tests/subscriptions.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/subscriptions.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 206c2f497d..206c2f497d 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/gentools/LICENSE b/qpid/gentools/LICENSE
index 43fa6abd19..43fa6abd19 100644
--- a/gentools/LICENSE
+++ b/qpid/gentools/LICENSE
diff --git a/gentools/NOTICE b/qpid/gentools/NOTICE
index 09e9ae4902..09e9ae4902 100644
--- a/gentools/NOTICE
+++ b/qpid/gentools/NOTICE
diff --git a/gentools/README.txt b/qpid/gentools/README.txt
index 94f705b064..94f705b064 100644
--- a/gentools/README.txt
+++ b/qpid/gentools/README.txt
diff --git a/gentools/build b/qpid/gentools/build
index a18a984dff..a18a984dff 100755
--- a/gentools/build
+++ b/qpid/gentools/build
diff --git a/gentools/build.xml b/qpid/gentools/build.xml
index 5d0976f56d..5d0976f56d 100644
--- a/gentools/build.xml
+++ b/qpid/gentools/build.xml
diff --git a/gentools/lib/LICENSE b/qpid/gentools/lib/LICENSE
index e69de29bb2..e69de29bb2 100644
--- a/gentools/lib/LICENSE
+++ b/qpid/gentools/lib/LICENSE
diff --git a/gentools/lib/NOTICE b/qpid/gentools/lib/NOTICE
index e69de29bb2..e69de29bb2 100644
--- a/gentools/lib/NOTICE
+++ b/qpid/gentools/lib/NOTICE
diff --git a/gentools/lib/README.txt b/qpid/gentools/lib/README.txt
index e69de29bb2..e69de29bb2 100644
--- a/gentools/lib/README.txt
+++ b/qpid/gentools/lib/README.txt
diff --git a/gentools/lib/velocity-1.4.jar b/qpid/gentools/lib/velocity-1.4.jar
index 04ec9d2f85..04ec9d2f85 100644
--- a/gentools/lib/velocity-1.4.jar
+++ b/qpid/gentools/lib/velocity-1.4.jar
diff --git a/gentools/lib/velocity-dep-1.4.jar b/qpid/gentools/lib/velocity-dep-1.4.jar
index 375712b0e8..375712b0e8 100644
--- a/gentools/lib/velocity-dep-1.4.jar
+++ b/qpid/gentools/lib/velocity-dep-1.4.jar
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpClass.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
index 26195da2e3..26195da2e3 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpClass.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
index a27a50d07e..a27a50d07e 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpConstant.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
index df5bc6c362..df5bc6c362 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
index ab8b8be61e..ab8b8be61e 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpDomain.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
index ba8552a6a6..ba8552a6a6 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
index 0cd9d214bd..0cd9d214bd 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
index e39550b96f..e39550b96f 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpField.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java
index 7c721cf913..7c721cf913 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpField.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
index 0bb5e03a61..0bb5e03a61 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
index 5993a1b715..5993a1b715 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpMethod.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
index 4ec39b209e..4ec39b209e 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
index d98dab4a39..d98dab4a39 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpModel.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java
index 45f0adb18d..45f0adb18d 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpModel.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
index 0633eff1e1..0633eff1e1 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
index fede88631a..fede88631a 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
index 10978d0e4a..10978d0e4a 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpParseException.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
index 3f3d4611fc..3f3d4611fc 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
index 1ac09ea453..1ac09ea453 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
index 127a8835b0..127a8835b0 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpVersion.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
index dbeef1b895..dbeef1b895 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
index 6419e23a1e..6419e23a1e 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
diff --git a/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java b/qpid/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java
index d85510ee98..d85510ee98 100644
--- a/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java
diff --git a/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java b/qpid/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java
index 641f50c3f8..641f50c3f8 100644
--- a/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java
diff --git a/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java b/qpid/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java
index 9ab7eb178b..9ab7eb178b 100644
--- a/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java
diff --git a/gentools/src/org/apache/qpid/gentools/CppGenerator.java b/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
index 4f58cba34e..4f58cba34e 100644
--- a/gentools/src/org/apache/qpid/gentools/CppGenerator.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
diff --git a/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java b/qpid/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
index 9fc81dd428..9fc81dd428 100644
--- a/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
diff --git a/gentools/src/org/apache/qpid/gentools/GenerateMethod.java b/qpid/gentools/src/org/apache/qpid/gentools/GenerateMethod.java
index 8b0bb99b41..8b0bb99b41 100644
--- a/gentools/src/org/apache/qpid/gentools/GenerateMethod.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/GenerateMethod.java
diff --git a/gentools/src/org/apache/qpid/gentools/Generator.java b/qpid/gentools/src/org/apache/qpid/gentools/Generator.java
index 5d6e7be527..5d6e7be527 100644
--- a/gentools/src/org/apache/qpid/gentools/Generator.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/Generator.java
diff --git a/gentools/src/org/apache/qpid/gentools/JavaGenerator.java b/qpid/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
index 7730fca1bd..7730fca1bd 100644
--- a/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
diff --git a/gentools/src/org/apache/qpid/gentools/LanguageConverter.java b/qpid/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
index 5e692d86e7..5e692d86e7 100644
--- a/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
diff --git a/gentools/src/org/apache/qpid/gentools/Main.java b/qpid/gentools/src/org/apache/qpid/gentools/Main.java
index c0584f7ca7..c0584f7ca7 100644
--- a/gentools/src/org/apache/qpid/gentools/Main.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/Main.java
diff --git a/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java b/qpid/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java
index ffeefed900..ffeefed900 100644
--- a/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java
diff --git a/gentools/src/org/apache/qpid/gentools/NodeAware.java b/qpid/gentools/src/org/apache/qpid/gentools/NodeAware.java
index f832da75ad..f832da75ad 100644
--- a/gentools/src/org/apache/qpid/gentools/NodeAware.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/NodeAware.java
diff --git a/gentools/src/org/apache/qpid/gentools/Printable.java b/qpid/gentools/src/org/apache/qpid/gentools/Printable.java
index aa13df7b68..aa13df7b68 100644
--- a/gentools/src/org/apache/qpid/gentools/Printable.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/Printable.java
diff --git a/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java b/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java
index 8e1af1c551..8e1af1c551 100644
--- a/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java
diff --git a/gentools/src/org/apache/qpid/gentools/SingleVersionField.java b/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionField.java
index b795663d15..b795663d15 100644
--- a/gentools/src/org/apache/qpid/gentools/SingleVersionField.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionField.java
diff --git a/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java b/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java
index 59a6d9e28a..59a6d9e28a 100644
--- a/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java
diff --git a/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java b/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java
index 22b416e45a..22b416e45a 100644
--- a/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java
diff --git a/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java b/qpid/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
index 39ce666288..39ce666288 100644
--- a/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
diff --git a/gentools/src/org/apache/qpid/gentools/Utils.java b/qpid/gentools/src/org/apache/qpid/gentools/Utils.java
index 1cedaeea12..1cedaeea12 100644
--- a/gentools/src/org/apache/qpid/gentools/Utils.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/Utils.java
diff --git a/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java b/qpid/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
index a9cdd56e88..a9cdd56e88 100644
--- a/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
diff --git a/gentools/templ.cpp/method/MethodBodyClass.h.tmpl b/qpid/gentools/templ.cpp/method/MethodBodyClass.h.tmpl
index 5819a9cf9c..5819a9cf9c 100644
--- a/gentools/templ.cpp/method/MethodBodyClass.h.tmpl
+++ b/qpid/gentools/templ.cpp/method/MethodBodyClass.h.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_ClientOperations.h.tmpl b/qpid/gentools/templ.cpp/model/AMQP_ClientOperations.h.tmpl
index a9fb0e0f69..a9fb0e0f69 100644
--- a/gentools/templ.cpp/model/AMQP_ClientOperations.h.tmpl
+++ b/qpid/gentools/templ.cpp/model/AMQP_ClientOperations.h.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_ClientProxy.cpp.tmpl b/qpid/gentools/templ.cpp/model/AMQP_ClientProxy.cpp.tmpl
index 8cca6e5cec..8cca6e5cec 100644
--- a/gentools/templ.cpp/model/AMQP_ClientProxy.cpp.tmpl
+++ b/qpid/gentools/templ.cpp/model/AMQP_ClientProxy.cpp.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_ClientProxy.h.tmpl b/qpid/gentools/templ.cpp/model/AMQP_ClientProxy.h.tmpl
index 0653ed7186..0653ed7186 100644
--- a/gentools/templ.cpp/model/AMQP_ClientProxy.h.tmpl
+++ b/qpid/gentools/templ.cpp/model/AMQP_ClientProxy.h.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_Constants.h.tmpl b/qpid/gentools/templ.cpp/model/AMQP_Constants.h.tmpl
index 4631bc8de6..4631bc8de6 100644
--- a/gentools/templ.cpp/model/AMQP_Constants.h.tmpl
+++ b/qpid/gentools/templ.cpp/model/AMQP_Constants.h.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_HighestVersion.h.tmpl b/qpid/gentools/templ.cpp/model/AMQP_HighestVersion.h.tmpl
index 9753b454ba..9753b454ba 100644
--- a/gentools/templ.cpp/model/AMQP_HighestVersion.h.tmpl
+++ b/qpid/gentools/templ.cpp/model/AMQP_HighestVersion.h.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_MethodVersionMap.cpp.tmpl b/qpid/gentools/templ.cpp/model/AMQP_MethodVersionMap.cpp.tmpl
index dc2a890c88..dc2a890c88 100644
--- a/gentools/templ.cpp/model/AMQP_MethodVersionMap.cpp.tmpl
+++ b/qpid/gentools/templ.cpp/model/AMQP_MethodVersionMap.cpp.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_MethodVersionMap.h.tmpl b/qpid/gentools/templ.cpp/model/AMQP_MethodVersionMap.h.tmpl
index c197871d4b..c197871d4b 100644
--- a/gentools/templ.cpp/model/AMQP_MethodVersionMap.h.tmpl
+++ b/qpid/gentools/templ.cpp/model/AMQP_MethodVersionMap.h.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_ServerOperations.h.tmpl b/qpid/gentools/templ.cpp/model/AMQP_ServerOperations.h.tmpl
index e87723667b..e87723667b 100644
--- a/gentools/templ.cpp/model/AMQP_ServerOperations.h.tmpl
+++ b/qpid/gentools/templ.cpp/model/AMQP_ServerOperations.h.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_ServerProxy.cpp.tmpl b/qpid/gentools/templ.cpp/model/AMQP_ServerProxy.cpp.tmpl
index cce369f98b..cce369f98b 100644
--- a/gentools/templ.cpp/model/AMQP_ServerProxy.cpp.tmpl
+++ b/qpid/gentools/templ.cpp/model/AMQP_ServerProxy.cpp.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_ServerProxy.h.tmpl b/qpid/gentools/templ.cpp/model/AMQP_ServerProxy.h.tmpl
index fab29f2c60..fab29f2c60 100644
--- a/gentools/templ.cpp/model/AMQP_ServerProxy.h.tmpl
+++ b/qpid/gentools/templ.cpp/model/AMQP_ServerProxy.h.tmpl
diff --git a/gentools/templ.java/PropertyContentHeaderClass.tmpl b/qpid/gentools/templ.java/PropertyContentHeaderClass.tmpl
index ab6406b1fe..ab6406b1fe 100644
--- a/gentools/templ.java/PropertyContentHeaderClass.tmpl
+++ b/qpid/gentools/templ.java/PropertyContentHeaderClass.tmpl
diff --git a/gentools/templ.java/method/version/MethodBodyClass.vm b/qpid/gentools/templ.java/method/version/MethodBodyClass.vm
index bb62438a65..bb62438a65 100644
--- a/gentools/templ.java/method/version/MethodBodyClass.vm
+++ b/qpid/gentools/templ.java/method/version/MethodBodyClass.vm
diff --git a/gentools/templ.java/model/ProtocolVersionListClass.vm b/qpid/gentools/templ.java/model/ProtocolVersionListClass.vm
index bcf7db345b..bcf7db345b 100644
--- a/gentools/templ.java/model/ProtocolVersionListClass.vm
+++ b/qpid/gentools/templ.java/model/ProtocolVersionListClass.vm
diff --git a/gentools/templ.java/model/version/AmqpConstantsClass.vm b/qpid/gentools/templ.java/model/version/AmqpConstantsClass.vm
index 8d459f2977..8d459f2977 100644
--- a/gentools/templ.java/model/version/AmqpConstantsClass.vm
+++ b/qpid/gentools/templ.java/model/version/AmqpConstantsClass.vm
diff --git a/gentools/templ.java/model/version/MethodRegistryClass.vm b/qpid/gentools/templ.java/model/version/MethodRegistryClass.vm
index 82287e7f8f..82287e7f8f 100644
--- a/gentools/templ.java/model/version/MethodRegistryClass.vm
+++ b/qpid/gentools/templ.java/model/version/MethodRegistryClass.vm
diff --git a/gentools/xml-src/amqp-0.10.test.xml b/qpid/gentools/xml-src/amqp-0.10.test.xml
index 5d3d80648b..5d3d80648b 100644
--- a/gentools/xml-src/amqp-0.10.test.xml
+++ b/qpid/gentools/xml-src/amqp-0.10.test.xml
diff --git a/gentools/xml-src/amqp-0.8.test.xml b/qpid/gentools/xml-src/amqp-0.8.test.xml
index b0adf31828..b0adf31828 100644
--- a/gentools/xml-src/amqp-0.8.test.xml
+++ b/qpid/gentools/xml-src/amqp-0.8.test.xml
diff --git a/gentools/xml-src/amqp-0.9.test.xml b/qpid/gentools/xml-src/amqp-0.9.test.xml
index e12e9c787a..e12e9c787a 100644
--- a/gentools/xml-src/amqp-0.9.test.xml
+++ b/qpid/gentools/xml-src/amqp-0.9.test.xml
diff --git a/gentools/xml-src/cluster-0.9.test.xml b/qpid/gentools/xml-src/cluster-0.9.test.xml
index 142e6c9380..142e6c9380 100644
--- a/gentools/xml-src/cluster-0.9.test.xml
+++ b/qpid/gentools/xml-src/cluster-0.9.test.xml
diff --git a/java/broker-plugins/access-control/MANIFEST.MF b/qpid/java/broker-plugins/access-control/MANIFEST.MF
index 1cd285ba20..1cd285ba20 100644
--- a/java/broker-plugins/access-control/MANIFEST.MF
+++ b/qpid/java/broker-plugins/access-control/MANIFEST.MF
diff --git a/java/broker-plugins/access-control/build.xml b/qpid/java/broker-plugins/access-control/build.xml
index 89f8240fd5..89f8240fd5 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/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 a684e52ce4..a684e52ce4 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/Action.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java
index fdbd96e63e..fdbd96e63e 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/ConfigurationFile.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ConfigurationFile.java
index 8b1a00259b..8b1a00259b 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 9f2168a31c..9f2168a31c 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 15d6b67192..15d6b67192 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 ebc73440ed..ebc73440ed 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/logging/AccessControl_logmessages.properties b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/logging/AccessControl_logmessages.properties
index bf80df3722..bf80df3722 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/logging/AccessControl_logmessages.properties
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/logging/AccessControl_logmessages.properties
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
index 69cfa173bd..69cfa173bd 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlActivator.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlActivator.java
index 72eac7dbe6..72eac7dbe6 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlActivator.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlActivator.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java
index f7db740ebc..f7db740ebc 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java
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/plugins/AccessControlTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AccessControlTest.java
index 309a3aeb2c..309a3aeb2c 100644
--- a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AccessControlTest.java
+++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AccessControlTest.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 aad7290557..aad7290557 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/experimental/info/MANIFEST.MF b/qpid/java/broker-plugins/experimental/info/MANIFEST.MF
index f213104d8d..f213104d8d 100644
--- a/java/broker-plugins/experimental/info/MANIFEST.MF
+++ b/qpid/java/broker-plugins/experimental/info/MANIFEST.MF
diff --git a/java/broker-plugins/experimental/info/build.properties b/qpid/java/broker-plugins/experimental/info/build.properties
index bdbbe1c2af..bdbbe1c2af 100644
--- a/java/broker-plugins/experimental/info/build.properties
+++ b/qpid/java/broker-plugins/experimental/info/build.properties
diff --git a/java/broker-plugins/experimental/info/build.xml b/qpid/java/broker-plugins/experimental/info/build.xml
index c5881aa839..c5881aa839 100644
--- a/java/broker-plugins/experimental/info/build.xml
+++ b/qpid/java/broker-plugins/experimental/info/build.xml
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java
index c7d3fd38ff..c7d3fd38ff 100644
--- a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java
+++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java
index a5d267282b..a5d267282b 100644
--- a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java
+++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Info.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Info.java
index 2fb9382526..2fb9382526 100644
--- a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Info.java
+++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Info.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoService.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoService.java
index 2804dfb1b4..2804dfb1b4 100644
--- a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoService.java
+++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoService.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoServiceImpl.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoServiceImpl.java
index 5522f2701e..5522f2701e 100644
--- a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoServiceImpl.java
+++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoServiceImpl.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java
index 8bd94fe14d..8bd94fe14d 100644
--- a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java
+++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/HttpPoster.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/HttpPoster.java
index d27980be05..d27980be05 100644
--- a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/HttpPoster.java
+++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/HttpPoster.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/IniFileReader.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/IniFileReader.java
index 60a025d322..60a025d322 100644
--- a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/IniFileReader.java
+++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/IniFileReader.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/SoapClient.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/SoapClient.java
index 0f66085fc3..0f66085fc3 100644
--- a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/SoapClient.java
+++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/SoapClient.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/XMLWriter.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/XMLWriter.java
index a266edae00..a266edae00 100644
--- a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/XMLWriter.java
+++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/XMLWriter.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java
index 156c9eb138..156c9eb138 100644
--- a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java
+++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/HttpPosterTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/HttpPosterTest.java
index 4f76fea8ef..4f76fea8ef 100644
--- a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/HttpPosterTest.java
+++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/HttpPosterTest.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java
index 9f359582a5..9f359582a5 100644
--- a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java
+++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServlet.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServlet.java
index 6b12a2d80c..6b12a2d80c 100644
--- a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServlet.java
+++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServlet.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoTest.java
index bb4965ef1e..bb4965ef1e 100644
--- a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoTest.java
+++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoTest.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/IniFileReaderTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/IniFileReaderTest.java
index 77ecaa2176..77ecaa2176 100644
--- a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/IniFileReaderTest.java
+++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/IniFileReaderTest.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SoapClientTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SoapClientTest.java
index a3d993a39f..a3d993a39f 100644
--- a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SoapClientTest.java
+++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SoapClientTest.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SystemInfoTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SystemInfoTest.java
index 6cb8e3a90a..6cb8e3a90a 100644
--- a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SystemInfoTest.java
+++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SystemInfoTest.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/XMLWriterTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/XMLWriterTest.java
index f352226361..f352226361 100644
--- a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/XMLWriterTest.java
+++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/XMLWriterTest.java
diff --git a/java/broker-plugins/experimental/shutdown/MANIFEST.MF b/qpid/java/broker-plugins/experimental/shutdown/MANIFEST.MF
index 49e90c6aad..49e90c6aad 100644
--- a/java/broker-plugins/experimental/shutdown/MANIFEST.MF
+++ b/qpid/java/broker-plugins/experimental/shutdown/MANIFEST.MF
diff --git a/java/broker-plugins/experimental/shutdown/build.xml b/qpid/java/broker-plugins/experimental/shutdown/build.xml
index ec4fce374e..ec4fce374e 100644
--- a/java/broker-plugins/experimental/shutdown/build.xml
+++ b/qpid/java/broker-plugins/experimental/shutdown/build.xml
diff --git a/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java b/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java
index ad5e7707b6..ad5e7707b6 100644
--- a/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java
+++ b/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java
diff --git a/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Shutdown.java b/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Shutdown.java
index 9a6f85fe9c..9a6f85fe9c 100644
--- a/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Shutdown.java
+++ b/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Shutdown.java
diff --git a/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/ShutdownMBean.java b/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/ShutdownMBean.java
index 6294f869e9..6294f869e9 100644
--- a/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/ShutdownMBean.java
+++ b/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/ShutdownMBean.java
diff --git a/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd b/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
index f49578ba8c..f49578ba8c 100755
--- a/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
+++ b/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
diff --git a/java/broker-plugins/extras/MANIFEST.MF b/qpid/java/broker-plugins/extras/MANIFEST.MF
index f4ef6e8178..f4ef6e8178 100644
--- a/java/broker-plugins/extras/MANIFEST.MF
+++ b/qpid/java/broker-plugins/extras/MANIFEST.MF
diff --git a/java/broker-plugins/extras/build.xml b/qpid/java/broker-plugins/extras/build.xml
index 7c1d0be49f..7c1d0be49f 100644
--- a/java/broker-plugins/extras/build.xml
+++ b/qpid/java/broker-plugins/extras/build.xml
diff --git a/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/Activator.java b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/Activator.java
index ca6c05a435..ca6c05a435 100644
--- a/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/Activator.java
+++ b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/Activator.java
diff --git a/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java
index 5d2c0dd5b2..5d2c0dd5b2 100644
--- a/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java
+++ b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java
diff --git a/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java
index b4d0d1aa0d..b4d0d1aa0d 100644
--- a/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java
+++ b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java
diff --git a/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java
index def0b3f91a..def0b3f91a 100644
--- a/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java
+++ b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java
diff --git a/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java
index db02ca13ea..db02ca13ea 100644
--- a/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java
+++ b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java
diff --git a/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java b/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java
index 57b6e19b5d..57b6e19b5d 100644
--- a/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java
+++ b/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java
diff --git a/java/broker-plugins/firewall/MANIFEST.MF b/qpid/java/broker-plugins/firewall/MANIFEST.MF
index 6ceea119da..6ceea119da 100644
--- a/java/broker-plugins/firewall/MANIFEST.MF
+++ b/qpid/java/broker-plugins/firewall/MANIFEST.MF
diff --git a/java/broker-plugins/firewall/build.xml b/qpid/java/broker-plugins/firewall/build.xml
index 576435de7f..576435de7f 100644
--- a/java/broker-plugins/firewall/build.xml
+++ b/qpid/java/broker-plugins/firewall/build.xml
diff --git a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallException.java b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallException.java
index a9e3fdc242..a9e3fdc242 100644
--- a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallException.java
+++ b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallException.java
diff --git a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallRule.java b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallRule.java
index f257b58867..f257b58867 100644
--- a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallRule.java
+++ b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallRule.java
diff --git a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java
index a6ea9d261e..a6ea9d261e 100644
--- a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java
+++ b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java
diff --git a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallActivator.java b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallActivator.java
index c20bba8d2c..c20bba8d2c 100644
--- a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallActivator.java
+++ b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallActivator.java
diff --git a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java
index b10656d622..b10656d622 100644
--- a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java
+++ b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java
diff --git a/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java b/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java
index ebede414f4..ebede414f4 100644
--- a/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java
+++ b/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java
diff --git a/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java b/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java
index 2b04962c89..2b04962c89 100644
--- a/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java
+++ b/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java
diff --git a/java/broker-plugins/simple-xml/MANIFEST.MF b/qpid/java/broker-plugins/simple-xml/MANIFEST.MF
index 04fe7518df..04fe7518df 100644
--- a/java/broker-plugins/simple-xml/MANIFEST.MF
+++ b/qpid/java/broker-plugins/simple-xml/MANIFEST.MF
diff --git a/java/broker-plugins/simple-xml/build.xml b/qpid/java/broker-plugins/simple-xml/build.xml
index d3cd451648..d3cd451648 100644
--- a/java/broker-plugins/simple-xml/build.xml
+++ b/qpid/java/broker-plugins/simple-xml/build.xml
diff --git a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/config/PrincipalPermissions.java b/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/config/PrincipalPermissions.java
index d9fc292f03..d9fc292f03 100755
--- a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/config/PrincipalPermissions.java
+++ b/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/config/PrincipalPermissions.java
diff --git a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java b/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
index ab43653122..ab43653122 100644
--- a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
+++ b/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
diff --git a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLActivator.java b/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLActivator.java
index c09a9da0d8..c09a9da0d8 100644
--- a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLActivator.java
+++ b/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLActivator.java
diff --git a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLConfiguration.java b/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLConfiguration.java
index e95c21b590..e95c21b590 100644
--- a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLConfiguration.java
+++ b/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLConfiguration.java
diff --git a/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java b/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
index 65ab12a095..65ab12a095 100644
--- a/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
+++ b/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
diff --git a/java/broker/bin/create-example-ssl-stores.bat b/qpid/java/broker/bin/create-example-ssl-stores.bat
index 5419c098d5..5419c098d5 100644
--- a/java/broker/bin/create-example-ssl-stores.bat
+++ b/qpid/java/broker/bin/create-example-ssl-stores.bat
diff --git a/java/broker/bin/create-example-ssl-stores.sh b/qpid/java/broker/bin/create-example-ssl-stores.sh
index bfcb3dfecf..bfcb3dfecf 100755
--- a/java/broker/bin/create-example-ssl-stores.sh
+++ b/qpid/java/broker/bin/create-example-ssl-stores.sh
diff --git a/java/broker/bin/msTool.sh b/qpid/java/broker/bin/msTool.sh
index e190a0a46a..e190a0a46a 100755
--- a/java/broker/bin/msTool.sh
+++ b/qpid/java/broker/bin/msTool.sh
diff --git a/java/broker/bin/qpid-passwd b/qpid/java/broker/bin/qpid-passwd
index f432e00ab8..f432e00ab8 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 90b11da202..90b11da202 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 c81f5fc3e7..c81f5fc3e7 100644
--- 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 316f8dff46..316f8dff46 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 b0ad506629..b0ad506629 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 edd71effaa..edd71effaa 100644
--- a/java/broker/build.xml
+++ b/qpid/java/broker/build.xml
diff --git a/java/broker/etc/access b/qpid/java/broker/etc/access
index 58b7443fa9..58b7443fa9 100644
--- a/java/broker/etc/access
+++ b/qpid/java/broker/etc/access
diff --git a/java/broker/etc/config.xml b/qpid/java/broker/etc/config.xml
index ec386ab669..ec386ab669 100644
--- a/java/broker/etc/config.xml
+++ b/qpid/java/broker/etc/config.xml
diff --git a/java/broker/etc/debug.log4j.xml b/qpid/java/broker/etc/debug.log4j.xml
index fc0bd9f34f..fc0bd9f34f 100644
--- a/java/broker/etc/debug.log4j.xml
+++ b/qpid/java/broker/etc/debug.log4j.xml
diff --git a/java/broker/etc/log4j.xml b/qpid/java/broker/etc/log4j.xml
index 7dbb1bc87d..7dbb1bc87d 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 6a149919de..6a149919de 100644
--- a/java/broker/etc/md5passwd
+++ b/qpid/java/broker/etc/md5passwd
diff --git a/java/broker/etc/mstool-log4j.xml b/qpid/java/broker/etc/mstool-log4j.xml
index 8c46010e2d..8c46010e2d 100644
--- a/java/broker/etc/mstool-log4j.xml
+++ b/qpid/java/broker/etc/mstool-log4j.xml
diff --git a/java/broker/etc/passwd b/qpid/java/broker/etc/passwd
index 99f0f05c6a..99f0f05c6a 100644
--- a/java/broker/etc/passwd
+++ b/qpid/java/broker/etc/passwd
diff --git a/java/broker/etc/passwdVhost b/qpid/java/broker/etc/passwdVhost
index 48ce8299b6..48ce8299b6 100644
--- a/java/broker/etc/passwdVhost
+++ b/qpid/java/broker/etc/passwdVhost
diff --git a/java/broker/etc/qpid-server.conf b/qpid/java/broker/etc/qpid-server.conf
index 8a16849b04..8a16849b04 100644
--- a/java/broker/etc/qpid-server.conf
+++ b/qpid/java/broker/etc/qpid-server.conf
diff --git a/java/broker/etc/qpid-server.conf.jpp b/qpid/java/broker/etc/qpid-server.conf.jpp
index 3ed2431ef3..3ed2431ef3 100644
--- a/java/broker/etc/qpid-server.conf.jpp
+++ b/qpid/java/broker/etc/qpid-server.conf.jpp
diff --git a/java/broker/etc/qpid.passwd b/qpid/java/broker/etc/qpid.passwd
index dbfb9d1923..dbfb9d1923 100644
--- a/java/broker/etc/qpid.passwd
+++ b/qpid/java/broker/etc/qpid.passwd
diff --git a/java/broker/etc/virtualhosts.xml b/qpid/java/broker/etc/virtualhosts.xml
index 5860bfe2cb..5860bfe2cb 100644
--- a/java/broker/etc/virtualhosts.xml
+++ b/qpid/java/broker/etc/virtualhosts.xml
diff --git a/java/broker/python-test.xml b/qpid/java/broker/python-test.xml
index 5c263e3169..5c263e3169 100755
--- 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 18e8c64cb0..18e8c64cb0 100644
--- a/java/broker/scripts/resetAlerting.sh
+++ b/qpid/java/broker/scripts/resetAlerting.sh
diff --git a/java/broker/src/main/grammar/SelectorParser.jj b/qpid/java/broker/src/main/grammar/SelectorParser.jj
index c9e01cd01f..c9e01cd01f 100644
--- a/java/broker/src/main/grammar/SelectorParser.jj
+++ b/qpid/java/broker/src/main/grammar/SelectorParser.jj
diff --git a/java/broker/src/main/java/log4j.properties b/qpid/java/broker/src/main/java/log4j.properties
index 6788c65463..6788c65463 100644
--- a/java/broker/src/main/java/log4j.properties
+++ b/qpid/java/broker/src/main/java/log4j.properties
diff --git a/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java b/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
index 4426a7aeec..4426a7aeec 100644
--- a/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
+++ b/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
diff --git a/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java b/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
index 1200ba6e0b..1200ba6e0b 100644
--- a/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
+++ b/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
diff --git a/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java b/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
index 0b63c68854..0b63c68854 100644
--- a/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/CompletionCode.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/CompletionCode.java
index 706ab3974a..706ab3974a 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/CompletionCode.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/CompletionCode.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
index 593c1616fb..593c1616fb 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerRequestCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerRequestCommand.java
index b98daf7cb1..b98daf7cb1 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerRequestCommand.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerRequestCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerResponseCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerResponseCommand.java
index ac01c47fe8..ac01c47fe8 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerResponseCommand.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerResponseCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFClass.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFClass.java
index 3408ff09f4..3408ff09f4 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFClass.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFClass.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFClassIndicationCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFClassIndicationCommand.java
index a956a9bd70..a956a9bd70 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFClassIndicationCommand.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFClassIndicationCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFClassQueryCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFClassQueryCommand.java
index 26a27cfa19..26a27cfa19 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFClassQueryCommand.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFClassQueryCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommand.java
index 4f143701af..4f143701af 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommand.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandCompletionCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandCompletionCommand.java
index f163e434d1..f163e434d1 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandCompletionCommand.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandCompletionCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandDecoder.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandDecoder.java
index ac036dfa19..ac036dfa19 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandDecoder.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandDecoder.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandHeader.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandHeader.java
index c4d771317f..c4d771317f 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandHeader.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandHeader.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventClass.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventClass.java
index ec471f18e8..ec471f18e8 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventClass.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventClass.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventCommand.java
index d70c12db19..d70c12db19 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventCommand.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventSeverity.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventSeverity.java
index 9f9c832732..9f9c832732 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventSeverity.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventSeverity.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFGetQueryCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFGetQueryCommand.java
index 8e8cb55a0d..8e8cb55a0d 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFGetQueryCommand.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFGetQueryCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMessage.java
index 895ff643a2..895ff643a2 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFMessage.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethod.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethod.java
index 63e8fa6a1e..63e8fa6a1e 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethod.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethod.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodInvocation.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodInvocation.java
index 5348c2783f..5348c2783f 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodInvocation.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodInvocation.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodRequestCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodRequestCommand.java
index cf27e4b970..cf27e4b970 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodRequestCommand.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodRequestCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodResponseCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodResponseCommand.java
index 5fea014ad8..5fea014ad8 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodResponseCommand.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodResponseCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFObject.java
index d126717fc8..d126717fc8 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFObject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFObject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFObjectClass.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFObjectClass.java
index fefdecb8d7..fefdecb8d7 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFObjectClass.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFObjectClass.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFOperation.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFOperation.java
index 6736b5d460..6736b5d460 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFOperation.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFOperation.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackage.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackage.java
index 681e64b799..681e64b799 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackage.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageIndicationCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageIndicationCommand.java
index 7053b80655..7053b80655 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageIndicationCommand.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageIndicationCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageQueryCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageQueryCommand.java
index 6defd088de..6defd088de 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageQueryCommand.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageQueryCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFProperty.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFProperty.java
index 5748722afe..5748722afe 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFProperty.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFProperty.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaRequestCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaRequestCommand.java
index 3141676f10..3141676f10 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaRequestCommand.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaRequestCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaResponseCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaResponseCommand.java
index fea2430130..fea2430130 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaResponseCommand.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaResponseCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
index 5192d5be6f..5192d5be6f 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFStatistic.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFStatistic.java
index 89d650e03b..89d650e03b 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFStatistic.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFStatistic.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFType.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFType.java
index 0e01c27db5..0e01c27db5 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
index d1ea5dba69..d1ea5dba69 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index 08eb05680c..08eb05680c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java
index 9da02e0600..9da02e0600 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java
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 9d3c4dd2e8..9d3c4dd2e8 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/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
index 3bad73d86d..3bad73d86d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
index d920d97c1a..d920d97c1a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java
index 60c9a86b76..60c9a86b76 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
index 400ce50bc4..400ce50bc4 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java
index 233134abc5..233134abc5 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfigType.java
index 5cd064ff42..5cd064ff42 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfigType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java
index 00ed5fd0dd..00ed5fd0dd 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfigType.java
index a8d3cd9ec3..a8d3cd9ec3 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfigType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java
index 5cdb886821..5cdb886821 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigType.java
index 82b2fc82d2..82b2fc82d2 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigObjectType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigObjectType.java
index c45aaaf1ee..c45aaaf1ee 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigObjectType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigObjectType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigProperty.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigProperty.java
index 2d88ba00a0..2d88ba00a0 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigProperty.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigProperty.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java
index 0e03e33be8..0e03e33be8 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationManager.java
index 2c492ff6b9..2c492ff6b9 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
index 78666a3f93..78666a3f93 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java
index 0dd36fe1fe..0dd36fe1fe 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfigType.java
index 9750b12dea..9750b12dea 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfigType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java
index 41c51d9684..41c51d9684 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigType.java
index 2095301ad6..2095301ad6 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java
index c7cf0c0892..c7cf0c0892 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigurationPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigurationPlugin.java
index bfb2de4235..bfb2de4235 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigurationPlugin.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigurationPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java
index 5a6159df34..5a6159df34 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfigType.java
index 4dc46b70c9..4dc46b70c9 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfigType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
index be34c8d63d..be34c8d63d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfigType.java
index a794ed9747..a794ed9747 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfigType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
index 4512de6fb4..4512de6fb4 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
index 297f7abdb8..297f7abdb8 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfig.java
index 8fef642eff..8fef642eff 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfig.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfigType.java
index 97cf275575..97cf275575 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfigType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfig.java
index b101d70553..b101d70553 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfig.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfigType.java
index 99d3273b55..99d3273b55 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfigType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java
index 8a9029fbfd..8a9029fbfd 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java
index 09ebb07105..09ebb07105 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigType.java
index f5aabd2345..f5aabd2345 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfig.java
index d5420d9718..d5420d9718 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfig.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java
index 8716fed8c1..8716fed8c1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java
index 9256724c56..9256724c56 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfigType.java
index 96682335bf..96682335bf 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfigType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
index a710230616..a710230616 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java
index cc402d5b4a..cc402d5b4a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
index 82b576ea51..82b576ea51 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginFactory.java
index 02560b296e..02560b296e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java
index 7a2632d923..7a2632d923 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionPolicyConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionPolicyConfiguration.java
index ca8dec851a..ca8dec851a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionPolicyConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionPolicyConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionQueueConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionQueueConfiguration.java
index 0638ea362f..0638ea362f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionQueueConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionQueueConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
index c06305ee4e..c06305ee4e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java
index b4f5bffa57..b4f5bffa57 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index d0231e4d80..d0231e4d80 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
index 0f1b709475..0f1b709475 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
index 7837a9bc38..7837a9bc38 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
index 0e7459498a..0e7459498a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
index cb0d8ecf8f..cb0d8ecf8f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java
index 94fc44d9c7..94fc44d9c7 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
index 356a7f89b9..356a7f89b9 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
index 92795487e4..92795487e4 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
index c77f114428..c77f114428 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInitialiser.java
index 4dfcce7bbe..4dfcce7bbe 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInitialiser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeReferrer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeReferrer.java
index e41d63d97d..e41d63d97d 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeReferrer.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeReferrer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
index e34ef29d9b..e34ef29d9b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeType.java
index 0b55caa2f1..0b55caa2f1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
index bd75f7bc51..bd75f7bc51 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java
index 2c85b7f787..2c85b7f787 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
index f58a6513a9..f58a6513a9 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
index f9cbfeb78b..f9cbfeb78b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java
index 66c9b5b552..66c9b5b552 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
index 025a8014aa..025a8014aa 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
index e523eb24fb..e523eb24fb 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java
index 620c3ce140..620c3ce140 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKey.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKey.java
index 8fdb91cbef..8fdb91cbef 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKey.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKey.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKeyDictionary.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKeyDictionary.java
index 7be99a88c9..7be99a88c9 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKeyDictionary.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKeyDictionary.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderMatcherResult.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderMatcherResult.java
index 518064bb29..518064bb29 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderMatcherResult.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderMatcherResult.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersMatcherDFAState.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersMatcherDFAState.java
index 9da93d483a..9da93d483a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersMatcherDFAState.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersMatcherDFAState.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java
index 0e3a3894fe..0e3a3894fe 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
index 41dc0d749a..41dc0d749a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
index 36076cf75b..36076cf75b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherResult.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherResult.java
index 71d30adfac..71d30adfac 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherResult.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherResult.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicNormalizer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicNormalizer.java
index 7e7cb6c0ae..7e7cb6c0ae 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicNormalizer.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicNormalizer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
index 3e9facf412..3e9facf412 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java
index f14d70f8a1..f14d70f8a1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java
index 65a0cd3107..65a0cd3107 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java
index fbc5387daf..fbc5387daf 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
index fa2fb9ead1..fa2fb9ead1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
index 221d23ef0d..221d23ef0d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
index 024257bea9..024257bea9 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
index 06e8664470..06e8664470 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
index aad9d41174..aad9d41174 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
index 5cc9ca8ef2..5cc9ca8ef2 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
index 97e9915271..97e9915271 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManager.java
index b5e282038b..b5e282038b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
index dac517150a..dac517150a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
index f32de03841..f32de03841 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
index fdba184da4..fdba184da4 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/MessageFilter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
index f5416af09a..f5416af09a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
index 65ddf19fc4..65ddf19fc4 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
index 11fdeae2b1..11fdeae2b1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
index c563569cb4..c563569cb4 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
index 557af95001..557af95001 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
index aa35cb5a76..aa35cb5a76 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java
index ae22f17413..ae22f17413 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java
index f83eb63ac5..f83eb63ac5 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java
index cfe5aedd61..cfe5aedd61 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/BytesOnlyCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/BytesOnlyCreditManager.java
index c5f2d1e808..c5f2d1e808 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/flow/BytesOnlyCreditManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/BytesOnlyCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/CreditCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/CreditCreditManager.java
index b47f986155..b47f986155 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/flow/CreditCreditManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/CreditCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager.java
index bec51d361d..bec51d361d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager_0_10.java
index 48c336c0b1..48c336c0b1 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager_0_10.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager_0_10.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/LimitlessCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/LimitlessCreditManager.java
index 901b71fd1f..901b71fd1f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/flow/LimitlessCreditManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/LimitlessCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/MessageAndBytesCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/MessageAndBytesCreditManager.java
index 19a9ac1d23..19a9ac1d23 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/flow/MessageAndBytesCreditManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/MessageAndBytesCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/MessageOnlyCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/MessageOnlyCreditManager.java
index a386f66b11..a386f66b11 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/flow/MessageOnlyCreditManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/MessageOnlyCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/Pre0_10CreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/Pre0_10CreditManager.java
index 026804439c..026804439c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/flow/Pre0_10CreditManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/Pre0_10CreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/WindowCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/WindowCreditManager.java
index 10f578551a..10f578551a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/flow/WindowCreditManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/WindowCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/AccessRequestHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/AccessRequestHandler.java
index d587ef0c16..d587ef0c16 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/AccessRequestHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/AccessRequestHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
index f90e7c3dff..f90e7c3dff 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
index 29054f55c1..29054f55c1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
index a5999711bc..a5999711bc 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java
index 790027f293..790027f293 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
index 8f23b1c4d4..8f23b1c4d4 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
index dd3281c65f..dd3281c65f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
index c7842cd643..c7842cd643 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverSyncMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverSyncMethodHandler.java
index f9feada6fe..f9feada6fe 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverSyncMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverSyncMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java
index 62dd76f832..62dd76f832 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
index 9133cce6b7..9133cce6b7 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java
index a857490e7e..a857490e7e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
index 696ca8a63b..696ca8a63b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
index 6d874ee971..6d874ee971 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
index dade5d5f54..dade5d5f54 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java
index bc6e5ab403..bc6e5ab403 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
index 9a79467526..9a79467526 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
index d4b79134a2..d4b79134a2 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
index 4442f969c4..4442f969c4 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
index 1da2760639..1da2760639 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java
index ccd42204d9..ccd42204d9 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
index 98a0d33487..98a0d33487 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
index 586aaf9336..586aaf9336 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java
index ac516b6133..ac516b6133 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
index 0eb69e4b16..0eb69e4b16 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
index 8939cfa334..8939cfa334 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
index da52268e52..da52268e52 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java
index 759eec0129..759eec0129 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java
index 8391a4b184..8391a4b184 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl.java
index e290afcde3..e290afcde3 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_9.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_9.java
index 8b1dca77ba..8b1dca77ba 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_9.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_9.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_91.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_91.java
index 32cd4c4e9f..32cd4c4e9f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_91.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_91.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_8_0.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_8_0.java
index d599ca3d4e..d599ca3d4e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_8_0.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_8_0.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
index abd2bccc8d..abd2bccc8d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
index 4643dee0a3..4643dee0a3 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
index 308f5b73cf..308f5b73cf 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/UnexpectedMethodException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/UnexpectedMethodException.java
index 3526fdcae5..3526fdcae5 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/UnexpectedMethodException.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/UnexpectedMethodException.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/information/management/ServerInformationMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/information/management/ServerInformationMBean.java
index 5e6a143d52..5e6a143d52 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/information/management/ServerInformationMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/information/management/ServerInformationMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/AbstractRootMessageLogger.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/AbstractRootMessageLogger.java
index 545f2adea2..545f2adea2 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/AbstractRootMessageLogger.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/AbstractRootMessageLogger.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/CompositeStartupMessageLogger.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/CompositeStartupMessageLogger.java
index e0a51b3a3e..e0a51b3a3e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/CompositeStartupMessageLogger.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/CompositeStartupMessageLogger.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java
index a0285ebfc4..a0285ebfc4 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/LogActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogActor.java
index 18f03c2716..18f03c2716 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/LogActor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/LogMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogMessage.java
index fa18435fab..fa18435fab 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/LogMessage.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/LogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogSubject.java
index 09a277e520..09a277e520 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/LogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java
index db8b24e90e..db8b24e90e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java
index 1431dd1da9..1431dd1da9 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
index b384b3fde3..b384b3fde3 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
index 9c7ffcc5f8..9c7ffcc5f8 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
index 1b4bc91bc1..1b4bc91bc1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
index e0bf180cc4..e0bf180cc4 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/BrokerActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/BrokerActor.java
index 9e77452228..9e77452228 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/BrokerActor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/BrokerActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java
index 2ebbfeb734..2ebbfeb734 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/GenericActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/GenericActor.java
index 9afc76ce78..9afc76ce78 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/GenericActor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/GenericActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
index 2825fa1b75..2825fa1b75 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java
index 3364365b61..3364365b61 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
index a2dbf2f6ee..a2dbf2f6ee 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
index a823fb7cb1..a823fb7cb1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties
index 808ec7918f..808ec7918f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
index 5d1e85fe41..5d1e85fe41 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Channel_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Channel_logmessages.properties
index ed8c0d0ce9..ed8c0d0ce9 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Channel_logmessages.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Channel_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ConfigStore_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ConfigStore_logmessages.properties
index 3bc5074777..3bc5074777 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ConfigStore_logmessages.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ConfigStore_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties
index 81ae6f3bd0..81ae6f3bd0 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties
index b9890d9f27..b9890d9f27 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
index ab77476da2..ab77476da2 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/MessageStore_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/MessageStore_logmessages.properties
index a2cedeb22a..a2cedeb22a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/MessageStore_logmessages.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/MessageStore_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties
index 538bf994ea..538bf994ea 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties
index ef5f885b50..ef5f885b50 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/TransactionLog_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/TransactionLog_logmessages.properties
index fadc2e2098..fadc2e2098 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/TransactionLog_logmessages.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/TransactionLog_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties
index 3e640c7929..3e640c7929 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
index 779db01601..779db01601 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
index 088b59ae68..088b59ae68 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
index f28873940b..f28873940b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
index a697029d24..a697029d24 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
index 6ab44a92b9..6ab44a92b9 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
index ff2bb90140..ff2bb90140 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
index 3fce13bcb5..3fce13bcb5 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java
index bfe12f1a60..bfe12f1a60 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
index 8b57647046..8b57647046 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
index c4ffcd26bf..c4ffcd26bf 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
index 7924964fdf..7924964fdf 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
index 0334a856c1..0334a856c1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
index 17a6851abc..17a6851abc 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
index 380f51e308..380f51e308 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java
index 166a2a376d..166a2a376d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java
index de14785fb0..de14785fb0 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
index fda80ad0dd..fda80ad0dd 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
index a048e75b2e..a048e75b2e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessage.java
index e0c181a5fc..e0c181a5fc 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessage.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java
index faac14f8a7..faac14f8a7 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageReference.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageReference.java
index 940caaefe4..940caaefe4 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageReference.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageReference.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/ContentHeaderBodyAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/ContentHeaderBodyAdapter.java
index 84a1642578..84a1642578 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/message/ContentHeaderBodyAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/ContentHeaderBodyAdapter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/EnqueableMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/EnqueableMessage.java
index c32f80fc5b..c32f80fc5b 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/message/EnqueableMessage.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/EnqueableMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/InboundMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/InboundMessage.java
index 1b3fdb1870..1b3fdb1870 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/message/InboundMessage.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/InboundMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageContentSource.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageContentSource.java
index 08a09c4a85..08a09c4a85 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/message/MessageContentSource.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageContentSource.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java
index 66cb7ed83b..66cb7ed83b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_0_10.java
index cf8ae2166c..cf8ae2166c 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_0_10.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_0_10.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageReference.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageReference.java
index 399f8f9327..399f8f9327 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/message/MessageReference.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageReference.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java
index 31cf223428..31cf223428 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferMessage.java
index 08006435f8..08006435f8 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferMessage.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/ServerMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/ServerMessage.java
index 2f2d39115f..2f2d39115f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/message/ServerMessage.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/ServerMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/TransferMessageReference.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/TransferMessageReference.java
index ed189c49c4..ed189c49c4 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/message/TransferMessageReference.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/TransferMessageReference.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/output/HeaderPropertiesConverter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/HeaderPropertiesConverter.java
index aded3f3d2a..aded3f3d2a 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/output/HeaderPropertiesConverter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/HeaderPropertiesConverter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverter.java
index 5300bad613..5300bad613 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
index dbefeb61f2..dbefeb61f2 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java
index 2cebec373e..2cebec373e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/ProtocolOutputConverterImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/ProtocolOutputConverterImpl.java
index 319b5cc7bd..319b5cc7bd 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/ProtocolOutputConverterImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/ProtocolOutputConverterImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9_1/ProtocolOutputConverterImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9_1/ProtocolOutputConverterImpl.java
index cffbe445ee..cffbe445ee 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9_1/ProtocolOutputConverterImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9_1/ProtocolOutputConverterImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/plugins/Activator.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Activator.java
index df72e87fd8..df72e87fd8 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/plugins/Activator.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Activator.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java
index e7f9983fff..e7f9983fff 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginFactory.java
index bbf3e74a30..bbf3e74a30 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
index 4e8d64a136..4e8d64a136 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java
index 061ebf50cd..061ebf50cd 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java
index a7599a3e0d..a7599a3e0d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
index 449f698c48..449f698c48 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngineFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngineFactory.java
index 0e4444725e..0e4444725e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngineFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngineFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
index c64ed4ad5a..c64ed4ad5a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
index fcac78fafa..fcac78fafa 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
index bc63403a86..bc63403a86 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
index eb957ee33c..eb957ee33c 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
index 75358c42d9..75358c42d9 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
index 30d506a89b..30d506a89b 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java
index b6e97e08fb..b6e97e08fb 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
index 9b9de8333b..9b9de8333b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
index bee55118ba..bee55118ba 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
index c8eb118b11..c8eb118b11 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/BaseQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/BaseQueue.java
index 05e0efd9a6..05e0efd9a6 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/BaseQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/BaseQueue.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java
index b5293f51be..b5293f51be 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
index 2c1883e763..2c1883e763 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
index d76487073d..d76487073d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
index 6466e81dd2..6466e81dd2 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/Filterable.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/Filterable.java
index eaa3992e98..eaa3992e98 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/Filterable.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/Filterable.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
index 77da08d8c4..77da08d8c4 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
index 3e3288404f..3e3288404f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
index 090096d3c3..090096d3c3 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
index d1fb0f3fe6..d1fb0f3fe6 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
index 0c6b84d2b6..0c6b84d2b6 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java
index 825a85a89c..825a85a89c 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
index 79ede2694e..79ede2694e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
index 809ba3277e..809ba3277e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryIterator.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryIterator.java
index c5c115a2d1..c5c115a2d1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryIterator.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryIterator.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryList.java
index b4042ce02c..b4042ce02c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryList.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryList.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java
index 4dbce45f67..4dbce45f67 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java
index 959ca03c80..959ca03c80 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
index a537e0c83f..a537e0c83f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRunner.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
index 7e1d57e205..7e1d57e205 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index b02d03a1ad..b02d03a1ad 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
index b97c2c55c5..b97c2c55c5 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
index 46c1a6af9a..46c1a6af9a 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
index b6df0cc0a6..b6df0cc0a6 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/BrokerConfigAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/BrokerConfigAdapter.java
index 4a4253153c..4a4253153c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/registry/BrokerConfigAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/BrokerConfigAdapter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
index ff2a8c959b..ff2a8c959b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
index 0ef55097ce..0ef55097ce 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java
index ff80499bc2..ff80499bc2 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java
index 8b5ff6781d..8b5ff6781d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/PrincipalHolder.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/PrincipalHolder.java
index 7e93623cab..7e93623cab 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/security/PrincipalHolder.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/PrincipalHolder.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/Result.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/Result.java
index f79721799e..f79721799e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/Result.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/Result.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
index f18c327692..f18c327692 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPlugin.java
index c3c06bf206..c3c06bf206 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPlugin.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginActivator.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginActivator.java
index 5ee7833c4c..5ee7833c4c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginActivator.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginActivator.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginFactory.java
index fe81cba282..fe81cba282 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
index 70a9ea5356..70a9ea5356 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
index 7103b30283..7103b30283 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/Operation.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/Operation.java
index 06d7f8fd0c..06d7f8fd0c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/access/Operation.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/Operation.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/Permission.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/Permission.java
index 49b3a331f9..49b3a331f9 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/access/Permission.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/Permission.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
index db18a89231..db18a89231 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java
index f3161551dc..f3161551dc 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java
index 6c0fb1eaa4..6c0fb1eaa4 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
index bd99cdd1fa..bd99cdd1fa 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
index 62967ef7eb..62967ef7eb 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
index 5a92b33e43..5a92b33e43 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java
index e9276e1b0e..e9276e1b0e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
index 3690e7f92a..3690e7f92a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
index 76ebea0321..76ebea0321 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java
index 46a78a55aa..46a78a55aa 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java
index ef37e043a6..ef37e043a6 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabaseManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabaseManager.java
index f9882f8810..f9882f8810 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabaseManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabaseManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java
index ff8851306f..ff8851306f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabaseManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabaseManager.java
index 8658101cd8..8658101cd8 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabaseManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabaseManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/management/AMQUserManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/management/AMQUserManagementMBean.java
index a839315bcc..a839315bcc 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/management/AMQUserManagementMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/management/AMQUserManagementMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
index 39e1e07c57..39e1e07c57 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
index d10ad2c170..d10ad2c170 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java
index 0cbbccb3b8..0cbbccb3b8 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java
index 89e545d6f5..89e545d6f5 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/JCAProvider.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/JCAProvider.java
index d6a09d8217..d6a09d8217 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/JCAProvider.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/JCAProvider.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
index 5c13e03886..5c13e03886 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipal.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipal.java
index d7c8383690..d7c8383690 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipal.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipal.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java
index 7acc6322d1..7acc6322d1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java
index 9f56b8521a..9f56b8521a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java
index 17d123eb0d..17d123eb0d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousInitialiser.java
index 4a66b74783..4a66b74783 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousInitialiser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServer.java
index b4cce15d88..b4cce15d88 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServer.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java
index 8a5ff7df2d..8a5ff7df2d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java
index 97f9a4e91a..97f9a4e91a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java
index f6cab084ea..f6cab084ea 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java
index 5298b5cc63..5298b5cc63 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java
index 139818735f..139818735f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexSaslServer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexSaslServer.java
index 192ff74bff..192ff74bff 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexSaslServer.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexSaslServer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexServerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexServerFactory.java
index ce0e19abf9..ce0e19abf9 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexServerFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexServerFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java
index 264832888d..264832888d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java
index 1d16cd8755..1d16cd8755 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainPasswordCallback.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainPasswordCallback.java
index 7230e8ee53..7230e8ee53 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainPasswordCallback.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainPasswordCallback.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
index 847a3a34ce..847a3a34ce 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java
index 3144bfbce6..3144bfbce6 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java
index f427cc7206..f427cc7206 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
index 6cc5e7b019..6cc5e7b019 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java
index cec67a8a6d..cec67a8a6d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
index 3c11bb8a9c..3c11bb8a9c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java
index 00fc09867b..00fc09867b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java
index b732121180..b732121180 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
index 36fec4025a..36fec4025a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java
index b9adaeacdf..b9adaeacdf 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java
index a883f656be..a883f656be 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
index 2e694b24ea..2e694b24ea 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java
index 5fb23653cb..5fb23653cb 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
index d008d42fa0..d008d42fa0 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataType.java
index 428bb1e41b..428bb1e41b 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
index e2fca2f9c7..e2fca2f9c7 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java
index 3d1538c7eb..3d1538c7eb 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreRecoveryHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreRecoveryHandler.java
index ba65b8e1ec..ba65b8e1ec 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreRecoveryHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreRecoveryHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java
index 12d2a6a6c7..12d2a6a6c7 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java
index 88cc68bc71..88cc68bc71 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
index 1f5b027b80..1f5b027b80 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/StoredMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMessage.java
index 0bc45c6718..0bc45c6718 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/store/StoredMessage.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLog.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLog.java
index d196a91930..d196a91930 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLog.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLog.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogRecoveryHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogRecoveryHandler.java
index 7781c52df3..7781c52df3 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogRecoveryHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogRecoveryHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java
index 0d81dd151d..0d81dd151d 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java
index fbc8b3af7d..fbc8b3af7d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/ExplicitAcceptDispositionChangeListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/ExplicitAcceptDispositionChangeListener.java
index b49b12fb79..b49b12fb79 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/subscription/ExplicitAcceptDispositionChangeListener.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/ExplicitAcceptDispositionChangeListener.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/ImplicitAcceptDispositionChangeListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/ImplicitAcceptDispositionChangeListener.java
index b5bb2014b5..b5bb2014b5 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/subscription/ImplicitAcceptDispositionChangeListener.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/ImplicitAcceptDispositionChangeListener.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/MessageAcceptCompletionListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/MessageAcceptCompletionListener.java
index 8a2a370236..8a2a370236 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/subscription/MessageAcceptCompletionListener.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/MessageAcceptCompletionListener.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/RecordDeliveryMethod.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/RecordDeliveryMethod.java
index e2ed4104de..e2ed4104de 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/subscription/RecordDeliveryMethod.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/RecordDeliveryMethod.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java
index 0a3576ff42..0a3576ff42 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactory.java
index ce0362d73f..ce0362d73f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactoryImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactoryImpl.java
index 1bba2529c6..1bba2529c6 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactoryImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactoryImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
index d8f44c9f7f..d8f44c9f7f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java
index 9ea81660c6..9ea81660c6 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
index 68e47fd86a..68e47fd86a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/QpidAcceptor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/QpidAcceptor.java
index 3ca22b60c8..3ca22b60c8 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/transport/QpidAcceptor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/QpidAcceptor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
index 54cd709af3..54cd709af3 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
index 174dcbfa69..174dcbfa69 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
index 60c94b43c0..60c94b43c0 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
index be659c87ae..be659c87ae 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
index 36e9d78440..36e9d78440 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
index 946dbd7c28..946dbd7c28 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java
index b3c6e1ac3a..b3c6e1ac3a 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
index e730e2f3c3..e730e2f3c3 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java
index eda97e0ed2..eda97e0ed2 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
index 2db1944cd1..2db1944cd1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
index 767474d5ae..767474d5ae 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
index 04f19b79bb..04f19b79bb 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
index 96a9ac729e..96a9ac729e 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
index 33c713c62a..33c713c62a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
index 32d0c4c4d1..32d0c4c4d1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java
index 12206013eb..12206013eb 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetection.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetection.java
index 5c4fe0aab8..5c4fe0aab8 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetection.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetection.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostHouseKeepingPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostHouseKeepingPlugin.java
index 3798f47f0b..3798f47f0b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostHouseKeepingPlugin.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostHouseKeepingPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPlugin.java
index 1886c2d01d..1886c2d01d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPlugin.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPluginFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPluginFactory.java
index c8bea18444..c8bea18444 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPluginFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPluginFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/SlowConsumerDetection_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/SlowConsumerDetection_logmessages.properties
index 03c56910c2..03c56910c2 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/SlowConsumerDetection_logmessages.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/SlowConsumerDetection_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/TopicDeletePolicy_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/TopicDeletePolicy_logmessages.properties
index ed4fb1d45a..ed4fb1d45a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/TopicDeletePolicy_logmessages.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/TopicDeletePolicy_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicy.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicy.java
index 6028f63fdb..6028f63fdb 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicy.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicy.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfiguration.java
index 7dfd22c733..7dfd22c733 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java
index 7f600abdc9..7f600abdc9 100644
--- a/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java
index b2fe6766a6..b2fe6766a6 100644
--- a/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
index dca165fa7e..dca165fa7e 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java
index 5444197cb4..5444197cb4 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java
index b0006b3fe6..b0006b3fe6 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java
index bfa775a34a..bfa775a34a 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java
index 348c95572d..348c95572d 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
index 8bb5d02b01..8bb5d02b01 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java
index 0f9546541b..0f9546541b 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java
index 3c4a0c8fac..3c4a0c8fac 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java
index 244a311c30..244a311c30 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java
index 615f6ec1c2..615f6ec1c2 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java
index 8df4afa2db..8df4afa2db 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java
index a81bc07c38..a81bc07c38 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java
index ff59568374..ff59568374 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java
index 806e161bbc..806e161bbc 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java
index c27c52eb8e..c27c52eb8e 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java
index 986fea32cc..986fea32cc 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java
index cf457d1ea5..cf457d1ea5 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java
index 09444ccdd7..09444ccdd7 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java
index 2791a39f92..2791a39f92 100644
--- a/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java
diff --git a/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java b/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
index 445c7d57f2..445c7d57f2 100644
--- a/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
index 6c135e8ba7..6c135e8ba7 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/ExtractResendAndRequeueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/ExtractResendAndRequeueTest.java
index d2408ba21f..d2408ba21f 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/ExtractResendAndRequeueTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/ExtractResendAndRequeueTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
index 59543874b4..59543874b4 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
index a0304a7b01..a0304a7b01 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
index b3223f16c4..b3223f16c4 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
index d2f2ae5eea..d2f2ae5eea 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
index 43540c88a1..43540c88a1 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java
index 7fc3b2d06a..7fc3b2d06a 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
index 593119041d..593119041d 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginTest.java
index ee2f77f16b..ee2f77f16b 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index 9e831b2a8e..9e831b2a8e 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
index 71e92b5294..71e92b5294 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
index a7c226cbd8..a7c226cbd8 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
index ac638e4e6a..ac638e4e6a 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
index 403a290a0f..403a290a0f 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java
index a845bff9ce..a845bff9ce 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
index 956bb6f8fa..956bb6f8fa 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
index 3752dcb37e..3752dcb37e 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
index e2e112be8f..e2e112be8f 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
index 6346fff85f..6346fff85f 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
index 4eda9e9da1..4eda9e9da1 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
index 60ecbef438..60ecbef438 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
index 956d296dce..956d296dce 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
index 32ad1d110d..32ad1d110d 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
index 033ae3b4b3..033ae3b4b3 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
index 409f7c84b7..409f7c84b7 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
index a2272cc395..a2272cc395 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java
index 30f4e16e42..30f4e16e42 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
index 2d25a769aa..2d25a769aa 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
index e253881d09..e253881d09 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
index 22de8349c6..22de8349c6 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
index a3d46f5716..a3d46f5716 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
index e94b79ba95..e94b79ba95 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
index 24fccf8446..24fccf8446 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
index 728a98e009..728a98e009 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
index 4bfbae44ac..4bfbae44ac 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
index cc032a0430..cc032a0430 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
index d51e6a6bb7..d51e6a6bb7 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
index b2bc351f8f..b2bc351f8f 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
index 17d68ef7c3..17d68ef7c3 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
index 1cd8d55b0d..1cd8d55b0d 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
index e80c4c4679..e80c4c4679 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
index 6bc5effa05..6bc5effa05 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
index c246fff2a8..c246fff2a8 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
index 7e16516fc6..7e16516fc6 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
index 9c868ea651..9c868ea651 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
index 1f432be57a..1f432be57a 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
index 0c356e1838..0c356e1838 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
index 89688e13b3..89688e13b3 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java
index 21f79e4b69..21f79e4b69 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/plugins/MockPluginManager.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/MockPluginManager.java
index a64ec5d3b1..a64ec5d3b1 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/plugins/MockPluginManager.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/MockPluginManager.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/plugins/PluginTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
index 8c18ab85b0..8c18ab85b0 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
index 4df051edb5..4df051edb5 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java
index 3b6cd37ea9..3b6cd37ea9 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
index f6e83e6369..f6e83e6369 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
index 3961b3b355..3961b3b355 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
index a8bddcf6bf..a8bddcf6bf 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
index 27891289fb..27891289fb 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
index 365353e734..365353e734 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
index 0f5374b3e5..0f5374b3e5 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java
index 7000df157e..7000df157e 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
index 888a16053c..888a16053c 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockMessagePublishInfo.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockMessagePublishInfo.java
index 5a5ffaa14d..5a5ffaa14d 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/MockMessagePublishInfo.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockMessagePublishInfo.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
index 5bdbe2c68e..5bdbe2c68e 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockStoredMessage.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockStoredMessage.java
index 7dc491de4d..7dc491de4d 100755
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/MockStoredMessage.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockStoredMessage.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryTest.java
index b67723dd25..b67723dd25 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
index abe2d1728f..abe2d1728f 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
index a40dc5670f..a40dc5670f 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
index 320a75045a..320a75045a 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
index e45c8d7b96..e45c8d7b96 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
index 2ab15d4872..2ab15d4872 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
index aa85cac758..aa85cac758 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
index a3dad19bb4..a3dad19bb4 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
index 7f0843d46e..7f0843d46e 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
index f51ce0b6c6..f51ce0b6c6 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java
index e8c24da68d..e8c24da68d 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java
index 3c5ed1d6c2..3c5ed1d6c2 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java
index 8b3f9c0622..8b3f9c0622 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
index f80413d4f8..f80413d4f8 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/TestPrincipalDatabase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/TestPrincipalDatabase.java
index 8507e49e17..8507e49e17 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/TestPrincipalDatabase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/TestPrincipalDatabase.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java
index 6245064bf7..6245064bf7 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java
index 5dd51250dc..5dd51250dc 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
index fbaa1342c9..fbaa1342c9 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreShutdownTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreShutdownTest.java
index 6ca88d1796..6ca88d1796 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreShutdownTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreShutdownTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
index 62ceb68208..62ceb68208 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/ReferenceCountingTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/ReferenceCountingTest.java
index 2d41eb9899..2d41eb9899 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/store/ReferenceCountingTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/ReferenceCountingTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
index 5ff84557d8..5ff84557d8 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java
index 4dea13d391..4dea13d391 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
index 3593297a05..3593297a05 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
index 6fbc627d8c..6fbc627d8c 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
index b315a79b33..b315a79b33 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
index 9afed49922..9afed49922 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
index e81fd8e3f1..e81fd8e3f1 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/txn/MockAction.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockAction.java
index 975e3e91b9..975e3e91b9 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/txn/MockAction.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockAction.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java
index 64c62fd029..64c62fd029 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
index 5700bba9f8..5700bba9f8 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
index ff94942457..ff94942457 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
index c7db51016e..c7db51016e 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
index af8997cf40..af8997cf40 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionConfigurationTest.java
index cc11d68e07..cc11d68e07 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionPolicyConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionPolicyConfigurationTest.java
index efb898e365..efb898e365 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionPolicyConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionPolicyConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionQueueConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionQueueConfigurationTest.java
index be86037dd8..be86037dd8 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionQueueConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionQueueConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfigurationTest.java
index 3d3cc810df..3d3cc810df 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java
index a2e83add05..a2e83add05 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/util/MockChannel.java b/qpid/java/broker/src/test/java/org/apache/qpid/util/MockChannel.java
index 9bd1e7c5e1..9bd1e7c5e1 100644
--- a/java/broker/src/test/java/org/apache/qpid/util/MockChannel.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/util/MockChannel.java
diff --git a/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java b/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
index a39799a6b6..a39799a6b6 100644
--- a/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
+++ b/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
diff --git a/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm b/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
index fd847fd513..fd847fd513 100644
--- a/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
+++ b/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
diff --git a/java/broker/src/xsl/qmf.xsl b/qpid/java/broker/src/xsl/qmf.xsl
index 3a7e10dac8..3a7e10dac8 100644
--- a/java/broker/src/xsl/qmf.xsl
+++ b/qpid/java/broker/src/xsl/qmf.xsl
diff --git a/java/build.deps b/qpid/java/build.deps
index 73c35940cb..73c35940cb 100644
--- a/java/build.deps
+++ b/qpid/java/build.deps
diff --git a/java/build.xml b/qpid/java/build.xml
index 8651404cb7..8651404cb7 100644
--- a/java/build.xml
+++ b/qpid/java/build.xml
diff --git a/java/client/README.txt b/qpid/java/client/README.txt
index 57a98cc978..57a98cc978 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 d52de8dca6..d52de8dca6 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/README.txt b/qpid/java/client/example/src/main/java/README.txt
index 757054e492..757054e492 100644
--- a/java/client/example/src/main/java/README.txt
+++ b/qpid/java/client/example/src/main/java/README.txt
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 b43031ad23..b43031ad23 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/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 f4e17c5c4c..f4e17c5c4c 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 5da319a658..5da319a658 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 27ea66b318..27ea66b318 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/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
index 1849f733e9..1849f733e9 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java
index 04339b2498..04339b2498 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java
index d709da6432..d709da6432 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
index 3d16e01af4..3d16e01af4 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java
index 750f57d9dc..750f57d9dc 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MultiMessageDispatcher.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MultiMessageDispatcher.java
index a92efe99ac..a92efe99ac 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MultiMessageDispatcher.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MultiMessageDispatcher.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
index b5f44557a4..b5f44557a4 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/TopicPublisher.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/TopicPublisher.java
index 8645e41101..8645e41101 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/TopicPublisher.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/TopicPublisher.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
index 245008b68a..245008b68a 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java
index e32ee0ba73..e32ee0ba73 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java
index 88ee9ed2c5..88ee9ed2c5 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java
index ac3829d49e..ac3829d49e 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java
index f2d736701f..f2d736701f 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java
index 1a3d596a24..1a3d596a24 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java
index 2987a9559b..2987a9559b 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/shared/FileUtils.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/FileUtils.java
index 54446cb6a7..54446cb6a7 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/shared/FileUtils.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/FileUtils.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java
index 16a185133a..16a185133a 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/shared/Statics.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/Statics.java
index c056f8a7da..c056f8a7da 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/shared/Statics.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/Statics.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties
index c76acbd8b9..c76acbd8b9 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Client.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Client.java
index 8a0ff88448..8a0ff88448 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Client.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Client.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Server.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Server.java
index 9c284eee97..9c284eee97 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Server.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Server.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
index e4eb5ac7f5..e4eb5ac7f5 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
index 5e78107182..5e78107182 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java
index c36668575f..c36668575f 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
index f8fbf63037..f8fbf63037 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/transport/ExistingSocketConnectorDemo.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/transport/ExistingSocketConnectorDemo.java
index d7eb138523..d7eb138523 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/transport/ExistingSocketConnectorDemo.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/transport/ExistingSocketConnectorDemo.java
diff --git a/java/client/example/src/main/java/runSample.sh b/qpid/java/client/example/src/main/java/runSample.sh
index 66338556a5..66338556a5 100755
--- a/java/client/example/src/main/java/runSample.sh
+++ b/qpid/java/client/example/src/main/java/runSample.sh
diff --git a/java/client/src/main/grammar/SelectorParser.jj b/qpid/java/client/src/main/grammar/SelectorParser.jj
index 4bf9a968d7..4bf9a968d7 100644
--- a/java/client/src/main/grammar/SelectorParser.jj
+++ b/qpid/java/client/src/main/grammar/SelectorParser.jj
diff --git a/java/client/src/main/java/client.bnd b/qpid/java/client/src/main/java/client.bnd
index d2bc4f8d50..d2bc4f8d50 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/mina/transport/socket/nio/ExistingSocketConnector.java b/qpid/java/client/src/main/java/org/apache/mina/transport/socket/nio/ExistingSocketConnector.java
index 98716c0c3c..98716c0c3c 100644
--- a/java/client/src/main/java/org/apache/mina/transport/socket/nio/ExistingSocketConnector.java
+++ b/qpid/java/client/src/main/java/org/apache/mina/transport/socket/nio/ExistingSocketConnector.java
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 999b22299c..999b22299c 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 b31dd2bc91..b31dd2bc91 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/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
new file mode 100644
index 0000000000..94a55ef52c
--- /dev/null
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
@@ -0,0 +1,1485 @@
+/*
+*
+ * 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.
+ *
+ */
+package org.apache.qpid.client;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.ConnectException;
+import java.net.UnknownHostException;
+import java.nio.channels.UnresolvedAddressException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import javax.jms.ConnectionConsumer;
+import javax.jms.ConnectionMetaData;
+import javax.jms.Destination;
+import javax.jms.ExceptionListener;
+import javax.jms.IllegalStateException;
+import javax.jms.JMSException;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueSession;
+import javax.jms.ServerSessionPool;
+import javax.jms.Topic;
+import javax.jms.TopicConnection;
+import javax.jms.TopicSession;
+import javax.naming.NamingException;
+import javax.naming.Reference;
+import javax.naming.Referenceable;
+import javax.naming.StringRefAddr;
+
+import org.apache.qpid.AMQConnectionFailureException;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.AMQProtocolException;
+import org.apache.qpid.AMQUnresolvedAddressException;
+import org.apache.qpid.AMQDisconnectedException;
+import org.apache.qpid.client.failover.FailoverException;
+import org.apache.qpid.client.failover.FailoverProtectedOperation;
+import org.apache.qpid.client.protocol.AMQProtocolHandler;
+import org.apache.qpid.configuration.ClientProperties;
+import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.BasicQosBody;
+import org.apache.qpid.framing.BasicQosOkBody;
+import org.apache.qpid.framing.ChannelOpenBody;
+import org.apache.qpid.framing.ChannelOpenOkBody;
+import org.apache.qpid.framing.ProtocolVersion;
+import org.apache.qpid.framing.TxSelectBody;
+import org.apache.qpid.framing.TxSelectOkBody;
+import org.apache.qpid.jms.BrokerDetails;
+import org.apache.qpid.jms.Connection;
+import org.apache.qpid.jms.ConnectionListener;
+import org.apache.qpid.jms.ConnectionURL;
+import org.apache.qpid.jms.FailoverPolicy;
+import org.apache.qpid.protocol.AMQConstant;
+import org.apache.qpid.url.URLSyntaxException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AMQConnection extends Closeable implements Connection, QueueConnection, TopicConnection, Referenceable
+{
+    private static final Logger _logger = LoggerFactory.getLogger(AMQConnection.class);
+
+
+    /**
+     * This is the "root" mutex that must be held when doing anything that could be impacted by failover. This must be
+     * held by any child objects of this connection such as the session, producers and consumers.
+     */
+    private final Object _failoverMutex = new Object();
+
+    private final Object _sessionCreationLock = new Object();
+
+    /**
+     * A channel is roughly analogous to a session. The server can negotiate the maximum number of channels per session
+     * and we must prevent the client from opening too many.
+     */
+    private long _maximumChannelCount;
+
+    /** The maximum size of frame supported by the server */
+    private long _maximumFrameSize;
+
+    /**
+     * The protocol handler dispatches protocol events for this connection. For example, when the connection is dropped
+     * the handler deals with this. It also deals with the initial dispatch of any protocol frames to their appropriate
+     * handler.
+     */
+    protected AMQProtocolHandler _protocolHandler;
+
+    /** Maps from session id (Integer) to AMQSession instance */
+    private final ChannelToSessionMap _sessions = new ChannelToSessionMap();
+
+    private final String _clientName;
+
+    /** The user name to use for authentication */
+    private String _username;
+
+    /** The password to use for authentication */
+    private String _password;
+
+    /** The virtual path to connect to on the AMQ server */
+    private String _virtualHost;
+
+    protected ExceptionListener _exceptionListener;
+
+    private ConnectionListener _connectionListener;
+
+    private final ConnectionURL _connectionURL;
+
+    /**
+     * Whether this connection is started, i.e. whether messages are flowing to consumers. It has no meaning for message
+     * publication.
+     */
+    protected volatile boolean _started;
+
+    /** Policy dictating how to failover */
+    protected FailoverPolicy _failoverPolicy;
+
+    /*
+     * _Connected should be refactored with a suitable wait object.
+     */
+    protected boolean _connected;
+
+    /*
+     * The connection meta data
+     */
+    private QpidConnectionMetaData _connectionMetaData;
+
+    /** Configuration info for SSL */
+    private SSLConfiguration _sslConfiguration;
+
+    private AMQShortString _defaultTopicExchangeName = ExchangeDefaults.TOPIC_EXCHANGE_NAME;
+    private AMQShortString _defaultQueueExchangeName = ExchangeDefaults.DIRECT_EXCHANGE_NAME;
+    private AMQShortString _temporaryTopicExchangeName = ExchangeDefaults.TOPIC_EXCHANGE_NAME;
+    private AMQShortString _temporaryQueueExchangeName = ExchangeDefaults.DIRECT_EXCHANGE_NAME;
+
+    /** Thread Pool for executing connection level processes. Such as returning bounced messages. */
+    private final ExecutorService _taskPool = Executors.newCachedThreadPool();
+    private static final long DEFAULT_TIMEOUT = 1000 * 30;
+
+    protected AMQConnectionDelegate _delegate;
+
+    // this connection maximum number of prefetched messages
+    private int _maxPrefetch;
+
+    //Indicates whether persistent messages are synchronized
+    private boolean _syncPersistence;
+
+    //Indicates whether we need to sync on every message ack
+    private boolean _syncAck;
+
+    //Indicates the sync publish options (persistent|all)
+    //By default it's async publish
+    private String _syncPublish = "";
+    
+    // Indicates whether to use the old map message format or the 
+    // new amqp-0-10 encoded format.
+    private boolean _useLegacyMapMessageFormat;
+
+    /**
+     * @param broker      brokerdetails
+     * @param username    username
+     * @param password    password
+     * @param clientName  clientid
+     * @param virtualHost virtualhost
+     *
+     * @throws AMQException
+     * @throws URLSyntaxException
+     */
+    public AMQConnection(String broker, String username, String password, String clientName, String virtualHost)
+            throws AMQException, URLSyntaxException
+    {
+        this(new AMQConnectionURL(
+                ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password + "@"
+                + ((clientName == null) ? "" : clientName) + "/" + virtualHost + "?brokerlist='"
+                + AMQBrokerDetails.checkTransport(broker) + "'"), null);
+    }
+
+    /**
+     * @param broker      brokerdetails
+     * @param username    username
+     * @param password    password
+     * @param clientName  clientid
+     * @param virtualHost virtualhost
+     *
+     * @throws AMQException
+     * @throws URLSyntaxException
+     */
+    public AMQConnection(String broker, String username, String password, String clientName, String virtualHost,
+                         SSLConfiguration sslConfig) throws AMQException, URLSyntaxException
+    {
+        this(new AMQConnectionURL(
+                ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password + "@"
+                + ((clientName == null) ? "" : clientName) + "/" + virtualHost + "?brokerlist='"
+                + AMQBrokerDetails.checkTransport(broker) + "'"), sslConfig);
+    }
+
+    public AMQConnection(String host, int port, String username, String password, String clientName, String virtualHost)
+            throws AMQException, URLSyntaxException
+    {
+        this(host, port, false, username, password, clientName, virtualHost, null);
+    }
+
+    public AMQConnection(String host, int port, String username, String password, String clientName, String virtualHost,
+                         SSLConfiguration sslConfig) throws AMQException, URLSyntaxException
+    {
+        this(host, port, false, username, password, clientName, virtualHost, sslConfig);
+    }
+
+    public AMQConnection(String host, int port, boolean useSSL, String username, String password, String clientName,
+                         String virtualHost, SSLConfiguration sslConfig) throws AMQException, URLSyntaxException
+    {
+        this(new AMQConnectionURL(
+                useSSL
+                ? (ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password + "@"
+                   + ((clientName == null) ? "" : clientName) + virtualHost + "?brokerlist='tcp://" + host + ":" + port
+                   + "'" + "," + BrokerDetails.OPTIONS_SSL + "='true'")
+                : (ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password + "@"
+                   + ((clientName == null) ? "" : clientName) + virtualHost + "?brokerlist='tcp://" + host + ":" + port
+                   + "'" + "," + BrokerDetails.OPTIONS_SSL + "='false'")), sslConfig);
+    }
+
+    public AMQConnection(String connection) throws AMQException, URLSyntaxException
+    {
+        this(new AMQConnectionURL(connection), null);
+    }
+
+    public AMQConnection(String connection, SSLConfiguration sslConfig) throws AMQException, URLSyntaxException
+    {
+        this(new AMQConnectionURL(connection), sslConfig);
+    }
+
+    /**
+     * @todo Some horrible stuff going on here with setting exceptions to be non-null to detect if an exception
+     * was thrown during the connection! Intention not clear. Use a flag anyway, not exceptions... Will fix soon.
+     */
+    public AMQConnection(ConnectionURL connectionURL, SSLConfiguration sslConfig) throws AMQException
+    {
+        if (connectionURL == null)
+        {
+            throw new IllegalArgumentException("Connection must be specified");
+        }
+        
+        // set this connection maxPrefetch
+        if (connectionURL.getOption(ConnectionURL.OPTIONS_MAXPREFETCH) != null)
+        {
+            _maxPrefetch = Integer.parseInt(connectionURL.getOption(ConnectionURL.OPTIONS_MAXPREFETCH));
+        }
+        else
+        {
+            // use the default value set for all connections
+            _maxPrefetch = Integer.parseInt(System.getProperties().getProperty(ClientProperties.MAX_PREFETCH_PROP_NAME,
+                    ClientProperties.MAX_PREFETCH_DEFAULT));
+        }
+
+        if (connectionURL.getOption(ConnectionURL.OPTIONS_SYNC_PERSISTENCE) != null)
+        {
+            _syncPersistence =
+                Boolean.parseBoolean(connectionURL.getOption(ConnectionURL.OPTIONS_SYNC_PERSISTENCE));
+            _logger.warn("sync_persistence is a deprecated property, " +
+            		"please use sync_publish={persistent|all} instead");
+        }
+        else
+        {
+            // use the default value set for all connections
+            _syncPersistence = Boolean.getBoolean(ClientProperties.SYNC_PERSISTENT_PROP_NAME);
+            if (_syncPersistence)
+            {
+                _logger.warn("sync_persistence is a deprecated property, " +
+                        "please use sync_publish={persistent|all} instead");
+            }
+        }
+
+        if (connectionURL.getOption(ConnectionURL.OPTIONS_SYNC_ACK) != null)
+        {
+            _syncAck = Boolean.parseBoolean(connectionURL.getOption(ConnectionURL.OPTIONS_SYNC_ACK));
+        }
+        else
+        {
+            // use the default value set for all connections
+            _syncAck = Boolean.getBoolean(ClientProperties.SYNC_ACK_PROP_NAME);
+        }
+
+        if (connectionURL.getOption(ConnectionURL.OPTIONS_SYNC_PUBLISH) != null)
+        {
+            _syncPublish = connectionURL.getOption(ConnectionURL.OPTIONS_SYNC_PUBLISH);
+        }
+        else
+        {
+            // use the default value set for all connections
+            _syncPublish = System.getProperty((ClientProperties.SYNC_PUBLISH_PROP_NAME),_syncPublish);
+        }
+        
+        if (connectionURL.getOption(ConnectionURL.OPTIONS_USE_LEGACY_MAP_MESSAGE_FORMAT) != null)
+        {
+            _useLegacyMapMessageFormat =  Boolean.parseBoolean(
+                    connectionURL.getOption(ConnectionURL.OPTIONS_USE_LEGACY_MAP_MESSAGE_FORMAT));
+        }
+        else
+        {
+            // use the default value set for all connections
+            _useLegacyMapMessageFormat = Boolean.getBoolean(ClientProperties.USE_LEGACY_MAP_MESSAGE_FORMAT);
+        }
+        
+        String amqpVersion = System.getProperty((ClientProperties.AMQP_VERSION), "0-10");
+        _logger.debug("AMQP version " + amqpVersion);
+        
+        _failoverPolicy = new FailoverPolicy(connectionURL, this);
+        BrokerDetails brokerDetails = _failoverPolicy.getCurrentBrokerDetails();
+        if (brokerDetails.getTransport().equals(BrokerDetails.VM) || "0-8".equals(amqpVersion)) 
+        {
+            _delegate = new AMQConnectionDelegate_8_0(this);
+        } 
+        else if ("0-9".equals(amqpVersion))
+        {
+            _delegate = new AMQConnectionDelegate_0_9(this);
+        }
+        else if ("0-91".equals(amqpVersion) || "0-9-1".equals(amqpVersion))
+        {
+            _delegate = new AMQConnectionDelegate_9_1(this);
+        }
+        else
+        {
+            _delegate = new AMQConnectionDelegate_0_10(this);
+        }
+
+        if (_logger.isInfoEnabled())
+        {
+            _logger.info("Connection:" + connectionURL);
+        }
+
+        _sslConfiguration = sslConfig;
+        _connectionURL = connectionURL;
+
+        _clientName = connectionURL.getClientName();
+        _username = connectionURL.getUsername();
+        _password = connectionURL.getPassword();
+
+        setVirtualHost(connectionURL.getVirtualHost());
+
+        if (connectionURL.getDefaultQueueExchangeName() != null)
+        {
+            _defaultQueueExchangeName = connectionURL.getDefaultQueueExchangeName();
+        }
+
+        if (connectionURL.getDefaultTopicExchangeName() != null)
+        {
+            _defaultTopicExchangeName = connectionURL.getDefaultTopicExchangeName();
+        }
+
+        if (connectionURL.getTemporaryQueueExchangeName() != null)
+        {
+            _temporaryQueueExchangeName = connectionURL.getTemporaryQueueExchangeName();
+        }
+
+        if (connectionURL.getTemporaryTopicExchangeName() != null)
+        {
+            _temporaryTopicExchangeName = connectionURL.getTemporaryTopicExchangeName();
+        }
+
+        _protocolHandler = new AMQProtocolHandler(this);
+
+        _logger.info("Connecting with ProtocolHandler Version:"+_protocolHandler.getProtocolVersion());
+
+        // We are not currently connected
+        _connected = false;
+
+        boolean retryAllowed = true;
+        Exception connectionException = null;
+        while (!_connected && retryAllowed && brokerDetails != null)
+        {
+            ProtocolVersion pe = null;
+            try
+            {
+                pe = makeBrokerConnection(brokerDetails);
+            }
+            catch (Exception e)
+            {
+                if (_logger.isInfoEnabled())
+                {
+                    _logger.info("Unable to connect to broker at " +
+                                 _failoverPolicy.getCurrentBrokerDetails(),
+                                 e);
+                }
+                connectionException = e;
+            }
+
+            if (pe != null)
+            {
+                // reset the delegate to the version returned by the
+                // broker
+                initDelegate(pe);
+            }
+            else if (!_connected)
+            {
+                retryAllowed = _failoverPolicy.failoverAllowed();
+                brokerDetails = _failoverPolicy.getNextBrokerDetails();
+            }
+        }
+
+        if (_logger.isDebugEnabled())
+        {
+            _logger.debug("Are we connected:" + _connected);
+        }
+
+        if (!_connected)
+        {
+            if (_logger.isDebugEnabled())
+            {
+                _logger.debug("Last attempted ProtocolHandler Version:"+_protocolHandler.getProtocolVersion());
+            }
+
+            String message = null;
+
+            if (connectionException != null)
+            {
+                if (connectionException.getCause() != null)
+                {
+                    message = connectionException.getCause().getMessage();
+                }
+                else
+                {
+                    message = connectionException.getMessage();
+                }
+            }
+
+            if ((message == null) || message.equals(""))
+            {
+                if (message == null)
+                {
+                    message = "Unable to Connect";
+                }
+                else // can only be "" if getMessage() returned it therfore lastException != null
+                {
+                    message = "Unable to Connect:" + connectionException.getClass();
+                }
+            }
+
+            for (Throwable th = connectionException; th != null; th = th.getCause())
+            {
+                if (th instanceof UnresolvedAddressException ||
+                    th instanceof UnknownHostException)
+                {
+                    throw new AMQUnresolvedAddressException
+                        (message,
+                         _failoverPolicy.getCurrentBrokerDetails().toString(),
+                         connectionException);
+                }
+            }
+
+            throw new AMQConnectionFailureException(message, connectionException);
+        }
+
+        _logger.info("Connected with ProtocolHandler Version:"+_protocolHandler.getProtocolVersion());
+
+        _sessions.setMaxChannelID(_delegate.getMaxChannelID());
+        _sessions.setMinChannelID(_delegate.getMinChannelID());
+
+        _connectionMetaData = new QpidConnectionMetaData(this);
+    }
+
+    protected boolean checkException(Throwable thrown)
+    {
+        Throwable cause = thrown.getCause();
+
+        if (cause == null)
+        {
+            cause = thrown;
+        }
+
+        return ((cause instanceof ConnectException) || (cause instanceof UnresolvedAddressException));
+    }
+
+    private void initDelegate(ProtocolVersion pe) throws AMQProtocolException
+    {
+        try
+        {
+            String delegateClassName = String.format
+                                    ("org.apache.qpid.client.AMQConnectionDelegate_%s_%s",
+                                     pe.getMajorVersion(), pe.getMinorVersion());
+            _logger.info("Looking up delegate '" + delegateClassName + "' Based on PE:" + pe);
+            Class c = Class.forName(delegateClassName);
+            Class partypes[] = new Class[1];
+            partypes[0] = AMQConnection.class;
+            _delegate = (AMQConnectionDelegate) c.getConstructor(partypes).newInstance(this);
+            //Update our session to use this new protocol version 
+            _protocolHandler.getProtocolSession().setProtocolVersion(_delegate.getProtocolVersion());
+
+        }
+        catch (ClassNotFoundException e)
+        {
+            throw new AMQProtocolException
+                (AMQConstant.UNSUPPORTED_CLIENT_PROTOCOL_ERROR,
+                 String.format("Protocol: %s.%s is rquired by the broker but is not " +
+                               "currently supported by this client library implementation",
+                               pe.getMajorVersion(), pe.getMinorVersion()),
+                 e);
+        }
+        catch (NoSuchMethodException e)
+        {
+            throw new RuntimeException("unable to locate constructor for delegate", e);
+        }
+        catch (InstantiationException e)
+        {
+            throw new RuntimeException("error instantiating delegate", e);
+        }
+        catch (IllegalAccessException e)
+        {
+            throw new RuntimeException("error accessing delegate", e);
+        }
+        catch (InvocationTargetException e)
+        {
+            throw new RuntimeException("error invoking delegate", e);
+        }
+    }
+
+    private void setVirtualHost(String virtualHost)
+    {
+        if (virtualHost != null && virtualHost.startsWith("/"))
+        {
+            virtualHost = virtualHost.substring(1);
+        }
+
+        _virtualHost = virtualHost;
+    }
+
+    public boolean attemptReconnection(String host, int port)
+    {
+        BrokerDetails bd = new AMQBrokerDetails(host, port, _sslConfiguration);
+
+        _failoverPolicy.setBroker(bd);
+
+        try
+        {
+            makeBrokerConnection(bd);
+
+            return true;
+        }
+        catch (Exception e)
+        {
+            if (_logger.isInfoEnabled())
+            {
+                _logger.info("Unable to connect to broker at " + bd);
+            }
+
+            attemptReconnection();
+        }
+
+        return false;
+    }
+
+    public boolean attemptReconnection()
+    {
+        BrokerDetails broker = null;
+        while (_failoverPolicy.failoverAllowed() && (broker = _failoverPolicy.getNextBrokerDetails()) != null)
+        {
+            try
+            {
+                makeBrokerConnection(broker);
+                return true;
+            }
+            catch (Exception e)
+            {
+                if (!(e instanceof AMQException))
+                {
+                    if (_logger.isInfoEnabled())
+                    {
+                        _logger.info("Unable to connect to broker at " + _failoverPolicy.getCurrentBrokerDetails(), e);
+                    }
+                }
+                else
+                {
+                    if (_logger.isInfoEnabled())
+                    {
+                        _logger.info(e.getMessage() + ":Unable to connect to broker at "
+                                     + _failoverPolicy.getCurrentBrokerDetails());
+                    }
+                }
+            }
+        }
+
+        // connection unsuccessful
+        return false;
+    }
+
+    public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail) throws IOException, AMQException
+    {
+        return _delegate.makeBrokerConnection(brokerDetail);
+    }
+
+    public <T, E extends Exception> T executeRetrySupport(FailoverProtectedOperation<T,E> operation) throws E
+    {
+        return _delegate.executeRetrySupport(operation);
+    }
+
+    /**
+     * Get the details of the currently active broker
+     *
+     * @return null if no broker is active (i.e. no successful connection has been made, or the BrokerDetail instance
+     *         otherwise
+     */
+    public BrokerDetails getActiveBrokerDetails()
+    {
+        return _failoverPolicy.getCurrentBrokerDetails();
+    }
+
+    public boolean failoverAllowed()
+    {
+        if (!_connected)
+        {
+            return false;
+        }
+        else
+        {
+            return _failoverPolicy.failoverAllowed();
+        }
+    }
+
+    public org.apache.qpid.jms.Session createSession(final boolean transacted, final int acknowledgeMode) throws JMSException
+    {
+        return createSession(transacted, acknowledgeMode, _maxPrefetch);
+    }
+
+    public org.apache.qpid.jms.Session createSession(final boolean transacted, final int acknowledgeMode, final int prefetch)
+            throws JMSException
+    {
+        return createSession(transacted, acknowledgeMode, prefetch, prefetch);
+    }
+
+    public org.apache.qpid.jms.Session createSession(final boolean transacted, final int acknowledgeMode,
+                                                     final int prefetchHigh, final int prefetchLow) throws JMSException
+    {
+        synchronized (_sessionCreationLock)
+        {
+            checkNotClosed();
+            return _delegate.createSession(transacted, acknowledgeMode, prefetchHigh, prefetchLow);
+        }
+    }
+
+    private void createChannelOverWire(int channelId, int prefetchHigh, int prefetchLow, boolean transacted)
+            throws AMQException, FailoverException
+    {
+
+        ChannelOpenBody channelOpenBody = getProtocolHandler().getMethodRegistry().createChannelOpenBody(null);
+
+        // TODO: Be aware of possible changes to parameter order as versions change.
+
+        _protocolHandler.syncWrite(channelOpenBody.generateFrame(channelId), ChannelOpenOkBody.class);
+
+        BasicQosBody basicQosBody = getProtocolHandler().getMethodRegistry().createBasicQosBody(0, prefetchHigh, false);
+
+        // todo send low water mark when protocol allows.
+        // todo Be aware of possible changes to parameter order as versions change.
+        _protocolHandler.syncWrite(basicQosBody.generateFrame(channelId), BasicQosOkBody.class);
+
+        if (transacted)
+        {
+            if (_logger.isDebugEnabled())
+            {
+                _logger.debug("Issuing TxSelect for " + channelId);
+            }
+
+            TxSelectBody body = getProtocolHandler().getMethodRegistry().createTxSelectBody();
+
+            // TODO: Be aware of possible changes to parameter order as versions change.
+            _protocolHandler.syncWrite(body.generateFrame(channelId), TxSelectOkBody.class);
+        }
+    }
+
+    public void setFailoverPolicy(FailoverPolicy policy)
+    {
+        _failoverPolicy = policy;
+    }
+
+    public FailoverPolicy getFailoverPolicy()
+    {
+        return _failoverPolicy;
+    }
+
+    /**
+     * Returns an AMQQueueSessionAdaptor which wraps an AMQSession and throws IllegalStateExceptions where specified in
+     * the JMS spec
+     *
+     * @param transacted
+     * @param acknowledgeMode
+     *
+     * @return QueueSession
+     *
+     * @throws JMSException
+     */
+    public QueueSession createQueueSession(boolean transacted, int acknowledgeMode) throws JMSException
+    {
+        return new AMQQueueSessionAdaptor(createSession(transacted, acknowledgeMode));
+    }
+
+    /**
+     * Returns an AMQTopicSessionAdapter which wraps an AMQSession and throws IllegalStateExceptions where specified in
+     * the JMS spec
+     *
+     * @param transacted
+     * @param acknowledgeMode
+     *
+     * @return TopicSession
+     *
+     * @throws JMSException
+     */
+    public TopicSession createTopicSession(boolean transacted, int acknowledgeMode) throws JMSException
+    {
+        return new AMQTopicSessionAdaptor(createSession(transacted, acknowledgeMode));
+    }
+
+    public boolean channelLimitReached()
+    {
+        return _sessions.size() >= _maximumChannelCount;
+    }
+
+    public String getClientID() throws JMSException
+    {
+        checkNotClosed();
+
+        return _clientName;
+    }
+
+    public void setClientID(String clientID) throws JMSException
+    {
+        checkNotClosed();
+        // in AMQP it is not possible to change the client ID. If one is not specified
+        // upon connection construction, an id is generated automatically. Therefore
+        // we can always throw an exception.
+        if (!Boolean.getBoolean(ClientProperties.IGNORE_SET_CLIENTID_PROP_NAME))
+        {
+            throw new IllegalStateException("Client name cannot be changed after being set");
+        }
+        else
+        {
+            _logger.info("Operation setClientID is ignored using ID: " + getClientID());
+        }
+    }
+
+    public ConnectionMetaData getMetaData() throws JMSException
+    {
+        checkNotClosed();
+
+        return _connectionMetaData;
+
+    }
+
+    public ExceptionListener getExceptionListener() throws JMSException
+    {
+        checkNotClosed();
+
+        return _exceptionListener;
+    }
+
+    public void setExceptionListener(ExceptionListener listener) throws JMSException
+    {
+        checkNotClosed();
+        _exceptionListener = listener;
+    }
+
+    /**
+     * Start the connection, i.e. start flowing messages. Note that this method must be called only from a single thread
+     * and is not thread safe (which is legal according to the JMS specification).
+     *
+     * @throws JMSException
+     */
+    public void start() throws JMSException
+    {
+        checkNotClosed();
+        if (!_started)
+        {
+            _started = true;
+            final Iterator it = _sessions.values().iterator();
+            while (it.hasNext())
+            {
+                final AMQSession s = (AMQSession) (it.next());
+                try
+                {
+                    s.start();
+                }
+                catch (AMQException e)
+                {
+                    throw new JMSAMQException(e);
+                }
+            }
+
+        }
+    }
+
+    public void stop() throws JMSException
+    {
+        checkNotClosed();
+        if (_started)
+        {
+            for (Iterator i = _sessions.values().iterator(); i.hasNext();)
+            {
+                try
+                {
+                    ((AMQSession) i.next()).stop();
+                }
+                catch (AMQException e)
+                {
+                    throw new JMSAMQException(e);
+                }
+            }
+
+            _started = false;
+        }
+    }
+
+    public void     close() throws JMSException
+    {
+        close(DEFAULT_TIMEOUT);
+    }
+
+    public void close(long timeout) throws JMSException
+    {
+        close(new ArrayList<AMQSession>(_sessions.values()), timeout);
+    }
+
+    public void close(List<AMQSession> sessions, long timeout) throws JMSException
+    {
+        if (!_closed.getAndSet(true))
+        {
+            _closing.set(true);
+            try{
+                doClose(sessions, timeout);
+            }finally{
+                _closing.set(false);
+            }
+        }
+    }
+
+    private void doClose(List<AMQSession> sessions, long timeout) throws JMSException
+    {
+        synchronized (_sessionCreationLock)
+        {
+            if (!sessions.isEmpty())
+            {
+                AMQSession session = sessions.remove(0);
+                synchronized (session.getMessageDeliveryLock())
+                {
+                    doClose(sessions, timeout);
+                }
+            }
+            else
+            {
+                synchronized (getFailoverMutex())
+                {
+                    try
+                    {
+                        long startCloseTime = System.currentTimeMillis();
+
+	                    closeAllSessions(null, timeout, startCloseTime);
+
+                        //This MUST occur after we have successfully closed all Channels/Sessions
+                        _taskPool.shutdown();
+
+                        if (!_taskPool.isTerminated())
+                        {
+                            try
+                            {
+                                // adjust timeout
+                                long taskPoolTimeout = adjustTimeout(timeout, startCloseTime);
+
+                                _taskPool.awaitTermination(taskPoolTimeout, TimeUnit.MILLISECONDS);
+                            }
+                            catch (InterruptedException e)
+                            {
+                                _logger.info("Interrupted while shutting down connection thread pool.");
+                            }
+                        }
+
+                        // adjust timeout
+                        timeout = adjustTimeout(timeout, startCloseTime);
+                        _delegate.closeConnection(timeout);
+
+                        //If the taskpool hasn't shutdown by now then give it shutdownNow.
+                        // This will interupt any running tasks.
+                        if (!_taskPool.isTerminated())
+                        {
+                            List<Runnable> tasks = _taskPool.shutdownNow();
+                            for (Runnable r : tasks)
+                            {
+                                _logger.warn("Connection close forced taskpool to prevent execution:" + r);
+                            }
+                        }
+                    }
+                    catch (AMQException e)
+                    {
+                        _logger.error("error:", e);
+                        JMSException jmse = new JMSException("Error closing connection: " + e);
+                        jmse.setLinkedException(e);
+                        jmse.initCause(e);
+                        throw jmse;
+                    }
+                }
+            }
+        }
+    }
+
+    private long adjustTimeout(long timeout, long startTime)
+    {
+        long now = System.currentTimeMillis();
+        timeout -= now - startTime;
+        if (timeout < 0)
+        {
+            timeout = 0;
+        }
+
+        return timeout;
+    }
+
+    /**
+     * Marks all sessions and their children as closed without sending any protocol messages. Useful when you need to
+     * mark objects "visible" in userland as closed after failover or other significant event that impacts the
+     * connection. <p/> The caller must hold the failover mutex before calling this method.
+     */
+    private void markAllSessionsClosed()
+    {
+        final LinkedList sessionCopy = new LinkedList(_sessions.values());
+        final Iterator it = sessionCopy.iterator();
+        while (it.hasNext())
+        {
+            final AMQSession session = (AMQSession) it.next();
+
+            session.markClosed();
+        }
+
+        _sessions.clear();
+    }
+
+    /**
+     * Close all the sessions, either due to normal connection closure or due to an error occurring.
+     *
+     * @param cause if not null, the error that is causing this shutdown <p/> The caller must hold the failover mutex
+     *              before calling this method.
+     */
+    private void closeAllSessions(Throwable cause, long timeout, long starttime) throws JMSException
+    {
+        final LinkedList sessionCopy = new LinkedList(_sessions.values());
+        final Iterator it = sessionCopy.iterator();
+        JMSException sessionException = null;
+        while (it.hasNext())
+        {
+            final AMQSession session = (AMQSession) it.next();
+            if (cause != null)
+            {
+                session.closed(cause);
+            }
+            else
+            {
+                try
+                {
+                    if (starttime != -1)
+                    {
+                        timeout = adjustTimeout(timeout, starttime);
+                    }
+
+                    session.close(timeout);
+                }
+                catch (JMSException e)
+                {
+                    _logger.error("Error closing session: " + e);
+                    sessionException = e;
+                }
+            }
+        }
+
+        _sessions.clear();
+        if (sessionException != null)
+        {
+            throw sessionException;
+        }
+    }
+
+    public ConnectionConsumer createConnectionConsumer(Destination destination, String messageSelector,
+                                                       ServerSessionPool sessionPool, int maxMessages) throws JMSException
+    {
+        checkNotClosed();
+
+        return null;
+    }
+
+    public ConnectionConsumer createConnectionConsumer(Queue queue, String messageSelector, ServerSessionPool sessionPool,
+                                                       int maxMessages) throws JMSException
+    {
+        checkNotClosed();
+
+        return null;
+    }
+
+    public ConnectionConsumer createConnectionConsumer(Topic topic, String messageSelector, ServerSessionPool sessionPool,
+                                                       int maxMessages) throws JMSException
+    {
+        checkNotClosed();
+
+        return null;
+    }
+
+    public ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector,
+                                                              ServerSessionPool sessionPool, int maxMessages) throws JMSException
+    {
+        // TODO Auto-generated method stub
+        checkNotClosed();
+
+        return null;
+    }
+
+    public long getMaximumChannelCount() throws JMSException
+    {
+        checkNotClosed();
+
+        return _maximumChannelCount;
+    }
+
+    public void setConnectionListener(ConnectionListener listener)
+    {
+        _connectionListener = listener;
+    }
+
+    public ConnectionListener getConnectionListener()
+    {
+        return _connectionListener;
+    }
+
+    public void setMaximumChannelCount(long maximumChannelCount)
+    {
+        _maximumChannelCount = maximumChannelCount;
+    }
+
+    public void setMaximumFrameSize(long frameMax)
+    {
+        _maximumFrameSize = frameMax;
+    }
+
+    public long getMaximumFrameSize()
+    {
+        return _maximumFrameSize;
+    }
+
+    public ChannelToSessionMap getSessions()
+    {
+        return _sessions;
+    }
+
+    public String getUsername()
+    {
+        return _username;
+    }
+
+    public void setUsername(String id)
+    {
+        _username = id;
+    }
+    
+    public String getPassword()
+    {
+        return _password;
+    }
+
+    public String getVirtualHost()
+    {
+        return _virtualHost;
+    }
+
+    public AMQProtocolHandler getProtocolHandler()
+    {
+        return _protocolHandler;
+    }
+
+    public boolean started()
+    {
+        return _started;
+    }
+
+    public void bytesSent(long writtenBytes)
+    {
+        if (_connectionListener != null)
+        {
+            _connectionListener.bytesSent(writtenBytes);
+        }
+    }
+
+    public void bytesReceived(long receivedBytes)
+    {
+        if (_connectionListener != null)
+        {
+            _connectionListener.bytesReceived(receivedBytes);
+        }
+    }
+
+    /**
+     * Fire the preFailover event to the registered connection listener (if any)
+     *
+     * @param redirect true if this is the result of a redirect request rather than a connection error
+     *
+     * @return true if no listener or listener does not veto change
+     */
+    public boolean firePreFailover(boolean redirect)
+    {
+        boolean proceed = true;
+        if (_connectionListener != null)
+        {
+            proceed = _connectionListener.preFailover(redirect);
+        }
+
+        return proceed;
+    }
+
+    /**
+     * Fire the preResubscribe event to the registered connection listener (if any). If the listener vetoes
+     * resubscription then all the sessions are closed.
+     *
+     * @return true if no listener or listener does not veto resubscription.
+     *
+     * @throws JMSException
+     */
+    public boolean firePreResubscribe() throws JMSException
+    {
+        if (_connectionListener != null)
+        {
+            boolean resubscribe = _connectionListener.preResubscribe();
+            if (!resubscribe)
+            {
+                markAllSessionsClosed();
+            }
+
+            return resubscribe;
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    /** Fires a failover complete event to the registered connection listener (if any). */
+    public void fireFailoverComplete()
+    {
+        if (_connectionListener != null)
+        {
+            _connectionListener.failoverComplete();
+        }
+    }
+
+    /**
+     * In order to protect the consistency of the connection and its child sessions, consumers and producers, the
+     * "failover mutex" must be held when doing any operations that could be corrupted during failover.
+     *
+     * @return a mutex. Guaranteed never to change for the lifetime of this connection even if failover occurs.
+     */
+    public final Object getFailoverMutex()
+    {
+        return _failoverMutex;
+    }
+
+    public void failoverPrep()
+    {
+        _delegate.failoverPrep();
+    }
+
+    public void resubscribeSessions() throws JMSException, AMQException, FailoverException
+    {
+        _delegate.resubscribeSessions();
+    }
+
+    /**
+     * If failover is taking place this will block until it has completed. If failover is not taking place it will
+     * return immediately.
+     *
+     * @throws InterruptedException
+     */
+    public void blockUntilNotFailingOver() throws InterruptedException
+    {
+        _protocolHandler.blockUntilNotFailingOver();
+    }
+
+    /**
+     * Invoked by the AMQProtocolSession when a protocol session exception has occurred. This method sends the exception
+     * to a JMS exception listener, if configured, and propagates the exception to sessions, which in turn will
+     * propagate to consumers. This allows synchronous consumers to have exceptions thrown to them.
+     *
+     * @param cause the exception
+     */
+    public void exceptionReceived(Throwable cause)
+    {
+
+        if (_logger.isDebugEnabled())
+        {
+            _logger.debug("exceptionReceived done by:" + Thread.currentThread().getName(), cause);
+        }
+
+        final JMSException je;
+        if (cause instanceof JMSException)
+        {
+            je = (JMSException) cause;
+        }
+        else
+        {
+            AMQConstant code = null;
+
+            if (cause instanceof AMQException)
+            {
+                code = ((AMQException) cause).getErrorCode();
+            }
+
+            if (code != null)
+            {
+                je = new JMSException(Integer.toString(code.getCode()), "Exception thrown against " + toString() + ": " + cause);
+            }
+            else
+            {
+                //Should never get here as all AMQEs are required to have an ErrorCode!
+                // Other than AMQDisconnectedEx!
+
+                if (cause instanceof AMQDisconnectedException)
+                {
+                    Exception last = _protocolHandler.getStateManager().getLastException();
+                    if (last != null)
+                    {
+                        _logger.info("StateManager had an exception for us to use a cause of our Disconnected Exception");
+                        cause = last;
+                    }
+                }
+                je = new JMSException("Exception thrown against " + toString() + ": " + cause);
+            }
+
+            if (cause instanceof Exception)
+            {
+                je.setLinkedException((Exception) cause);
+            }
+            
+            je.initCause(cause);
+        }
+
+        boolean closer = false;
+
+        // in the case of an IOException, MINA has closed the protocol session so we set _closed to true
+        // so that any generic client code that tries to close the connection will not mess up this error
+        // handling sequence
+        if (cause instanceof IOException || cause instanceof AMQDisconnectedException)
+        {
+            // If we have an IOE/AMQDisconnect there is no connection to close on.
+            _closing.set(false);
+            closer = !_closed.getAndSet(true);
+
+            _protocolHandler.getProtocolSession().notifyError(je);
+        }
+
+        // get the failover mutex before trying to close
+        synchronized (getFailoverMutex())
+        {
+            // decide if we are going to close the session
+            if (hardError(cause))
+            {
+                closer = (!_closed.getAndSet(true)) || closer;
+                {
+                    _logger.info("Closing AMQConnection due to :" + cause);
+                }
+            }
+            else
+            {
+                _logger.info("Not a hard-error connection not closing: " + cause);
+            }
+            
+            // deliver the exception if there is a listener
+            if (_exceptionListener != null)
+            {
+                _exceptionListener.onException(je);
+            }
+            else
+            {
+                _logger.error("Throwable Received but no listener set: " + cause);
+            }
+    
+            // if we are closing the connection, close sessions first
+            if (closer)
+            {
+                try
+                {
+                    closeAllSessions(cause, -1, -1); // FIXME: when doing this end up with RejectedExecutionException from executor.
+                }
+                catch (JMSException e)
+                {
+                    _logger.error("Error closing all sessions: " + e, e);
+                }
+            }
+        }
+    }
+
+    private boolean hardError(Throwable cause)
+    {
+        if (cause instanceof AMQException)
+        {
+            return ((AMQException) cause).isHardError();
+        }
+
+        return true;
+    }
+
+    void registerSession(int channelId, AMQSession session)
+    {
+        _sessions.put(channelId, session);
+    }
+
+    public void deregisterSession(int channelId)
+    {
+        _sessions.remove(channelId);
+    }
+
+    public String toString()
+    {
+        StringBuffer buf = new StringBuffer("AMQConnection:\n");
+        if (_failoverPolicy.getCurrentBrokerDetails() == null)
+        {
+            buf.append("No active broker connection");
+        }
+        else
+        {
+            BrokerDetails bd = _failoverPolicy.getCurrentBrokerDetails();
+            buf.append("Host: ").append(String.valueOf(bd.getHost()));
+            buf.append("\nPort: ").append(String.valueOf(bd.getPort()));
+        }
+
+        buf.append("\nVirtual Host: ").append(String.valueOf(_virtualHost));
+        buf.append("\nClient ID: ").append(String.valueOf(_clientName));
+        buf.append("\nActive session count: ").append((_sessions == null) ? 0 : _sessions.size());
+
+        return buf.toString();
+    }
+
+    /**
+     * Returns connection url. 
+     * @return connection url
+     */
+    public ConnectionURL getConnectionURL()
+    {
+        return _connectionURL;
+    }
+    
+    /**
+     * Returns stringified connection url.   This url is suitable only for display
+     * as {@link AMQConnectionURL#toString()} converts any password to asterisks. 
+     * @return connection url
+     */
+    public String toURL()
+    {
+        return _connectionURL.toString();
+    }
+
+    public Reference getReference() throws NamingException
+    {
+        return new Reference(AMQConnection.class.getName(), new StringRefAddr(AMQConnection.class.getName(), toURL()),
+                             AMQConnectionFactory.class.getName(), null); // factory location
+    }
+
+    public SSLConfiguration getSSLConfiguration()
+    {
+        return _sslConfiguration;
+    }
+
+    public AMQShortString getDefaultTopicExchangeName()
+    {
+        return _defaultTopicExchangeName;
+    }
+
+    public void setDefaultTopicExchangeName(AMQShortString defaultTopicExchangeName)
+    {
+        _defaultTopicExchangeName = defaultTopicExchangeName;
+    }
+
+    public AMQShortString getDefaultQueueExchangeName()
+    {
+        return _defaultQueueExchangeName;
+    }
+
+    public void setDefaultQueueExchangeName(AMQShortString defaultQueueExchangeName)
+    {
+        _defaultQueueExchangeName = defaultQueueExchangeName;
+    }
+
+    public AMQShortString getTemporaryTopicExchangeName()
+    {
+        return _temporaryTopicExchangeName;
+    }
+
+    public AMQShortString getTemporaryQueueExchangeName()
+    {
+        return _temporaryQueueExchangeName; // To change body of created methods use File | Settings | File Templates.
+    }
+
+    public void setTemporaryTopicExchangeName(AMQShortString temporaryTopicExchangeName)
+    {
+        _temporaryTopicExchangeName = temporaryTopicExchangeName;
+    }
+
+    public void setTemporaryQueueExchangeName(AMQShortString temporaryQueueExchangeName)
+    {
+        _temporaryQueueExchangeName = temporaryQueueExchangeName;
+    }
+
+    public void performConnectionTask(Runnable task)
+    {
+        _taskPool.execute(task);
+    }
+
+    public AMQSession getSession(int channelId)
+    {
+        return _sessions.get(channelId);
+    }
+
+    public ProtocolVersion getProtocolVersion()
+    {
+        return _delegate.getProtocolVersion();
+    }
+
+    public boolean isFailingOver()
+    {
+        return (_protocolHandler.getFailoverLatch() != null);
+    }
+
+    /**
+     * Get the maximum number of messages that this connection can pre-fetch.
+     *
+     * @return The maximum number of messages that this connection can pre-fetch.
+     */
+    public long getMaxPrefetch()
+    {
+        return _maxPrefetch;
+    }
+
+    /**
+     * Indicates whether persistent messages are synchronized
+     *
+     * @return true if persistent messages are synchronized false otherwise
+     */
+    public boolean getSyncPersistence()
+    {
+        return _syncPersistence;
+    }
+
+    /**
+     * Indicates whether we need to sync on every message ack
+     */
+    public boolean getSyncAck()
+    {
+        return _syncAck;
+    }
+
+    public String getSyncPublish()
+    {
+        return _syncPublish;
+    }
+
+    public int getNextChannelID()
+    {
+        return _sessions.getNextChannelId();
+    }
+    
+    public boolean isUseLegacyMapMessageFormat()
+    {
+        return _useLegacyMapMessageFormat;
+    }
+}
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 9560bd5c7c..9560bd5c7c 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 d50c9e16fe..d50c9e16fe 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 40b332d216..40b332d216 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 ec4c668d7e..ec4c668d7e 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 93b4c51a8f..93b4c51a8f 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 eb9682a3cf..eb9682a3cf 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 b9e9a33cd6..b9e9a33cd6 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 5bd1bd629a..5bd1bd629a 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 d96544adf8..d96544adf8 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 a8c83d8868..a8c83d8868 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 25562cfff7..25562cfff7 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 7e257e0c20..7e257e0c20 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 1ea92c67f7..1ea92c67f7 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 c010e4c7ed..c010e4c7ed 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 f54cb782c8..f54cb782c8 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 7b5781530b..7b5781530b 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 780dbcafc2..780dbcafc2 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 ec482a8f79..ec482a8f79 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/BasicMessageConsumer.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
index 5d32863f2f..5d32863f2f 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 964c238946..964c238946 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 00acd5e866..00acd5e866 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 8756ac4d05..8756ac4d05 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 62d1d1698c..62d1d1698c 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 27f7486890..27f7486890 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 e6771e122c..e6771e122c 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 b1ec7216bc..b1ec7216bc 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 7cc548915c..7cc548915c 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/DispatcherCallback.java b/qpid/java/client/src/main/java/org/apache/qpid/client/DispatcherCallback.java
index 81a55006ed..81a55006ed 100644
--- a/java/client/src/main/java/org/apache/qpid/client/DispatcherCallback.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/DispatcherCallback.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 585d6db3fd..585d6db3fd 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 3bb5707417..3bb5707417 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 7059588367..7059588367 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 295c6a4091..295c6a4091 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/SSLConfiguration.java b/qpid/java/client/src/main/java/org/apache/qpid/client/SSLConfiguration.java
index 2280cc9870..2280cc9870 100644
--- a/java/client/src/main/java/org/apache/qpid/client/SSLConfiguration.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/SSLConfiguration.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 7f8e80c73a..7f8e80c73a 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 81b9940ed5..81b9940ed5 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 43025bd724..43025bd724 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 8a75082202..8a75082202 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 354b67cd35..354b67cd35 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 f74dbba939..f74dbba939 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 51cc94965a..51cc94965a 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 e9e52cc97c..e9e52cc97c 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/handler/AccessRequestOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java
index af47673a43..af47673a43 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 5cb9412d51..5cb9412d51 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 6237234c4d..6237234c4d 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 3bbc9209c5..3bbc9209c5 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 2cf19bf391..2cf19bf391 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 72936779c2..72936779c2 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 2153b9cc8c..2153b9cc8c 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 6f66a972d5..6f66a972d5 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 ec98783a8a..ec98783a8a 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 d3e9fba8ed..d3e9fba8ed 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 f15340ae00..f15340ae00 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 19f758817d..19f758817d 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/ConnectionCloseMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
index b392604822..b392604822 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 e40cafd72f..e40cafd72f 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 472c471fd6..472c471fd6 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 9a9bee757b..9a9bee757b 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/qpid/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
new file mode 100644
index 0000000000..2b49bb8f81
--- /dev/null
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
@@ -0,0 +1,239 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.client.handler;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.protocol.AMQProtocolSession;
+import org.apache.qpid.client.security.AMQCallbackHandler;
+import org.apache.qpid.client.security.CallbackHandlerRegistry;
+import org.apache.qpid.client.state.AMQState;
+import org.apache.qpid.client.state.StateAwareMethodListener;
+import org.apache.qpid.common.ClientProperties;
+import org.apache.qpid.common.QpidProperties;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.ConnectionStartBody;
+import org.apache.qpid.framing.ConnectionStartOkBody;
+import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.framing.FieldTableFactory;
+import org.apache.qpid.framing.ProtocolVersion;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.security.sasl.Sasl;
+import javax.security.sasl.SaslClient;
+import javax.security.sasl.SaslException;
+
+import java.io.UnsupportedEncodingException;
+import java.util.HashSet;
+import java.util.StringTokenizer;
+
+public class ConnectionStartMethodHandler implements StateAwareMethodListener<ConnectionStartBody>
+{
+    private static final Logger _log = LoggerFactory.getLogger(ConnectionStartMethodHandler.class);
+
+    private static final ConnectionStartMethodHandler _instance = new ConnectionStartMethodHandler();
+
+    public static ConnectionStartMethodHandler getInstance()
+    {
+        return _instance;
+    }
+
+    private ConnectionStartMethodHandler()
+    { }
+
+    public void methodReceived(AMQProtocolSession session, ConnectionStartBody body, int channelId)
+            throws AMQException
+    {
+        _log.debug("public void methodReceived(AMQStateManager stateManager, AMQProtocolSession protocolSession, "
+            + "AMQMethodEvent evt): called");
+
+        ProtocolVersion pv = new ProtocolVersion((byte) body.getVersionMajor(), (byte) body.getVersionMinor());
+
+        // 0-9-1 is indistinguishable from 0-9 using only major and minor ... if we established the connection as 0-9-1
+        // and now get back major = 0 , minor = 9 then we can assume it means 0-9-1
+
+        if(pv.equals(ProtocolVersion.v0_9) && session.getProtocolVersion().equals(ProtocolVersion.v0_91))
+        {
+            pv = ProtocolVersion.v0_91;
+        }
+
+        // For the purposes of interop, we can make the client accept the broker's version string.
+        // If it does, it then internally records the version as being the latest one that it understands.
+        // It needs to do this since frame lookup is done by version.
+        if (Boolean.getBoolean("qpid.accept.broker.version") && !pv.isSupported())
+        {
+
+            pv = ProtocolVersion.getLatestSupportedVersion();
+        }
+
+        if (pv.isSupported())
+        {
+            session.setProtocolVersion(pv);
+
+            try
+            {
+                // Used to hold the SASL mechanism to authenticate with.
+                String mechanism;
+
+                if (body.getMechanisms()== null)
+                {
+                    throw new AMQException(null, "mechanism not specified in ConnectionStart method frame", null);
+                }
+                else
+                {
+                    mechanism = chooseMechanism(body.getMechanisms());
+                    _log.debug("mechanism = " + mechanism);
+                }
+
+                if (mechanism == null)
+                {
+                    throw new AMQException(null, "No supported security mechanism found, passed: " + new String(body.getMechanisms()), null);
+                }
+
+                byte[] saslResponse;
+                try
+                {
+                    SaslClient sc =
+                        Sasl.createSaslClient(new String[] { mechanism }, null, "AMQP", "localhost", null,
+                            createCallbackHandler(mechanism, session));
+                    if (sc == null)
+                    {
+                        throw new AMQException(null, "Client SASL configuration error: no SaslClient could be created for mechanism " + mechanism
+                            + ". Please ensure all factories are registered. See DynamicSaslRegistrar for "
+                            + " details of how to register non-standard SASL client providers.", null);
+                    }
+
+                    session.setSaslClient(sc);
+                    saslResponse = (sc.hasInitialResponse() ? sc.evaluateChallenge(new byte[0]) : null);
+                }
+                catch (SaslException e)
+                {
+                    session.setSaslClient(null);
+                    throw new AMQException(null, "Unable to create SASL client: " + e, e);
+                }
+
+                if (body.getLocales() == null)
+                {
+                    throw new AMQException(null, "Locales is not defined in Connection Start method", null);
+                }
+
+                final String locales = new String(body.getLocales(), "utf8");
+                final StringTokenizer tokenizer = new StringTokenizer(locales, " ");
+                if (tokenizer.hasMoreTokens())
+                {
+                    tokenizer.nextToken();
+                }
+                else
+                {
+                    throw new AMQException(null, "No locales sent from server, passed: " + locales, null);
+                }
+
+                session.getStateManager().changeState(AMQState.CONNECTION_NOT_TUNED);
+                FieldTable clientProperties = FieldTableFactory.newFieldTable();
+
+                clientProperties.setString(new AMQShortString(ClientProperties.instance.toString()),
+                    session.getClientID());
+                clientProperties.setString(new AMQShortString(ClientProperties.product.toString()),
+                    QpidProperties.getProductName());
+                clientProperties.setString(new AMQShortString(ClientProperties.version.toString()),
+                    QpidProperties.getReleaseVersion());
+                clientProperties.setString(new AMQShortString(ClientProperties.platform.toString()), getFullSystemInfo());
+
+
+                ConnectionStartOkBody connectionStartOkBody = session.getMethodRegistry().createConnectionStartOkBody(clientProperties,new AMQShortString(mechanism),saslResponse,new AMQShortString(locales));
+                // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
+                // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
+                // Be aware of possible changes to parameter order as versions change.
+                session.writeFrame(connectionStartOkBody.generateFrame(channelId));
+                        
+            }
+            catch (UnsupportedEncodingException e)
+            {
+                throw new AMQException(null, "Unable to decode data: " + e, e);
+            }
+        }
+        else
+        {
+            _log.error("Broker requested Protocol [" + body.getVersionMajor() + "-" + body.getVersionMinor()
+                + "] which is not supported by this version of the client library");
+
+            session.closeProtocolSession();
+        }
+    }
+
+    private String getFullSystemInfo()
+    {
+        StringBuffer fullSystemInfo = new StringBuffer();
+        fullSystemInfo.append(System.getProperty("java.runtime.name"));
+        fullSystemInfo.append(", " + System.getProperty("java.runtime.version"));
+        fullSystemInfo.append(", " + System.getProperty("java.vendor"));
+        fullSystemInfo.append(", " + System.getProperty("os.arch"));
+        fullSystemInfo.append(", " + System.getProperty("os.name"));
+        fullSystemInfo.append(", " + System.getProperty("os.version"));
+        fullSystemInfo.append(", " + System.getProperty("sun.os.patch.level"));
+
+        return fullSystemInfo.toString();
+    }
+
+    private String chooseMechanism(byte[] availableMechanisms) throws UnsupportedEncodingException
+    {
+        final String mechanisms = new String(availableMechanisms, "utf8");
+        StringTokenizer tokenizer = new StringTokenizer(mechanisms, " ");
+        HashSet mechanismSet = new HashSet();
+        while (tokenizer.hasMoreTokens())
+        {
+            mechanismSet.add(tokenizer.nextToken());
+        }
+
+        String preferredMechanisms = CallbackHandlerRegistry.getInstance().getMechanisms();
+        StringTokenizer prefTokenizer = new StringTokenizer(preferredMechanisms, " ");
+        while (prefTokenizer.hasMoreTokens())
+        {
+            String mech = prefTokenizer.nextToken();
+            if (mechanismSet.contains(mech))
+            {
+                return mech;
+            }
+        }
+
+        return null;
+    }
+
+    private AMQCallbackHandler createCallbackHandler(String mechanism, AMQProtocolSession protocolSession)
+        throws AMQException
+    {
+        Class mechanismClass = CallbackHandlerRegistry.getInstance().getCallbackHandlerClass(mechanism);
+        try
+        {
+            Object instance = mechanismClass.newInstance();
+            AMQCallbackHandler cbh = (AMQCallbackHandler) instance;
+            cbh.initialise(protocolSession.getAMQConnection().getConnectionURL());
+
+            return cbh;
+        }
+        catch (Exception e)
+        {
+            throw new AMQException(null, "Unable to create callback handler: " + e, e);
+        }
+    }
+
+}
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 d1b2caf987..d1b2caf987 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 690d782b40..690d782b40 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 01d82c9b55..01d82c9b55 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 c2821591d8..c2821591d8 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 8c3f2fd08f..8c3f2fd08f 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 fb7b191656..fb7b191656 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 cec4268a7b..cec4268a7b 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/AMQPEncodedMapMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java
index 58f108f1a4..58f108f1a4 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 4978d1ce85..4978d1ce85 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 89fbc9722c..89fbc9722c 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/AbstractBytesMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java
index 3846ee043d..3846ee043d 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.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 85818dcd2b..85818dcd2b 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 6ba55b207a..6ba55b207a 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 40c1df0c5d..40c1df0c5d 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 49ae8c14b2..49ae8c14b2 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 b87275a9ce..b87275a9ce 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 cb04ebee1b..cb04ebee1b 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 e295d4a2a0..e295d4a2a0 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 306ffeeadf..306ffeeadf 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 eccb90560b..eccb90560b 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 637d9dd692..637d9dd692 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 03851dfa01..03851dfa01 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 ad2620852b..ad2620852b 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 5e25db9ae0..5e25db9ae0 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 fc2006a119..fc2006a119 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 1f4d64c78f..1f4d64c78f 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 e606ef11c9..e606ef11c9 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 f3d96cd855..f3d96cd855 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 cdb75fc9a9..cdb75fc9a9 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/ReturnMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/ReturnMessage.java
index 6e5f33a65c..6e5f33a65c 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 e2cb36a030..e2cb36a030 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 685e646d85..685e646d85 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 368ec60525..368ec60525 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 5f97d625b4..5f97d625b4 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 c98b194334..c98b194334 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 04aa7d146f..04aa7d146f 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 eb5af119b2..eb5af119b2 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/qpid/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
new file mode 100644
index 0000000000..5b7d272506
--- /dev/null
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
@@ -0,0 +1,467 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.client.protocol;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jms.JMSException;
+import javax.security.sasl.SaslClient;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.client.ConnectionTuneParameters;
+import org.apache.qpid.client.message.UnprocessedMessage;
+import org.apache.qpid.client.message.UnprocessedMessage_0_8;
+import org.apache.qpid.client.state.AMQStateManager;
+import org.apache.qpid.client.state.AMQState;
+import org.apache.qpid.framing.*;
+import org.apache.qpid.protocol.AMQConstant;
+import org.apache.qpid.protocol.AMQVersionAwareProtocolSession;
+import org.apache.qpid.transport.Sender;
+import org.apache.qpid.client.handler.ClientMethodDispatcherImpl;
+
+/**
+ * Wrapper for protocol session that provides type-safe access to session attributes. <p/> The underlying protocol
+ * session is still available but clients should not use it to obtain session attributes.
+ */
+public class AMQProtocolSession implements AMQVersionAwareProtocolSession
+{
+    protected static final int LAST_WRITE_FUTURE_JOIN_TIMEOUT = 1000 * 60 * 2;
+
+    protected static final Logger _logger = LoggerFactory.getLogger(AMQProtocolSession.class);
+
+    public static final String PROTOCOL_INITIATION_RECEIVED = "ProtocolInitiatiionReceived";
+
+    //Usable channels are numbered 1 to <ChannelMax>
+    public static final int MAX_CHANNEL_MAX = 0xFFFF;
+    public static final int MIN_USABLE_CHANNEL_NUM = 1;
+
+    protected static final String CONNECTION_TUNE_PARAMETERS = "ConnectionTuneParameters";
+
+    protected static final String AMQ_CONNECTION = "AMQConnection";
+
+    protected static final String SASL_CLIENT = "SASLClient";
+
+    /**
+     * The handler from which this session was created and which is used to handle protocol events. We send failover
+     * events to the handler.
+     */
+    protected final AMQProtocolHandler _protocolHandler;
+
+    /** Maps from the channel id to the AMQSession that it represents. */
+    protected ConcurrentMap<Integer, AMQSession> _channelId2SessionMap = new ConcurrentHashMap<Integer, AMQSession>();
+
+    protected ConcurrentMap _closingChannels = new ConcurrentHashMap();
+
+    /**
+     * Maps from a channel id to an unprocessed message. This is used to tie together the JmsDeliverBody (which arrives
+     * first) with the subsequent content header and content bodies.
+     */
+    private final ConcurrentMap<Integer, UnprocessedMessage> _channelId2UnprocessedMsgMap = new ConcurrentHashMap<Integer, UnprocessedMessage>();
+    private final UnprocessedMessage[] _channelId2UnprocessedMsgArray = new UnprocessedMessage[16];
+
+    /** Counter to ensure unique queue names */
+    protected int _queueId = 1;
+    protected final Object _queueIdLock = new Object();
+
+    private ProtocolVersion _protocolVersion;
+//    private VersionSpecificRegistry _registry =
+//        MainRegistry.getVersionSpecificRegistry(ProtocolVersion.getLatestSupportedVersion());
+
+    private MethodRegistry _methodRegistry =
+            MethodRegistry.getMethodRegistry(ProtocolVersion.getLatestSupportedVersion());
+
+    private MethodDispatcher _methodDispatcher;
+
+    protected final AMQConnection _connection;
+
+    private ConnectionTuneParameters _connectionTuneParameters;
+
+    private SaslClient _saslClient;
+
+    private static final int FAST_CHANNEL_ACCESS_MASK = 0xFFFFFFF0;
+
+    public AMQProtocolSession(AMQProtocolHandler protocolHandler, AMQConnection connection)
+    {
+        _protocolHandler = protocolHandler;
+        _protocolVersion = connection.getProtocolVersion();
+        _logger.info("Using ProtocolVersion for Session:" + _protocolVersion);
+        _methodDispatcher = ClientMethodDispatcherImpl.newMethodDispatcher(ProtocolVersion.getLatestSupportedVersion(),
+                                                                           this);
+        _connection = connection;
+    }
+
+    public void init()
+    {
+        // start the process of setting up the connection. This is the first place that
+        // data is written to the server.
+        _protocolHandler.writeFrame(new ProtocolInitiation(_connection.getProtocolVersion()));
+    }
+
+    public String getClientID()
+    {
+        try
+        {
+            return getAMQConnection().getClientID();
+        }
+        catch (JMSException e)
+        {
+            // we never throw a JMSException here
+            return null;
+        }
+    }
+
+    public void setClientID(String clientID) throws JMSException
+    {
+        getAMQConnection().setClientID(clientID);
+    }
+
+    public AMQStateManager getStateManager()
+    {
+        return _protocolHandler.getStateManager();
+    }
+
+    public String getVirtualHost()
+    {
+        return getAMQConnection().getVirtualHost();
+    }
+
+    public SaslClient getSaslClient()
+    {
+        return _saslClient;
+    }
+
+    /**
+     * Store the SASL client currently being used for the authentication handshake
+     *
+     * @param client if non-null, stores this in the session. if null clears any existing client being stored
+     */
+    public void setSaslClient(SaslClient client)
+    {
+        _saslClient = client;
+    }
+
+    public ConnectionTuneParameters getConnectionTuneParameters()
+    {
+        return _connectionTuneParameters;
+    }
+
+    public void setConnectionTuneParameters(ConnectionTuneParameters params)
+    {
+        _connectionTuneParameters = params;
+        AMQConnection con = getAMQConnection();
+
+        con.setMaximumChannelCount(params.getChannelMax());
+        con.setMaximumFrameSize(params.getFrameMax());
+        _protocolHandler.initHeartbeats((int) params.getHeartbeat());
+    }
+
+    /**
+     * Callback invoked from the BasicDeliverMethodHandler when a message has been received. This is invoked on the MINA
+     * dispatcher thread.
+     *
+     * @param message
+     *
+     * @throws AMQException if this was not expected
+     */
+    public void unprocessedMessageReceived(final int channelId, UnprocessedMessage message) throws AMQException
+    {
+        if ((channelId & FAST_CHANNEL_ACCESS_MASK) == 0)
+        {
+            _channelId2UnprocessedMsgArray[channelId] = message;
+        }
+        else
+        {
+            _channelId2UnprocessedMsgMap.put(channelId, message);
+        }
+    }
+
+    public void contentHeaderReceived(int channelId, ContentHeaderBody contentHeader) throws AMQException
+    {
+        final UnprocessedMessage_0_8 msg = (UnprocessedMessage_0_8) ((channelId & FAST_CHANNEL_ACCESS_MASK) == 0 ? _channelId2UnprocessedMsgArray[channelId]
+                                               : _channelId2UnprocessedMsgMap.get(channelId));
+
+        if (msg == null)
+        {
+            throw new AMQException(null, "Error: received content header without having received a BasicDeliver frame first on session:" + this, null);
+        }
+
+        if (msg.getContentHeader() != null)
+        {
+            throw new AMQException(null, "Error: received duplicate content header or did not receive correct number of content body frames on session:" + this, null);
+        }
+
+        msg.setContentHeader(contentHeader);
+        if (contentHeader.bodySize == 0)
+        {
+            deliverMessageToAMQSession(channelId, msg);
+        }
+    }
+
+    public void contentBodyReceived(final int channelId, ContentBody contentBody) throws AMQException
+    {
+        UnprocessedMessage_0_8 msg;
+        final boolean fastAccess = (channelId & FAST_CHANNEL_ACCESS_MASK) == 0;
+        if (fastAccess)
+        {
+            msg = (UnprocessedMessage_0_8) _channelId2UnprocessedMsgArray[channelId];
+        }
+        else
+        {
+            msg = (UnprocessedMessage_0_8) _channelId2UnprocessedMsgMap.get(channelId);
+        }
+
+        if (msg == null)
+        {
+            throw new AMQException(null, "Error: received content body without having received a JMSDeliver frame first", null);
+        }
+
+        if (msg.getContentHeader() == null)
+        {
+            if (fastAccess)
+            {
+                _channelId2UnprocessedMsgArray[channelId] = null;
+            }
+            else
+            {
+                _channelId2UnprocessedMsgMap.remove(channelId);
+            }
+            throw new AMQException(null, "Error: received content body without having received a ContentHeader frame first", null);
+        }
+
+        msg.receiveBody(contentBody);
+
+        if (msg.isAllBodyDataReceived())
+        {
+            deliverMessageToAMQSession(channelId, msg);
+        }
+    }
+
+    public void heartbeatBodyReceived(int channelId, HeartbeatBody body) throws AMQException
+    {
+
+    }
+
+    /**
+     * Deliver a message to the appropriate session, removing the unprocessed message from our map
+     *
+     * @param channelId the channel id the message should be delivered to
+     * @param msg       the message
+     */
+    private void deliverMessageToAMQSession(int channelId, UnprocessedMessage msg)
+    {
+        AMQSession session = getSession(channelId);
+        session.messageReceived(msg);
+        if ((channelId & FAST_CHANNEL_ACCESS_MASK) == 0)
+        {
+            _channelId2UnprocessedMsgArray[channelId] = null;
+        }
+        else
+        {
+            _channelId2UnprocessedMsgMap.remove(channelId);
+        }
+    }
+
+    protected AMQSession getSession(int channelId)
+    {
+        return _connection.getSession(channelId);
+    }
+
+    /**
+     * Convenience method that writes a frame to the protocol session. Equivalent to calling
+     * getProtocolSession().write().
+     *
+     * @param frame the frame to write
+     */
+    public void writeFrame(AMQDataBlock frame)
+    {
+        _protocolHandler.writeFrame(frame);
+    }
+
+    public void writeFrame(AMQDataBlock frame, boolean wait)
+    {
+        _protocolHandler.writeFrame(frame, wait);
+    }
+
+    /**
+     * Starts the process of closing a session
+     *
+     * @param session the AMQSession being closed
+     */
+    public void closeSession(AMQSession session)
+    {
+        _logger.debug("closeSession called on protocol session for session " + session.getChannelId());
+        final int channelId = session.getChannelId();
+        if (channelId <= 0)
+        {
+            throw new IllegalArgumentException("Attempt to close a channel with id < 0");
+        }
+        // we need to know when a channel is closing so that we can respond
+        // with a channel.close frame when we receive any other type of frame
+        // on that channel
+        _closingChannels.putIfAbsent(channelId, session);
+    }
+
+    /**
+     * Called from the ChannelClose handler when a channel close frame is received. This method decides whether this is
+     * a response or an initiation. The latter case causes the AMQSession to be closed and an exception to be thrown if
+     * appropriate.
+     *
+     * @param channelId the id of the channel (session)
+     *
+     * @return true if the client must respond to the server, i.e. if the server initiated the channel close, false if
+     *         the channel close is just the server responding to the client's earlier request to close the channel.
+     */
+    public boolean channelClosed(int channelId, AMQConstant code, String text) throws AMQException
+    {
+
+        // if this is not a response to an earlier request to close the channel
+        if (_closingChannels.remove(channelId) == null)
+        {
+            final AMQSession session = getSession(channelId);
+            try
+            {
+                session.closed(new AMQException(code, text, null));
+            }
+            catch (JMSException e)
+            {
+                throw new AMQException(null, "JMSException received while closing session", e);
+            }
+
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    public AMQConnection getAMQConnection()
+    {
+        return _connection;
+    }
+
+    public void closeProtocolSession() throws AMQException
+    {
+        _protocolHandler.closeConnection(0);
+    }
+
+    public void failover(String host, int port)
+    {
+        _protocolHandler.failover(host, port);
+    }
+
+    protected AMQShortString generateQueueName()
+    {
+        int id;
+        synchronized (_queueIdLock)
+        {
+            id = _queueId++;
+        }
+        // convert '.', '/', ':' and ';' to single '_', for spec compliance and readability
+        String localAddress = _protocolHandler.getLocalAddress().toString().replaceAll("[./:;]", "_");
+        String queueName = "tmp_" + localAddress + "_" + id;
+        return new AMQShortString(queueName.replaceAll("_+", "_"));
+    }
+
+    public void confirmConsumerCancelled(int channelId, AMQShortString consumerTag)
+    {
+        final AMQSession session = getSession(channelId);
+
+        session.confirmConsumerCancelled(consumerTag.toIntValue());
+    }
+
+    public void setProtocolVersion(final ProtocolVersion pv)
+    {
+        _logger.info("Setting ProtocolVersion to :" + pv);
+        _protocolVersion = pv;
+        _methodRegistry = MethodRegistry.getMethodRegistry(pv);
+        _methodDispatcher = ClientMethodDispatcherImpl.newMethodDispatcher(pv, this);
+  }
+
+    public byte getProtocolMinorVersion()
+    {
+        return _protocolVersion.getMinorVersion();
+    }
+
+    public byte getProtocolMajorVersion()
+    {
+        return _protocolVersion.getMajorVersion();
+    }
+
+    public ProtocolVersion getProtocolVersion()
+    {
+        return _protocolVersion;
+    }
+
+    public MethodRegistry getMethodRegistry()
+    {
+        return _methodRegistry;
+    }
+
+    public MethodDispatcher getMethodDispatcher()
+    {
+        return _methodDispatcher;
+    }
+
+    public void setTicket(int ticket, int channelId)
+    {
+        final AMQSession session = getSession(channelId);
+        session.setTicket(ticket);
+    }
+
+    public void setMethodDispatcher(MethodDispatcher methodDispatcher)
+    {
+        _methodDispatcher = methodDispatcher;
+    }
+
+    public void setFlowControl(final int channelId, final boolean active)
+    {
+        final AMQSession session = getSession(channelId);
+        session.setFlowControl(active);
+    }
+
+    public void methodFrameReceived(final int channel, final AMQMethodBody amqMethodBody) throws AMQException
+    {
+        _protocolHandler.methodBodyReceived(channel, amqMethodBody);
+    }
+
+    public void notifyError(Exception error)
+    {
+        _protocolHandler.propagateExceptionToAllWaiters(error);
+    }
+
+    public void setSender(Sender<java.nio.ByteBuffer> sender)
+    {
+        // No-op, interface munging
+    }
+
+
+    @Override
+    public String toString()
+    {
+        return "AMQProtocolSession[" + _connection + ']';
+    }
+}
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 2bc609ebf2..2bc609ebf2 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/protocol/HeartbeatConfig.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatConfig.java
index 35ea44a331..35ea44a331 100644
--- a/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatConfig.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatConfig.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java
index d44faeab04..d44faeab04 100644
--- a/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java
index bbd0a7b144..bbd0a7b144 100644
--- a/java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java
diff --git a/qpid/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
new file mode 100644
index 0000000000..67dd1a58b6
--- /dev/null
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
@@ -0,0 +1,30 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.client.security;
+
+import javax.security.auth.callback.CallbackHandler;
+
+import org.apache.qpid.jms.ConnectionURL;
+
+public interface AMQCallbackHandler extends CallbackHandler
+{
+    void initialise(ConnectionURL connectionURL);    
+}
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 140cbdeb75..140cbdeb75 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 1fcfde3579..1fcfde3579 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 2b4261b4b7..2b4261b4b7 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 828d26ed0d..828d26ed0d 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/qpid/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
new file mode 100644
index 0000000000..6ec83f0a23
--- /dev/null
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java
@@ -0,0 +1,102 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.client.security;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.qpid.jms.ConnectionURL;
+
+public class UsernameHashedPasswordCallbackHandler implements AMQCallbackHandler
+{
+    private ConnectionURL _connectionURL;
+
+    /**
+     * @see org.apache.qpid.client.security.AMQCallbackHandler#initialise(org.apache.qpid.jms.ConnectionURL)
+     */
+    @Override
+    public void initialise(ConnectionURL connectionURL)
+    {
+        _connectionURL = connectionURL;
+    }
+
+    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
+    {
+        for (int i = 0; i < callbacks.length; i++)
+        {
+            Callback cb = callbacks[i];
+            if (cb instanceof NameCallback)
+            {
+                ((NameCallback) cb).setName(_connectionURL.getUsername());
+            }
+            else if (cb instanceof PasswordCallback)
+            {
+                try
+                {
+                    ((PasswordCallback) cb).setPassword(getHash(_connectionURL.getPassword()));
+                }
+                catch (NoSuchAlgorithmException e)
+                {
+                    UnsupportedCallbackException uce = new UnsupportedCallbackException(cb);
+                    uce.initCause(e);
+                    throw uce;
+                }
+            }
+            else
+            {
+                throw new UnsupportedCallbackException(cb);
+            }
+        }
+    }
+
+    private char[] getHash(String text) throws NoSuchAlgorithmException, UnsupportedEncodingException
+    {
+
+        byte[] data = text.getBytes("utf-8");
+
+        MessageDigest md = MessageDigest.getInstance("MD5");
+
+        for (byte b : data)
+        {
+            md.update(b);
+        }
+
+        byte[] digest = md.digest();
+
+        char[] hash = new char[digest.length];
+
+        int index = 0;
+        for (byte b : digest)
+        {
+            hash[index++] = (char) b;
+        }
+
+        return hash;
+    }
+
+}
diff --git a/qpid/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
new file mode 100644
index 0000000000..ad088722c8
--- /dev/null
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
@@ -0,0 +1,65 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.client.security;
+
+import java.io.IOException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.qpid.jms.ConnectionURL;
+
+public class UsernamePasswordCallbackHandler implements AMQCallbackHandler
+{
+    private ConnectionURL _connectionURL;
+
+    /**
+     * @see org.apache.qpid.client.security.AMQCallbackHandler#initialise(org.apache.qpid.jms.ConnectionURL)
+     */
+    @Override
+    public void initialise(final ConnectionURL connectionURL)
+    {
+        _connectionURL = connectionURL;
+    }
+
+    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
+    {
+        for (int i = 0; i < callbacks.length; i++)
+        {
+            Callback cb = callbacks[i];
+            if (cb instanceof NameCallback)
+            {
+                ((NameCallback)cb).setName(_connectionURL.getUsername());
+            }
+            else if (cb instanceof PasswordCallback)
+            {
+                ((PasswordCallback)cb).setPassword(_connectionURL.getPassword().toCharArray());
+            }
+            else
+            {
+                throw new UnsupportedCallbackException(cb);
+            }
+        }
+    }
+
+}
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 f8a25c630c..f8a25c630c 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 30cc786890..30cc786890 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 de698f87c6..de698f87c6 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/CRAMMD5HashedSaslClientFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClientFactory.java
index 22bb1ac156..22bb1ac156 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 2c99b9a97b..2c99b9a97b 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 9c7d62670c..9c7d62670c 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 17d04f4fa3..17d04f4fa3 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 79f438d35d..79f438d35d 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/AMQNoTransportForProtocolException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/AMQNoTransportForProtocolException.java
index 6e47e2ce28..6e47e2ce28 100644
--- a/java/client/src/main/java/org/apache/qpid/client/transport/AMQNoTransportForProtocolException.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/AMQNoTransportForProtocolException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/AMQTransportConnectionException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/AMQTransportConnectionException.java
index 6bef6216bd..6bef6216bd 100644
--- a/java/client/src/main/java/org/apache/qpid/client/transport/AMQTransportConnectionException.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/AMQTransportConnectionException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/ITransportConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/ITransportConnection.java
index 7a24d6e15a..7a24d6e15a 100644
--- a/java/client/src/main/java/org/apache/qpid/client/transport/ITransportConnection.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/ITransportConnection.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java
index 1ac8f62e32..1ac8f62e32 100644
--- a/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
index aef3a563af..aef3a563af 100644
--- a/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java
index 87cc2e7a5a..87cc2e7a5a 100644
--- a/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.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 f3f74dd332..f3f74dd332 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 605e9ee154..605e9ee154 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 208658a5ff..208658a5ff 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/FlowControllingBlockingQueue.java b/qpid/java/client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java
index ee7fc533a3..ee7fc533a3 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/client/vmbroker/AMQVMBrokerCreationException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
index dc0d9b8c78..dc0d9b8c78 100644
--- a/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
diff --git a/java/client/src/main/java/org/apache/qpid/collections/KeyValue.java b/qpid/java/client/src/main/java/org/apache/qpid/collections/KeyValue.java
index e890aba968..e890aba968 100644
--- a/java/client/src/main/java/org/apache/qpid/collections/KeyValue.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/collections/KeyValue.java
diff --git a/java/client/src/main/java/org/apache/qpid/collections/ReferenceMap.java b/qpid/java/client/src/main/java/org/apache/qpid/collections/ReferenceMap.java
index 1516c56e42..1516c56e42 100644
--- a/java/client/src/main/java/org/apache/qpid/collections/ReferenceMap.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/collections/ReferenceMap.java
diff --git a/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractKeyValue.java b/qpid/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractKeyValue.java
index a7ca67ad15..a7ca67ad15 100644
--- a/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractKeyValue.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractKeyValue.java
diff --git a/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractMapEntry.java b/qpid/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractMapEntry.java
index f4717a1c20..f4717a1c20 100644
--- a/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractMapEntry.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractMapEntry.java
diff --git a/java/client/src/main/java/org/apache/qpid/collections/keyvalue/DefaultMapEntry.java b/qpid/java/client/src/main/java/org/apache/qpid/collections/keyvalue/DefaultMapEntry.java
index f0f04a366a..f0f04a366a 100644
--- a/java/client/src/main/java/org/apache/qpid/collections/keyvalue/DefaultMapEntry.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/collections/keyvalue/DefaultMapEntry.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
index a86613f10c..a86613f10c 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java
index f97f858fad..f97f858fad 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
index 14a5c7ea87..14a5c7ea87 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
index 55fca853ef..55fca853ef 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
index 3874d13431..3874d13431 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/Expression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/Expression.java
index 8208f49688..8208f49688 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/Expression.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/filter/Expression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
index 4159986090..4159986090 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
index 7ef85cbacb..7ef85cbacb 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
index 62e4a28c1e..62e4a28c1e 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
index b7b6bd57bc..b7b6bd57bc 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
index 0fc3382b7e..0fc3382b7e 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.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 6d81f728c9..6d81f728c9 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 0e8ca60686..0e8ca60686 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 56abf03c81..56abf03c81 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/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 b830c377b8..b830c377b8 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 5287381fae..5287381fae 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 1dbe464230..1dbe464230 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 ef30f2adbc..ef30f2adbc 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 41ba4974ec..41ba4974ec 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 d033a49f5c..d033a49f5c 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 1231324397..1231324397 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 fec5af55c1..fec5af55c1 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 1719ea1219..1719ea1219 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/naming/ReadOnlyContext.java b/qpid/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java
index 59ec4cfba7..59ec4cfba7 100644
--- a/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java
diff --git a/java/client/src/main/java/org/apache/qpid/naming/jndi.properties b/qpid/java/client/src/main/java/org/apache/qpid/naming/jndi.properties
index 830de5f619..830de5f619 100644
--- a/java/client/src/main/java/org/apache/qpid/naming/jndi.properties
+++ b/qpid/java/client/src/main/java/org/apache/qpid/naming/jndi.properties
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 6f07dcb469..6f07dcb469 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 14bfb4f95e..14bfb4f95e 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 10fd8d2a80..10fd8d2a80 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/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java b/qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
index 2c08f1e34a..2c08f1e34a 100644
--- a/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java b/qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
index 10e8b94311..10e8b94311 100644
--- a/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java b/qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
index ca071c1187..ca071c1187 100644
--- a/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/README.txt b/qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/README.txt
index 95ee9f9c77..95ee9f9c77 100644
--- a/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/README.txt
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/README.txt
diff --git a/java/client/src/old_test/java/org/apache/qpid/cluster/Client.java b/qpid/java/client/src/old_test/java/org/apache/qpid/cluster/Client.java
index cf8059a143..cf8059a143 100644
--- a/java/client/src/old_test/java/org/apache/qpid/cluster/Client.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/cluster/Client.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/codec/BasicDeliverTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/codec/BasicDeliverTest.java
index 1db7e200bd..1db7e200bd 100644
--- a/java/client/src/old_test/java/org/apache/qpid/codec/BasicDeliverTest.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/codec/BasicDeliverTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/codec/Client.java b/qpid/java/client/src/old_test/java/org/apache/qpid/codec/Client.java
index 3886021277..3886021277 100644
--- a/java/client/src/old_test/java/org/apache/qpid/codec/Client.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/codec/Client.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/codec/Server.java b/qpid/java/client/src/old_test/java/org/apache/qpid/codec/Server.java
index fa4295e0b2..fa4295e0b2 100644
--- a/java/client/src/old_test/java/org/apache/qpid/codec/Server.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/codec/Server.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java b/qpid/java/client/src/old_test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
index cac0064785..cac0064785 100644
--- a/java/client/src/old_test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/config/AbstractConfig.java b/qpid/java/client/src/old_test/java/org/apache/qpid/config/AbstractConfig.java
index 04381d66a0..04381d66a0 100644
--- a/java/client/src/old_test/java/org/apache/qpid/config/AbstractConfig.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/config/AbstractConfig.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java b/qpid/java/client/src/old_test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
index a9984eb09a..a9984eb09a 100644
--- a/java/client/src/old_test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/config/Connector.java b/qpid/java/client/src/old_test/java/org/apache/qpid/config/Connector.java
index ff2377f087..ff2377f087 100644
--- a/java/client/src/old_test/java/org/apache/qpid/config/Connector.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/config/Connector.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/config/ConnectorConfig.java b/qpid/java/client/src/old_test/java/org/apache/qpid/config/ConnectorConfig.java
index b120ed3f12..b120ed3f12 100644
--- a/java/client/src/old_test/java/org/apache/qpid/config/ConnectorConfig.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/config/ConnectorConfig.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java b/qpid/java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
index 1c86aea56c..1c86aea56c 100644
--- a/java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java
index cb8adae18c..cb8adae18c 100644
--- a/java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java b/qpid/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
index 2fe01fc126..2fe01fc126 100644
--- a/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java b/qpid/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
index b0cde22349..b0cde22349 100644
--- a/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/headers/Listener.java b/qpid/java/client/src/old_test/java/org/apache/qpid/headers/Listener.java
index cb5caefc1e..cb5caefc1e 100644
--- a/java/client/src/old_test/java/org/apache/qpid/headers/Listener.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/headers/Listener.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/headers/MessageFactory.java b/qpid/java/client/src/old_test/java/org/apache/qpid/headers/MessageFactory.java
index a2d575fdd4..a2d575fdd4 100644
--- a/java/client/src/old_test/java/org/apache/qpid/headers/MessageFactory.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/headers/MessageFactory.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/headers/Publisher.java b/qpid/java/client/src/old_test/java/org/apache/qpid/headers/Publisher.java
index d9ef702c48..d9ef702c48 100644
--- a/java/client/src/old_test/java/org/apache/qpid/headers/Publisher.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/headers/Publisher.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Bind.java b/qpid/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Bind.java
index ee6a12c233..ee6a12c233 100644
--- a/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Bind.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Bind.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Lookup.java b/qpid/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Lookup.java
index 1c9d8b0fd5..1c9d8b0fd5 100644
--- a/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Lookup.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Lookup.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Unbind.java b/qpid/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Unbind.java
index 1acead674c..1acead674c 100644
--- a/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Unbind.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Unbind.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java
index 4865a68dc4..4865a68dc4 100644
--- a/java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/mina/AcceptorTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/mina/AcceptorTest.java
index f0ac0e6902..f0ac0e6902 100644
--- a/java/client/src/old_test/java/org/apache/qpid/mina/AcceptorTest.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/mina/AcceptorTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/mina/BlockingAcceptorTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/mina/BlockingAcceptorTest.java
index bfe29c47e6..bfe29c47e6 100644
--- a/java/client/src/old_test/java/org/apache/qpid/mina/BlockingAcceptorTest.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/mina/BlockingAcceptorTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/mina/WriterTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/mina/WriterTest.java
index 910345624f..910345624f 100644
--- a/java/client/src/old_test/java/org/apache/qpid/mina/WriterTest.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/mina/WriterTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java
index db02b9954a..db02b9954a 100644
--- a/java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java b/qpid/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java
index 37b4ff1498..37b4ff1498 100644
--- a/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java b/qpid/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java
index 450d9b3914..450d9b3914 100644
--- a/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/test/unit/client/connection/TestManyConnections.java b/qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/client/connection/TestManyConnections.java
index f59b36166a..f59b36166a 100644
--- a/java/client/src/old_test/java/org/apache/qpid/test/unit/client/connection/TestManyConnections.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/client/connection/TestManyConnections.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java
index 5ab5722146..5ab5722146 100644
--- a/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/example.properties b/qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/example.properties
index ea9dc5ae0e..ea9dc5ae0e 100644
--- a/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/example.properties
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/example.properties
diff --git a/java/client/src/old_test/java/org/apache/qpid/topic/Config.java b/qpid/java/client/src/old_test/java/org/apache/qpid/topic/Config.java
index bb740f9094..bb740f9094 100644
--- a/java/client/src/old_test/java/org/apache/qpid/topic/Config.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/topic/Config.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/topic/Listener.java b/qpid/java/client/src/old_test/java/org/apache/qpid/topic/Listener.java
index 47c608cfe4..47c608cfe4 100644
--- a/java/client/src/old_test/java/org/apache/qpid/topic/Listener.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/topic/Listener.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java b/qpid/java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java
index 39d64069d1..39d64069d1 100644
--- a/java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/topic/Publisher.java b/qpid/java/client/src/old_test/java/org/apache/qpid/topic/Publisher.java
index d788029ee9..d788029ee9 100644
--- a/java/client/src/old_test/java/org/apache/qpid/topic/Publisher.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/topic/Publisher.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/transacted/Config.java b/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Config.java
index bd104e5407..bd104e5407 100644
--- a/java/client/src/old_test/java/org/apache/qpid/transacted/Config.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Config.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java b/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java
index 8f15bf089e..8f15bf089e 100644
--- a/java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java b/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java
index f4f4b20d7c..f4f4b20d7c 100644
--- a/java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/transacted/Relay.java b/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Relay.java
index cede95e5f0..cede95e5f0 100644
--- a/java/client/src/old_test/java/org/apache/qpid/transacted/Relay.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Relay.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/transacted/Start.java b/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Start.java
index de718d828a..de718d828a 100644
--- a/java/client/src/old_test/java/org/apache/qpid/transacted/Start.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Start.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceProvider.java b/qpid/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceProvider.java
index 71d806b338..71d806b338 100644
--- a/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceProvider.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceProvider.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java b/qpid/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
index 2f64a1dde5..2f64a1dde5 100644
--- a/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
+++ b/qpid/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
diff --git a/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java b/qpid/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
index 5323ad28bf..5323ad28bf 100644
--- a/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
+++ b/qpid/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.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 7789f87ace..7789f87ace 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/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java b/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
new file mode 100644
index 0000000000..5972bf3fae
--- /dev/null
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
@@ -0,0 +1,89 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.client;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.state.AMQState;
+import org.apache.qpid.framing.ProtocolVersion;
+import org.apache.qpid.jms.ConnectionURL;
+import org.apache.qpid.jms.BrokerDetails;
+import org.apache.qpid.url.URLSyntaxException;
+
+import java.io.IOException;
+
+public class MockAMQConnection extends AMQConnection
+{
+    public MockAMQConnection(String broker, String username, String password, String clientName, String virtualHost)
+            throws AMQException, URLSyntaxException
+    {
+        super(broker, username, password, clientName, virtualHost);
+    }
+
+    public MockAMQConnection(String broker, String username, String password, String clientName, String virtualHost, SSLConfiguration sslConfig)
+            throws AMQException, URLSyntaxException
+    {
+        super(broker, username, password, clientName, virtualHost, sslConfig);
+    }
+
+    public MockAMQConnection(String host, int port, String username, String password, String clientName, String virtualHost)
+            throws AMQException, URLSyntaxException
+    {
+        super(host, port, username, password, clientName, virtualHost);
+    }
+
+    public MockAMQConnection(String host, int port, String username, String password, String clientName, String virtualHost, SSLConfiguration sslConfig)
+            throws AMQException, URLSyntaxException
+    {
+        super(host, port, username, password, clientName, virtualHost, sslConfig);
+    }
+
+    public MockAMQConnection(String host, int port, boolean useSSL, String username, String password, String clientName, String virtualHost, SSLConfiguration sslConfig)
+            throws AMQException, URLSyntaxException
+    {
+        super(host, port, useSSL, username, password, clientName, virtualHost, sslConfig);
+    }
+
+    public MockAMQConnection(String connection)
+            throws AMQException, URLSyntaxException
+    {
+        super(connection);
+    }
+
+    public MockAMQConnection(String connection, SSLConfiguration sslConfig)
+            throws AMQException, URLSyntaxException
+    {
+        super(connection, sslConfig);
+    }
+
+    public MockAMQConnection(ConnectionURL connectionURL, SSLConfiguration sslConfig)
+            throws AMQException
+    {
+        super(connectionURL, sslConfig);
+    }
+
+    @Override
+    public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail) throws IOException
+    {
+        _connected = true;
+        _protocolHandler.getStateManager().changeState(AMQState.CONNECTION_OPEN);
+        return null;
+    }
+}
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 f81f482c6a..f81f482c6a 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 7ee991b63c..7ee991b63c 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/protocol/AMQProtocolHandlerTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
index f520a21ba0..f520a21ba0 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/protocol/MockIoSession.java b/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/MockIoSession.java
index f0938a4bc0..f0938a4bc0 100644
--- a/java/client/src/test/java/org/apache/qpid/client/protocol/MockIoSession.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/MockIoSession.java
diff --git a/qpid/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
new file mode 100644
index 0000000000..98fc09c25b
--- /dev/null
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java
@@ -0,0 +1,99 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.client.security;
+
+import java.security.MessageDigest;
+import java.util.Arrays;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+
+import junit.framework.TestCase;
+
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQConnectionURL;
+import org.apache.qpid.client.MockAMQConnection;
+import org.apache.qpid.client.protocol.AMQProtocolHandler;
+import org.apache.qpid.client.protocol.AMQProtocolSession;
+
+/**
+ * Unit tests for the UsernameHashPasswordCallbackHandler.  This callback handler is
+ * used by the CRAM-MD5-HASHED SASL mechanism.
+ *
+ */
+public class UsernameHashedPasswordCallbackHandlerTest extends TestCase
+{
+    private AMQCallbackHandler _callbackHandler = new UsernameHashedPasswordCallbackHandler(); // Class under test
+    private static final String PROMPT_UNUSED = "unused";
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        final String url = "amqp://username:password@client/test?brokerlist='vm://:1'";
+        _callbackHandler.initialise(new AMQConnectionURL(url));
+    }
+
+    /**
+     *  Tests that the callback handler can correctly retrieve the username from the connection url.
+     */
+    public void testNameCallback() throws Exception
+    {
+        final String expectedName = "username";
+        NameCallback nameCallback = new NameCallback(PROMPT_UNUSED);
+
+        assertNull("Unexpected name before test", nameCallback.getName());
+        _callbackHandler.handle(new Callback[] {nameCallback});
+        assertEquals("Unexpected name", expectedName, nameCallback.getName());
+    }
+
+    /**
+     *  Tests that the callback handler can correctly retrieve the password from the connection url
+     *  and calculate a MD5.
+     */
+    public void testDigestedPasswordCallback() throws Exception
+    {
+        final char[] expectedPasswordDigested = getHashPassword("password");
+        
+        PasswordCallback passwordCallback = new PasswordCallback(PROMPT_UNUSED, false);
+        assertNull("Unexpected password before test", passwordCallback.getPassword());
+        _callbackHandler.handle(new Callback[] {passwordCallback});
+        assertTrue("Unexpected password", Arrays.equals(expectedPasswordDigested, passwordCallback.getPassword()));
+    }
+
+    private char[] getHashPassword(final String password) throws Exception
+    {
+        MessageDigest md5Digester = MessageDigest.getInstance("MD5");
+        final byte[] digest = md5Digester.digest(password.getBytes("UTF-8"));
+
+        char[] hash = new char[digest.length];
+
+        int index = 0;
+        for (byte b : digest)
+        {
+            hash[index++] = (char) b;
+        }
+
+        return hash;
+    }
+}
diff --git a/qpid/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
new file mode 100644
index 0000000000..05a60fbef7
--- /dev/null
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java
@@ -0,0 +1,78 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.client.security;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+
+import junit.framework.TestCase;
+
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQConnectionURL;
+import org.apache.qpid.client.MockAMQConnection;
+import org.apache.qpid.client.protocol.AMQProtocolHandler;
+import org.apache.qpid.client.protocol.AMQProtocolSession;
+
+/**
+ * Unit tests for the UsernamePasswordCallbackHandler.
+ *
+ */
+public class UsernamePasswordCallbackHandlerTest extends TestCase
+{
+    private AMQCallbackHandler _callbackHandler = new UsernamePasswordCallbackHandler(); // Class under test
+    private static final String PROMPT_UNUSED = "unused";
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        final String url = "amqp://username:password@client/test?brokerlist='vm://:1'";
+
+        _callbackHandler.initialise(new AMQConnectionURL(url));
+    }
+
+    /**
+     *  Tests that the callback handler can correctly retrieve the username from the connection url.
+     */
+    public void testNameCallback() throws Exception
+    {
+        final String expectedName = "username";
+        NameCallback nameCallback = new NameCallback(PROMPT_UNUSED);
+
+        assertNull("Unexpected name before test", nameCallback.getName());
+        _callbackHandler.handle(new Callback[] {nameCallback});
+        assertEquals("Unexpected name", expectedName, nameCallback.getName());
+    }
+
+    /**
+     *  Tests that the callback handler can correctly retrieve the password from the connection url.
+     */
+    public void testPasswordCallback() throws Exception
+    {
+        final String expectedPassword = "password";
+        PasswordCallback passwordCallback = new PasswordCallback(PROMPT_UNUSED, false);
+        assertNull("Unexpected password before test", passwordCallback.getPassword());
+        _callbackHandler.handle(new Callback[] {passwordCallback});
+        assertEquals("Unexpected password", expectedPassword, new String(passwordCallback.getPassword()));
+    }    
+}
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 438995aedc..438995aedc 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/test/unit/basic/FieldTableKeyEnumeratorTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
index ddbc69826d..ddbc69826d 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 60ed688897..60ed688897 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 1b27ff6300..1b27ff6300 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 66f220643c..66f220643c 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 c7eb745566..c7eb745566 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 2c5fa0112e..2c5fa0112e 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 7de09cff45..7de09cff45 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 65013e7e6d..65013e7e6d 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 3e04c36b38..3e04c36b38 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/StreamMessageTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java
index 085dd81079..085dd81079 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 30f3b0b4eb..30f3b0b4eb 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/jndi/ConnectionFactoryTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java
index 9e76b0d468..9e76b0d468 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDIPropertyFileTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDIPropertyFileTest.java
index a1b14d5723..a1b14d5723 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDIPropertyFileTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDIPropertyFileTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDITest.properties b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDITest.properties
index 07017a05a6..07017a05a6 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDITest.properties
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDITest.properties
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 b5e7ae82b5..b5e7ae82b5 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 b1cf23bb9e..b1cf23bb9e 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 4637c6e505..4637c6e505 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/client/test/bin/IBM-JNDI-Setup.bat b/qpid/java/client/test/bin/IBM-JNDI-Setup.bat
index eb6a87fa9e..eb6a87fa9e 100644
--- a/java/client/test/bin/IBM-JNDI-Setup.bat
+++ b/qpid/java/client/test/bin/IBM-JNDI-Setup.bat
diff --git a/java/client/test/bin/IBM-JNDI-Setup.sh b/qpid/java/client/test/bin/IBM-JNDI-Setup.sh
index e3112f812d..e3112f812d 100755
--- a/java/client/test/bin/IBM-JNDI-Setup.sh
+++ b/qpid/java/client/test/bin/IBM-JNDI-Setup.sh
diff --git a/java/client/test/bin/IBM-Publisher.bat b/qpid/java/client/test/bin/IBM-Publisher.bat
index 5bb4343c4c..5bb4343c4c 100644
--- a/java/client/test/bin/IBM-Publisher.bat
+++ b/qpid/java/client/test/bin/IBM-Publisher.bat
diff --git a/java/client/test/bin/IBM-Publisher.sh b/qpid/java/client/test/bin/IBM-Publisher.sh
index adecf040bc..adecf040bc 100755
--- a/java/client/test/bin/IBM-Publisher.sh
+++ b/qpid/java/client/test/bin/IBM-Publisher.sh
diff --git a/java/client/test/bin/IBM-PutGet.bat b/qpid/java/client/test/bin/IBM-PutGet.bat
index c4316f1256..c4316f1256 100644
--- a/java/client/test/bin/IBM-PutGet.bat
+++ b/qpid/java/client/test/bin/IBM-PutGet.bat
diff --git a/java/client/test/bin/IBM-PutGet.sh b/qpid/java/client/test/bin/IBM-PutGet.sh
index c75667c9f6..c75667c9f6 100755
--- a/java/client/test/bin/IBM-PutGet.sh
+++ b/qpid/java/client/test/bin/IBM-PutGet.sh
diff --git a/java/client/test/bin/IBM-README.txt b/qpid/java/client/test/bin/IBM-README.txt
index b076f3b3ca..b076f3b3ca 100644
--- a/java/client/test/bin/IBM-README.txt
+++ b/qpid/java/client/test/bin/IBM-README.txt
diff --git a/java/client/test/bin/IBM-Receiver.bat b/qpid/java/client/test/bin/IBM-Receiver.bat
index dff44d472a..dff44d472a 100644
--- a/java/client/test/bin/IBM-Receiver.bat
+++ b/qpid/java/client/test/bin/IBM-Receiver.bat
diff --git a/java/client/test/bin/IBM-Receiver.sh b/qpid/java/client/test/bin/IBM-Receiver.sh
index f50f0f744e..f50f0f744e 100755
--- a/java/client/test/bin/IBM-Receiver.sh
+++ b/qpid/java/client/test/bin/IBM-Receiver.sh
diff --git a/java/client/test/bin/IBM-Sender.bat b/qpid/java/client/test/bin/IBM-Sender.bat
index b8826322e5..b8826322e5 100644
--- a/java/client/test/bin/IBM-Sender.bat
+++ b/qpid/java/client/test/bin/IBM-Sender.bat
diff --git a/java/client/test/bin/IBM-Sender.sh b/qpid/java/client/test/bin/IBM-Sender.sh
index b99429fd54..b99429fd54 100755
--- a/java/client/test/bin/IBM-Sender.sh
+++ b/qpid/java/client/test/bin/IBM-Sender.sh
diff --git a/java/client/test/bin/IBM-Subscriber.bat b/qpid/java/client/test/bin/IBM-Subscriber.bat
index 5245639eba..5245639eba 100644
--- a/java/client/test/bin/IBM-Subscriber.bat
+++ b/qpid/java/client/test/bin/IBM-Subscriber.bat
diff --git a/java/client/test/bin/IBM-Subscriber.sh b/qpid/java/client/test/bin/IBM-Subscriber.sh
index 43550100be..43550100be 100755
--- a/java/client/test/bin/IBM-Subscriber.sh
+++ b/qpid/java/client/test/bin/IBM-Subscriber.sh
diff --git a/java/client/test/bin/headersListener.sh b/qpid/java/client/test/bin/headersListener.sh
index 81930b7043..81930b7043 100755
--- a/java/client/test/bin/headersListener.sh
+++ b/qpid/java/client/test/bin/headersListener.sh
diff --git a/java/client/test/bin/headersListenerGroup.sh b/qpid/java/client/test/bin/headersListenerGroup.sh
index e1cc05cfd2..e1cc05cfd2 100755
--- a/java/client/test/bin/headersListenerGroup.sh
+++ b/qpid/java/client/test/bin/headersListenerGroup.sh
diff --git a/java/client/test/bin/headersPublisher.sh b/qpid/java/client/test/bin/headersPublisher.sh
index fd9fd26416..fd9fd26416 100755
--- a/java/client/test/bin/headersPublisher.sh
+++ b/qpid/java/client/test/bin/headersPublisher.sh
diff --git a/java/client/test/bin/run_many.sh b/qpid/java/client/test/bin/run_many.sh
index cca2ffec21..cca2ffec21 100755
--- a/java/client/test/bin/run_many.sh
+++ b/qpid/java/client/test/bin/run_many.sh
diff --git a/java/client/test/bin/serviceProvidingClient.sh b/qpid/java/client/test/bin/serviceProvidingClient.sh
index cbcf5a0f4b..cbcf5a0f4b 100755
--- a/java/client/test/bin/serviceProvidingClient.sh
+++ b/qpid/java/client/test/bin/serviceProvidingClient.sh
diff --git a/java/client/test/bin/serviceRequestingClient.sh b/qpid/java/client/test/bin/serviceRequestingClient.sh
index 213f44c00b..213f44c00b 100755
--- a/java/client/test/bin/serviceRequestingClient.sh
+++ b/qpid/java/client/test/bin/serviceRequestingClient.sh
diff --git a/java/client/test/bin/testService.sh b/qpid/java/client/test/bin/testService.sh
index 20161c3abf..20161c3abf 100755
--- a/java/client/test/bin/testService.sh
+++ b/qpid/java/client/test/bin/testService.sh
diff --git a/java/client/test/bin/topicListener.sh b/qpid/java/client/test/bin/topicListener.sh
index ac0cb63c91..ac0cb63c91 100755
--- a/java/client/test/bin/topicListener.sh
+++ b/qpid/java/client/test/bin/topicListener.sh
diff --git a/java/client/test/bin/topicPublisher.sh b/qpid/java/client/test/bin/topicPublisher.sh
index e35c131fe8..e35c131fe8 100755
--- a/java/client/test/bin/topicPublisher.sh
+++ b/qpid/java/client/test/bin/topicPublisher.sh
diff --git a/java/client/test/etc/ApacheDS.properties b/qpid/java/client/test/etc/ApacheDS.properties
index 6c5cb4cec4..6c5cb4cec4 100644
--- a/java/client/test/etc/ApacheDS.properties
+++ b/qpid/java/client/test/etc/ApacheDS.properties
diff --git a/java/client/test/example_build.xml b/qpid/java/client/test/example_build.xml
index 329c12982c..329c12982c 100644
--- a/java/client/test/example_build.xml
+++ b/qpid/java/client/test/example_build.xml
diff --git a/java/common.xml b/qpid/java/common.xml
index 1125a3230c..1125a3230c 100644
--- a/java/common.xml
+++ b/qpid/java/common.xml
diff --git a/java/common/Composite.tpl b/qpid/java/common/Composite.tpl
index 350dd893c8..350dd893c8 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 da4233c847..da4233c847 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 0835d34a20..0835d34a20 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 2eed43ad28..2eed43ad28 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 27e20a7ef2..27e20a7ef2 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 c22b35b999..c22b35b999 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 09c669f74e..09c669f74e 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 7f9cfee268..7f9cfee268 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 d456171bf1..d456171bf1 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 15d88992df..15d88992df 100755
--- a/java/common/bin/qpid-run
+++ b/qpid/java/common/bin/qpid-run
diff --git a/java/common/build.xml b/qpid/java/common/build.xml
index f2f85fc634..f2f85fc634 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/genutil.py b/qpid/java/common/genutil.py
index 57a461ed40..57a461ed40 100644
--- a/java/common/genutil.py
+++ b/qpid/java/common/genutil.py
diff --git a/java/common/protocol-version.xml b/qpid/java/common/protocol-version.xml
index 5435a0a582..5435a0a582 100644
--- a/java/common/protocol-version.xml
+++ b/qpid/java/common/protocol-version.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/java/common.bnd b/qpid/java/common/src/main/java/common.bnd
index 89c397f400..89c397f400 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/configuration/PropertyNameResolver.java b/qpid/java/common/src/main/java/org/apache/configuration/PropertyNameResolver.java
index 73ee747c07..73ee747c07 100644
--- a/java/common/src/main/java/org/apache/configuration/PropertyNameResolver.java
+++ b/qpid/java/common/src/main/java/org/apache/configuration/PropertyNameResolver.java
diff --git a/java/common/src/main/java/org/apache/mina/common/FixedSizeByteBufferAllocator.java b/qpid/java/common/src/main/java/org/apache/mina/common/FixedSizeByteBufferAllocator.java
index 0c311b6645..0c311b6645 100644
--- a/java/common/src/main/java/org/apache/mina/common/FixedSizeByteBufferAllocator.java
+++ b/qpid/java/common/src/main/java/org/apache/mina/common/FixedSizeByteBufferAllocator.java
diff --git a/java/common/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java b/qpid/java/common/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java
index 4fd28c4eb5..4fd28c4eb5 100644
--- a/java/common/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java
+++ b/qpid/java/common/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java
diff --git a/java/common/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java b/qpid/java/common/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java
index 5723ffbaa9..5723ffbaa9 100644
--- a/java/common/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java
+++ b/qpid/java/common/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java
diff --git a/java/common/src/main/java/org/apache/mina/filter/WriteBufferFullExeception.java b/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferFullExeception.java
index 47f19aa76d..47f19aa76d 100644
--- a/java/common/src/main/java/org/apache/mina/filter/WriteBufferFullExeception.java
+++ b/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferFullExeception.java
diff --git a/java/common/src/main/java/org/apache/mina/filter/WriteBufferLimitFilterBuilder.java b/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferLimitFilterBuilder.java
index 4e9db9071a..4e9db9071a 100644
--- a/java/common/src/main/java/org/apache/mina/filter/WriteBufferLimitFilterBuilder.java
+++ b/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferLimitFilterBuilder.java
diff --git a/java/common/src/main/java/org/apache/mina/filter/codec/OurCumulativeProtocolDecoder.java b/qpid/java/common/src/main/java/org/apache/mina/filter/codec/OurCumulativeProtocolDecoder.java
index 3f7e206cb4..3f7e206cb4 100644
--- a/java/common/src/main/java/org/apache/mina/filter/codec/OurCumulativeProtocolDecoder.java
+++ b/qpid/java/common/src/main/java/org/apache/mina/filter/codec/OurCumulativeProtocolDecoder.java
diff --git a/java/common/src/main/java/org/apache/mina/filter/codec/QpidProtocolCodecFilter.java b/qpid/java/common/src/main/java/org/apache/mina/filter/codec/QpidProtocolCodecFilter.java
index b8c6f29720..b8c6f29720 100644
--- a/java/common/src/main/java/org/apache/mina/filter/codec/QpidProtocolCodecFilter.java
+++ b/qpid/java/common/src/main/java/org/apache/mina/filter/codec/QpidProtocolCodecFilter.java
diff --git a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketAcceptor.java b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketAcceptor.java
index e5360d32e0..e5360d32e0 100644
--- a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketAcceptor.java
+++ b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketAcceptor.java
diff --git a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketConnector.java b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketConnector.java
index 7344f70078..7344f70078 100644
--- a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketConnector.java
+++ b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketConnector.java
diff --git a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketFilterChain.java b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketFilterChain.java
index 67b8c8d820..67b8c8d820 100644
--- a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketFilterChain.java
+++ b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketFilterChain.java
diff --git a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketIoProcessor.java b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketIoProcessor.java
index c23ad8686f..c23ad8686f 100644
--- a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketIoProcessor.java
+++ b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketIoProcessor.java
diff --git a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionConfigImpl.java b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionConfigImpl.java
index 043d4800b6..043d4800b6 100644
--- a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionConfigImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionConfigImpl.java
diff --git a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionImpl.java b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionImpl.java
index be4a2d289d..be4a2d289d 100644
--- a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionImpl.java
+++ b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionImpl.java
diff --git a/java/common/src/main/java/org/apache/mina/transport/vmpipe/QpidVmPipeConnector.java b/qpid/java/common/src/main/java/org/apache/mina/transport/vmpipe/QpidVmPipeConnector.java
index a23e546af5..a23e546af5 100644
--- a/java/common/src/main/java/org/apache/mina/transport/vmpipe/QpidVmPipeConnector.java
+++ b/qpid/java/common/src/main/java/org/apache/mina/transport/vmpipe/QpidVmPipeConnector.java
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 ef9420ba87..ef9420ba87 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 8ef6facef1..8ef6facef1 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 f2503e549f..f2503e549f 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 b0c6fccc9e..b0c6fccc9e 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 baca2a4773..baca2a4773 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 bbc569839a..bbc569839a 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 8389fe5efa..8389fe5efa 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 eee3e6afcf..eee3e6afcf 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/ConsoleOutput.java b/qpid/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java
index 00ad5cf08a..00ad5cf08a 100644
--- a/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java
diff --git a/java/common/src/main/java/org/apache/qpid/QpidConfig.java b/qpid/java/common/src/main/java/org/apache/qpid/QpidConfig.java
index b4cad44130..b4cad44130 100644
--- a/java/common/src/main/java/org/apache/qpid/QpidConfig.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/QpidConfig.java
diff --git a/java/common/src/main/java/org/apache/qpid/SerialException.java b/qpid/java/common/src/main/java/org/apache/qpid/SerialException.java
index c59a6af779..c59a6af779 100644
--- a/java/common/src/main/java/org/apache/qpid/SerialException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/SerialException.java
diff --git a/java/common/src/main/java/org/apache/qpid/ToyBroker.java b/qpid/java/common/src/main/java/org/apache/qpid/ToyBroker.java
index 5423bbb68f..5423bbb68f 100644
--- a/java/common/src/main/java/org/apache/qpid/ToyBroker.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/ToyBroker.java
diff --git a/java/common/src/main/java/org/apache/qpid/ToyClient.java b/qpid/java/common/src/main/java/org/apache/qpid/ToyClient.java
index 5b2db10613..5b2db10613 100644
--- a/java/common/src/main/java/org/apache/qpid/ToyClient.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/ToyClient.java
diff --git a/java/common/src/main/java/org/apache/qpid/ToyExchange.java b/qpid/java/common/src/main/java/org/apache/qpid/ToyExchange.java
index da6aed9629..da6aed9629 100644
--- a/java/common/src/main/java/org/apache/qpid/ToyExchange.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/ToyExchange.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 df6f279026..df6f279026 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 591dbd085b..591dbd085b 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 281c0761d9..281c0761d9 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/AMQEncoder.java b/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQEncoder.java
index 53f48ae1c8..53f48ae1c8 100644
--- a/java/common/src/main/java/org/apache/qpid/codec/AMQEncoder.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQEncoder.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 9ed915cc35..9ed915cc35 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/ClientProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/common/ClientProperties.java
index 7371c12519..7371c12519 100644
--- a/java/common/src/main/java/org/apache/qpid/common/ClientProperties.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/common/ClientProperties.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/configuration/Accessor.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java
index dc5b69dc89..dc5b69dc89 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 0dd21238a7..0dd21238a7 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/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 73a336321c..73a336321c 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 6e2b25fb2c..6e2b25fb2c 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 9c0aaaec89..9c0aaaec89 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 13f7954bbc..13f7954bbc 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 69457ca4a9..69457ca4a9 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 1989ade4ac..1989ade4ac 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/framing/AMQBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
index fe04155bb8..fe04155bb8 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 a2fc3a03ef..a2fc3a03ef 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 228867b2b0..228867b2b0 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/AMQDataBlockEncoder.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockEncoder.java
index 374644b4f2..374644b4f2 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockEncoder.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockEncoder.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 02a46f3748..02a46f3748 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 4763b22290..4763b22290 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 1a7022c11b..1a7022c11b 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 cd3d721065..cd3d721065 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 0c61d9db3c..0c61d9db3c 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/AMQMethodFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodFactory.java
index bfcc38ad60..bfcc38ad60 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodFactory.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 39a9beb9e8..39a9beb9e8 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 e2db8906a1..e2db8906a1 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 14fb63da03..14fb63da03 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 a07fd78c8c..a07fd78c8c 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 647d531476..647d531476 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/BasicContentHeaderProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
index c7d89a9927..c7d89a9927 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/BodyFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BodyFactory.java
index 59646577e1..59646577e1 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/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 94030f383e..94030f383e 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/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 9d39f8aa86..9d39f8aa86 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 c42995d148..c42995d148 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 30db3b8be7..30db3b8be7 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 8d5e2f9fb4..8d5e2f9fb4 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 7ef538cfdc..7ef538cfdc 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 46189b63d7..46189b63d7 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/DeferredDataBlock.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/DeferredDataBlock.java
index f6795ff200..f6795ff200 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/DeferredDataBlock.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/DeferredDataBlock.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 6425f8c591..6425f8c591 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/FieldTable.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
index 22205d49f8..22205d49f8 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 e9d75137ef..e9d75137ef 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/HeartbeatBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
index 18ab05ffa1..18ab05ffa1 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 c7ada708dc..c7ada708dc 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/ProtocolInitiation.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
index fb3dd89717..fb3dd89717 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/SmallCompositeAMQDataBlock.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java
index bd763599b0..bd763599b0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java
index 76c154581d..76c154581d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.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 0695349f76..0695349f76 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 e3d5da73da..e3d5da73da 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 7544d9b7e7..7544d9b7e7 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/MethodConverter_0_9.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
index 1c4a29b106..1c4a29b106 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_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/MethodConverter_0_91.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
index 6e330574bc..6e330574bc 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_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/MethodConverter_8_0.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
index c87820b9b2..c87820b9b2 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/messaging/Address.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java
index 2c7fe7b8ed..2c7fe7b8ed 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 7b31436ba0..7b31436ba0 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 93df052af1..93df052af1 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 8226cc77cb..8226cc77cb 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 2e983f5165..2e983f5165 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 ef6c724371..ef6c724371 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/Job.java b/qpid/java/common/src/main/java/org/apache/qpid/pool/Job.java
index 82b600de88..82b600de88 100644
--- a/java/common/src/main/java/org/apache/qpid/pool/Job.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/pool/Job.java
diff --git a/java/common/src/main/java/org/apache/qpid/pool/ReadWriteJobQueue.java b/qpid/java/common/src/main/java/org/apache/qpid/pool/ReadWriteJobQueue.java
index 8de0f93ce9..8de0f93ce9 100644
--- a/java/common/src/main/java/org/apache/qpid/pool/ReadWriteJobQueue.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/pool/ReadWriteJobQueue.java
diff --git a/java/common/src/main/java/org/apache/qpid/pool/ReadWriteRunnable.java b/qpid/java/common/src/main/java/org/apache/qpid/pool/ReadWriteRunnable.java
index 140c93ca8d..140c93ca8d 100644
--- a/java/common/src/main/java/org/apache/qpid/pool/ReadWriteRunnable.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/pool/ReadWriteRunnable.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 8152a1f5e9..8152a1f5e9 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/protocol/AMQConstant.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
index f0f2652ce3..f0f2652ce3 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 5a7679a972..5a7679a972 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 b58e7d01dc..b58e7d01dc 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 31953ea6ab..31953ea6ab 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 9df84eef90..9df84eef90 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/security/AMQPCallbackHandler.java b/qpid/java/common/src/main/java/org/apache/qpid/security/AMQPCallbackHandler.java
index a3dad9acdc..a3dad9acdc 100644
--- a/java/common/src/main/java/org/apache/qpid/security/AMQPCallbackHandler.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/security/AMQPCallbackHandler.java
diff --git a/java/common/src/main/java/org/apache/qpid/security/UsernamePasswordCallbackHandler.java b/qpid/java/common/src/main/java/org/apache/qpid/security/UsernamePasswordCallbackHandler.java
index 89a63abeab..89a63abeab 100644
--- a/java/common/src/main/java/org/apache/qpid/security/UsernamePasswordCallbackHandler.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/security/UsernamePasswordCallbackHandler.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 702746b3da..702746b3da 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 192675edcd..192675edcd 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 38f60c04fe..38f60c04fe 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 95a8d192c5..95a8d192c5 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 4b8937acbd..4b8937acbd 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 603e8a7441..603e8a7441 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/Binary.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java
index 491a7ac218..491a7ac218 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 c8b7ad2a5e..c8b7ad2a5e 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 dc32569ee8..dc32569ee8 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/ConnectionDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
index 88dd2d6afa..88dd2d6afa 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/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/ConnectionSettings.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
index 08678b213b..08678b213b 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/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/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/Header.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Header.java
index 9439e5e0de..9439e5e0de 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/Method.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Method.java
index 3c80180d0b..3c80180d0b 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/NetworkDriver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkDriver.java
index 86af97bf7e..86af97bf7e 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/NetworkDriver.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkDriver.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/NetworkDriverConfiguration.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkDriverConfiguration.java
index c38afe5dd5..c38afe5dd5 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/NetworkDriverConfiguration.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkDriverConfiguration.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/OpenException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/OpenException.java
index 68fbb5e8ec..68fbb5e8ec 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/OpenException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/OpenException.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 e5b93e40a9..e5b93e40a9 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/ProtocolViolationException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolViolationException.java
index 6787157e8e..6787157e8e 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ProtocolViolationException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolViolationException.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 f4335dc8a6..f4335dc8a6 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 3850dc162b..3850dc162b 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/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/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/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 f21df251da..f21df251da 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 862c37283b..862c37283b 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/SessionClosedException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionClosedException.java
index 64f9039484..64f9039484 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/SessionDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java
index 9a02961dc4..9a02961dc4 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/SessionException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionException.java
index c4fc9558a1..c4fc9558a1 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/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/Struct.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Struct.java
index 22bd9f34ad..22bd9f34ad 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/TransportBuilder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/TransportBuilder.java
index c08909c6e4..c08909c6e4 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/TransportBuilder.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/TransportBuilder.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/codec/AbstractDecoder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
index 09ce6a7eb1..09ce6a7eb1 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 0ccfcfcb70..0ccfcfcb70 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 10f67e1cd6..10f67e1cd6 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 4486b03a67..4486b03a67 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 a4df5b5fcb..a4df5b5fcb 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 7d4f02af31..7d4f02af31 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 1a85ab88a5..1a85ab88a5 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 1a8d277bba..1a8d277bba 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 685034d1a9..685034d1a9 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 849355276e..849355276e 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/InputHandler.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java
index a2885f97bc..a2885f97bc 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/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 5e12d7e7c6..5e12d7e7c6 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/Transport.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java
index f0bf04d04f..f0bf04d04f 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/io/InputHandler_0_9.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/InputHandler_0_9.java
index ecc5f6d07c..ecc5f6d07c 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/io/InputHandler_0_9.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/InputHandler_0_9.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoAcceptor.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoAcceptor.java
index 8530240dcc..8530240dcc 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoAcceptor.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoAcceptor.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoContext.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoContext.java
index 69b3a0ce45..69b3a0ce45 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoContext.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoContext.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 dd6a37eca2..dd6a37eca2 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 19a683d505..19a683d505 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 66b97e8225..66b97e8225 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/io/IoTransport.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java
index bfdbb34978..bfdbb34978 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java
index 0f2c0d0226..0f2c0d0226 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaHandler.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaHandler.java
index b89eed48b0..b89eed48b0 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaHandler.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaHandler.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java
index 22b9c5e784..22b9c5e784 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java
index 84e66c25bd..84e66c25bd 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java
index 2fa875f279..2fa875f279 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.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 3f0966903d..3f0966903d 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/sasl/SASLEncryptor.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java
index 7964239e31..7964239e31 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 86106318ef..86106318ef 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 27255f79f6..27255f79f6 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 14f28f8828..14f28f8828 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/SSLReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
index e227a51729..e227a51729 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 cd47a11825..cd47a11825 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 fd73915b65..fd73915b65 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 5761228642..5761228642 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/SliceIterator.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/util/SliceIterator.java
index 3db29847b2..3db29847b2 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/util/SliceIterator.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/util/SliceIterator.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/url/AMQBindingURL.java b/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
index 26cb56ea97..26cb56ea97 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 9996fff311..9996fff311 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 0ebfe0e869..0ebfe0e869 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 6f21c327e7..6f21c327e7 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/CommandLineParser.java b/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
index 09478d4157..09478d4157 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/ConcurrentLinkedMessageQueueAtomicSize.java b/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java
index 633cf4fe3a..633cf4fe3a 100644
--- a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java b/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
index c4d7683a02..c4d7683a02 100644
--- a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueNoSize.java b/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueNoSize.java
index 1f168345a1..1f168345a1 100644
--- a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueNoSize.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueNoSize.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 1a57af9bf7..1a57af9bf7 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/MessageQueue.java b/qpid/java/common/src/main/java/org/apache/qpid/util/MessageQueue.java
index b5efaa61b6..b5efaa61b6 100644
--- a/java/common/src/main/java/org/apache/qpid/util/MessageQueue.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/MessageQueue.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/NetMatcher.java b/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
index 4c653e6ca0..4c653e6ca0 100644
--- a/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/PrettyPrintingUtils.java b/qpid/java/common/src/main/java/org/apache/qpid/util/PrettyPrintingUtils.java
index 93266f2486..93266f2486 100644
--- a/java/common/src/main/java/org/apache/qpid/util/PrettyPrintingUtils.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/PrettyPrintingUtils.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 8ad9d00f54..8ad9d00f54 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 a6a8b8beb4..a6a8b8beb4 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 4bf6b7f0a2..4bf6b7f0a2 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/main/java/org/apache/qpid/util/concurrent/AlreadyUnblockedException.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/AlreadyUnblockedException.java
index e0c0337898..e0c0337898 100644
--- a/java/common/src/main/java/org/apache/qpid/util/concurrent/AlreadyUnblockedException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/AlreadyUnblockedException.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueue.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueue.java
index 63d8f77edb..63d8f77edb 100644
--- a/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueue.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueue.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
index 4564b1d686..4564b1d686 100644
--- a/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/BooleanLatch.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BooleanLatch.java
index 0e4a07594f..0e4a07594f 100644
--- a/java/common/src/main/java/org/apache/qpid/util/concurrent/BooleanLatch.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BooleanLatch.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/Capacity.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/Capacity.java
index a97ce0e172..a97ce0e172 100644
--- a/java/common/src/main/java/org/apache/qpid/util/concurrent/Capacity.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/Capacity.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchBuffer.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchBuffer.java
index bc63eb0353..bc63eb0353 100644
--- a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchBuffer.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchBuffer.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchException.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchException.java
index 99a83f96cd..99a83f96cd 100644
--- a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchException.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchQueue.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchQueue.java
index 95833f398a..95833f398a 100644
--- a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchQueue.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchQueue.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRecord.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRecord.java
index fd740c20cd..fd740c20cd 100644
--- a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRecord.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRecord.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRef.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRef.java
index efe2344c06..efe2344c06 100644
--- a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRef.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRef.java
diff --git a/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterClient.java b/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterClient.java
index b93dc46741..b93dc46741 100644
--- a/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterClient.java
+++ b/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterClient.java
diff --git a/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterServer.java b/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterServer.java
index 423e98c67b..423e98c67b 100644
--- a/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterServer.java
+++ b/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterServer.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 ef6cd41492..ef6cd41492 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 62e25e7d79..62e25e7d79 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/codec/MockAMQVersionAwareProtocolSession.java b/qpid/java/common/src/test/java/org/apache/qpid/codec/MockAMQVersionAwareProtocolSession.java
index 401848c21d..401848c21d 100644
--- a/java/common/src/test/java/org/apache/qpid/codec/MockAMQVersionAwareProtocolSession.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/codec/MockAMQVersionAwareProtocolSession.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 92e7ce0a80..92e7ce0a80 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 4fd1f60d69..4fd1f60d69 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/PropertyFieldTableTest.java b/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
index d4691ba097..d4691ba097 100644
--- a/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.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 3243136287..3243136287 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 35998de3a1..35998de3a1 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/session/TestSession.java b/qpid/java/common/src/test/java/org/apache/qpid/session/TestSession.java
index aafc91b03b..aafc91b03b 100644
--- a/java/common/src/test/java/org/apache/qpid/session/TestSession.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/session/TestSession.java
diff --git a/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
index 8b470d555e..8b470d555e 100644
--- a/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.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/ConnectionTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
index 375a326654..375a326654 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 ad45d00e46..ad45d00e46 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/TestNetworkDriver.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/TestNetworkDriver.java
index 957a7190ee..957a7190ee 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/TestNetworkDriver.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/TestNetworkDriver.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/mina/MINANetworkDriverTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MINANetworkDriverTest.java
index fc8e689ca4..fc8e689ca4 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/network/mina/MINANetworkDriverTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MINANetworkDriverTest.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 942901f1c0..942901f1c0 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 7eba5f092e..7eba5f092e 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 9fd18d461a..9fd18d461a 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 b2578563e0..b2578563e0 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/templates/method/MethodBodyInterface.vm b/qpid/java/common/templates/method/MethodBodyInterface.vm
index d5feba12de..d5feba12de 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 a739110d70..a739110d70 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 9e4aee7dee..9e4aee7dee 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 ff14715fef..ff14715fef 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 759e5e4a42..759e5e4a42 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 78605c70ff..78605c70ff 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 b80d6027b7..b80d6027b7 100644
--- a/java/common/templates/model/ServerMethodDispatcherInterface.vm
+++ b/qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm
diff --git a/java/common/templates/model/version/AmqpConstantsClass.vm b/qpid/java/common/templates/model/version/AmqpConstantsClass.vm
index 8d459f2977..8d459f2977 100644
--- a/java/common/templates/model/version/AmqpConstantsClass.vm
+++ b/qpid/java/common/templates/model/version/AmqpConstantsClass.vm
diff --git a/java/common/templates/model/version/ClientMethodDispatcherInterface.vm b/qpid/java/common/templates/model/version/ClientMethodDispatcherInterface.vm
index 80705c1a39..80705c1a39 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 8a7b667a91..8a7b667a91 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 277605e34b..277605e34b 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 db388fcc65..db388fcc65 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 39eccd4c3e..39eccd4c3e 100755
--- a/java/genpom
+++ b/qpid/java/genpom
diff --git a/java/integrationtests/README.txt b/qpid/java/integrationtests/README.txt
index 00a21883a9..00a21883a9 100644
--- a/java/integrationtests/README.txt
+++ b/qpid/java/integrationtests/README.txt
diff --git a/java/integrationtests/bin/interoptests.py b/qpid/java/integrationtests/bin/interoptests.py
index a883a22a5f..a883a22a5f 100755
--- a/java/integrationtests/bin/interoptests.py
+++ b/qpid/java/integrationtests/bin/interoptests.py
diff --git a/java/integrationtests/build.xml b/qpid/java/integrationtests/build.xml
index ae870c5675..ae870c5675 100644
--- a/java/integrationtests/build.xml
+++ b/qpid/java/integrationtests/build.xml
diff --git a/java/integrationtests/docs/RunningSustainedTests.txt b/qpid/java/integrationtests/docs/RunningSustainedTests.txt
index db4405a32d..db4405a32d 100644
--- a/java/integrationtests/docs/RunningSustainedTests.txt
+++ b/qpid/java/integrationtests/docs/RunningSustainedTests.txt
diff --git a/java/integrationtests/jar-with-dependencies.xml b/qpid/java/integrationtests/jar-with-dependencies.xml
index 3e95e7ab22..3e95e7ab22 100644
--- a/java/integrationtests/jar-with-dependencies.xml
+++ b/qpid/java/integrationtests/jar-with-dependencies.xml
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase1DummyRun.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase1DummyRun.java
index db17c7aacc..db17c7aacc 100644
--- a/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase1DummyRun.java
+++ b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase1DummyRun.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase2BasicP2P.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase2BasicP2P.java
index 36d3cce7f7..36d3cce7f7 100644
--- a/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase2BasicP2P.java
+++ b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase2BasicP2P.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase3BasicPubSub.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase3BasicPubSub.java
index 205472716b..205472716b 100644
--- a/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase3BasicPubSub.java
+++ b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase3BasicPubSub.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase4P2PMessageSize.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase4P2PMessageSize.java
index 3730233264..3730233264 100644
--- a/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase4P2PMessageSize.java
+++ b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase4P2PMessageSize.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java
index f601712bc9..f601712bc9 100644
--- a/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java
+++ b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase1DummyRun.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase1DummyRun.java
index a2e4a00aa6..a2e4a00aa6 100644
--- a/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase1DummyRun.java
+++ b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase1DummyRun.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase2BasicP2P.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase2BasicP2P.java
index 6d6515f1fd..6d6515f1fd 100644
--- a/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase2BasicP2P.java
+++ b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase2BasicP2P.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase3BasicPubSub.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase3BasicPubSub.java
index 2faca91e73..2faca91e73 100644
--- a/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase3BasicPubSub.java
+++ b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase3BasicPubSub.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase4P2PMessageSize.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase4P2PMessageSize.java
index 2d64f2b805..2d64f2b805 100644
--- a/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase4P2PMessageSize.java
+++ b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase4P2PMessageSize.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase5PubSubMessageSize.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase5PubSubMessageSize.java
index 23d33fc115..23d33fc115 100644
--- a/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase5PubSubMessageSize.java
+++ b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase5PubSubMessageSize.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedClientTestCase.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedClientTestCase.java
index 63e2c75509..63e2c75509 100644
--- a/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedClientTestCase.java
+++ b/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedClientTestCase.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestCase.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestCase.java
index 0077b4727a..0077b4727a 100644
--- a/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestCase.java
+++ b/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestCase.java
diff --git a/java/integrationtests/src/resources/sustained-log4j.xml b/qpid/java/integrationtests/src/resources/sustained-log4j.xml
index c5ab3137bf..c5ab3137bf 100644
--- a/java/integrationtests/src/resources/sustained-log4j.xml
+++ b/qpid/java/integrationtests/src/resources/sustained-log4j.xml
diff --git a/java/ivy.xml b/qpid/java/ivy.xml
index cdffcff458..cdffcff458 100644
--- a/java/ivy.xml
+++ b/qpid/java/ivy.xml
diff --git a/java/ivysettings-nexus.xml b/qpid/java/ivysettings-nexus.xml
index 1d9c393e23..1d9c393e23 100644
--- a/java/ivysettings-nexus.xml
+++ b/qpid/java/ivysettings-nexus.xml
diff --git a/java/junit-toolkit/build.xml b/qpid/java/junit-toolkit/build.xml
index a2f352c4b7..a2f352c4b7 100644
--- a/java/junit-toolkit/build.xml
+++ b/qpid/java/junit-toolkit/build.xml
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/DefaultThreadFactory.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/DefaultThreadFactory.java
index 8fb0a6a90e..8fb0a6a90e 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/DefaultThreadFactory.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/DefaultThreadFactory.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/PossibleDeadlockException.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/PossibleDeadlockException.java
index 3bbfc2d502..3bbfc2d502 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/PossibleDeadlockException.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/PossibleDeadlockException.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/TestRunnable.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/TestRunnable.java
index 02e776a4ea..02e776a4ea 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/TestRunnable.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/TestRunnable.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestCoordinator.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestCoordinator.java
index 3cf8543656..3cf8543656 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestCoordinator.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestCoordinator.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestExample.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestExample.java
index b9865f2e22..b9865f2e22 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestExample.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestExample.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/package.html b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/package.html
index 904fd0fd05..904fd0fd05 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/package.html
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/package.html
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestCase.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestCase.java
index 58a7f60f3c..58a7f60f3c 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestCase.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestCase.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestDecorator.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestDecorator.java
index 8869d25be3..8869d25be3 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestDecorator.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestDecorator.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BaseThrottle.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BaseThrottle.java
index 61d5746421..61d5746421 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BaseThrottle.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BaseThrottle.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BatchedThrottle.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BatchedThrottle.java
index 241e7aa2b7..241e7aa2b7 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BatchedThrottle.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BatchedThrottle.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/DurationTestDecorator.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/DurationTestDecorator.java
index e99fcce752..e99fcce752 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/DurationTestDecorator.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/DurationTestDecorator.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/InstrumentedTest.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/InstrumentedTest.java
index 0804757dce..0804757dce 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/InstrumentedTest.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/InstrumentedTest.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/NullResultPrinter.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/NullResultPrinter.java
index 6727f6f152..6727f6f152 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/NullResultPrinter.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/NullResultPrinter.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ParameterVariationTestDecorator.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ParameterVariationTestDecorator.java
index 7da4667928..7da4667928 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ParameterVariationTestDecorator.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ParameterVariationTestDecorator.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ScaledTestDecorator.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ScaledTestDecorator.java
index 93e2a3c855..93e2a3c855 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ScaledTestDecorator.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ScaledTestDecorator.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskAware.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskAware.java
index e462145d7d..e462145d7d 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskAware.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskAware.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskHandler.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskHandler.java
index b91ce41ad3..b91ce41ad3 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskHandler.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskHandler.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ShutdownHookable.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ShutdownHookable.java
index dc6aa3c291..dc6aa3c291 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ShutdownHookable.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ShutdownHookable.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SleepThrottle.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SleepThrottle.java
index 2dc4c0e272..2dc4c0e272 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SleepThrottle.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SleepThrottle.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestResult.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestResult.java
index 5ce56a690e..5ce56a690e 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestResult.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestResult.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestRunner.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestRunner.java
index 671d33feed..671d33feed 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestRunner.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestRunner.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestRunnerImprovedErrorHandling.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestRunnerImprovedErrorHandling.java
index c68405bd06..c68405bd06 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestRunnerImprovedErrorHandling.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestRunnerImprovedErrorHandling.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestThreadAware.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestThreadAware.java
index 94dcf5499b..94dcf5499b 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestThreadAware.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestThreadAware.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/Throttle.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/Throttle.java
index 1ea8e8e2be..1ea8e8e2be 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/Throttle.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/Throttle.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingController.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingController.java
index 27e43a10a4..27e43a10a4 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingController.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingController.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingControllerAware.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingControllerAware.java
index 11db87e073..11db87e073 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingControllerAware.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingControllerAware.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/WrappedSuiteTestDecorator.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/WrappedSuiteTestDecorator.java
index d5690fc24a..d5690fc24a 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/WrappedSuiteTestDecorator.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/WrappedSuiteTestDecorator.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/CSVTestListener.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/CSVTestListener.java
index 40841189a3..40841189a3 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/CSVTestListener.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/CSVTestListener.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/ConsoleTestListener.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/ConsoleTestListener.java
index 276fec328e..276fec328e 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/ConsoleTestListener.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/ConsoleTestListener.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/TKTestListener.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/TKTestListener.java
index 63b042db10..63b042db10 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/TKTestListener.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/TKTestListener.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/XMLTestListener.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/XMLTestListener.java
index ac875f89cf..ac875f89cf 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/XMLTestListener.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/XMLTestListener.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/package.html b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/package.html
index 15acc02ab1..15acc02ab1 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/package.html
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/package.html
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/package.html b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/package.html
index 4cab8d936a..4cab8d936a 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/package.html
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/package.html
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/CommandLineParser.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/CommandLineParser.java
index f158090e96..f158090e96 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/CommandLineParser.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/CommandLineParser.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ContextualProperties.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ContextualProperties.java
index 14de96d165..14de96d165 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ContextualProperties.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ContextualProperties.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/MathUtils.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/MathUtils.java
index 7c803294f4..7c803294f4 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/MathUtils.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/MathUtils.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ParsedProperties.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ParsedProperties.java
index 1cc6757675..1cc6757675 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ParsedProperties.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ParsedProperties.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/SizeOf.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/SizeOf.java
index ecc08770a9..ecc08770a9 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/SizeOf.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/SizeOf.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/StackQueue.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/StackQueue.java
index acc1e2c218..acc1e2c218 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/StackQueue.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/StackQueue.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestContextProperties.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestContextProperties.java
index d402077963..d402077963 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestContextProperties.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestContextProperties.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestUtils.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestUtils.java
index 553a41ecae..553a41ecae 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestUtils.java
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestUtils.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/package.html b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/package.html
index f39b892e2d..f39b892e2d 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/package.html
+++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/package.html
diff --git a/java/lib/backport-util-concurrent-2.2.jar b/qpid/java/lib/backport-util-concurrent-2.2.jar
index 20a16877bd..20a16877bd 100644
--- a/java/lib/backport-util-concurrent-2.2.jar
+++ b/qpid/java/lib/backport-util-concurrent-2.2.jar
diff --git a/java/lib/bnd-0.0.384.jar b/qpid/java/lib/bnd-0.0.384.jar
index fa5e5263f7..fa5e5263f7 100644
--- a/java/lib/bnd-0.0.384.jar
+++ b/qpid/java/lib/bnd-0.0.384.jar
diff --git a/java/lib/cobertura/README.txt b/qpid/java/lib/cobertura/README.txt
index 8e4cc09a80..8e4cc09a80 100644
--- a/java/lib/cobertura/README.txt
+++ b/qpid/java/lib/cobertura/README.txt
diff --git a/java/lib/com.ibm.icu_3.8.1.v20080530.jar b/qpid/java/lib/com.ibm.icu_3.8.1.v20080530.jar
index 1d8a0a0997..1d8a0a0997 100644
--- a/java/lib/com.ibm.icu_3.8.1.v20080530.jar
+++ b/qpid/java/lib/com.ibm.icu_3.8.1.v20080530.jar
diff --git a/java/lib/commons-beanutils-core-1.8.0.jar b/qpid/java/lib/commons-beanutils-core-1.8.0.jar
index 87c15f4565..87c15f4565 100644
--- a/java/lib/commons-beanutils-core-1.8.0.jar
+++ b/qpid/java/lib/commons-beanutils-core-1.8.0.jar
diff --git a/java/lib/commons-cli-1.0.jar b/qpid/java/lib/commons-cli-1.0.jar
index 22a004e14e..22a004e14e 100644
--- a/java/lib/commons-cli-1.0.jar
+++ b/qpid/java/lib/commons-cli-1.0.jar
diff --git a/java/lib/commons-codec-1.3.jar b/qpid/java/lib/commons-codec-1.3.jar
index 957b6752af..957b6752af 100644
--- a/java/lib/commons-codec-1.3.jar
+++ b/qpid/java/lib/commons-codec-1.3.jar
diff --git a/java/lib/commons-collections-3.2.jar b/qpid/java/lib/commons-collections-3.2.jar
index 75580be255..75580be255 100644
--- a/java/lib/commons-collections-3.2.jar
+++ b/qpid/java/lib/commons-collections-3.2.jar
diff --git a/java/lib/commons-configuration-1.6.jar b/qpid/java/lib/commons-configuration-1.6.jar
index 2d4689a1b8..2d4689a1b8 100644
--- a/java/lib/commons-configuration-1.6.jar
+++ b/qpid/java/lib/commons-configuration-1.6.jar
diff --git a/java/lib/commons-digester-1.8.1.jar b/qpid/java/lib/commons-digester-1.8.1.jar
index 7abda9696a..7abda9696a 100644
--- a/java/lib/commons-digester-1.8.1.jar
+++ b/qpid/java/lib/commons-digester-1.8.1.jar
diff --git a/java/lib/commons-lang-2.2.jar b/qpid/java/lib/commons-lang-2.2.jar
index b9105611f3..b9105611f3 100644
--- a/java/lib/commons-lang-2.2.jar
+++ b/qpid/java/lib/commons-lang-2.2.jar
diff --git a/java/lib/commons-logging-1.0.4.jar b/qpid/java/lib/commons-logging-1.0.4.jar
index b73a80fab6..b73a80fab6 100644
--- a/java/lib/commons-logging-1.0.4.jar
+++ b/qpid/java/lib/commons-logging-1.0.4.jar
diff --git a/java/lib/derby-10.6.1.0.jar b/qpid/java/lib/derby-10.6.1.0.jar
index 33a84e9dc5..33a84e9dc5 100644
--- a/java/lib/derby-10.6.1.0.jar
+++ b/qpid/java/lib/derby-10.6.1.0.jar
diff --git a/java/lib/findbugs/README.txt b/qpid/java/lib/findbugs/README.txt
index 56343d7e63..56343d7e63 100644
--- a/java/lib/findbugs/README.txt
+++ b/qpid/java/lib/findbugs/README.txt
diff --git a/java/lib/geronimo-jms_1.1_spec-1.0.jar b/qpid/java/lib/geronimo-jms_1.1_spec-1.0.jar
index 42bf403e28..42bf403e28 100644
--- a/java/lib/geronimo-jms_1.1_spec-1.0.jar
+++ b/qpid/java/lib/geronimo-jms_1.1_spec-1.0.jar
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/javacc.jar b/qpid/java/lib/javacc.jar
index 5506008402..5506008402 100644
--- a/java/lib/javacc.jar
+++ b/qpid/java/lib/javacc.jar
diff --git a/java/lib/jetty-6.1.14.jar b/qpid/java/lib/jetty-6.1.14.jar
index 3e67d1e19e..3e67d1e19e 100644
--- a/java/lib/jetty-6.1.14.jar
+++ b/qpid/java/lib/jetty-6.1.14.jar
diff --git a/java/lib/jetty-servlet-tester-6.1.14.jar b/qpid/java/lib/jetty-servlet-tester-6.1.14.jar
index c6d7c66f4a..c6d7c66f4a 100644
--- a/java/lib/jetty-servlet-tester-6.1.14.jar
+++ b/qpid/java/lib/jetty-servlet-tester-6.1.14.jar
diff --git a/java/lib/jetty-util-6.1.14.jar b/qpid/java/lib/jetty-util-6.1.14.jar
index 7acc988655..7acc988655 100644
--- a/java/lib/jetty-util-6.1.14.jar
+++ b/qpid/java/lib/jetty-util-6.1.14.jar
diff --git a/java/lib/junit-3.8.1.jar b/qpid/java/lib/junit-3.8.1.jar
index 674d71e89e..674d71e89e 100644
--- a/java/lib/junit-3.8.1.jar
+++ b/qpid/java/lib/junit-3.8.1.jar
diff --git a/java/lib/jython-2.5.0.jar b/qpid/java/lib/jython-2.5.0.jar
index f8fc553ae7..f8fc553ae7 100644
--- a/java/lib/jython-2.5.0.jar
+++ b/qpid/java/lib/jython-2.5.0.jar
diff --git a/java/lib/log4j-1.2.12.jar b/qpid/java/lib/log4j-1.2.12.jar
index 9b5a720088..9b5a720088 100644
--- a/java/lib/log4j-1.2.12.jar
+++ b/qpid/java/lib/log4j-1.2.12.jar
diff --git a/java/lib/maven-ant-tasks-2.1.1.jar b/qpid/java/lib/maven-ant-tasks-2.1.1.jar
index 7810a541b8..7810a541b8 100644
--- a/java/lib/maven-ant-tasks-2.1.1.jar
+++ b/qpid/java/lib/maven-ant-tasks-2.1.1.jar
diff --git a/java/lib/mina-core-1.0.1.jar b/qpid/java/lib/mina-core-1.0.1.jar
index f12067aa90..f12067aa90 100755
--- a/java/lib/mina-core-1.0.1.jar
+++ b/qpid/java/lib/mina-core-1.0.1.jar
diff --git a/java/lib/mina-filter-ssl-1.0.1.jar b/qpid/java/lib/mina-filter-ssl-1.0.1.jar
index 53738e6498..53738e6498 100755
--- a/java/lib/mina-filter-ssl-1.0.1.jar
+++ b/qpid/java/lib/mina-filter-ssl-1.0.1.jar
diff --git a/java/lib/org.apache.commons.codec_1.3.0.v20080530-1600.jar b/qpid/java/lib/org.apache.commons.codec_1.3.0.v20080530-1600.jar
index d9b4c8ea1f..d9b4c8ea1f 100644
--- a/java/lib/org.apache.commons.codec_1.3.0.v20080530-1600.jar
+++ b/qpid/java/lib/org.apache.commons.codec_1.3.0.v20080530-1600.jar
diff --git a/java/lib/org.apache.felix.framework-2.0.5.jar b/qpid/java/lib/org.apache.felix.framework-2.0.5.jar
index 71e5a84231..71e5a84231 100644
--- a/java/lib/org.apache.felix.framework-2.0.5.jar
+++ b/qpid/java/lib/org.apache.felix.framework-2.0.5.jar
diff --git a/java/lib/org.eclipse.core.commands_3.4.0.I20080509-2000.jar b/qpid/java/lib/org.eclipse.core.commands_3.4.0.I20080509-2000.jar
index 6467d78d66..6467d78d66 100644
--- a/java/lib/org.eclipse.core.commands_3.4.0.I20080509-2000.jar
+++ b/qpid/java/lib/org.eclipse.core.commands_3.4.0.I20080509-2000.jar
diff --git a/java/lib/org.eclipse.core.contenttype_3.3.0.v20080604-1400.jar b/qpid/java/lib/org.eclipse.core.contenttype_3.3.0.v20080604-1400.jar
index 0b6163cf1b..0b6163cf1b 100644
--- a/java/lib/org.eclipse.core.contenttype_3.3.0.v20080604-1400.jar
+++ b/qpid/java/lib/org.eclipse.core.contenttype_3.3.0.v20080604-1400.jar
diff --git a/java/lib/org.eclipse.core.databinding_1.1.1.M20080827-0800b.jar b/qpid/java/lib/org.eclipse.core.databinding_1.1.1.M20080827-0800b.jar
index 7f9d1b637e..7f9d1b637e 100644
--- a/java/lib/org.eclipse.core.databinding_1.1.1.M20080827-0800b.jar
+++ b/qpid/java/lib/org.eclipse.core.databinding_1.1.1.M20080827-0800b.jar
diff --git a/java/lib/org.eclipse.core.expressions_3.4.0.v20080603-2000.jar b/qpid/java/lib/org.eclipse.core.expressions_3.4.0.v20080603-2000.jar
index 671e92aa4b..671e92aa4b 100644
--- a/java/lib/org.eclipse.core.expressions_3.4.0.v20080603-2000.jar
+++ b/qpid/java/lib/org.eclipse.core.expressions_3.4.0.v20080603-2000.jar
diff --git a/java/lib/org.eclipse.core.jobs_3.4.0.v20080512.jar b/qpid/java/lib/org.eclipse.core.jobs_3.4.0.v20080512.jar
index 7bdbc00313..7bdbc00313 100644
--- a/java/lib/org.eclipse.core.jobs_3.4.0.v20080512.jar
+++ b/qpid/java/lib/org.eclipse.core.jobs_3.4.0.v20080512.jar
diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.RSA b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.RSA
index d694a14d7f..d694a14d7f 100644
--- a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.RSA
+++ b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.RSA
diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.SF b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.SF
index 6bf4f8d81a..6bf4f8d81a 100644
--- a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.SF
+++ b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.SF
diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/MANIFEST.MF b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/MANIFEST.MF
index d9a497e8f4..d9a497e8f4 100644
--- a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/MANIFEST.MF
+++ b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/MANIFEST.MF
diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/eclipse.inf b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/eclipse.inf
index 7864d3c4c3..7864d3c4c3 100644
--- a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/eclipse.inf
+++ b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/eclipse.inf
diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/about.html b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/about.html
index 460233046e..460233046e 100644
--- a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/about.html
+++ b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/about.html
diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/fragment.properties b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/fragment.properties
index e60dbf5c67..e60dbf5c67 100644
--- a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/fragment.properties
+++ b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/fragment.properties
diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/runtime_registry_compatibility.jar b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/runtime_registry_compatibility.jar
index 3103fb0ce7..3103fb0ce7 100644
--- a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/runtime_registry_compatibility.jar
+++ b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/runtime_registry_compatibility.jar
diff --git a/java/lib/org.eclipse.core.runtime_3.4.0.v20080512.jar b/qpid/java/lib/org.eclipse.core.runtime_3.4.0.v20080512.jar
index 366be26fe3..366be26fe3 100644
--- a/java/lib/org.eclipse.core.runtime_3.4.0.v20080512.jar
+++ b/qpid/java/lib/org.eclipse.core.runtime_3.4.0.v20080512.jar
diff --git a/java/lib/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar b/qpid/java/lib/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar
index e46c099fe4..e46c099fe4 100644
--- a/java/lib/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar
+++ b/qpid/java/lib/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar
diff --git a/java/lib/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar b/qpid/java/lib/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar
index c73223995b..c73223995b 100644
--- a/java/lib/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar
+++ b/qpid/java/lib/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
index 29e6f3e7a0..29e6f3e7a0 100644
--- a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
index 1d2eece149..1d2eece149 100644
--- a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
index f9ef43c43a..f9ef43c43a 100644
--- a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/eclipse.inf b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/eclipse.inf
index 7864d3c4c3..7864d3c4c3 100644
--- a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/eclipse.inf
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/eclipse.inf
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/about.html b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/about.html
index 395df3ba90..395df3ba90 100644
--- a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/about.html
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/about.html
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/eclipse_1115.so b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/eclipse_1115.so
index 17e8230b19..17e8230b19 100644
--- a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/eclipse_1115.so
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/eclipse_1115.so
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/launcher.carbon.macosx.properties b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/launcher.carbon.macosx.properties
index 4373d35790..4373d35790 100644
--- a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/launcher.carbon.macosx.properties
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/launcher.carbon.macosx.properties
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.RSA b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.RSA
index 566c0abd11..566c0abd11 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.RSA
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.RSA
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF
index 4122b4ea8f..4122b4ea8f 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF
index d699938858..d699938858 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf
index 7864d3c4c3..7864d3c4c3 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html
index 395df3ba90..395df3ba90 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/eclipse_1115.so b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/eclipse_1115.so
index 3ec14a5e88..3ec14a5e88 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/eclipse_1115.so
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/eclipse_1115.so
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties
index 792485112e..792485112e 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
index df6b24ad57..df6b24ad57 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
index 4193e97338..4193e97338 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
index b790c0af9a..b790c0af9a 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/eclipse.inf b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/eclipse.inf
index 7864d3c4c3..7864d3c4c3 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/eclipse.inf
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/eclipse.inf
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/about.html b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/about.html
index 395df3ba90..395df3ba90 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/about.html
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/about.html
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/eclipse_1115.so b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/eclipse_1115.so
index 8bf855533c..8bf855533c 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/eclipse_1115.so
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/eclipse_1115.so
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/launcher.gtk.linux.x86_64.properties b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/launcher.gtk.linux.x86_64.properties
index da448aadbb..da448aadbb 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/launcher.gtk.linux.x86_64.properties
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/launcher.gtk.linux.x86_64.properties
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
index 81599f2e21..81599f2e21 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
index 20fe507cdf..20fe507cdf 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
index f81e6141bb..f81e6141bb 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/eclipse.inf b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/eclipse.inf
index 7864d3c4c3..7864d3c4c3 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/eclipse.inf
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/eclipse.inf
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/about.html b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/about.html
index 395df3ba90..395df3ba90 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/about.html
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/about.html
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/eclipse_1115.so b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/eclipse_1115.so
index 3d8beb88dd..3d8beb88dd 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/eclipse_1115.so
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/eclipse_1115.so
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/launcher.gtk.solaris.sparc.properties b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/launcher.gtk.solaris.sparc.properties
index c3f2ae186e..c3f2ae186e 100644
--- a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/launcher.gtk.solaris.sparc.properties
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/launcher.gtk.solaris.sparc.properties
diff --git a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
index e2350f7b3d..e2350f7b3d 100644
--- a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
diff --git a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
index a4cc0ac995..a4cc0ac995 100644
--- a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
diff --git a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
index 6acfe13c74..6acfe13c74 100644
--- a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
diff --git a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/eclipse.inf b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/eclipse.inf
index 7864d3c4c3..7864d3c4c3 100644
--- a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/eclipse.inf
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/eclipse.inf
diff --git a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/about.html b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/about.html
index 395df3ba90..395df3ba90 100644
--- a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/about.html
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/about.html
diff --git a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/eclipse_1115.dll b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/eclipse_1115.dll
index 5e438cf505..5e438cf505 100644
--- a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/eclipse_1115.dll
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/eclipse_1115.dll
diff --git a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/launcher.win32.win32.x86.properties b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/launcher.win32.win32.x86.properties
index e8f40bca50..e8f40bca50 100644
--- a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/launcher.win32.win32.x86.properties
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/launcher.win32.win32.x86.properties
diff --git a/java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar b/qpid/java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar
index 21cc2a6a07..21cc2a6a07 100644
--- a/java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar
+++ b/qpid/java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar
diff --git a/java/lib/org.eclipse.equinox.preferences_3.2.201.R34x_v20080709.jar b/qpid/java/lib/org.eclipse.equinox.preferences_3.2.201.R34x_v20080709.jar
index 0efcea4022..0efcea4022 100644
--- a/java/lib/org.eclipse.equinox.preferences_3.2.201.R34x_v20080709.jar
+++ b/qpid/java/lib/org.eclipse.equinox.preferences_3.2.201.R34x_v20080709.jar
diff --git a/java/lib/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar b/qpid/java/lib/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar
index ddc97ffe7c..ddc97ffe7c 100644
--- a/java/lib/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar
+++ b/qpid/java/lib/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar
diff --git a/java/lib/org.eclipse.help_3.3.101.v20080702_34x.jar b/qpid/java/lib/org.eclipse.help_3.3.101.v20080702_34x.jar
index 8bb2b74a73..8bb2b74a73 100644
--- a/java/lib/org.eclipse.help_3.3.101.v20080702_34x.jar
+++ b/qpid/java/lib/org.eclipse.help_3.3.101.v20080702_34x.jar
diff --git a/java/lib/org.eclipse.jface.databinding_1.2.1.M20080827-0800a.jar b/qpid/java/lib/org.eclipse.jface.databinding_1.2.1.M20080827-0800a.jar
index b61037ef9f..b61037ef9f 100644
--- a/java/lib/org.eclipse.jface.databinding_1.2.1.M20080827-0800a.jar
+++ b/qpid/java/lib/org.eclipse.jface.databinding_1.2.1.M20080827-0800a.jar
diff --git a/java/lib/org.eclipse.jface_3.4.1.M20080827-2000.jar b/qpid/java/lib/org.eclipse.jface_3.4.1.M20080827-2000.jar
index ad1c58f0d0..ad1c58f0d0 100644
--- a/java/lib/org.eclipse.jface_3.4.1.M20080827-2000.jar
+++ b/qpid/java/lib/org.eclipse.jface_3.4.1.M20080827-2000.jar
diff --git a/java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar b/qpid/java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar
index 673f3f5932..673f3f5932 100644
--- a/java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar
+++ b/qpid/java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar
diff --git a/java/lib/org.eclipse.swt.carbon.macosx_3.4.1.v3449c.jar b/qpid/java/lib/org.eclipse.swt.carbon.macosx_3.4.1.v3449c.jar
index d64249df6a..d64249df6a 100644
--- a/java/lib/org.eclipse.swt.carbon.macosx_3.4.1.v3449c.jar
+++ b/qpid/java/lib/org.eclipse.swt.carbon.macosx_3.4.1.v3449c.jar
diff --git a/java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar b/qpid/java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar
index cda22da341..cda22da341 100644
--- a/java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar
+++ b/qpid/java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar
diff --git a/java/lib/org.eclipse.swt.gtk.linux.x86_64_3.4.1.v3449c.jar b/qpid/java/lib/org.eclipse.swt.gtk.linux.x86_64_3.4.1.v3449c.jar
index 95909028d4..95909028d4 100644
--- a/java/lib/org.eclipse.swt.gtk.linux.x86_64_3.4.1.v3449c.jar
+++ b/qpid/java/lib/org.eclipse.swt.gtk.linux.x86_64_3.4.1.v3449c.jar
diff --git a/java/lib/org.eclipse.swt.gtk.solaris.sparc_3.4.1.v3449c.jar b/qpid/java/lib/org.eclipse.swt.gtk.solaris.sparc_3.4.1.v3449c.jar
index d7143505a4..d7143505a4 100644
--- a/java/lib/org.eclipse.swt.gtk.solaris.sparc_3.4.1.v3449c.jar
+++ b/qpid/java/lib/org.eclipse.swt.gtk.solaris.sparc_3.4.1.v3449c.jar
diff --git a/java/lib/org.eclipse.swt.win32.win32.x86_3.4.1.v3449c.jar b/qpid/java/lib/org.eclipse.swt.win32.win32.x86_3.4.1.v3449c.jar
index 5c261c8411..5c261c8411 100644
--- a/java/lib/org.eclipse.swt.win32.win32.x86_3.4.1.v3449c.jar
+++ b/qpid/java/lib/org.eclipse.swt.win32.win32.x86_3.4.1.v3449c.jar
diff --git a/java/lib/org.eclipse.swt_3.4.1.v3449c.jar b/qpid/java/lib/org.eclipse.swt_3.4.1.v3449c.jar
index 606abc5a3b..606abc5a3b 100644
--- a/java/lib/org.eclipse.swt_3.4.1.v3449c.jar
+++ b/qpid/java/lib/org.eclipse.swt_3.4.1.v3449c.jar
diff --git a/java/lib/org.eclipse.ui.forms_3.3.101.v20080708_34x.jar b/qpid/java/lib/org.eclipse.ui.forms_3.3.101.v20080708_34x.jar
index a458fcb058..a458fcb058 100644
--- a/java/lib/org.eclipse.ui.forms_3.3.101.v20080708_34x.jar
+++ b/qpid/java/lib/org.eclipse.ui.forms_3.3.101.v20080708_34x.jar
diff --git a/java/lib/org.eclipse.ui.workbench_3.4.1.M20080827-0800a.jar b/qpid/java/lib/org.eclipse.ui.workbench_3.4.1.M20080827-0800a.jar
index 3e151c8122..3e151c8122 100644
--- a/java/lib/org.eclipse.ui.workbench_3.4.1.M20080827-0800a.jar
+++ b/qpid/java/lib/org.eclipse.ui.workbench_3.4.1.M20080827-0800a.jar
diff --git a/java/lib/org.eclipse.ui_3.4.1.M20080910-0800.jar b/qpid/java/lib/org.eclipse.ui_3.4.1.M20080910-0800.jar
index c7a8cf4256..c7a8cf4256 100644
--- a/java/lib/org.eclipse.ui_3.4.1.M20080910-0800.jar
+++ b/qpid/java/lib/org.eclipse.ui_3.4.1.M20080910-0800.jar
diff --git a/java/lib/poms/backport-util-concurrent-2.2.xml b/qpid/java/lib/poms/backport-util-concurrent-2.2.xml
index 6df4cfca40..6df4cfca40 100644
--- a/java/lib/poms/backport-util-concurrent-2.2.xml
+++ b/qpid/java/lib/poms/backport-util-concurrent-2.2.xml
diff --git a/java/lib/poms/commons-beanutils-core-1.8.0.xml b/qpid/java/lib/poms/commons-beanutils-core-1.8.0.xml
index 612b45e1a6..612b45e1a6 100644
--- a/java/lib/poms/commons-beanutils-core-1.8.0.xml
+++ b/qpid/java/lib/poms/commons-beanutils-core-1.8.0.xml
diff --git a/java/lib/poms/commons-cli-1.0.xml b/qpid/java/lib/poms/commons-cli-1.0.xml
index 77b47f63f1..77b47f63f1 100644
--- a/java/lib/poms/commons-cli-1.0.xml
+++ b/qpid/java/lib/poms/commons-cli-1.0.xml
diff --git a/java/lib/poms/commons-codec-1.3.xml b/qpid/java/lib/poms/commons-codec-1.3.xml
index 772ff6ab71..772ff6ab71 100644
--- a/java/lib/poms/commons-codec-1.3.xml
+++ b/qpid/java/lib/poms/commons-codec-1.3.xml
diff --git a/java/lib/poms/commons-collections-3.2.xml b/qpid/java/lib/poms/commons-collections-3.2.xml
index 3a07dc4a9d..3a07dc4a9d 100644
--- a/java/lib/poms/commons-collections-3.2.xml
+++ b/qpid/java/lib/poms/commons-collections-3.2.xml
diff --git a/java/lib/poms/commons-configuration-1.6.xml b/qpid/java/lib/poms/commons-configuration-1.6.xml
index 523310f10a..523310f10a 100644
--- a/java/lib/poms/commons-configuration-1.6.xml
+++ b/qpid/java/lib/poms/commons-configuration-1.6.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 1edee7b5f0..1edee7b5f0 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.2.xml b/qpid/java/lib/poms/commons-lang-2.2.xml
index b0bef7ca04..b0bef7ca04 100644
--- a/java/lib/poms/commons-lang-2.2.xml
+++ b/qpid/java/lib/poms/commons-lang-2.2.xml
diff --git a/java/lib/poms/commons-logging-1.0.4.xml b/qpid/java/lib/poms/commons-logging-1.0.4.xml
index c85d0f7b29..c85d0f7b29 100644
--- a/java/lib/poms/commons-logging-1.0.4.xml
+++ b/qpid/java/lib/poms/commons-logging-1.0.4.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.6.1.0.xml b/qpid/java/lib/poms/derby-10.6.1.0.xml
index de6a4d79f3..de6a4d79f3 100644
--- a/java/lib/poms/derby-10.6.1.0.xml
+++ b/qpid/java/lib/poms/derby-10.6.1.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/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.12.xml b/qpid/java/lib/poms/log4j-1.2.12.xml
index 87331f4acc..87331f4acc 100644
--- a/java/lib/poms/log4j-1.2.12.xml
+++ b/qpid/java/lib/poms/log4j-1.2.12.xml
diff --git a/java/lib/poms/mina-core-1.0.1.xml b/qpid/java/lib/poms/mina-core-1.0.1.xml
index 87fb96999f..87fb96999f 100644
--- a/java/lib/poms/mina-core-1.0.1.xml
+++ b/qpid/java/lib/poms/mina-core-1.0.1.xml
diff --git a/java/lib/poms/mina-filter-ssl-1.0.1.xml b/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml
index ae41d7ed63..ae41d7ed63 100644
--- a/java/lib/poms/mina-filter-ssl-1.0.1.xml
+++ b/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml
diff --git a/java/lib/poms/org.apache.felix.framework-2.0.5.xml b/qpid/java/lib/poms/org.apache.felix.framework-2.0.5.xml
index cef17fe589..cef17fe589 100644
--- a/java/lib/poms/org.apache.felix.framework-2.0.5.xml
+++ b/qpid/java/lib/poms/org.apache.felix.framework-2.0.5.xml
diff --git a/java/lib/poms/org.osgi.core-1.0.0.xml b/qpid/java/lib/poms/org.osgi.core-1.0.0.xml
index 833cc91729..833cc91729 100644
--- a/java/lib/poms/org.osgi.core-1.0.0.xml
+++ b/qpid/java/lib/poms/org.osgi.core-1.0.0.xml
diff --git a/java/lib/poms/slf4j-api-1.6.1.xml b/qpid/java/lib/poms/slf4j-api-1.6.1.xml
index e3f989bd4e..e3f989bd4e 100644
--- a/java/lib/poms/slf4j-api-1.6.1.xml
+++ b/qpid/java/lib/poms/slf4j-api-1.6.1.xml
diff --git a/java/lib/poms/slf4j-log4j12-1.6.1.xml b/qpid/java/lib/poms/slf4j-log4j12-1.6.1.xml
index 482bbec894..482bbec894 100644
--- a/java/lib/poms/slf4j-log4j12-1.6.1.xml
+++ b/qpid/java/lib/poms/slf4j-log4j12-1.6.1.xml
diff --git a/java/lib/poms/xalan-2.7.0.xml b/qpid/java/lib/poms/xalan-2.7.0.xml
index 73ea2df7e2..73ea2df7e2 100644
--- a/java/lib/poms/xalan-2.7.0.xml
+++ b/qpid/java/lib/poms/xalan-2.7.0.xml
diff --git a/java/lib/servlet-api.jar b/qpid/java/lib/servlet-api.jar
index e3b61e0079..e3b61e0079 100644
--- a/java/lib/servlet-api.jar
+++ b/qpid/java/lib/servlet-api.jar
diff --git a/java/lib/slf4j-api-1.6.1.jar b/qpid/java/lib/slf4j-api-1.6.1.jar
index 42e0ad0de7..42e0ad0de7 100644
--- a/java/lib/slf4j-api-1.6.1.jar
+++ b/qpid/java/lib/slf4j-api-1.6.1.jar
diff --git a/java/lib/slf4j-log4j12-1.6.1.jar b/qpid/java/lib/slf4j-log4j12-1.6.1.jar
index 873d11983e..873d11983e 100644
--- a/java/lib/slf4j-log4j12-1.6.1.jar
+++ b/qpid/java/lib/slf4j-log4j12-1.6.1.jar
diff --git a/java/lib/xalan-2.7.0.jar b/qpid/java/lib/xalan-2.7.0.jar
index 007be3960a..007be3960a 100644
--- a/java/lib/xalan-2.7.0.jar
+++ b/qpid/java/lib/xalan-2.7.0.jar
diff --git a/java/management/common/build.xml b/qpid/java/management/common/build.xml
index ce2ec3a106..ce2ec3a106 100644
--- a/java/management/common/build.xml
+++ b/qpid/java/management/common/build.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 66eb9f156b..66eb9f156b 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 40202c2679..40202c2679 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/ConfigurationManagement.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
index a21a6713cc..a21a6713cc 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.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 6d15869f0c..6d15869f0c 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 b5c80a4fed..b5c80a4fed 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 d16db65d5d..d16db65d5d 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 78a1eb964f..78a1eb964f 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 be31d8ef88..be31d8ef88 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 12ae69571e..12ae69571e 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 194bd83752..194bd83752 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 c608f64817..c608f64817 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 be4897d6c4..be4897d6c4 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 ee5803a220..ee5803a220 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 f5a3ca8ccc..f5a3ca8ccc 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 806975c32f..806975c32f 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 a1634f86d9..a1634f86d9 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 09aba1f3e1..09aba1f3e1 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 1a4a73f207..1a4a73f207 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/eclipse-plugin/META-INF/MANIFEST.MF b/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
index 2164c5d326..2164c5d326 100644
--- a/java/management/eclipse-plugin/META-INF/MANIFEST.MF
+++ b/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
diff --git a/java/management/eclipse-plugin/build-release-common.properties b/qpid/java/management/eclipse-plugin/build-release-common.properties
index 7ccbd750cf..7ccbd750cf 100644
--- a/java/management/eclipse-plugin/build-release-common.properties
+++ b/qpid/java/management/eclipse-plugin/build-release-common.properties
diff --git a/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties b/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
index 51c4bfa8d0..51c4bfa8d0 100644
--- a/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
+++ b/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
diff --git a/java/management/eclipse-plugin/build-release-linux-gtk-x86_64.properties b/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86_64.properties
index bf58d9c08e..bf58d9c08e 100644
--- a/java/management/eclipse-plugin/build-release-linux-gtk-x86_64.properties
+++ b/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86_64.properties
diff --git a/java/management/eclipse-plugin/build-release-macosx.properties b/qpid/java/management/eclipse-plugin/build-release-macosx.properties
index bdb2f0d7da..bdb2f0d7da 100644
--- a/java/management/eclipse-plugin/build-release-macosx.properties
+++ b/qpid/java/management/eclipse-plugin/build-release-macosx.properties
diff --git a/java/management/eclipse-plugin/build-release-macosx.xml b/qpid/java/management/eclipse-plugin/build-release-macosx.xml
index 2aa63d7f2f..2aa63d7f2f 100644
--- a/java/management/eclipse-plugin/build-release-macosx.xml
+++ b/qpid/java/management/eclipse-plugin/build-release-macosx.xml
diff --git a/java/management/eclipse-plugin/build-release-solaris-gtk-sparc.properties b/qpid/java/management/eclipse-plugin/build-release-solaris-gtk-sparc.properties
index d58d0c9ac0..d58d0c9ac0 100644
--- a/java/management/eclipse-plugin/build-release-solaris-gtk-sparc.properties
+++ b/qpid/java/management/eclipse-plugin/build-release-solaris-gtk-sparc.properties
diff --git a/java/management/eclipse-plugin/build-release-win32-win32-x86.properties b/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
index ee678a92c9..ee678a92c9 100644
--- a/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
+++ b/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
diff --git a/java/management/eclipse-plugin/build-release.xml b/qpid/java/management/eclipse-plugin/build-release.xml
index dec4cd5f32..dec4cd5f32 100644
--- a/java/management/eclipse-plugin/build-release.xml
+++ b/qpid/java/management/eclipse-plugin/build-release.xml
diff --git a/java/management/eclipse-plugin/build.xml b/qpid/java/management/eclipse-plugin/build.xml
index 527fc1cd09..527fc1cd09 100644
--- a/java/management/eclipse-plugin/build.xml
+++ b/qpid/java/management/eclipse-plugin/build.xml
diff --git a/java/management/eclipse-plugin/icons/add.gif b/qpid/java/management/eclipse-plugin/icons/add.gif
index 252d7ebcb8..252d7ebcb8 100644
--- a/java/management/eclipse-plugin/icons/add.gif
+++ b/qpid/java/management/eclipse-plugin/icons/add.gif
diff --git a/java/management/eclipse-plugin/icons/back.gif b/qpid/java/management/eclipse-plugin/icons/back.gif
index d3a10077a5..d3a10077a5 100644
--- a/java/management/eclipse-plugin/icons/back.gif
+++ b/qpid/java/management/eclipse-plugin/icons/back.gif
diff --git a/java/management/eclipse-plugin/icons/configuration_management.gif b/qpid/java/management/eclipse-plugin/icons/configuration_management.gif
index d11c996e57..d11c996e57 100644
--- a/java/management/eclipse-plugin/icons/configuration_management.gif
+++ b/qpid/java/management/eclipse-plugin/icons/configuration_management.gif
diff --git a/java/management/eclipse-plugin/icons/delete.gif b/qpid/java/management/eclipse-plugin/icons/delete.gif
index 6f647666d3..6f647666d3 100644
--- a/java/management/eclipse-plugin/icons/delete.gif
+++ b/qpid/java/management/eclipse-plugin/icons/delete.gif
diff --git a/java/management/eclipse-plugin/icons/failure.gif b/qpid/java/management/eclipse-plugin/icons/failure.gif
index 9b048d6053..9b048d6053 100644
--- a/java/management/eclipse-plugin/icons/failure.gif
+++ b/qpid/java/management/eclipse-plugin/icons/failure.gif
diff --git a/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif b/qpid/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif
index beb6ed134c..beb6ed134c 100644
--- a/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif
+++ b/qpid/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif
diff --git a/java/management/eclipse-plugin/icons/icon_OpenFolder.gif b/qpid/java/management/eclipse-plugin/icons/icon_OpenFolder.gif
index a9c777343c..a9c777343c 100644
--- a/java/management/eclipse-plugin/icons/icon_OpenFolder.gif
+++ b/qpid/java/management/eclipse-plugin/icons/icon_OpenFolder.gif
diff --git a/java/management/eclipse-plugin/icons/logging_management.gif b/qpid/java/management/eclipse-plugin/icons/logging_management.gif
index 7f5fe98a73..7f5fe98a73 100644
--- a/java/management/eclipse-plugin/icons/logging_management.gif
+++ b/qpid/java/management/eclipse-plugin/icons/logging_management.gif
diff --git a/java/management/eclipse-plugin/icons/mbean_view.png b/qpid/java/management/eclipse-plugin/icons/mbean_view.png
index 9871b72bb8..9871b72bb8 100644
--- a/java/management/eclipse-plugin/icons/mbean_view.png
+++ b/qpid/java/management/eclipse-plugin/icons/mbean_view.png
diff --git a/java/management/eclipse-plugin/icons/notifications.gif b/qpid/java/management/eclipse-plugin/icons/notifications.gif
index f1e585bdf7..f1e585bdf7 100644
--- a/java/management/eclipse-plugin/icons/notifications.gif
+++ b/qpid/java/management/eclipse-plugin/icons/notifications.gif
diff --git a/java/management/eclipse-plugin/icons/qpidConnections.gif b/qpid/java/management/eclipse-plugin/icons/qpidConnections.gif
index 17f927e9a4..17f927e9a4 100644
--- a/java/management/eclipse-plugin/icons/qpidConnections.gif
+++ b/qpid/java/management/eclipse-plugin/icons/qpidConnections.gif
diff --git a/java/management/eclipse-plugin/icons/qpidmc.gif b/qpid/java/management/eclipse-plugin/icons/qpidmc.gif
index baf929fbc5..baf929fbc5 100644
--- a/java/management/eclipse-plugin/icons/qpidmc.gif
+++ b/qpid/java/management/eclipse-plugin/icons/qpidmc.gif
diff --git a/java/management/eclipse-plugin/icons/qpidmc16.gif b/qpid/java/management/eclipse-plugin/icons/qpidmc16.gif
index 4df535bb9a..4df535bb9a 100644
--- a/java/management/eclipse-plugin/icons/qpidmc16.gif
+++ b/qpid/java/management/eclipse-plugin/icons/qpidmc16.gif
diff --git a/java/management/eclipse-plugin/icons/qpidmc32.bmp b/qpid/java/management/eclipse-plugin/icons/qpidmc32.bmp
index e42ce01dff..e42ce01dff 100644
--- a/java/management/eclipse-plugin/icons/qpidmc32.bmp
+++ b/qpid/java/management/eclipse-plugin/icons/qpidmc32.bmp
diff --git a/java/management/eclipse-plugin/icons/qpidmc32.gif b/qpid/java/management/eclipse-plugin/icons/qpidmc32.gif
index e42ce01dff..e42ce01dff 100644
--- a/java/management/eclipse-plugin/icons/qpidmc32.gif
+++ b/qpid/java/management/eclipse-plugin/icons/qpidmc32.gif
diff --git a/java/management/eclipse-plugin/icons/reconnect.gif b/qpid/java/management/eclipse-plugin/icons/reconnect.gif
index e2f8c3e1fe..e2f8c3e1fe 100644
--- a/java/management/eclipse-plugin/icons/reconnect.gif
+++ b/qpid/java/management/eclipse-plugin/icons/reconnect.gif
diff --git a/java/management/eclipse-plugin/icons/refresh.gif b/qpid/java/management/eclipse-plugin/icons/refresh.gif
index 1b724a6784..1b724a6784 100644
--- a/java/management/eclipse-plugin/icons/refresh.gif
+++ b/qpid/java/management/eclipse-plugin/icons/refresh.gif
diff --git a/java/management/eclipse-plugin/icons/server_information.gif b/qpid/java/management/eclipse-plugin/icons/server_information.gif
index 716df436f9..716df436f9 100644
--- a/java/management/eclipse-plugin/icons/server_information.gif
+++ b/qpid/java/management/eclipse-plugin/icons/server_information.gif
diff --git a/java/management/eclipse-plugin/icons/splash.bmp b/qpid/java/management/eclipse-plugin/icons/splash.bmp
index cf3b93d523..cf3b93d523 100644
--- a/java/management/eclipse-plugin/icons/splash.bmp
+++ b/qpid/java/management/eclipse-plugin/icons/splash.bmp
diff --git a/java/management/eclipse-plugin/icons/stop.gif b/qpid/java/management/eclipse-plugin/icons/stop.gif
index dc47edf069..dc47edf069 100644
--- a/java/management/eclipse-plugin/icons/stop.gif
+++ b/qpid/java/management/eclipse-plugin/icons/stop.gif
diff --git a/java/management/eclipse-plugin/icons/success.gif b/qpid/java/management/eclipse-plugin/icons/success.gif
index 9cacb96dca..9cacb96dca 100644
--- a/java/management/eclipse-plugin/icons/success.gif
+++ b/qpid/java/management/eclipse-plugin/icons/success.gif
diff --git a/java/management/eclipse-plugin/icons/user_management.gif b/qpid/java/management/eclipse-plugin/icons/user_management.gif
index d28c326dea..d28c326dea 100644
--- a/java/management/eclipse-plugin/icons/user_management.gif
+++ b/qpid/java/management/eclipse-plugin/icons/user_management.gif
diff --git a/java/management/eclipse-plugin/icons/virtualhost_manager.gif b/qpid/java/management/eclipse-plugin/icons/virtualhost_manager.gif
index e7ec2a1544..e7ec2a1544 100644
--- a/java/management/eclipse-plugin/icons/virtualhost_manager.gif
+++ b/qpid/java/management/eclipse-plugin/icons/virtualhost_manager.gif
diff --git a/java/management/eclipse-plugin/plugin.properties b/qpid/java/management/eclipse-plugin/plugin.properties
index 8507441886..8507441886 100644
--- a/java/management/eclipse-plugin/plugin.properties
+++ b/qpid/java/management/eclipse-plugin/plugin.properties
diff --git a/java/management/eclipse-plugin/plugin.xml b/qpid/java/management/eclipse-plugin/plugin.xml
index e151456fa1..e151456fa1 100644
--- a/java/management/eclipse-plugin/plugin.xml
+++ b/qpid/java/management/eclipse-plugin/plugin.xml
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
index d6a9c0b0c6..d6a9c0b0c6 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApiVersion.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApiVersion.java
index 2bdcd77f08..2bdcd77f08 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApiVersion.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApiVersion.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java
index a1c4b7ddb0..a1c4b7ddb0 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java
index b5c1b5074a..b5c1b5074a 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
index 4a59176374..4a59176374 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java
index a46fa870e4..a46fa870e4 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java
index 00574440c5..00574440c5 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
index c8f95dd8cb..c8f95dd8cb 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
index 8ded3f35c6..8ded3f35c6 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java
index 96e0fa46c6..96e0fa46c6 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java
index 9ca8787bb5..9ca8787bb5 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java
index f93200cadf..f93200cadf 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/RefreshIntervalComboPanel.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/RefreshIntervalComboPanel.java
index ae60467bf5..ae60467bf5 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/RefreshIntervalComboPanel.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/RefreshIntervalComboPanel.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
index c3c0277f7d..c3c0277f7d 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java
index 5d892f5503..5d892f5503 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
index e487c02a67..e487c02a67 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/BackAction.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/BackAction.java
index 2998c5db53..2998c5db53 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/BackAction.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/BackAction.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java
index a3e52149df..a3e52149df 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
index 5eb9d9a168..5eb9d9a168 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
index dd4cbffd84..dd4cbffd84 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java
index e329255414..e329255414 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java
index be69fadbe8..be69fadbe8 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java
index 672426a59d..672426a59d 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/ManagementConsoleException.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/ManagementConsoleException.java
index 17c127c01a..17c127c01a 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/ManagementConsoleException.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/ManagementConsoleException.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
index 6fa78b1d36..6fa78b1d36 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java
index 2af8e681ae..2af8e681ae 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
index a8fb864cf6..a8fb864cf6 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
index 717f781334..717f781334 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
index 6d6aa80f4d..6d6aa80f4d 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
index ccd4cf8df8..ccd4cf8df8 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
index b3219f15ea..b3219f15ea 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java
index 6d4160889e..6d4160889e 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
index 35cc9f6e27..35cc9f6e27 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
index bf3b730b3e..bf3b730b3e 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java
index 96964a81ef..96964a81ef 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
index d12217c6eb..d12217c6eb 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
index 2b9f5042dc..2b9f5042dc 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java
index bc560b6064..bc560b6064 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTabFolderFactory.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTabFolderFactory.java
index 527fc67be3..527fc67be3 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTabFolderFactory.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTabFolderFactory.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
index 65615a6d18..65615a6d18 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
index 417734e5fb..417734e5fb 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
index ea49a5c006..ea49a5c006 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NumberVerifyListener.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NumberVerifyListener.java
index 1774209dae..1774209dae 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NumberVerifyListener.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NumberVerifyListener.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
index d0b70f4340..d0b70f4340 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
index 156543d603..156543d603 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
index 9545ed9876..9545ed9876 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
index d23355501f..d23355501f 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
index 8e4bea39e9..8e4bea39e9 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
index 35171773ad..35171773ad 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
index b51cb85427..b51cb85427 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
index e22898fb93..e22898fb93 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java
index 1ae48f5c6c..1ae48f5c6c 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableContentProvider.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableContentProvider.java
index 6ef3ab70a7..6ef3ab70a7 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableContentProvider.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableContentProvider.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableLabelProvider.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableLabelProvider.java
index 3156e3f1c4..3156e3f1c4 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableLabelProvider.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableLabelProvider.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableSorter.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableSorter.java
index 99d22f2cb8..99d22f2cb8 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableSorter.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableSorter.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java
index 1ae97cfcb6..1ae97cfcb6 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
index ee6bd3522b..ee6bd3522b 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
index f1f7b07b6f..f1f7b07b6f 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
index 5d587c7158..5d587c7158 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
index a4574b8d22..a4574b8d22 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
index 406ef08326..406ef08326 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java
index fdcc25d337..fdcc25d337 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
index 0cbb1389d8..0cbb1389d8 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/resources/.eclipseproduct b/qpid/java/management/eclipse-plugin/src/main/resources/.eclipseproduct
index 28ee27ca17..28ee27ca17 100644
--- a/java/management/eclipse-plugin/src/main/resources/.eclipseproduct
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/.eclipseproduct
diff --git a/java/management/eclipse-plugin/src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF b/qpid/java/management/eclipse-plugin/src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF
index 83c7c9f435..83c7c9f435 100644
--- a/java/management/eclipse-plugin/src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini
index dc15366740..dc15366740 100644
--- a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so
index b66f95814e..b66f95814e 100644
--- a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc
index 0cc5c65455..0cc5c65455 100644
--- a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini
index 19ceb6f717..19ceb6f717 100644
--- a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/Configuration/config.ini b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/Configuration/config.ini
index f437e830b5..f437e830b5 100644
--- a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/Configuration/config.ini
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/Configuration/config.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/libcairo-swt.so b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/libcairo-swt.so
index 5734427fb8..5734427fb8 100644
--- a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/libcairo-swt.so
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/libcairo-swt.so
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc
index ff1f3a7507..ff1f3a7507 100644
--- a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc.ini b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc.ini
index 19ceb6f717..19ceb6f717 100644
--- a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc.ini
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini
index 3ac3aa20f3..3ac3aa20f3 100644
--- a/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist
index c6482a9254..c6482a9254 100644
--- a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
index 36247a08e4..36247a08e4 100755
--- a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini
index 2a31b9b2c7..2a31b9b2c7 100644
--- a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Resources/Console.icns b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Resources/Console.icns
index 610976efab..610976efab 100644
--- a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Resources/Console.icns
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Resources/Console.icns
diff --git a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Configuration/config.ini b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Configuration/config.ini
index a99a8b3f7d..a99a8b3f7d 100644
--- a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Configuration/config.ini
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Configuration/config.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.l.pm b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.l.pm
index 995d7c9bb0..995d7c9bb0 100644
--- a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.l.pm
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.l.pm
diff --git a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.m.pm b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.m.pm
index e64aa0cc06..e64aa0cc06 100644
--- a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.m.pm
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.m.pm
diff --git a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.s.pm b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.s.pm
index e2b9379f3a..e2b9379f3a 100644
--- a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.s.pm
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.s.pm
diff --git a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.t.pm b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.t.pm
index 3f6b21f428..3f6b21f428 100644
--- a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.t.pm
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.t.pm
diff --git a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc
index b88ff49e8e..b88ff49e8e 100755
--- a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc
diff --git a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc.ini b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc.ini
index cfa715e5a8..cfa715e5a8 100644
--- a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc.ini
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini
index a61bea2fa8..a61bea2fa8 100644
--- a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe
index 3999884bfb..3999884bfb 100644
--- a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe
diff --git a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini
index 312580769e..312580769e 100644
--- a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini
+++ b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini
diff --git a/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApiVersionTest.java b/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApiVersionTest.java
index b4f6aea57b..b4f6aea57b 100644
--- a/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApiVersionTest.java
+++ b/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApiVersionTest.java
diff --git a/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApplicationRegistryTest.java b/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApplicationRegistryTest.java
index 1a56ab69b6..1a56ab69b6 100644
--- a/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApplicationRegistryTest.java
+++ b/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApplicationRegistryTest.java
diff --git a/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java b/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
index 0f62fa8ab2..0f62fa8ab2 100644
--- a/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
+++ b/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
diff --git a/java/management/example/build.xml b/qpid/java/management/example/build.xml
index 8bcd615282..8bcd615282 100644
--- a/java/management/example/build.xml
+++ b/qpid/java/management/example/build.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 b858742c4e..b858742c4e 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 985f39b6f1..985f39b6f1 100644
--- a/java/maven-settings.xml
+++ b/qpid/java/maven-settings.xml
diff --git a/java/module.xml b/qpid/java/module.xml
index 8c6a05e035..8c6a05e035 100644
--- a/java/module.xml
+++ b/qpid/java/module.xml
diff --git a/java/perftests/RunningPerformanceTests.txt b/qpid/java/perftests/RunningPerformanceTests.txt
index 2bc9220774..2bc9220774 100644
--- a/java/perftests/RunningPerformanceTests.txt
+++ b/qpid/java/perftests/RunningPerformanceTests.txt
diff --git a/java/perftests/bin/monitoring/monitor-broker.sh b/qpid/java/perftests/bin/monitoring/monitor-broker.sh
index 27c8ff25f6..27c8ff25f6 100755
--- a/java/perftests/bin/monitoring/monitor-broker.sh
+++ b/qpid/java/perftests/bin/monitoring/monitor-broker.sh
diff --git a/java/perftests/bin/monitoring/runTests.sh b/qpid/java/perftests/bin/monitoring/runTests.sh
index 676db0d4fa..676db0d4fa 100755
--- a/java/perftests/bin/monitoring/runTests.sh
+++ b/qpid/java/perftests/bin/monitoring/runTests.sh
diff --git a/java/perftests/bin/monitoring/stop-monitored-broker.sh b/qpid/java/perftests/bin/monitoring/stop-monitored-broker.sh
index ad882b0bea..ad882b0bea 100755
--- a/java/perftests/bin/monitoring/stop-monitored-broker.sh
+++ b/qpid/java/perftests/bin/monitoring/stop-monitored-broker.sh
diff --git a/java/perftests/bin/processing/process.sh b/qpid/java/perftests/bin/processing/process.sh
index 6dbf9b9ea8..6dbf9b9ea8 100755
--- a/java/perftests/bin/processing/process.sh
+++ b/qpid/java/perftests/bin/processing/process.sh
diff --git a/java/perftests/bin/processing/processAll.sh b/qpid/java/perftests/bin/processing/processAll.sh
index 895d59c316..895d59c316 100755
--- a/java/perftests/bin/processing/processAll.sh
+++ b/qpid/java/perftests/bin/processing/processAll.sh
diff --git a/java/perftests/bin/processing/processTests.py b/qpid/java/perftests/bin/processing/processTests.py
index 8db44eda79..8db44eda79 100755
--- a/java/perftests/bin/processing/processTests.py
+++ b/qpid/java/perftests/bin/processing/processTests.py
diff --git a/java/perftests/bin/run_many.sh b/qpid/java/perftests/bin/run_many.sh
index cca2ffec21..cca2ffec21 100755
--- a/java/perftests/bin/run_many.sh
+++ b/qpid/java/perftests/bin/run_many.sh
diff --git a/java/perftests/bin/topicListener.sh b/qpid/java/perftests/bin/topicListener.sh
index 3a925910ad..3a925910ad 100755
--- a/java/perftests/bin/topicListener.sh
+++ b/qpid/java/perftests/bin/topicListener.sh
diff --git a/java/perftests/bin/topicPublisher.sh b/qpid/java/perftests/bin/topicPublisher.sh
index e4e9981a75..e4e9981a75 100755
--- a/java/perftests/bin/topicPublisher.sh
+++ b/qpid/java/perftests/bin/topicPublisher.sh
diff --git a/java/perftests/build.xml b/qpid/java/perftests/build.xml
index 497bfc8035..497bfc8035 100644
--- a/java/perftests/build.xml
+++ b/qpid/java/perftests/build.xml
diff --git a/java/perftests/dist-zip.xml b/qpid/java/perftests/dist-zip.xml
index 0039bfb157..0039bfb157 100644
--- a/java/perftests/dist-zip.xml
+++ b/qpid/java/perftests/dist-zip.xml
diff --git a/java/perftests/etc/jndi/activemq.properties b/qpid/java/perftests/etc/jndi/activemq.properties
index 281577c4a8..281577c4a8 100644
--- a/java/perftests/etc/jndi/activemq.properties
+++ b/qpid/java/perftests/etc/jndi/activemq.properties
diff --git a/java/perftests/etc/jndi/failovertest.properties b/qpid/java/perftests/etc/jndi/failovertest.properties
index b437d12062..b437d12062 100644
--- a/java/perftests/etc/jndi/failovertest.properties
+++ b/qpid/java/perftests/etc/jndi/failovertest.properties
diff --git a/java/perftests/etc/jndi/perftests.properties b/qpid/java/perftests/etc/jndi/perftests.properties
index a2348f4547..a2348f4547 100644
--- a/java/perftests/etc/jndi/perftests.properties
+++ b/qpid/java/perftests/etc/jndi/perftests.properties
diff --git a/java/perftests/etc/jndi/swiftmq.properties b/qpid/java/perftests/etc/jndi/swiftmq.properties
index 2d037a2513..2d037a2513 100644
--- a/java/perftests/etc/jndi/swiftmq.properties
+++ b/qpid/java/perftests/etc/jndi/swiftmq.properties
diff --git a/java/perftests/etc/perftests.log4j b/qpid/java/perftests/etc/perftests.log4j
index af8c1b0784..af8c1b0784 100644
--- a/java/perftests/etc/perftests.log4j
+++ b/qpid/java/perftests/etc/perftests.log4j
diff --git a/java/perftests/etc/scripts/CTQ-Qpid-1.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-1.sh
index 057dec5c63..057dec5c63 100755
--- a/java/perftests/etc/scripts/CTQ-Qpid-1.sh
+++ b/qpid/java/perftests/etc/scripts/CTQ-Qpid-1.sh
diff --git a/java/perftests/etc/scripts/CTQ-Qpid-2.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-2.sh
index 08057cbf44..08057cbf44 100755
--- a/java/perftests/etc/scripts/CTQ-Qpid-2.sh
+++ b/qpid/java/perftests/etc/scripts/CTQ-Qpid-2.sh
diff --git a/java/perftests/etc/scripts/CTQ-Qpid-3.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-3.sh
index 0bb7e25197..0bb7e25197 100755
--- a/java/perftests/etc/scripts/CTQ-Qpid-3.sh
+++ b/qpid/java/perftests/etc/scripts/CTQ-Qpid-3.sh
diff --git a/java/perftests/etc/scripts/CTQ-Qpid-4.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-4.sh
index 278e44d12b..278e44d12b 100755
--- a/java/perftests/etc/scripts/CTQ-Qpid-4.sh
+++ b/qpid/java/perftests/etc/scripts/CTQ-Qpid-4.sh
diff --git a/java/perftests/etc/scripts/CTQ-Qpid-5.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-5.sh
index 5dee0176b2..5dee0176b2 100755
--- a/java/perftests/etc/scripts/CTQ-Qpid-5.sh
+++ b/qpid/java/perftests/etc/scripts/CTQ-Qpid-5.sh
diff --git a/java/perftests/etc/scripts/CTQ-Qpid-6.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-6.sh
index b9996da77d..b9996da77d 100755
--- a/java/perftests/etc/scripts/CTQ-Qpid-6.sh
+++ b/qpid/java/perftests/etc/scripts/CTQ-Qpid-6.sh
diff --git a/java/perftests/etc/scripts/Connections.sh b/qpid/java/perftests/etc/scripts/Connections.sh
index 17e69166bf..17e69166bf 100755
--- a/java/perftests/etc/scripts/Connections.sh
+++ b/qpid/java/perftests/etc/scripts/Connections.sh
diff --git a/java/perftests/etc/scripts/JobQueue.sh b/qpid/java/perftests/etc/scripts/JobQueue.sh
index 312037f5ab..312037f5ab 100755
--- a/java/perftests/etc/scripts/JobQueue.sh
+++ b/qpid/java/perftests/etc/scripts/JobQueue.sh
diff --git a/java/perftests/etc/scripts/Latency.sh b/qpid/java/perftests/etc/scripts/Latency.sh
index f70131de38..f70131de38 100755
--- a/java/perftests/etc/scripts/Latency.sh
+++ b/qpid/java/perftests/etc/scripts/Latency.sh
diff --git a/java/perftests/etc/scripts/MessageSize.sh b/qpid/java/perftests/etc/scripts/MessageSize.sh
index bb10822257..bb10822257 100755
--- a/java/perftests/etc/scripts/MessageSize.sh
+++ b/qpid/java/perftests/etc/scripts/MessageSize.sh
diff --git a/java/perftests/etc/scripts/PT-Qpid-13.sh b/qpid/java/perftests/etc/scripts/PT-Qpid-13.sh
index df35f718b9..df35f718b9 100755
--- a/java/perftests/etc/scripts/PT-Qpid-13.sh
+++ b/qpid/java/perftests/etc/scripts/PT-Qpid-13.sh
diff --git a/java/perftests/etc/scripts/PT-Qpid-14.sh b/qpid/java/perftests/etc/scripts/PT-Qpid-14.sh
index ff5b8a76f9..ff5b8a76f9 100755
--- a/java/perftests/etc/scripts/PT-Qpid-14.sh
+++ b/qpid/java/perftests/etc/scripts/PT-Qpid-14.sh
diff --git a/java/perftests/etc/scripts/Reliability.sh b/qpid/java/perftests/etc/scripts/Reliability.sh
index 9e5e508743..9e5e508743 100755
--- a/java/perftests/etc/scripts/Reliability.sh
+++ b/qpid/java/perftests/etc/scripts/Reliability.sh
diff --git a/java/perftests/etc/scripts/RunAll.sh b/qpid/java/perftests/etc/scripts/RunAll.sh
index 8b0d8b6e7c..8b0d8b6e7c 100755
--- a/java/perftests/etc/scripts/RunAll.sh
+++ b/qpid/java/perftests/etc/scripts/RunAll.sh
diff --git a/java/perftests/etc/scripts/RunCore.sh b/qpid/java/perftests/etc/scripts/RunCore.sh
index fcc45aacf0..fcc45aacf0 100755
--- a/java/perftests/etc/scripts/RunCore.sh
+++ b/qpid/java/perftests/etc/scripts/RunCore.sh
diff --git a/java/perftests/etc/scripts/Test-ActiveMQ.sh b/qpid/java/perftests/etc/scripts/Test-ActiveMQ.sh
index 27e0411870..27e0411870 100644
--- a/java/perftests/etc/scripts/Test-ActiveMQ.sh
+++ b/qpid/java/perftests/etc/scripts/Test-ActiveMQ.sh
diff --git a/java/perftests/etc/scripts/Test-SwiftMQ.sh b/qpid/java/perftests/etc/scripts/Test-SwiftMQ.sh
index 1f0b38ccc2..1f0b38ccc2 100644
--- a/java/perftests/etc/scripts/Test-SwiftMQ.sh
+++ b/qpid/java/perftests/etc/scripts/Test-SwiftMQ.sh
diff --git a/java/perftests/etc/scripts/Throughput.sh b/qpid/java/perftests/etc/scripts/Throughput.sh
index d08ad248a5..d08ad248a5 100755
--- a/java/perftests/etc/scripts/Throughput.sh
+++ b/qpid/java/perftests/etc/scripts/Throughput.sh
diff --git a/java/perftests/etc/scripts/drainBroker.sh b/qpid/java/perftests/etc/scripts/drainBroker.sh
index eea7209f03..eea7209f03 100755
--- a/java/perftests/etc/scripts/drainBroker.sh
+++ b/qpid/java/perftests/etc/scripts/drainBroker.sh
diff --git a/java/perftests/etc/scripts/extractResults.sh b/qpid/java/perftests/etc/scripts/extractResults.sh
index 4fc74059af..4fc74059af 100755
--- a/java/perftests/etc/scripts/extractResults.sh
+++ b/qpid/java/perftests/etc/scripts/extractResults.sh
diff --git a/java/perftests/etc/scripts/extractThroughputResults.sh b/qpid/java/perftests/etc/scripts/extractThroughputResults.sh
index 14236c68bc..14236c68bc 100755
--- a/java/perftests/etc/scripts/extractThroughputResults.sh
+++ b/qpid/java/perftests/etc/scripts/extractThroughputResults.sh
diff --git a/java/perftests/etc/scripts/fillBroker.sh b/qpid/java/perftests/etc/scripts/fillBroker.sh
index 5b7de6f999..5b7de6f999 100755
--- a/java/perftests/etc/scripts/fillBroker.sh
+++ b/qpid/java/perftests/etc/scripts/fillBroker.sh
diff --git a/java/perftests/etc/scripts/sendAndWaitClient.sh b/qpid/java/perftests/etc/scripts/sendAndWaitClient.sh
index af4b788658..af4b788658 100755
--- a/java/perftests/etc/scripts/sendAndWaitClient.sh
+++ b/qpid/java/perftests/etc/scripts/sendAndWaitClient.sh
diff --git a/java/perftests/etc/scripts/testWithPreFill.sh b/qpid/java/perftests/etc/scripts/testWithPreFill.sh
index 721ecf6ecc..721ecf6ecc 100755
--- a/java/perftests/etc/scripts/testWithPreFill.sh
+++ b/qpid/java/perftests/etc/scripts/testWithPreFill.sh
diff --git a/java/perftests/generate-scripts b/qpid/java/perftests/generate-scripts
index 3d12cc13c3..3d12cc13c3 100644
--- a/java/perftests/generate-scripts
+++ b/qpid/java/perftests/generate-scripts
diff --git a/java/perftests/jar-with-dependencies.xml b/qpid/java/perftests/jar-with-dependencies.xml
index bbbbd3788e..bbbbd3788e 100644
--- a/java/perftests/jar-with-dependencies.xml
+++ b/qpid/java/perftests/jar-with-dependencies.xml
diff --git a/java/perftests/scripts.xml b/qpid/java/perftests/scripts.xml
index 9a5163c598..9a5163c598 100644
--- a/java/perftests/scripts.xml
+++ b/qpid/java/perftests/scripts.xml
diff --git a/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java
index 3ad6c021bd..3ad6c021bd 100644
--- a/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java b/qpid/java/perftests/src/main/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
index cac0064785..cac0064785 100644
--- a/java/perftests/src/main/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/config/AbstractConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/config/AbstractConfig.java
index 14db74438f..14db74438f 100644
--- a/java/perftests/src/main/java/org/apache/qpid/config/AbstractConfig.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/config/AbstractConfig.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java b/qpid/java/perftests/src/main/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
index a9984eb09a..a9984eb09a 100644
--- a/java/perftests/src/main/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/config/Connector.java b/qpid/java/perftests/src/main/java/org/apache/qpid/config/Connector.java
index ff2377f087..ff2377f087 100644
--- a/java/perftests/src/main/java/org/apache/qpid/config/Connector.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/config/Connector.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/config/ConnectorConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/config/ConnectorConfig.java
index b120ed3f12..b120ed3f12 100644
--- a/java/perftests/src/main/java/org/apache/qpid/config/ConnectorConfig.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/config/ConnectorConfig.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java b/qpid/java/perftests/src/main/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
index a0248a8f79..a0248a8f79 100644
--- a/java/perftests/src/main/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/oldtopic/Config.java b/qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/Config.java
index 5b6169ed2d..5b6169ed2d 100644
--- a/java/perftests/src/main/java/org/apache/qpid/oldtopic/Config.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/Config.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/oldtopic/Listener.java b/qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/Listener.java
index 4732782d4c..4732782d4c 100644
--- a/java/perftests/src/main/java/org/apache/qpid/oldtopic/Listener.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/Listener.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/oldtopic/MessageFactory.java b/qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/MessageFactory.java
index b2fbeb7e35..b2fbeb7e35 100644
--- a/java/perftests/src/main/java/org/apache/qpid/oldtopic/MessageFactory.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/MessageFactory.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java b/qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java
index f811704323..f811704323 100644
--- a/java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingAsyncTestPerf.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingAsyncTestPerf.java
index dc78276edd..dc78276edd 100644
--- a/java/perftests/src/main/java/org/apache/qpid/ping/PingAsyncTestPerf.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingAsyncTestPerf.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
index dcfc67d4fc..dcfc67d4fc 100644
--- a/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
index a15897c82b..a15897c82b 100644
--- a/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java
index 5ba4004c56..5ba4004c56 100644
--- a/java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
index 2fe852af77..2fe852af77 100644
--- a/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java
index cf16abc596..cf16abc596 100644
--- a/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongBouncer.java b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongBouncer.java
index 8e010ccf07..8e010ccf07 100644
--- a/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongBouncer.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongBouncer.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
index 0bf952b7e1..0bf952b7e1 100644
--- a/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongTestPerf.java b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongTestPerf.java
index 009254c612..009254c612 100644
--- a/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongTestPerf.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongTestPerf.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/test/testcases/MessageThroughputPerf.java b/qpid/java/perftests/src/main/java/org/apache/qpid/test/testcases/MessageThroughputPerf.java
index e2e97ab6f8..e2e97ab6f8 100644
--- a/java/perftests/src/main/java/org/apache/qpid/test/testcases/MessageThroughputPerf.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/test/testcases/MessageThroughputPerf.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/topic/Config.java b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Config.java
index d5c0979399..d5c0979399 100644
--- a/java/perftests/src/main/java/org/apache/qpid/topic/Config.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Config.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/topic/Listener.java b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Listener.java
index 6dcea42bfe..6dcea42bfe 100644
--- a/java/perftests/src/main/java/org/apache/qpid/topic/Listener.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Listener.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/topic/MessageFactory.java b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/MessageFactory.java
index 4efdc1cb56..4efdc1cb56 100644
--- a/java/perftests/src/main/java/org/apache/qpid/topic/MessageFactory.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/MessageFactory.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/topic/Publisher.java b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Publisher.java
index c3b19b558a..c3b19b558a 100644
--- a/java/perftests/src/main/java/org/apache/qpid/topic/Publisher.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Publisher.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/topic/TopicWithSelectorsTransientVolumeTest.java b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/TopicWithSelectorsTransientVolumeTest.java
index e0c0b00335..e0c0b00335 100644
--- a/java/perftests/src/main/java/org/apache/qpid/topic/TopicWithSelectorsTransientVolumeTest.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/TopicWithSelectorsTransientVolumeTest.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/topic/topicselectors.properties b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/topicselectors.properties
index 1f572af58a..1f572af58a 100644
--- a/java/perftests/src/main/java/org/apache/qpid/topic/topicselectors.properties
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/topicselectors.properties
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 607c1c1580..607c1c1580 100644
--- a/java/resources/NOTICE
+++ b/qpid/java/resources/NOTICE
diff --git a/java/resources/README.txt b/qpid/java/resources/README.txt
index 1d52d487fb..1d52d487fb 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 1da0a6d355..1da0a6d355 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/bin/testclients.sh b/qpid/java/systests/etc/bin/testclients.sh
index 002f3d98bb..002f3d98bb 100755
--- a/java/systests/etc/bin/testclients.sh
+++ b/qpid/java/systests/etc/bin/testclients.sh
diff --git a/java/systests/etc/config-systests-ServerConfigurationTest-New.xml b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
index 39805cbc48..39805cbc48 100644
--- a/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
+++ b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
diff --git a/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml
index e87be87154..e87be87154 100644
--- a/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml
+++ b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml
diff --git a/java/systests/etc/config-systests-acl-settings.xml b/qpid/java/systests/etc/config-systests-acl-settings.xml
index eebc75f05f..eebc75f05f 100644
--- a/java/systests/etc/config-systests-acl-settings.xml
+++ b/qpid/java/systests/etc/config-systests-acl-settings.xml
diff --git a/java/systests/etc/config-systests-acl.xml b/qpid/java/systests/etc/config-systests-acl.xml
index 535108235e..535108235e 100644
--- a/java/systests/etc/config-systests-acl.xml
+++ b/qpid/java/systests/etc/config-systests-acl.xml
diff --git a/java/systests/etc/config-systests-aclv2-settings.xml b/qpid/java/systests/etc/config-systests-aclv2-settings.xml
index fbf218fdfa..fbf218fdfa 100644
--- a/java/systests/etc/config-systests-aclv2-settings.xml
+++ b/qpid/java/systests/etc/config-systests-aclv2-settings.xml
diff --git a/java/systests/etc/config-systests-aclv2.xml b/qpid/java/systests/etc/config-systests-aclv2.xml
index 33563e7891..33563e7891 100644
--- a/java/systests/etc/config-systests-aclv2.xml
+++ b/qpid/java/systests/etc/config-systests-aclv2.xml
diff --git a/java/systests/etc/config-systests-derby-settings.xml b/qpid/java/systests/etc/config-systests-derby-settings.xml
index 3ed3a9e33b..3ed3a9e33b 100644
--- a/java/systests/etc/config-systests-derby-settings.xml
+++ b/qpid/java/systests/etc/config-systests-derby-settings.xml
diff --git a/java/systests/etc/config-systests-derby.xml b/qpid/java/systests/etc/config-systests-derby.xml
index ba27a0c020..ba27a0c020 100644
--- a/java/systests/etc/config-systests-derby.xml
+++ b/qpid/java/systests/etc/config-systests-derby.xml
diff --git a/java/systests/etc/config-systests-firewall-2.xml b/qpid/java/systests/etc/config-systests-firewall-2.xml
index 05c3eaff9f..05c3eaff9f 100644
--- a/java/systests/etc/config-systests-firewall-2.xml
+++ b/qpid/java/systests/etc/config-systests-firewall-2.xml
diff --git a/java/systests/etc/config-systests-firewall-3.xml b/qpid/java/systests/etc/config-systests-firewall-3.xml
index 861a3b33a3..861a3b33a3 100644
--- a/java/systests/etc/config-systests-firewall-3.xml
+++ b/qpid/java/systests/etc/config-systests-firewall-3.xml
diff --git a/java/systests/etc/config-systests-firewall-settings.xml b/qpid/java/systests/etc/config-systests-firewall-settings.xml
index aa73be0646..aa73be0646 100644
--- a/java/systests/etc/config-systests-firewall-settings.xml
+++ b/qpid/java/systests/etc/config-systests-firewall-settings.xml
diff --git a/java/systests/etc/config-systests-firewall.xml b/qpid/java/systests/etc/config-systests-firewall.xml
index c0ce71210f..c0ce71210f 100644
--- a/java/systests/etc/config-systests-firewall.xml
+++ b/qpid/java/systests/etc/config-systests-firewall.xml
diff --git a/java/systests/etc/config-systests-settings.xml b/qpid/java/systests/etc/config-systests-settings.xml
index 751ff133cb..751ff133cb 100644
--- a/java/systests/etc/config-systests-settings.xml
+++ b/qpid/java/systests/etc/config-systests-settings.xml
diff --git a/java/systests/etc/config-systests.xml b/qpid/java/systests/etc/config-systests.xml
index 5d7d878e76..5d7d878e76 100644
--- a/java/systests/etc/config-systests.xml
+++ b/qpid/java/systests/etc/config-systests.xml
diff --git a/java/systests/etc/global-default.txt b/qpid/java/systests/etc/global-default.txt
index 01b2c41809..01b2c41809 100644
--- a/java/systests/etc/global-default.txt
+++ b/qpid/java/systests/etc/global-default.txt
diff --git a/java/systests/etc/global-externaladminacl-changeloggerleveldenied.txt b/qpid/java/systests/etc/global-externaladminacl-changeloggerleveldenied.txt
index a59b3176cb..a59b3176cb 100644
--- a/java/systests/etc/global-externaladminacl-changeloggerleveldenied.txt
+++ b/qpid/java/systests/etc/global-externaladminacl-changeloggerleveldenied.txt
diff --git a/java/systests/etc/global-externaladminacl-getallloggerlevelsdenied.txt b/qpid/java/systests/etc/global-externaladminacl-getallloggerlevelsdenied.txt
index ff024b5ee8..ff024b5ee8 100644
--- a/java/systests/etc/global-externaladminacl-getallloggerlevelsdenied.txt
+++ b/qpid/java/systests/etc/global-externaladminacl-getallloggerlevelsdenied.txt
diff --git a/java/systests/etc/test-default.txt b/qpid/java/systests/etc/test-default.txt
index 95e733d077..95e733d077 100644
--- a/java/systests/etc/test-default.txt
+++ b/qpid/java/systests/etc/test-default.txt
diff --git a/java/systests/etc/test-externalacljmx-deleteexchangefailure.txt b/qpid/java/systests/etc/test-externalacljmx-deleteexchangefailure.txt
index 197fe9dabe..197fe9dabe 100644
--- a/java/systests/etc/test-externalacljmx-deleteexchangefailure.txt
+++ b/qpid/java/systests/etc/test-externalacljmx-deleteexchangefailure.txt
diff --git a/java/systests/etc/test-externalacljmx.txt b/qpid/java/systests/etc/test-externalacljmx.txt
index f8a94bd44a..f8a94bd44a 100644
--- a/java/systests/etc/test-externalacljmx.txt
+++ b/qpid/java/systests/etc/test-externalacljmx.txt
diff --git a/java/systests/etc/test-logging.txt b/qpid/java/systests/etc/test-logging.txt
index 76c6e442e0..76c6e442e0 100644
--- a/java/systests/etc/test-logging.txt
+++ b/qpid/java/systests/etc/test-logging.txt
diff --git a/java/systests/etc/test2-default.txt b/qpid/java/systests/etc/test2-default.txt
index 0855e631d7..0855e631d7 100644
--- a/java/systests/etc/test2-default.txt
+++ b/qpid/java/systests/etc/test2-default.txt
diff --git a/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml b/qpid/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml
index 1b6845662b..1b6845662b 100644
--- a/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml
+++ b/qpid/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml
diff --git a/java/systests/etc/virtualhosts-systests-acl-settings.xml b/qpid/java/systests/etc/virtualhosts-systests-acl-settings.xml
index ffbace569f..ffbace569f 100644
--- a/java/systests/etc/virtualhosts-systests-acl-settings.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-acl-settings.xml
diff --git a/java/systests/etc/virtualhosts-systests-acl.xml b/qpid/java/systests/etc/virtualhosts-systests-acl.xml
index 4a56c39de0..4a56c39de0 100644
--- a/java/systests/etc/virtualhosts-systests-acl.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-acl.xml
diff --git a/java/systests/etc/virtualhosts-systests-aclv2-settings.xml b/qpid/java/systests/etc/virtualhosts-systests-aclv2-settings.xml
index db1ad33a39..db1ad33a39 100644
--- a/java/systests/etc/virtualhosts-systests-aclv2-settings.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-aclv2-settings.xml
diff --git a/java/systests/etc/virtualhosts-systests-aclv2.xml b/qpid/java/systests/etc/virtualhosts-systests-aclv2.xml
index eb96577487..eb96577487 100644
--- a/java/systests/etc/virtualhosts-systests-aclv2.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-aclv2.xml
diff --git a/java/systests/etc/virtualhosts-systests-derby-settings.xml b/qpid/java/systests/etc/virtualhosts-systests-derby-settings.xml
index ed5ffbb1fd..ed5ffbb1fd 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 171be37416..171be37416 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 51ab6739b3..51ab6739b3 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.xml b/qpid/java/systests/etc/virtualhosts-systests.xml
index 71f1cc9889..71f1cc9889 100644
--- a/java/systests/etc/virtualhosts-systests.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests.xml
diff --git a/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java b/qpid/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
index 5323ad28bf..5323ad28bf 100644
--- a/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
+++ b/qpid/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
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 ca10126aa7..ca10126aa7 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 09a03a17a0..09a03a17a0 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/DispatcherTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java
index a8a23c2c41..a8a23c2c41 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java
index 7461f6c200..7461f6c200 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
index ca83b99120..ca83b99120 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java
index e4d1c72208..e4d1c72208 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
index 29b4dd82a7..29b4dd82a7 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java
index 303da29389..303da29389 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.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 15900a17fe..15900a17fe 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/message/AMQPEncodedMapMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
index bf96dae02e..bf96dae02e 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 857adaf82c..857adaf82c 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/ssl/SSLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
index 8cdf12eaa4..8cdf12eaa4 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/management/jmx/ManagementActorLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
index 19657ef396..19657ef396 100644
--- a/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageConnectionStatisticsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageConnectionStatisticsTest.java
index 9839c6e475..9839c6e475 100644
--- a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageConnectionStatisticsTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageConnectionStatisticsTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsConfigurationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsConfigurationTest.java
index df8c6e74cd..df8c6e74cd 100644
--- a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsConfigurationTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsConfigurationTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsDeliveryTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsDeliveryTest.java
index e657856d0e..e657856d0e 100644
--- a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsDeliveryTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsDeliveryTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsReportingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsReportingTest.java
index 180440c0d6..180440c0d6 100644
--- a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsReportingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsReportingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java
index 50ca51b18a..50ca51b18a 100644
--- a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTestCase.java
index a5b3aa283c..a5b3aa283c 100644
--- a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTestCase.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 f9227c53ba..f9227c53ba 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/configuration/ServerConfigurationFileTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
index d4c550bc08..d4c550bc08 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java
index 2d89d319d7..2d89d319d7 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.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 4b4fbd711b..4b4fbd711b 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 ec222ff03d..ec222ff03d 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/failover/MessageDisappearWithIOExceptionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java
index 4c2758241e..4c2758241e 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
index 22a1b119fa..22a1b119fa 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.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 f56f428f0b..f56f428f0b 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 2629e82831..2629e82831 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 05aaf16af1..05aaf16af1 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 97914f84a5..97914f84a5 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 8fd2c085c3..8fd2c085c3 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 02d0d6f334..02d0d6f334 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 d28429aa39..d28429aa39 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/DerbyMessageStoreLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
index 16c529316a..16c529316a 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.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 32adc49521..32adc49521 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 1e48f34f99..1e48f34f99 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/ManagementLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
index 595c0d5f35..595c0d5f35 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
index 34d9e1f057..34d9e1f057 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.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 b8a42c0ab3..b8a42c0ab3 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 6e156f091e..6e156f091e 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 a23e40ecce..a23e40ecce 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/persistent/NoLocalAfterRecoveryTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java
index a5aec3edce..a5aec3edce 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/queue/ConflationQueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ConflationQueueTest.java
index ae7be6f7f4..ae7be6f7f4 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 4ac0d2c4d6..4ac0d2c4d6 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/ModelTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java
index e3fd042560..e3fd042560 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 460270e188..460270e188 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/PersistentTestManual.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
index c4e744573f..c4e744573f 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java
index 6203e8a194..6203e8a194 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.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 f78b327209..f78b327209 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/QueueDepthWithSelectorTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
index 74f50e8659..74f50e8659 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/SubscriptionTestHelper.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
index 1152797dbf..1152797dbf 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.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 abb0781536..abb0781536 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 f845ff1214..f845ff1214 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 1b2c98d30a..1b2c98d30a 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/ExternalACLFileTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLFileTest.java
index 1d08015669..1d08015669 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLFileTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLFileTest.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 b823690002..b823690002 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 4603cc1862..4603cc1862 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/acl/ExternalAdminACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalAdminACLTest.java
index 290cbfdc14..290cbfdc14 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalAdminACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalAdminACLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
index a50817e659..a50817e659 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java
index f40e95885d..f40e95885d 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.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 bf9d0e0f7b..bf9d0e0f7b 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/SlowMessageStore.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
index a5c38e7e33..a5c38e7e33 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/util/AveragedRun.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java
index 1d17985ab5..1d17985ab5 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/GlobalQueuesTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalQueuesTest.java
index 9ff143daf3..9ff143daf3 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/GlobalQueuesTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalQueuesTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/GlobalTopicsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalTopicsTest.java
index aff5d1b1b8..aff5d1b1b8 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/GlobalTopicsTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalTopicsTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/MergeConfigurationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/MergeConfigurationTest.java
index e4efac60f8..e4efac60f8 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/MergeConfigurationTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/MergeConfigurationTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/SubscriptionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/SubscriptionTest.java
index 9e9375fd44..9e9375fd44 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/SubscriptionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/SubscriptionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java
index 08a7b7a6e5..08a7b7a6e5 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/TopicTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/TopicTest.java
index 09c849cfde..09c849cfde 100644
--- a/java/systests/src/main/java/org/apache/qpid/systest/TopicTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/TopicTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java
index 13a9dd73b8..13a9dd73b8 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.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 a94d975a32..a94d975a32 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 e1f639afb6..e1f639afb6 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/QueueBrowserAutoAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
index 97d825177c..97d825177c 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 b944f2ddd2..b944f2ddd2 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/destination/AddressBasedDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
index fb389c5345..fb389c5345 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 fcbab273e5..fcbab273e5 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 a7efe4922b..a7efe4922b 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/MessageToStringTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java
index 1071861d47..1071861d47 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 147a03be0c..147a03be0c 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 49a608190d..49a608190d 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 14fbd1deb6..14fbd1deb6 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 e3557efd97..e3557efd97 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 85565a33b0..85565a33b0 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 1a23eee8ab..1a23eee8ab 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/framework/AMQPPublisher.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java
index 13465741bd..13465741bd 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/Assertion.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Assertion.java
index 60d54f1f6f..60d54f1f6f 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/Assertion.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Assertion.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/AssertionBase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/AssertionBase.java
index 0bb4911d4c..0bb4911d4c 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/AssertionBase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/AssertionBase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java
index 41614f92fc..41614f92fc 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailure.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailure.java
index 9bdd5a72c5..9bdd5a72c5 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailure.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailure.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailureUserPrompt.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailureUserPrompt.java
index 889df4ad07..889df4ad07 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailureUserPrompt.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailureUserPrompt.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/Circuit.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Circuit.java
index 4f9ab1a273..4f9ab1a273 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/Circuit.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Circuit.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEnd.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEnd.java
index 824edd7022..824edd7022 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEnd.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEnd.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java
index d5a33514df..d5a33514df 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java
index 78b5a72c1f..78b5a72c1f 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java
index 7d06aba1c0..7d06aba1c0 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
index f866cd572f..f866cd572f 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java
index 2322955253..2322955253 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkTestContext.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkTestContext.java
index 9a4668e86f..9a4668e86f 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkTestContext.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkTestContext.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java
index 4c8f301d1c..4c8f301d1c 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
index ec70759cf7..ec70759cf7 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/MessageIdentityVector.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/MessageIdentityVector.java
index 397c4e9fbd..397c4e9fbd 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/MessageIdentityVector.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/MessageIdentityVector.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/MessageMonitor.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/MessageMonitor.java
index 3fac969369..3fac969369 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/MessageMonitor.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/MessageMonitor.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java
index 6d72402018..6d72402018 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java
index 2a20be12d6..2a20be12d6 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java
index 2c8be4f787..2c8be4f787 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java
index 19dc4d90e7..19dc4d90e7 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/TestCaseVector.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/TestCaseVector.java
index ad1e70f6f7..ad1e70f6f7 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/TestCaseVector.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/TestCaseVector.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java
index 7498f2b6b5..7498f2b6b5 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java
index f1adeead80..f1adeead80 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java
index 00cc2d8966..00cc2d8966 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java
index 3d4c4f7d12..3d4c4f7d12 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java
index a92c551bc2..a92c551bc2 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/LocalClockSynchronizer.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/LocalClockSynchronizer.java
index f448d5f23c..f448d5f23c 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/LocalClockSynchronizer.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/LocalClockSynchronizer.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java
index 8bce752f68..8bce752f68 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java
index c89112eff8..c89112eff8 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
index f375eda4d1..f375eda4d1 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java
index c51f710494..c51f710494 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java
index 863921e387..863921e387 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java
index dce2706bc4..dce2706bc4 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
index d532109dc3..d532109dc3 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
index bdcfc996d6..bdcfc996d6 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
index eed9b1f290..eed9b1f290 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
index 413d5558f2..413d5558f2 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java
index 008b89a981..008b89a981 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
index 33770363ce..33770363ce 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClientControlledTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClientControlledTest.java
index 30fd382333..30fd382333 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClientControlledTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClientControlledTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
index c79029c99a..c79029c99a 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java
index 4388c7fbd8..4388c7fbd8 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
index 391091266c..391091266c 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java
index 3ec3f62538..3ec3f62538 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java
index 74f414c974..74f414c974 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/package.html b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/package.html
index ac4e30d312..ac4e30d312 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/package.html
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/package.html
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java
index c11f75e742..c11f75e742 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java
index 2708253d86..2708253d86 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java
index 3e03ad0872..3e03ad0872 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
index b92a72a654..b92a72a654 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java
index bd27fc3d90..bd27fc3d90 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
index e69952918d..e69952918d 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
index 8a9c48d8e7..8a9c48d8e7 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
index 7df80bbf10..7df80bbf10 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java
index a5a0d4e41f..a5a0d4e41f 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java
index 3001211eae..3001211eae 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java
index b4c4eb91b4..b4c4eb91b4 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java
index edcde796a8..edcde796a8 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.java
index d4bab657d7..d4bab657d7 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.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 4b45a96c20..4b45a96c20 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/AcknowledgeAfterFailoverOnMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverOnMessageTest.java
index d73d012250..d73d012250 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverOnMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverOnMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverTest.java
index acc7d5a4c1..acc7d5a4c1 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverTest.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 efea57e5d2..efea57e5d2 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/FailoverBeforeConsumingRecoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/FailoverBeforeConsumingRecoverTest.java
index 834b17430b..834b17430b 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/FailoverBeforeConsumingRecoverTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/FailoverBeforeConsumingRecoverTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java
index 6c83136511..6c83136511 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.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 5e7ba5482d..5e7ba5482d 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 59ce64eb4f..59ce64eb4f 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 abf8da799c..abf8da799c 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 c9f6a22500..c9f6a22500 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 d97e22e024..d97e22e024 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 9f13ddcfdb..9f13ddcfdb 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 3a5f676ca6..3a5f676ca6 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 c8e7368092..c8e7368092 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 3b8b4946da..3b8b4946da 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 c257dacf76..c257dacf76 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/ReceiveTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ReceiveTest.java
index bc44617620..bc44617620 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ReceiveTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ReceiveTest.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 ee837fd41a..ee837fd41a 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 a87de8ac0c..a87de8ac0c 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 c6b8069300..c6b8069300 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/AMQConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
index 292bcd6039..292bcd6039 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.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 93cceb1048..93cceb1048 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 8577fb5b6a..8577fb5b6a 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/channelclose/ChannelCloseOkTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
index 79e2ff8148..79e2ff8148 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java
index b6232b1734..b6232b1734 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.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 56d03dc4a7..56d03dc4a7 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/CloseAfterConnectionFailureTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java
index dc2f59c384..dc2f59c384 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
index 6d1b6de238..6d1b6de238 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.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 ac14f8e50e..ac14f8e50e 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 04fc611cd1..04fc611cd1 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 cec9d292cf..cec9d292cf 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/forwardall/Client.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Client.java
index b60fe76b76..b60fe76b76 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Client.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Client.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
index 45945eb8fc..45945eb8fc 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Service.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Service.java
index 160700bdda..160700bdda 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Service.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Service.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java
index be16f6b7ae..be16f6b7ae 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.java
index 27371b0397..27371b0397 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.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 fd28b86762..fd28b86762 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 278b9e9c04..278b9e9c04 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 8c806fa2da..8c806fa2da 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/CloseBeforeAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
index 039a172e4d..039a172e4d 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.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 6bc6c591ae..6bc6c591ae 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/MessageRequeueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
index de092fc893..de092fc893 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 8a6dfb86ee..8a6dfb86ee 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 989ac98747..989ac98747 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 8caeaa55c0..8caeaa55c0 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 0f799073b4..0f799073b4 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 fe929b4965..fe929b4965 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/publish/DirtyTransactedPublishTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/publish/DirtyTransactedPublishTest.java
index 3ec7937812..3ec7937812 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/publish/DirtyTransactedPublishTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/publish/DirtyTransactedPublishTest.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 d799b141c0..d799b141c0 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/TopicPublisherTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
index 5874133ab1..5874133ab1 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 eee232e113..eee232e113 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 bc2cbe714f..bc2cbe714f 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 045deab052..045deab052 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/TransactionTimeoutConfigurationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutConfigurationTest.java
index 36bac3b715..36bac3b715 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutConfigurationTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutConfigurationTest.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 71b89bf911..71b89bf911 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 c912d6a323..c912d6a323 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 637f43fb2c..637f43fb2c 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 f39f640d04..f39f640d04 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 47705f8105..47705f8105 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 d2abc0eac1..d2abc0eac1 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 99d0f0a075..99d0f0a075 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/ConversationFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java
index e153b2e0f5..e153b2e0f5 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 d3b429e315..d3b429e315 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/JMXTestUtils.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
index 1fde6c7c73..1fde6c7c73 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/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 6fcde7e185..6fcde7e185 100644
--- 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 16f7bfd305..16f7bfd305 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/QpidClientConnectionHelper.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnectionHelper.java
index 72003ed7d7..72003ed7d7 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnectionHelper.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnectionHelper.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 7946c6a6d1..7946c6a6d1 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/protocol/TestIoSession.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/protocol/TestIoSession.java
index f1eb8159b6..f1eb8159b6 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/protocol/TestIoSession.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/protocol/TestIoSession.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 8cae846a39..8cae846a39 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 a5e2b80f64..a5e2b80f64 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 a99abe4b94..a99abe4b94 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/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/08StandaloneExcludes b/qpid/java/test-profiles/08StandaloneExcludes
index 43eb1f8ee5..43eb1f8ee5 100644
--- a/java/test-profiles/08StandaloneExcludes
+++ b/qpid/java/test-profiles/08StandaloneExcludes
diff --git a/java/test-profiles/CPPExcludes b/qpid/java/test-profiles/CPPExcludes
index 4127682208..4127682208 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 ebcd430161..ebcd430161 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 7ef52f89c7..7ef52f89c7 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 47f24db19c..47f24db19c 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 ff6993fa0b..ff6993fa0b 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 c05aad0cb1..c05aad0cb1 100755
--- a/java/test-profiles/Java010Excludes
+++ b/qpid/java/test-profiles/Java010Excludes
diff --git a/java/test-profiles/JavaExcludes b/qpid/java/test-profiles/JavaExcludes
index c38a250abc..c38a250abc 100644
--- a/java/test-profiles/JavaExcludes
+++ b/qpid/java/test-profiles/JavaExcludes
diff --git a/java/test-profiles/JavaInVMExcludes b/qpid/java/test-profiles/JavaInVMExcludes
index 7960b28d81..7960b28d81 100644
--- a/java/test-profiles/JavaInVMExcludes
+++ b/qpid/java/test-profiles/JavaInVMExcludes
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/JavaStandaloneExcludes b/qpid/java/test-profiles/JavaStandaloneExcludes
index d208a20d15..d208a20d15 100644
--- a/java/test-profiles/JavaStandaloneExcludes
+++ b/qpid/java/test-profiles/JavaStandaloneExcludes
diff --git a/java/test-profiles/JavaTransientExcludes b/qpid/java/test-profiles/JavaTransientExcludes
index 2ea46795d9..2ea46795d9 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/clean-dir b/qpid/java/test-profiles/clean-dir
index 4d6141b4ab..4d6141b4ab 100755
--- a/java/test-profiles/clean-dir
+++ b/qpid/java/test-profiles/clean-dir
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 c3d47f0ce6..c3d47f0ce6 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 4d499c57b9..4d499c57b9 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 bf71384835..bf71384835 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 694e22f48c..694e22f48c 100644
--- a/java/test-profiles/cpp.testprofile
+++ b/qpid/java/test-profiles/cpp.testprofile
diff --git a/java/test-profiles/default.testprofile b/qpid/java/test-profiles/default.testprofile
index df8148f787..df8148f787 100644
--- a/java/test-profiles/default.testprofile
+++ b/qpid/java/test-profiles/default.testprofile
diff --git a/java/test-profiles/java-derby.0.10.testprofile b/qpid/java/test-profiles/java-derby.0.10.testprofile
index ca9115d30d..ca9115d30d 100644
--- a/java/test-profiles/java-derby.0.10.testprofile
+++ b/qpid/java/test-profiles/java-derby.0.10.testprofile
diff --git a/java/test-profiles/java-derby.testprofile b/qpid/java/test-profiles/java-derby.testprofile
index d22e35f07e..d22e35f07e 100644
--- a/java/test-profiles/java-derby.testprofile
+++ b/qpid/java/test-profiles/java-derby.testprofile
diff --git a/java/test-profiles/java.0.10.testprofile b/qpid/java/test-profiles/java.0.10.testprofile
index fa87b22e92..fa87b22e92 100644
--- a/java/test-profiles/java.0.10.testprofile
+++ b/qpid/java/test-profiles/java.0.10.testprofile
diff --git a/java/test-profiles/java.testprofile b/qpid/java/test-profiles/java.testprofile
index c8c776d3e1..c8c776d3e1 100644
--- a/java/test-profiles/java.testprofile
+++ b/qpid/java/test-profiles/java.testprofile
diff --git a/java/test-profiles/kill-broker b/qpid/java/test-profiles/kill-broker
index 8078fa755e..8078fa755e 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 9adfd68202..9adfd68202 100644
--- a/java/test-profiles/log4j-test.xml
+++ b/qpid/java/test-profiles/log4j-test.xml
diff --git a/java/test-profiles/start-broker b/qpid/java/test-profiles/start-broker
index e0bbb89d87..e0bbb89d87 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 8cea012c1d..8cea012c1d 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/certstore.jks b/qpid/java/test-profiles/test_resources/ssl/certstore.jks
index 2af95f21f8..2af95f21f8 100644
--- a/java/test-profiles/test_resources/ssl/certstore.jks
+++ b/qpid/java/test-profiles/test_resources/ssl/certstore.jks
diff --git a/java/test-profiles/test_resources/ssl/keystore.jks b/qpid/java/test-profiles/test_resources/ssl/keystore.jks
index e3a850a248..e3a850a248 100644
--- a/java/test-profiles/test_resources/ssl/keystore.jks
+++ b/qpid/java/test-profiles/test_resources/ssl/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/testkit/README.txt b/qpid/java/testkit/README.txt
index df7996f471..df7996f471 100644
--- a/java/testkit/README.txt
+++ b/qpid/java/testkit/README.txt
diff --git a/java/testkit/bin/run_soak_client.sh b/qpid/java/testkit/bin/run_soak_client.sh
index ea1721d988..ea1721d988 100644
--- a/java/testkit/bin/run_soak_client.sh
+++ b/qpid/java/testkit/bin/run_soak_client.sh
diff --git a/java/testkit/bin/soak_report.sh b/qpid/java/testkit/bin/soak_report.sh
index 9da8bfa234..9da8bfa234 100644
--- a/java/testkit/bin/soak_report.sh
+++ b/qpid/java/testkit/bin/soak_report.sh
diff --git a/java/testkit/build.xml b/qpid/java/testkit/build.xml
index 80a3373379..80a3373379 100644
--- a/java/testkit/build.xml
+++ b/qpid/java/testkit/build.xml
diff --git a/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java b/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java
index c240ecdf2e..c240ecdf2e 100644
--- a/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java
+++ b/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java
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/perf_report.sh b/qpid/java/tools/bin/perf_report.sh
index e6b4c987e5..e6b4c987e5 100755
--- a/java/tools/bin/perf_report.sh
+++ b/qpid/java/tools/bin/perf_report.sh
diff --git a/java/tools/bin/qpid-bench b/qpid/java/tools/bin/qpid-bench
index c982e64efd..c982e64efd 100644
--- a/java/tools/bin/qpid-bench
+++ b/qpid/java/tools/bin/qpid-bench
diff --git a/java/tools/bin/qpid-python-testkit b/qpid/java/tools/bin/qpid-python-testkit
index cbe7972421..cbe7972421 100755
--- a/java/tools/bin/qpid-python-testkit
+++ b/qpid/java/tools/bin/qpid-python-testkit
diff --git a/java/tools/bin/run_pub.sh b/qpid/java/tools/bin/run_pub.sh
index 91b9287dea..91b9287dea 100644
--- a/java/tools/bin/run_pub.sh
+++ b/qpid/java/tools/bin/run_pub.sh
diff --git a/java/tools/bin/run_sub.sh b/qpid/java/tools/bin/run_sub.sh
index c9ad2fed74..c9ad2fed74 100644
--- a/java/tools/bin/run_sub.sh
+++ b/qpid/java/tools/bin/run_sub.sh
diff --git a/java/tools/bin/set-testkit-env.sh b/qpid/java/tools/bin/set-testkit-env.sh
index 051dad8179..051dad8179 100644
--- a/java/tools/bin/set-testkit-env.sh
+++ b/qpid/java/tools/bin/set-testkit-env.sh
diff --git a/java/tools/bin/setenv.sh b/qpid/java/tools/bin/setenv.sh
index 24135e711b..24135e711b 100644
--- a/java/tools/bin/setenv.sh
+++ b/qpid/java/tools/bin/setenv.sh
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 7cd1b1172c..7cd1b1172c 100644
--- a/java/tools/build.xml
+++ b/qpid/java/tools/build.xml
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/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 dbc73c404f..dbc73c404f 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 b4294ee4cc..b4294ee4cc 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/JNDICheck.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java
index 2390516ef0..2390516ef0 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/LatencyTest.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/LatencyTest.java
index b88b242e6d..b88b242e6d 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/LatencyTest.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/LatencyTest.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 8ab1379fce..8ab1379fce 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/PerfBase.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java
index ac597d17de..ac597d17de 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/PerfConsumer.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfConsumer.java
index 0ef0455a64..0ef0455a64 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/PerfConsumer.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfConsumer.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/PerfProducer.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfProducer.java
index 015d1e6205..015d1e6205 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/PerfProducer.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfProducer.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 602fcc6321..602fcc6321 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/TestParams.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java
index 89d6462a39..89d6462a39 100644
--- a/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java
diff --git a/java/upload.xml b/qpid/java/upload.xml
index 9f2fd6819b..9f2fd6819b 100644
--- a/java/upload.xml
+++ b/qpid/java/upload.xml
diff --git a/packaging/windows/INSTALL_NOTES.html b/qpid/packaging/windows/INSTALL_NOTES.html
index f8e109cb36..f8e109cb36 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 8481c7b8a2..8481c7b8a2 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 8e73ea0661..8e73ea0661 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 3b9a3560da..3b9a3560da 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 c2dc4db380..c2dc4db380 100755
--- a/python/examples/api/spout
+++ b/qpid/python/examples/api/spout
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 a47f633565..a47f633565 100755
--- a/python/qpid-python-test
+++ b/qpid/python/qpid-python-test
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 45ce8498e8..45ce8498e8 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 7dbefb8778..7dbefb8778 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 654148dad2..654148dad2 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 8dbdc37564..8dbdc37564 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 47f57cf649..47f57cf649 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/qpid/python/qpid/messaging/driver.py b/qpid/python/qpid/messaging/driver.py
new file mode 100644
index 0000000000..7c21388213
--- /dev/null
+++ b/qpid/python/qpid/messaging/driver.py
@@ -0,0 +1,1330 @@
+#
+# 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.
+#
+
+import socket, struct, sys, time
+from logging import getLogger, DEBUG
+from qpid import compat
+from qpid import sasl
+from qpid.concurrency import synchronized
+from qpid.datatypes import RangedSet, Serial
+from qpid.framing import OpEncoder, SegmentEncoder, FrameEncoder, \
+    FrameDecoder, SegmentDecoder, OpDecoder
+from qpid.messaging import address, transports
+from qpid.messaging.constants import UNLIMITED, REJECTED, RELEASED
+from qpid.messaging.exceptions import *
+from qpid.messaging.message import get_codec, Disposition, Message
+from qpid.ops import *
+from qpid.selector import Selector
+from qpid.util import URL, default
+from qpid.validator import And, Context, List, Map, Types, Values
+from threading import Condition, Thread
+
+log = getLogger("qpid.messaging")
+rawlog = getLogger("qpid.messaging.io.raw")
+opslog = getLogger("qpid.messaging.io.ops")
+
+def addr2reply_to(addr):
+  name, subject, options = address.parse(addr)
+  if options:
+    type = options.get("node", {}).get("type")
+  else:
+    type = None
+
+  if type == "topic":
+    return ReplyTo(name, subject)
+  else:
+    return ReplyTo(None, name)
+
+def reply_to2addr(reply_to):
+  if reply_to.exchange in (None, ""):
+    return reply_to.routing_key
+  elif reply_to.routing_key is None:
+    return "%s; {node: {type: topic}}" % reply_to.exchange
+  else:
+    return "%s/%s; {node: {type: topic}}" % (reply_to.exchange, reply_to.routing_key)
+
+class Attachment:
+
+  def __init__(self, target):
+    self.target = target
+
+# XXX
+
+DURABLE_DEFAULT=False
+
+# XXX
+
+class Pattern:
+  """
+  The pattern filter matches the supplied wildcard pattern against a
+  message subject.
+  """
+
+  def __init__(self, value):
+    self.value = value
+
+  # XXX: this should become part of the driver
+  def _bind(self, sst, exchange, queue):
+    from qpid.ops import ExchangeBind
+
+    sst.write_cmd(ExchangeBind(exchange=exchange, queue=queue,
+                               binding_key=self.value.replace("*", "#")))
+
+SUBJECT_DEFAULTS = {
+  "topic": "#"
+  }
+
+# XXX
+ppid = 0
+try:
+  ppid = os.getppid()
+except:
+  pass
+
+CLIENT_PROPERTIES = {"product": "qpid python client",
+                     "version": "development",
+                     "platform": os.name,
+                     "qpid.client_process": os.path.basename(sys.argv[0]),
+                     "qpid.client_pid": os.getpid(),
+                     "qpid.client_ppid": ppid}
+
+def noop(): pass
+def sync_noop(): pass
+
+class SessionState:
+
+  def __init__(self, driver, session, name, channel):
+    self.driver = driver
+    self.session = session
+    self.name = name
+    self.channel = channel
+    self.detached = False
+    self.committing = False
+    self.aborting = False
+
+    # sender state
+    self.sent = Serial(0)
+    self.acknowledged = RangedSet()
+    self.actions = {}
+    self.min_completion = self.sent
+    self.max_completion = self.sent
+    self.results = {}
+    self.need_sync = False
+
+    # receiver state
+    self.received = None
+    self.executed = RangedSet()
+
+    # XXX: need to periodically exchange completion/known_completion
+
+    self.destinations = {}
+
+  def write_query(self, query, handler):
+    id = self.sent
+    self.write_cmd(query, lambda: handler(self.results.pop(id)))
+
+  def apply_overrides(self, cmd, overrides):
+    for k, v in overrides.items():
+      cmd[k.replace('-', '_')] = v
+
+  def write_cmd(self, cmd, action=noop, overrides=None, sync=True):
+    if overrides:
+      self.apply_overrides(cmd, overrides)
+
+    if action != noop:
+      cmd.sync = sync
+    if self.detached:
+      raise Exception("detached")
+    cmd.id = self.sent
+    self.sent += 1
+    self.actions[cmd.id] = action
+    self.max_completion = cmd.id
+    self.write_op(cmd)
+    self.need_sync = not cmd.sync
+
+  def write_cmds(self, cmds, action=noop):
+    if cmds:
+      for cmd in cmds[:-1]:
+        self.write_cmd(cmd)
+      self.write_cmd(cmds[-1], action)
+    else:
+      action()
+
+  def write_op(self, op):
+    op.channel = self.channel
+    self.driver.write_op(op)
+
+POLICIES = Values("always", "sender", "receiver", "never")
+RELIABILITY = Values("unreliable", "at-most-once", "at-least-once",
+                     "exactly-once")
+
+DECLARE = Map({}, restricted=False)
+BINDINGS = List(Map({
+      "exchange": Types(basestring),
+      "queue": Types(basestring),
+      "key": Types(basestring),
+      "arguments": Map({}, restricted=False)
+      }))
+
+COMMON_OPTS = {
+  "create": POLICIES,
+  "delete": POLICIES,
+  "assert": POLICIES,
+  "node": Map({
+      "type": Values("queue", "topic"),
+      "durable": Types(bool),
+      "x-declare": DECLARE,
+      "x-bindings": BINDINGS
+      }),
+  "link": Map({
+      "name": Types(basestring),
+      "durable": Types(bool),
+      "reliability": RELIABILITY,
+      "x-declare": DECLARE,
+      "x-bindings": BINDINGS,
+      "x-subscribe": Map({}, restricted=False)
+      })
+  }
+
+RECEIVE_MODES = Values("browse", "consume")
+
+SOURCE_OPTS = COMMON_OPTS.copy()
+SOURCE_OPTS.update({
+    "mode": RECEIVE_MODES
+    })
+
+TARGET_OPTS = COMMON_OPTS.copy()
+
+class LinkIn:
+
+  ADDR_NAME = "source"
+  DIR_NAME = "receiver"
+  VALIDATOR = Map(SOURCE_OPTS)
+
+  def init_link(self, sst, rcv, _rcv):
+    _rcv.destination = str(rcv.id)
+    sst.destinations[_rcv.destination] = _rcv
+    _rcv.draining = False
+    _rcv.bytes_open = False
+    _rcv.on_unlink = []
+
+  def do_link(self, sst, rcv, _rcv, type, subtype, action):
+    link_opts = _rcv.options.get("link", {})
+    reliability = link_opts.get("reliability", "at-least-once")
+    declare = link_opts.get("x-declare", {})
+    subscribe = link_opts.get("x-subscribe", {})
+    acq_mode = acquire_mode.pre_acquired
+    if reliability in ("unreliable", "at-most-once"):
+      rcv._accept_mode = accept_mode.none
+    else:
+      rcv._accept_mode = accept_mode.explicit
+
+    if type == "topic":
+      default_name = "%s.%s" % (rcv.session.name, _rcv.destination)
+      _rcv._queue = link_opts.get("name", default_name)
+      sst.write_cmd(QueueDeclare(queue=_rcv._queue,
+                                 durable=link_opts.get("durable", False),
+                                 exclusive=True,
+                                 auto_delete=(reliability == "unreliable")),
+                    overrides=declare)
+      _rcv.on_unlink = [QueueDelete(_rcv._queue)]
+      subject = _rcv.subject or SUBJECT_DEFAULTS.get(subtype)
+      bindings = get_bindings(link_opts, _rcv._queue, _rcv.name, subject)
+      if not bindings:
+        sst.write_cmd(ExchangeBind(_rcv._queue, _rcv.name, subject))
+
+    elif type == "queue":
+      _rcv._queue = _rcv.name
+      if _rcv.options.get("mode", "consume") == "browse":
+        acq_mode = acquire_mode.not_acquired
+      bindings = get_bindings(link_opts, queue=_rcv._queue)
+
+
+    sst.write_cmds(bindings)
+    sst.write_cmd(MessageSubscribe(queue=_rcv._queue,
+                                   destination=_rcv.destination,
+                                   acquire_mode = acq_mode,
+                                   accept_mode = rcv._accept_mode),
+                  overrides=subscribe)
+    sst.write_cmd(MessageSetFlowMode(_rcv.destination, flow_mode.credit), action)
+
+  def do_unlink(self, sst, rcv, _rcv, action=noop):
+    link_opts = _rcv.options.get("link", {})
+    reliability = link_opts.get("reliability")
+    cmds = [MessageCancel(_rcv.destination)]
+    cmds.extend(_rcv.on_unlink)
+    sst.write_cmds(cmds, action)
+
+  def del_link(self, sst, rcv, _rcv):
+    del sst.destinations[_rcv.destination]
+
+class LinkOut:
+
+  ADDR_NAME = "target"
+  DIR_NAME = "sender"
+  VALIDATOR = Map(TARGET_OPTS)
+
+  def init_link(self, sst, snd, _snd):
+    _snd.closing = False
+    _snd.pre_ack = False
+
+  def do_link(self, sst, snd, _snd, type, subtype, action):
+    link_opts = _snd.options.get("link", {})
+    reliability = link_opts.get("reliability", "at-least-once")
+    _snd.pre_ack = reliability in ("unreliable", "at-most-once")
+    if type == "topic":
+      _snd._exchange = _snd.name
+      _snd._routing_key = _snd.subject
+      bindings = get_bindings(link_opts, exchange=_snd.name, key=_snd.subject)
+    elif type == "queue":
+      _snd._exchange = ""
+      _snd._routing_key = _snd.name
+      bindings = get_bindings(link_opts, queue=_snd.name)
+    sst.write_cmds(bindings, action)
+
+  def do_unlink(self, sst, snd, _snd, action=noop):
+    action()
+
+  def del_link(self, sst, snd, _snd):
+    pass
+
+class Cache:
+
+  def __init__(self, ttl):
+    self.ttl = ttl
+    self.entries = {}
+
+  def __setitem__(self, key, value):
+    self.entries[key] = time.time(), value
+
+  def __getitem__(self, key):
+    tstamp, value = self.entries[key]
+    if time.time() - tstamp >= self.ttl:
+      del self.entries[key]
+      raise KeyError(key)
+    else:
+      return value
+
+  def __delitem__(self, key):
+    del self.entries[key]
+
+# XXX
+HEADER="!4s4B"
+
+EMPTY_DP = DeliveryProperties()
+EMPTY_MP = MessageProperties()
+
+SUBJECT = "qpid.subject"
+
+CLOSED = "CLOSED"
+READ_ONLY = "READ_ONLY"
+WRITE_ONLY = "WRITE_ONLY"
+OPEN = "OPEN"
+
+class Driver:
+
+  def __init__(self, connection):
+    self.connection = connection
+    self.log_id = "%x" % id(self.connection)
+    self._lock = self.connection._lock
+
+    self._selector = Selector.default()
+    self._attempts = 0
+    self._delay = self.connection.reconnect_interval_min
+    self._reconnect_log = self.connection.reconnect_log
+    self._host = 0
+    self._retrying = False
+    self._next_retry = None
+    self._transport = None
+
+    self._timeout = None
+
+    self.engine = None
+
+  def _next_host(self):
+    urls = [URL(u) for u in self.connection.reconnect_urls]
+    hosts = [(self.connection.host, default(self.connection.port, 5672))] + \
+        [(u.host, default(u.port, 5672)) for u in urls]
+    if self._host >= len(hosts):
+      self._host = 0
+    result = hosts[self._host]
+    if self._host == 0:
+      self._attempts += 1
+    self._host = self._host + 1
+    return result
+
+  def _num_hosts(self):
+    return len(self.connection.reconnect_urls) + 1
+
+  @synchronized
+  def wakeup(self):
+    self.dispatch()
+    self._selector.wakeup()
+
+  def start(self):
+    self._selector.register(self)
+
+  def stop(self):
+    self._selector.unregister(self)
+    if self._transport:
+      self.st_closed()
+
+  def fileno(self):
+    return self._transport.fileno()
+
+  @synchronized
+  def reading(self):
+    return self._transport is not None and \
+        self._transport.reading(True)
+
+  @synchronized
+  def writing(self):
+    return self._transport is not None and \
+        self._transport.writing(self.engine.pending())
+
+  @synchronized
+  def timing(self):
+    return self._timeout
+
+  @synchronized
+  def readable(self):
+    try:
+      data = self._transport.recv(64*1024)
+      if data is None:
+        return
+      elif data:
+        rawlog.debug("READ[%s]: %r", self.log_id, data)
+        self.engine.write(data)
+      else:
+        self.close_engine()
+    except socket.error, e:
+      self.close_engine(ConnectionError(text=str(e)))
+
+    self.update_status()
+
+    self._notify()
+
+  def _notify(self):
+    if self.connection.error:
+      self.connection._condition.gc()
+    self.connection._waiter.notifyAll()
+
+  def close_engine(self, e=None):
+    if e is None:
+      e = ConnectionError(text="connection aborted")
+
+    if (self.connection.reconnect and
+        (self.connection.reconnect_limit is None or
+         self.connection.reconnect_limit <= 0 or
+         self._attempts <= self.connection.reconnect_limit)):
+      if self._host < self._num_hosts():
+        delay = 0
+      else:
+        delay = self._delay
+        self._delay = min(2*self._delay,
+                          self.connection.reconnect_interval_max)
+      self._next_retry = time.time() + delay
+      if self._reconnect_log:
+        log.warn("recoverable error[attempt %s]: %s" % (self._attempts, e))
+        if delay > 0:
+          log.warn("sleeping %s seconds" % delay)
+      self._retrying = True
+      self.engine.close()
+    else:
+      self.engine.close(e)
+
+    self.schedule()
+
+  def update_status(self):
+    status = self.engine.status()
+    return getattr(self, "st_%s" % status.lower())()
+
+  def st_closed(self):
+    # XXX: this log statement seems to sometimes hit when the socket is not connected
+    # XXX: rawlog.debug("CLOSE[%s]: %s", self.log_id, self._socket.getpeername())
+    self._transport.close()
+    self._transport = None
+    self.engine = None
+    return True
+
+  def st_open(self):
+    return False
+
+  @synchronized
+  def writeable(self):
+    notify = False
+    try:
+      n = self._transport.send(self.engine.peek())
+      if n == 0: return
+      sent = self.engine.read(n)
+      rawlog.debug("SENT[%s]: %r", self.log_id, sent)
+    except socket.error, e:
+      self.close_engine(e)
+      notify = True
+
+    if self.update_status() or notify:
+      self._notify()
+
+  @synchronized
+  def timeout(self):
+    self.dispatch()
+    self._notify()
+    self.schedule()
+
+  def schedule(self):
+    times = []
+    if self.connection.heartbeat:
+      times.append(time.time() + self.connection.heartbeat)
+    if self._next_retry:
+      times.append(self._next_retry)
+    if times:
+      self._timeout = min(times)
+    else:
+      self._timeout = None
+
+  def dispatch(self):
+    try:
+      if self._transport is None:
+        if self.connection._connected and not self.connection.error:
+          self.connect()
+      else:
+        self.engine.dispatch()
+    except HeartbeatTimeout, e:
+      self.close_engine(e)
+    except:
+      # XXX: Does socket get leaked if this occurs?
+      msg = compat.format_exc()
+      self.connection.error = InternalError(text=msg)
+
+  def connect(self):
+    if self._retrying and time.time() < self._next_retry:
+      return
+
+    try:
+      # XXX: should make this non blocking
+      host, port = self._next_host()
+      if self._retrying and self._reconnect_log:
+        log.warn("trying: %s:%s", host, port)
+      self.engine = Engine(self.connection)
+      self.engine.open()
+      rawlog.debug("OPEN[%s]: %s:%s", self.log_id, host, port)
+      trans = transports.TRANSPORTS.get(self.connection.transport)
+      if trans:
+        self._transport = trans(self.connection, host, port)
+      else:
+        raise ConnectError("no such transport: %s" % self.connection.transport)
+      if self._retrying and self._reconnect_log:
+        log.warn("reconnect succeeded: %s:%s", host, port)
+      self._next_retry = None
+      self._attempts = 0
+      self._host = 0
+      self._delay = self.connection.reconnect_interval_min
+      self._retrying = False
+      self.schedule()
+    except socket.error, e:
+      self.close_engine(ConnectError(text=str(e)))
+
+DEFAULT_DISPOSITION = Disposition(None)
+
+def get_bindings(opts, queue=None, exchange=None, key=None):
+  bindings = opts.get("x-bindings", [])
+  cmds = []
+  for b in bindings:
+    exchange = b.get("exchange", exchange)
+    queue = b.get("queue", queue)
+    key = b.get("key", key)
+    args = b.get("arguments", {})
+    cmds.append(ExchangeBind(queue, exchange, key, args))
+  return cmds
+
+CONNECTION_ERRS = {
+  # anythong not here (i.e. everything right now) will default to
+  # connection error
+  }
+
+SESSION_ERRS = {
+  # anything not here will default to session error
+  error_code.unauthorized_access: UnauthorizedAccess,
+  error_code.not_found: NotFound,
+  error_code.resource_locked: ReceiverError,
+  error_code.resource_limit_exceeded: TargetCapacityExceeded,
+  error_code.internal_error: ServerError
+  }
+
+class Engine:
+
+  def __init__(self, connection):
+    self.connection = connection
+    self.log_id = "%x" % id(self.connection)
+    self._closing = False
+    self._connected = False
+    self._attachments = {}
+
+    self._in = LinkIn()
+    self._out = LinkOut()
+
+    self._channel_max = 65536
+    self._channels = 0
+    self._sessions = {}
+
+    self.address_cache = Cache(self.connection.address_ttl)
+
+    self._status = CLOSED
+    self._buf = ""
+    self._hdr = ""
+    self._last_in = None
+    self._last_out = None
+    self._op_enc = OpEncoder()
+    self._seg_enc = SegmentEncoder()
+    self._frame_enc = FrameEncoder()
+    self._frame_dec = FrameDecoder()
+    self._seg_dec = SegmentDecoder()
+    self._op_dec = OpDecoder()
+
+    self._sasl = sasl.Client()
+    if self.connection.username:
+      self._sasl.setAttr("username", self.connection.username)
+    if self.connection.password:
+      self._sasl.setAttr("password", self.connection.password)
+    if self.connection.host:
+      self._sasl.setAttr("host", self.connection.host)
+    self._sasl.setAttr("service", self.connection.sasl_service)
+    if self.connection.sasl_min_ssf is not None:
+      self._sasl.setAttr("minssf", self.connection.sasl_min_ssf)
+    if self.connection.sasl_max_ssf is not None:
+      self._sasl.setAttr("maxssf", self.connection.sasl_max_ssf)
+    self._sasl.init()
+    self._sasl_encode = False
+    self._sasl_decode = False
+
+  def _reset(self):
+    self.connection._transport_connected = False
+
+    for ssn in self.connection.sessions.values():
+      for m in ssn.acked + ssn.unacked + ssn.incoming:
+        m._transfer_id = None
+      for snd in ssn.senders:
+        snd.linked = False
+      for rcv in ssn.receivers:
+        rcv.impending = rcv.received
+        rcv.linked = False
+
+  def status(self):
+    return self._status
+
+  def write(self, data):
+    self._last_in = time.time()
+    try:
+      if self._sasl_decode:
+        data = self._sasl.decode(data)
+
+      if len(self._hdr) < 8:
+        r = 8 - len(self._hdr)
+        self._hdr += data[:r]
+        data = data[r:]
+
+        if len(self._hdr) == 8:
+          self.do_header(self._hdr)
+
+      self._frame_dec.write(data)
+      self._seg_dec.write(*self._frame_dec.read())
+      self._op_dec.write(*self._seg_dec.read())
+      for op in self._op_dec.read():
+        self.assign_id(op)
+        opslog.debug("RCVD[%s]: %r", self.log_id, op)
+        op.dispatch(self)
+      self.dispatch()
+    except MessagingError, e:
+      self.close(e)
+    except:
+      self.close(InternalError(text=compat.format_exc()))
+
+  def close(self, e=None):
+    self._reset()
+    if e:
+      self.connection.error = e
+    self._status = CLOSED
+
+  def assign_id(self, op):
+    if isinstance(op, Command):
+      sst = self.get_sst(op)
+      op.id = sst.received
+      sst.received += 1
+
+  def pending(self):
+    return len(self._buf)
+
+  def read(self, n):
+    result = self._buf[:n]
+    self._buf = self._buf[n:]
+    return result
+
+  def peek(self):
+    return self._buf
+
+  def write_op(self, op):
+    opslog.debug("SENT[%s]: %r", self.log_id, op)
+    self._op_enc.write(op)
+    self._seg_enc.write(*self._op_enc.read())
+    self._frame_enc.write(*self._seg_enc.read())
+    bytes = self._frame_enc.read()
+    if self._sasl_encode:
+      bytes = self._sasl.encode(bytes)
+    self._buf += bytes
+    self._last_out = time.time()
+
+  def do_header(self, hdr):
+    cli_major = 0; cli_minor = 10
+    magic, _, _, major, minor = struct.unpack(HEADER, hdr)
+    if major != cli_major or minor != cli_minor:
+      raise VersionError(text="client: %s-%s, server: %s-%s" %
+                         (cli_major, cli_minor, major, minor))
+
+  def do_connection_start(self, start):
+    if self.connection.sasl_mechanisms:
+      permitted = self.connection.sasl_mechanisms.split()
+      mechs = [m for m in start.mechanisms if m in permitted]
+    else:
+      mechs = start.mechanisms
+    try:
+      mech, initial = self._sasl.start(" ".join(mechs))
+    except sasl.SASLError, e:
+      raise AuthenticationFailure(text=str(e))
+    self.write_op(ConnectionStartOk(client_properties=CLIENT_PROPERTIES,
+                                    mechanism=mech, response=initial))
+
+  def do_connection_secure(self, secure):
+    resp = self._sasl.step(secure.challenge)
+    self.write_op(ConnectionSecureOk(response=resp))
+
+  def do_connection_tune(self, tune):
+    # XXX: is heartbeat protocol specific?
+    if tune.channel_max is not None:
+      self.channel_max = tune.channel_max
+    self.write_op(ConnectionTuneOk(heartbeat=self.connection.heartbeat,
+                                   channel_max=self.channel_max))
+    self.write_op(ConnectionOpen())
+    self._sasl_encode = True
+
+  def do_connection_open_ok(self, open_ok):
+    self.connection.auth_username = self._sasl.auth_username()
+    self._connected = True
+    self._sasl_decode = True
+    self.connection._transport_connected = True
+
+  def do_connection_heartbeat(self, hrt):
+    pass
+
+  def do_connection_close(self, close):
+    self.write_op(ConnectionCloseOk())
+    if close.reply_code != close_code.normal:
+      exc = CONNECTION_ERRS.get(close.reply_code, ConnectionError)
+      self.connection.error = exc(close.reply_code, close.reply_text)
+    # XXX: should we do a half shutdown on the socket here?
+    # XXX: we really need to test this, we may end up reporting a
+    # connection abort after this, if we were to do a shutdown on read
+    # and stop reading, then we wouldn't report the abort, that's
+    # probably the right thing to do
+
+  def do_connection_close_ok(self, close_ok):
+    self.close()
+
+  def do_session_attached(self, atc):
+    pass
+
+  def do_session_command_point(self, cp):
+    sst = self.get_sst(cp)
+    sst.received = cp.command_id
+
+  def do_session_completed(self, sc):
+    sst = self.get_sst(sc)
+    for r in sc.commands:
+      sst.acknowledged.add(r.lower, r.upper)
+
+    if not sc.commands.empty():
+      while sst.min_completion in sc.commands:
+        if sst.actions.has_key(sst.min_completion):
+          sst.actions.pop(sst.min_completion)()
+        sst.min_completion += 1
+
+  def session_known_completed(self, kcmp):
+    sst = self.get_sst(kcmp)
+    executed = RangedSet()
+    for e in sst.executed.ranges:
+      for ke in kcmp.ranges:
+        if e.lower in ke and e.upper in ke:
+          break
+      else:
+        executed.add_range(e)
+    sst.executed = completed
+
+  def do_session_flush(self, sf):
+    sst = self.get_sst(sf)
+    if sf.expected:
+      if sst.received is None:
+        exp = None
+      else:
+        exp = RangedSet(sst.received)
+      sst.write_op(SessionExpected(exp))
+    if sf.confirmed:
+      sst.write_op(SessionConfirmed(sst.executed))
+    if sf.completed:
+      sst.write_op(SessionCompleted(sst.executed))
+
+  def do_session_request_timeout(self, rt):
+    sst = self.get_sst(rt)
+    sst.write_op(SessionTimeout(timeout=0))
+
+  def do_execution_result(self, er):
+    sst = self.get_sst(er)
+    sst.results[er.command_id] = er.value
+    sst.executed.add(er.id)
+
+  def do_execution_exception(self, ex):
+    sst = self.get_sst(ex)
+    exc = SESSION_ERRS.get(ex.error_code, SessionError)
+    sst.session.error = exc(ex.error_code, ex.description)
+
+  def dispatch(self):
+    if not self.connection._connected and not self._closing and self._status != CLOSED:
+      self.disconnect()
+
+    if self._connected and not self._closing:
+      for ssn in self.connection.sessions.values():
+        self.attach(ssn)
+        self.process(ssn)
+
+      if self.connection.heartbeat and self._status != CLOSED:
+        now = time.time()
+        if self._last_in is not None and \
+              now - self._last_in > 2*self.connection.heartbeat:
+          raise HeartbeatTimeout(text="heartbeat timeout")
+        if self._last_out is None or now - self._last_out >= self.connection.heartbeat/2.0:
+          self.write_op(ConnectionHeartbeat())
+
+  def open(self):
+    self._reset()
+    self._status = OPEN
+    self._buf += struct.pack(HEADER, "AMQP", 1, 1, 0, 10)
+
+  def disconnect(self):
+    self.write_op(ConnectionClose(close_code.normal))
+    self._closing = True
+
+  def attach(self, ssn):
+    if ssn.closed: return
+    sst = self._attachments.get(ssn)
+    if sst is None:
+      for i in xrange(0, self.channel_max):
+        if not self._sessions.has_key(i):
+          ch = i
+          break
+      else:
+        raise RuntimeError("all channels used")
+      sst = SessionState(self, ssn, ssn.name, ch)
+      sst.write_op(SessionAttach(name=ssn.name))
+      sst.write_op(SessionCommandPoint(sst.sent, 0))
+      sst.outgoing_idx = 0
+      sst.acked = []
+      sst.acked_idx = 0
+      if ssn.transactional:
+        sst.write_cmd(TxSelect())
+      self._attachments[ssn] = sst
+      self._sessions[sst.channel] = sst
+
+    for snd in ssn.senders:
+      self.link(snd, self._out, snd.target)
+    for rcv in ssn.receivers:
+      self.link(rcv, self._in, rcv.source)
+
+    if sst is not None and ssn.closing and not sst.detached:
+      sst.detached = True
+      sst.write_op(SessionDetach(name=ssn.name))
+
+  def get_sst(self, op):
+    return self._sessions[op.channel]
+
+  def do_session_detached(self, dtc):
+    sst = self._sessions.pop(dtc.channel)
+    ssn = sst.session
+    del self._attachments[ssn]
+    ssn.closed = True
+
+  def do_session_detach(self, dtc):
+    sst = self.get_sst(dtc)
+    sst.write_op(SessionDetached(name=dtc.name))
+    self.do_session_detached(dtc)
+
+  def link(self, lnk, dir, addr):
+    sst = self._attachments.get(lnk.session)
+    _lnk = self._attachments.get(lnk)
+
+    if _lnk is None and not lnk.closed:
+      _lnk = Attachment(lnk)
+      _lnk.closing = False
+      dir.init_link(sst, lnk, _lnk)
+
+      err = self.parse_address(_lnk, dir, addr) or self.validate_options(_lnk, dir)
+      if err:
+        lnk.error = err
+        lnk.closed = True
+        return
+
+      def linked():
+        lnk.linked = True
+
+      def resolved(type, subtype):
+        dir.do_link(sst, lnk, _lnk, type, subtype, linked)
+
+      self.resolve_declare(sst, _lnk, dir.DIR_NAME, resolved)
+      self._attachments[lnk] = _lnk
+
+    if lnk.linked and lnk.closing and not lnk.closed:
+      if not _lnk.closing:
+        def unlinked():
+          dir.del_link(sst, lnk, _lnk)
+          del self._attachments[lnk]
+          lnk.closed = True
+        if _lnk.options.get("delete") in ("always", dir.DIR_NAME):
+          dir.do_unlink(sst, lnk, _lnk)
+          self.delete(sst, _lnk.name, unlinked)
+        else:
+          dir.do_unlink(sst, lnk, _lnk, unlinked)
+        _lnk.closing = True
+    elif not lnk.linked and lnk.closing and not lnk.closed:
+      if lnk.error: lnk.closed = True
+
+  def parse_address(self, lnk, dir, addr):
+    if addr is None:
+      return MalformedAddress(text="%s is None" % dir.ADDR_NAME)
+    else:
+      try:
+        lnk.name, lnk.subject, lnk.options = address.parse(addr)
+        # XXX: subject
+        if lnk.options is None:
+          lnk.options = {}
+      except address.LexError, e:
+        return MalformedAddress(text=str(e))
+      except address.ParseError, e:
+        return MalformedAddress(text=str(e))
+
+  def validate_options(self, lnk, dir):
+    ctx = Context()
+    err = dir.VALIDATOR.validate(lnk.options, ctx)
+    if err: return InvalidOption(text="error in options: %s" % err)
+
+  def resolve_declare(self, sst, lnk, dir, action):
+    declare = lnk.options.get("create") in ("always", dir)
+    assrt = lnk.options.get("assert") in ("always", dir)
+    def do_resolved(type, subtype):
+      err = None
+      if type is None:
+        if declare:
+          err = self.declare(sst, lnk, action)
+        else:
+          err = NotFound(text="no such queue: %s" % lnk.name)
+      else:
+        if assrt:
+          expected = lnk.options.get("node", {}).get("type")
+          if expected and type != expected:
+            err = AssertionFailed(text="expected %s, got %s" % (expected, type))
+        if err is None:
+          action(type, subtype)
+
+      if err:
+        tgt = lnk.target
+        tgt.error = err
+        del self._attachments[tgt]
+        tgt.closed = True
+        return
+    self.resolve(sst, lnk.name, do_resolved, force=declare)
+
+  def resolve(self, sst, name, action, force=False):
+    if not force:
+      try:
+        type, subtype = self.address_cache[name]
+        action(type, subtype)
+        return
+      except KeyError:
+        pass
+
+    args = []
+    def do_result(r):
+      args.append(r)
+    def do_action(r):
+      do_result(r)
+      er, qr = args
+      if er.not_found and not qr.queue:
+        type, subtype = None, None
+      elif qr.queue:
+        type, subtype = "queue", None
+      else:
+        type, subtype = "topic", er.type
+      if type is not None:
+        self.address_cache[name] = (type, subtype)
+      action(type, subtype)
+    sst.write_query(ExchangeQuery(name), do_result)
+    sst.write_query(QueueQuery(name), do_action)
+
+  def declare(self, sst, lnk, action):
+    name = lnk.name
+    props = lnk.options.get("node", {})
+    durable = props.get("durable", DURABLE_DEFAULT)
+    type = props.get("type", "queue")
+    declare = props.get("x-declare", {})
+
+    if type == "topic":
+      cmd = ExchangeDeclare(exchange=name, durable=durable)
+      bindings = get_bindings(props, exchange=name)
+    elif type == "queue":
+      cmd = QueueDeclare(queue=name, durable=durable)
+      bindings = get_bindings(props, queue=name)
+    else:
+      raise ValueError(type)
+
+    sst.apply_overrides(cmd, declare)
+
+    if type == "topic":
+      if cmd.type is None:
+        cmd.type = "topic"
+      subtype = cmd.type
+    else:
+      subtype = None
+
+    cmds = [cmd]
+    cmds.extend(bindings)
+
+    def declared():
+      self.address_cache[name] = (type, subtype)
+      action(type, subtype)
+
+    sst.write_cmds(cmds, declared)
+
+  def delete(self, sst, name, action):
+    def deleted():
+      del self.address_cache[name]
+      action()
+
+    def do_delete(type, subtype):
+      if type == "topic":
+        sst.write_cmd(ExchangeDelete(name), deleted)
+      elif type == "queue":
+        sst.write_cmd(QueueDelete(name), deleted)
+      elif type is None:
+        action()
+      else:
+        raise ValueError(type)
+    self.resolve(sst, name, do_delete, force=True)
+
+  def process(self, ssn):
+    if ssn.closed or ssn.closing: return
+
+    sst = self._attachments[ssn]
+
+    while sst.outgoing_idx < len(ssn.outgoing):
+      msg = ssn.outgoing[sst.outgoing_idx]
+      snd = msg._sender
+      # XXX: should check for sender error here
+      _snd = self._attachments.get(snd)
+      if _snd and snd.linked:
+        self.send(snd, msg)
+        sst.outgoing_idx += 1
+      else:
+        break
+
+    for snd in ssn.senders:
+      # XXX: should included snd.acked in this
+      if snd.synced >= snd.queued and sst.need_sync:
+        sst.write_cmd(ExecutionSync(), sync_noop)
+
+    for rcv in ssn.receivers:
+      self.process_receiver(rcv)
+
+    if ssn.acked:
+      messages = ssn.acked[sst.acked_idx:]
+      if messages:
+        ids = RangedSet()
+
+        disposed = [(DEFAULT_DISPOSITION, [])]
+        acked = []
+        for m in messages:
+          # XXX: we're ignoring acks that get lost when disconnected,
+          # could we deal this via some message-id based purge?
+          if m._transfer_id is None:
+            acked.append(m)
+            continue
+          ids.add(m._transfer_id)
+          if m._receiver._accept_mode is accept_mode.explicit:
+            disp = m._disposition or DEFAULT_DISPOSITION
+            last, msgs = disposed[-1]
+            if disp.type is last.type and disp.options == last.options:
+              msgs.append(m)
+            else:
+              disposed.append((disp, [m]))
+          else:
+            acked.append(m)
+
+        for range in ids:
+          sst.executed.add_range(range)
+        sst.write_op(SessionCompleted(sst.executed))
+
+        def ack_acker(msgs):
+          def ack_ack():
+            for m in msgs:
+              ssn.acked.remove(m)
+              sst.acked_idx -= 1
+              # XXX: should this check accept_mode too?
+              if not ssn.transactional:
+                sst.acked.remove(m)
+          return ack_ack
+
+        for disp, msgs in disposed:
+          if not msgs: continue
+          if disp.type is None:
+            op = MessageAccept
+          elif disp.type is RELEASED:
+            op = MessageRelease
+          elif disp.type is REJECTED:
+            op = MessageReject
+          sst.write_cmd(op(RangedSet(*[m._transfer_id for m in msgs]),
+                           **disp.options),
+                        ack_acker(msgs))
+          if log.isEnabledFor(DEBUG):
+            for m in msgs:
+              log.debug("SACK[%s]: %s, %s", ssn.log_id, m, m._disposition)
+
+        sst.acked.extend(messages)
+        sst.acked_idx += len(messages)
+        ack_acker(acked)()
+
+    if ssn.committing and not sst.committing:
+      def commit_ok():
+        del sst.acked[:]
+        ssn.committing = False
+        ssn.committed = True
+        ssn.aborting = False
+        ssn.aborted = False
+        sst.committing = False
+      sst.write_cmd(TxCommit(), commit_ok)
+      sst.committing = True
+
+    if ssn.aborting and not sst.aborting:
+      sst.aborting = True
+      def do_rb():
+        messages = sst.acked + ssn.unacked + ssn.incoming
+        ids = RangedSet(*[m._transfer_id for m in messages])
+        for range in ids:
+          sst.executed.add_range(range)
+        sst.write_op(SessionCompleted(sst.executed))
+        sst.write_cmd(MessageRelease(ids, True))
+        sst.write_cmd(TxRollback(), do_rb_ok)
+
+      def do_rb_ok():
+        del ssn.incoming[:]
+        del ssn.unacked[:]
+        del sst.acked[:]
+
+        for rcv in ssn.receivers:
+          rcv.impending = rcv.received
+          rcv.returned = rcv.received
+          # XXX: do we need to update granted here as well?
+
+        for rcv in ssn.receivers:
+          self.process_receiver(rcv)
+
+        ssn.aborting = False
+        ssn.aborted = True
+        ssn.committing = False
+        ssn.committed = False
+        sst.aborting = False
+
+      for rcv in ssn.receivers:
+        _rcv = self._attachments[rcv]
+        sst.write_cmd(MessageStop(_rcv.destination))
+      sst.write_cmd(ExecutionSync(), do_rb)
+
+  def grant(self, rcv):
+    sst = self._attachments[rcv.session]
+    _rcv = self._attachments.get(rcv)
+    if _rcv is None or not rcv.linked or _rcv.closing or _rcv.draining:
+      return
+
+    if rcv.granted is UNLIMITED:
+      if rcv.impending is UNLIMITED:
+        delta = 0
+      else:
+        delta = UNLIMITED
+    elif rcv.impending is UNLIMITED:
+      delta = -1
+    else:
+      delta = max(rcv.granted, rcv.received) - rcv.impending
+
+    if delta is UNLIMITED:
+      if not _rcv.bytes_open:
+        sst.write_cmd(MessageFlow(_rcv.destination, credit_unit.byte, UNLIMITED.value))
+        _rcv.bytes_open = True
+      sst.write_cmd(MessageFlow(_rcv.destination, credit_unit.message, UNLIMITED.value))
+      rcv.impending = UNLIMITED
+    elif delta > 0:
+      if not _rcv.bytes_open:
+        sst.write_cmd(MessageFlow(_rcv.destination, credit_unit.byte, UNLIMITED.value))
+        _rcv.bytes_open = True
+      sst.write_cmd(MessageFlow(_rcv.destination, credit_unit.message, delta))
+      rcv.impending += delta
+    elif delta < 0 and not rcv.draining:
+      _rcv.draining = True
+      def do_stop():
+        rcv.impending = rcv.received
+        _rcv.draining = False
+        _rcv.bytes_open = False
+        self.grant(rcv)
+      sst.write_cmd(MessageStop(_rcv.destination), do_stop)
+
+    if rcv.draining:
+      _rcv.draining = True
+      def do_flush():
+        rcv.impending = rcv.received
+        rcv.granted = rcv.impending
+        _rcv.draining = False
+        _rcv.bytes_open = False
+        rcv.draining = False
+      sst.write_cmd(MessageFlush(_rcv.destination), do_flush)
+
+
+  def process_receiver(self, rcv):
+    if rcv.closed: return
+    self.grant(rcv)
+
+  def send(self, snd, msg):
+    sst = self._attachments[snd.session]
+    _snd = self._attachments[snd]
+
+    if msg.subject is None or _snd._exchange == "":
+      rk = _snd._routing_key
+    else:
+      rk = msg.subject
+
+    if msg.subject is None:
+      subject = _snd.subject
+    else:
+      subject = msg.subject
+
+    # XXX: do we need to query to figure out how to create the reply-to interoperably?
+    if msg.reply_to:
+      rt = addr2reply_to(msg.reply_to)
+    else:
+      rt = None
+    content_encoding = msg.properties.get("x-amqp-0-10.content-encoding")
+    dp = DeliveryProperties(routing_key=rk)
+    mp = MessageProperties(message_id=msg.id,
+                           user_id=msg.user_id,
+                           reply_to=rt,
+                           correlation_id=msg.correlation_id,
+                           app_id = msg.properties.get("x-amqp-0-10.app-id"),
+                           content_type=msg.content_type,
+                           content_encoding=content_encoding,
+                           application_headers=msg.properties)
+    if subject is not None:
+      if mp.application_headers is None:
+        mp.application_headers = {}
+      mp.application_headers[SUBJECT] = subject
+    if msg.durable is not None:
+      if msg.durable:
+        dp.delivery_mode = delivery_mode.persistent
+      else:
+        dp.delivery_mode = delivery_mode.non_persistent
+    if msg.priority is not None:
+      dp.priority = msg.priority
+    if msg.ttl is not None:
+      dp.ttl = long(msg.ttl*1000)
+    enc, dec = get_codec(msg.content_type)
+    body = enc(msg.content)
+
+    # XXX: this is not safe for out of order, can this be triggered by pre_ack?
+    def msg_acked():
+      # XXX: should we log the ack somehow too?
+      snd.acked += 1
+      m = snd.session.outgoing.pop(0)
+      sst.outgoing_idx -= 1
+      log.debug("RACK[%s]: %s", sst.session.log_id, msg)
+      assert msg == m
+
+    xfr = MessageTransfer(destination=_snd._exchange, headers=(dp, mp),
+                          payload=body)
+
+    if _snd.pre_ack:
+      sst.write_cmd(xfr)
+    else:
+      sst.write_cmd(xfr, msg_acked, sync=msg._sync)
+
+    log.debug("SENT[%s]: %s", sst.session.log_id, msg)
+
+    if _snd.pre_ack:
+      msg_acked()
+
+  def do_message_transfer(self, xfr):
+    sst = self.get_sst(xfr)
+    ssn = sst.session
+
+    msg = self._decode(xfr)
+    rcv = sst.destinations[xfr.destination].target
+    msg._receiver = rcv
+    if rcv.impending is not UNLIMITED:
+      assert rcv.received < rcv.impending, "%s, %s" % (rcv.received, rcv.impending)
+    rcv.received += 1
+    log.debug("RCVD[%s]: %s", ssn.log_id, msg)
+    ssn.incoming.append(msg)
+
+  def _decode(self, xfr):
+    dp = EMPTY_DP
+    mp = EMPTY_MP
+
+    for h in xfr.headers:
+      if isinstance(h, DeliveryProperties):
+        dp = h
+      elif isinstance(h, MessageProperties):
+        mp = h
+
+    ap = mp.application_headers
+    enc, dec = get_codec(mp.content_type)
+    content = dec(xfr.payload)
+    msg = Message(content)
+    msg.id = mp.message_id
+    if ap is not None:
+      msg.subject = ap.get(SUBJECT)
+    msg.user_id = mp.user_id
+    if mp.reply_to is not None:
+      msg.reply_to = reply_to2addr(mp.reply_to)
+    msg.correlation_id = mp.correlation_id
+    if dp.delivery_mode is not None:
+      msg.durable = dp.delivery_mode == delivery_mode.persistent
+    msg.priority = dp.priority
+    if dp.ttl is not None:
+      msg.ttl = dp.ttl/1000.0
+    msg.redelivered = dp.redelivered
+    msg.properties = mp.application_headers or {}
+    if mp.app_id is not None:
+      msg.properties["x-amqp-0-10.app-id"] = mp.app_id
+    if mp.content_encoding is not None:
+      msg.properties["x-amqp-0-10.content-encoding"] = mp.content_encoding
+    if dp.routing_key is not None:
+      msg.properties["x-amqp-0-10.routing-key"] = dp.routing_key
+    msg.content_type = mp.content_type
+    msg._transfer_id = xfr.id
+    return msg
diff --git a/python/qpid/messaging/endpoints.py b/qpid/python/qpid/messaging/endpoints.py
index 338ac70ecf..338ac70ecf 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 0296d615d9..0296d615d9 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 7abaae12e8..7abaae12e8 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 265cf7d51f..265cf7d51f 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 fed6deac20..fed6deac20 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 ca5946c3f9..ca5946c3f9 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.xml b/qpid/python/qpid/specs/amqp-0-10-qpid-errata.xml
index d0d9486fef..d0d9486fef 100644
--- a/python/qpid/specs/amqp-0-10-qpid-errata.xml
+++ b/qpid/python/qpid/specs/amqp-0-10-qpid-errata.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.xml b/qpid/python/qpid/specs/amqp-0-8.xml
index 0463f45fa9..0463f45fa9 100644
--- a/python/qpid/specs/amqp-0-8.xml
+++ b/qpid/python/qpid/specs/amqp-0-8.xml
diff --git a/python/qpid/specs/amqp-0-9.xml b/qpid/python/qpid/specs/amqp-0-9.xml
index 73cace7015..73cace7015 100644
--- a/python/qpid/specs/amqp-0-9.xml
+++ b/qpid/python/qpid/specs/amqp-0-9.xml
diff --git a/python/qpid/specs_config.py b/qpid/python/qpid/specs_config.py
index 58021320f6..58021320f6 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 1439b892ea..1439b892ea 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 101a0c3759..101a0c3759 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 8f6680d5e3..8f6680d5e3 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 db5ec03df2..db5ec03df2 100644
--- a/python/qpid/tests/messaging/endpoints.py
+++ b/qpid/python/qpid/tests/messaging/endpoints.py
diff --git a/python/qpid/tests/messaging/message.py b/qpid/python/qpid/tests/messaging/message.py
index 297374b82b..297374b82b 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/util.py b/qpid/python/qpid/util.py
index e62bebdf24..e62bebdf24 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 a301b3e4cc..a301b3e4cc 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/ruby/LICENSE.txt b/qpid/ruby/LICENSE.txt
index 6b0b1270ff..6b0b1270ff 100755
--- a/ruby/LICENSE.txt
+++ b/qpid/ruby/LICENSE.txt
diff --git a/ruby/Makefile b/qpid/ruby/Makefile
index 9cac3207c0..9cac3207c0 100644
--- a/ruby/Makefile
+++ b/qpid/ruby/Makefile
diff --git a/ruby/NOTICE.txt b/qpid/ruby/NOTICE.txt
index fff2bca45c..fff2bca45c 100644
--- a/ruby/NOTICE.txt
+++ b/qpid/ruby/NOTICE.txt
diff --git a/ruby/README.txt b/qpid/ruby/README.txt
index 330f9c6f61..330f9c6f61 100644
--- a/ruby/README.txt
+++ b/qpid/ruby/README.txt
diff --git a/ruby/RELEASE_NOTES b/qpid/ruby/RELEASE_NOTES
index 90e7297e47..90e7297e47 100644
--- a/ruby/RELEASE_NOTES
+++ b/qpid/ruby/RELEASE_NOTES
diff --git a/ruby/Rakefile b/qpid/ruby/Rakefile
index 9b0878813d..9b0878813d 100644
--- a/ruby/Rakefile
+++ b/qpid/ruby/Rakefile
diff --git a/ruby/examples/hello-world.rb b/qpid/ruby/examples/hello-world.rb
index e8ef673316..e8ef673316 100755
--- a/ruby/examples/hello-world.rb
+++ b/qpid/ruby/examples/hello-world.rb
diff --git a/ruby/examples/qmf-libvirt.rb b/qpid/ruby/examples/qmf-libvirt.rb
index 492f4fe8d6..492f4fe8d6 100644
--- a/ruby/examples/qmf-libvirt.rb
+++ b/qpid/ruby/examples/qmf-libvirt.rb
diff --git a/ruby/ext/sasl/extconf.rb b/qpid/ruby/ext/sasl/extconf.rb
index 56841f34e3..56841f34e3 100644
--- a/ruby/ext/sasl/extconf.rb
+++ b/qpid/ruby/ext/sasl/extconf.rb
diff --git a/ruby/ext/sasl/sasl.c b/qpid/ruby/ext/sasl/sasl.c
index 2d4e40d30e..2d4e40d30e 100644
--- a/ruby/ext/sasl/sasl.c
+++ b/qpid/ruby/ext/sasl/sasl.c
diff --git a/ruby/lib/qpid.rb b/qpid/ruby/lib/qpid.rb
index 1c719e9b1d..1c719e9b1d 100644
--- a/ruby/lib/qpid.rb
+++ b/qpid/ruby/lib/qpid.rb
diff --git a/ruby/lib/qpid/assembler.rb b/qpid/ruby/lib/qpid/assembler.rb
index b768c3f195..b768c3f195 100644
--- a/ruby/lib/qpid/assembler.rb
+++ b/qpid/ruby/lib/qpid/assembler.rb
diff --git a/ruby/lib/qpid/client.rb b/qpid/ruby/lib/qpid/client.rb
index ec3d100a9c..ec3d100a9c 100644
--- a/ruby/lib/qpid/client.rb
+++ b/qpid/ruby/lib/qpid/client.rb
diff --git a/ruby/lib/qpid/codec.rb b/qpid/ruby/lib/qpid/codec.rb
index a3b5d101c4..a3b5d101c4 100644
--- a/ruby/lib/qpid/codec.rb
+++ b/qpid/ruby/lib/qpid/codec.rb
diff --git a/ruby/lib/qpid/codec08.rb b/qpid/ruby/lib/qpid/codec08.rb
index 148dee07bb..148dee07bb 100644
--- a/ruby/lib/qpid/codec08.rb
+++ b/qpid/ruby/lib/qpid/codec08.rb
diff --git a/ruby/lib/qpid/config.rb b/qpid/ruby/lib/qpid/config.rb
index b5b79cd309..b5b79cd309 100644
--- a/ruby/lib/qpid/config.rb
+++ b/qpid/ruby/lib/qpid/config.rb
diff --git a/ruby/lib/qpid/connection.rb b/qpid/ruby/lib/qpid/connection.rb
index d2efbfb263..d2efbfb263 100644
--- a/ruby/lib/qpid/connection.rb
+++ b/qpid/ruby/lib/qpid/connection.rb
diff --git a/ruby/lib/qpid/connection08.rb b/qpid/ruby/lib/qpid/connection08.rb
index 09a4888cc4..09a4888cc4 100644
--- a/ruby/lib/qpid/connection08.rb
+++ b/qpid/ruby/lib/qpid/connection08.rb
diff --git a/ruby/lib/qpid/datatypes.rb b/qpid/ruby/lib/qpid/datatypes.rb
index 418388c73a..418388c73a 100644
--- a/ruby/lib/qpid/datatypes.rb
+++ b/qpid/ruby/lib/qpid/datatypes.rb
diff --git a/ruby/lib/qpid/delegates.rb b/qpid/ruby/lib/qpid/delegates.rb
index f779047e05..f779047e05 100644
--- a/ruby/lib/qpid/delegates.rb
+++ b/qpid/ruby/lib/qpid/delegates.rb
diff --git a/ruby/lib/qpid/fields.rb b/qpid/ruby/lib/qpid/fields.rb
index cc87d07529..cc87d07529 100644
--- a/ruby/lib/qpid/fields.rb
+++ b/qpid/ruby/lib/qpid/fields.rb
diff --git a/ruby/lib/qpid/framer.rb b/qpid/ruby/lib/qpid/framer.rb
index d057605383..d057605383 100644
--- a/ruby/lib/qpid/framer.rb
+++ b/qpid/ruby/lib/qpid/framer.rb
diff --git a/ruby/lib/qpid/invoker.rb b/qpid/ruby/lib/qpid/invoker.rb
index 39716ac6c2..39716ac6c2 100644
--- a/ruby/lib/qpid/invoker.rb
+++ b/qpid/ruby/lib/qpid/invoker.rb
diff --git a/ruby/lib/qpid/packer.rb b/qpid/ruby/lib/qpid/packer.rb
index ae1be37faf..ae1be37faf 100644
--- a/ruby/lib/qpid/packer.rb
+++ b/qpid/ruby/lib/qpid/packer.rb
diff --git a/ruby/lib/qpid/peer.rb b/qpid/ruby/lib/qpid/peer.rb
index cdb962169b..cdb962169b 100644
--- a/ruby/lib/qpid/peer.rb
+++ b/qpid/ruby/lib/qpid/peer.rb
diff --git a/ruby/lib/qpid/qmf.rb b/qpid/ruby/lib/qpid/qmf.rb
index 4711d355cd..4711d355cd 100644
--- a/ruby/lib/qpid/qmf.rb
+++ b/qpid/ruby/lib/qpid/qmf.rb
diff --git a/ruby/lib/qpid/queue.rb b/qpid/ruby/lib/qpid/queue.rb
index 4150173b53..4150173b53 100644
--- a/ruby/lib/qpid/queue.rb
+++ b/qpid/ruby/lib/qpid/queue.rb
diff --git a/ruby/lib/qpid/session.rb b/qpid/ruby/lib/qpid/session.rb
index d693b722c2..d693b722c2 100644
--- a/ruby/lib/qpid/session.rb
+++ b/qpid/ruby/lib/qpid/session.rb
diff --git a/ruby/lib/qpid/spec.rb b/qpid/ruby/lib/qpid/spec.rb
index b3d70d019d..b3d70d019d 100644
--- a/ruby/lib/qpid/spec.rb
+++ b/qpid/ruby/lib/qpid/spec.rb
diff --git a/ruby/lib/qpid/spec010.rb b/qpid/ruby/lib/qpid/spec010.rb
index 3e54115087..3e54115087 100644
--- a/ruby/lib/qpid/spec010.rb
+++ b/qpid/ruby/lib/qpid/spec010.rb
diff --git a/ruby/lib/qpid/spec08.rb b/qpid/ruby/lib/qpid/spec08.rb
index 902c05c297..902c05c297 100644
--- a/ruby/lib/qpid/spec08.rb
+++ b/qpid/ruby/lib/qpid/spec08.rb
diff --git a/ruby/lib/qpid/specs/amqp.0-10-qpid-errata.xml b/qpid/ruby/lib/qpid/specs/amqp.0-10-qpid-errata.xml
index 365928ea4e..365928ea4e 100644
--- a/ruby/lib/qpid/specs/amqp.0-10-qpid-errata.xml
+++ b/qpid/ruby/lib/qpid/specs/amqp.0-10-qpid-errata.xml
diff --git a/ruby/lib/qpid/specs/amqp.0-10.dtd b/qpid/ruby/lib/qpid/specs/amqp.0-10.dtd
index 2be198525a..2be198525a 100644
--- a/ruby/lib/qpid/specs/amqp.0-10.dtd
+++ b/qpid/ruby/lib/qpid/specs/amqp.0-10.dtd
diff --git a/ruby/lib/qpid/test.rb b/qpid/ruby/lib/qpid/test.rb
index 2e643f4348..2e643f4348 100644
--- a/ruby/lib/qpid/test.rb
+++ b/qpid/ruby/lib/qpid/test.rb
diff --git a/ruby/lib/qpid/traverse.rb b/qpid/ruby/lib/qpid/traverse.rb
index 67358a7eb1..67358a7eb1 100644
--- a/ruby/lib/qpid/traverse.rb
+++ b/qpid/ruby/lib/qpid/traverse.rb
diff --git a/ruby/lib/qpid/util.rb b/qpid/ruby/lib/qpid/util.rb
index 2dbc37da09..2dbc37da09 100644
--- a/ruby/lib/qpid/util.rb
+++ b/qpid/ruby/lib/qpid/util.rb
diff --git a/ruby/tests/assembler.rb b/qpid/ruby/tests/assembler.rb
index 1181ece547..1181ece547 100644
--- a/ruby/tests/assembler.rb
+++ b/qpid/ruby/tests/assembler.rb
diff --git a/ruby/tests/codec010.rb b/qpid/ruby/tests/codec010.rb
index a9a5ca81e0..a9a5ca81e0 100644
--- a/ruby/tests/codec010.rb
+++ b/qpid/ruby/tests/codec010.rb
diff --git a/ruby/tests/connection.rb b/qpid/ruby/tests/connection.rb
index c2a851ec0a..c2a851ec0a 100644
--- a/ruby/tests/connection.rb
+++ b/qpid/ruby/tests/connection.rb
diff --git a/ruby/tests/datatypes.rb b/qpid/ruby/tests/datatypes.rb
index 65b1f9e3f5..65b1f9e3f5 100644
--- a/ruby/tests/datatypes.rb
+++ b/qpid/ruby/tests/datatypes.rb
diff --git a/ruby/tests/framer.rb b/qpid/ruby/tests/framer.rb
index 1d56f2faf1..1d56f2faf1 100644
--- a/ruby/tests/framer.rb
+++ b/qpid/ruby/tests/framer.rb
diff --git a/ruby/tests/qmf.rb b/qpid/ruby/tests/qmf.rb
index 274e38416e..274e38416e 100644
--- a/ruby/tests/qmf.rb
+++ b/qpid/ruby/tests/qmf.rb
diff --git a/ruby/tests/queue.rb b/qpid/ruby/tests/queue.rb
index 4ec0e07ffb..4ec0e07ffb 100644
--- a/ruby/tests/queue.rb
+++ b/qpid/ruby/tests/queue.rb
diff --git a/ruby/tests/spec010.rb b/qpid/ruby/tests/spec010.rb
index 6db1523455..6db1523455 100644
--- a/ruby/tests/spec010.rb
+++ b/qpid/ruby/tests/spec010.rb
diff --git a/ruby/tests/util.rb b/qpid/ruby/tests/util.rb
index b22a6bab2f..b22a6bab2f 100644
--- a/ruby/tests/util.rb
+++ b/qpid/ruby/tests/util.rb
diff --git a/ruby/tests_0-8/basic.rb b/qpid/ruby/tests_0-8/basic.rb
index 10a43b1aab..10a43b1aab 100644
--- a/ruby/tests_0-8/basic.rb
+++ b/qpid/ruby/tests_0-8/basic.rb
diff --git a/ruby/tests_0-8/channel.rb b/qpid/ruby/tests_0-8/channel.rb
index 1eea8f18d9..1eea8f18d9 100644
--- a/ruby/tests_0-8/channel.rb
+++ b/qpid/ruby/tests_0-8/channel.rb
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 f8c0d5d1ba..f8c0d5d1ba 100644
--- a/specs/LICENSE
+++ b/qpid/specs/LICENSE
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-preview.xml b/qpid/specs/amqp.0-10-preview.xml
index 5af956e75d..5af956e75d 100644
--- a/specs/amqp.0-10-preview.xml
+++ b/qpid/specs/amqp.0-10-preview.xml
diff --git a/specs/amqp.0-10-qpid-errata.xml b/qpid/specs/amqp.0-10-qpid-errata.xml
index f0fd17a59b..f0fd17a59b 100644
--- a/specs/amqp.0-10-qpid-errata.xml
+++ b/qpid/specs/amqp.0-10-qpid-errata.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.xml b/qpid/specs/amqp.0-10.xml
index 454114c17a..454114c17a 100644
--- a/specs/amqp.0-10.xml
+++ b/qpid/specs/amqp.0-10.xml
diff --git a/specs/amqp.0-8.xml b/qpid/specs/amqp.0-8.xml
index 0463f45fa9..0463f45fa9 100644
--- a/specs/amqp.0-8.xml
+++ b/qpid/specs/amqp.0-8.xml
diff --git a/specs/amqp.0-9.xml b/qpid/specs/amqp.0-9.xml
index 73cace7015..73cace7015 100644
--- a/specs/amqp.0-9.xml
+++ b/qpid/specs/amqp.0-9.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/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/specs/management-schema.xml b/qpid/specs/management-schema.xml
index 881632c881..881632c881 100644
--- a/specs/management-schema.xml
+++ b/qpid/specs/management-schema.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 6a99fbb80f..6a99fbb80f 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 921786af22..921786af22 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 8cbb5793d9..8cbb5793d9 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 2823385a3b..2823385a3b 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 f51923fcf3..f51923fcf3 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 8fd6b88d78..8fd6b88d78 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 952878e0b7..952878e0b7 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 b46c446833..b46c446833 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/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 6a60add97e..6a60add97e 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/query.py b/qpid/tests/src/py/qpid_tests/broker_0_10/query.py
index d57e964982..d57e964982 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 d68cf91492..d68cf91492 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/threshold.py b/qpid/tests/src/py/qpid_tests/broker_0_10/threshold.py
index 6628ae8424..6628ae8424 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 d5837fc19c..d5837fc19c 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 56d6fa82e4..56d6fa82e4 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 d9f2ed7dbb..d9f2ed7dbb 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/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/client/client-api-example-tests.py b/qpid/tests/src/py/qpid_tests/client/client-api-example-tests.py
index 3140a83b7d..3140a83b7d 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 58863a07d9..58863a07d9 100755
--- a/tools/setup.py
+++ b/qpid/tools/setup.py
diff --git a/tools/src/py/.gitignore b/qpid/tools/src/py/.gitignore
index 97cb05dc36..97cb05dc36 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 e366d04709..e366d04709 100755
--- a/tools/src/py/qmf-tool
+++ b/qpid/tools/src/py/qmf-tool
diff --git a/tools/src/py/qpid-cluster b/qpid/tools/src/py/qpid-cluster
index 312d59f670..312d59f670 100755
--- a/tools/src/py/qpid-cluster
+++ b/qpid/tools/src/py/qpid-cluster
diff --git a/tools/src/py/qpid-cluster-store b/qpid/tools/src/py/qpid-cluster-store
index 3541b6679c..3541b6679c 100755
--- a/tools/src/py/qpid-cluster-store
+++ b/qpid/tools/src/py/qpid-cluster-store
diff --git a/tools/src/py/qpid-config b/qpid/tools/src/py/qpid-config
index 3df69dc99b..3df69dc99b 100755
--- a/tools/src/py/qpid-config
+++ b/qpid/tools/src/py/qpid-config
diff --git a/tools/src/py/qpid-printevents b/qpid/tools/src/py/qpid-printevents
index d56d2899b1..d56d2899b1 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 54f22dfc42..54f22dfc42 100755
--- a/tools/src/py/qpid-queue-stats
+++ b/qpid/tools/src/py/qpid-queue-stats
diff --git a/tools/src/py/qpid-route b/qpid/tools/src/py/qpid-route
index d98cefd618..d98cefd618 100755
--- a/tools/src/py/qpid-route
+++ b/qpid/tools/src/py/qpid-route
diff --git a/tools/src/py/qpid-stat b/qpid/tools/src/py/qpid-stat
index ce3f5d1ef5..ce3f5d1ef5 100755
--- a/tools/src/py/qpid-stat
+++ b/qpid/tools/src/py/qpid-stat
diff --git a/tools/src/py/qpid-tool b/qpid/tools/src/py/qpid-tool
index d6bb9bcaea..d6bb9bcaea 100755
--- a/tools/src/py/qpid-tool
+++ b/qpid/tools/src/py/qpid-tool
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 0845e42c8a..0845e42c8a 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 33d125e3c6..33d125e3c6 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 2b0119e338..2b0119e338 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