QPID-7207: remove cpp and python subdirs from svn trunk, they have migrated to their own git repositories

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

25 files changed, 0 insertions, 4904 deletions

diff --git a/qpid/cpp/examples/CMakeLists.txt b/qpid/cpp/examples/CMakeLists.txt
deleted file mode 100644
index 7bcc8d7261..0000000000
--- a/qpid/cpp/examples/CMakeLists.txt
+++ /dev/null
@@ -1,86 +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.
-#
-project(qpidc_examples)
-cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
-
-include_directories(${CMAKE_BINARY_DIR}/include)
-include_directories(${CMAKE_SOURCE_DIR}/include)
-
-# Shouldn't need this... but there are still client header inclusions
-# of Boost. When building examples at an install site, the Boost files
-# should be locatable aside from these settings.
-# So set up to find the headers, find the libs at link time, but dynamically
-# link them all and clear the CMake Boost library names to avoid adding them to
-# the project files.
-include_directories( ${Boost_INCLUDE_DIR} )
-link_directories( ${Boost_LIBRARY_DIRS} )
-
-# Visual Studio needs some Windows-specific simplifications.
-if (MSVC)
-  add_definitions( /D "NOMINMAX" /D "WIN32_LEAN_AND_MEAN" /D "BOOST_ALL_DYN_LINK" )
-  # On Windows, prevent the accidental inclusion of Boost headers from
-  # autolinking in the Boost libs. There should be no direct references to
-  # Boost in the examples, and references via qpidclient/qpidcommon are
-  # resolved in the Qpid libs.
-  add_definitions( /D "BOOST_ALL_NO_LIB" )
-endif (MSVC)
-
-# There are numerous duplicate names within the examples. Since all target
-# names must be unique, define a macro to prepend a prefix and manage the
-# actual names.
-# There can be an optional arguments at the end: libs to include
-macro(add_example subdir example)
-  add_executable(${subdir}_${example} ${example}.cpp)
-  set_target_properties(${subdir}_${example} PROPERTIES OUTPUT_NAME ${example})
-  if (${ARGC} GREATER 2)
-    target_link_libraries(${subdir}_${example} ${ARGN} qpidclient
-                          ${_boost_libs_needed})
-  else (${ARGC} GREATER 2)
-    target_link_libraries(${subdir}_${example} qpidclient
-                          ${_boost_libs_needed})
-  endif (${ARGC} GREATER 2)
-endmacro(add_example)
-
-macro(add_installed_example subdir example)
-  add_example(${subdir} ${example} ${ARGN})
-
-  # For installs, don't install the built example; that would be pointless.
-  # Install the things a user needs to build the example on-site.
-  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${example}.cpp
-           DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/${subdir}
-           COMPONENT ${QPID_COMPONENT_EXAMPLES})
-  if (MSVC)
-    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}_${example}.vcproj
-             DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/${subdir}
-             COMPONENT ${QPID_COMPONENT_EXAMPLES})
-  endif (MSVC)
-
-endmacro(add_installed_example)
-
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt
-         DESTINATION ${QPID_INSTALL_EXAMPLESDIR}
-         COMPONENT ${QPID_COMPONENT_EXAMPLES})
-if (MSVC)
-  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples.sln
-           DESTINATION ${QPID_INSTALL_EXAMPLESDIR}
-           COMPONENT ${QPID_COMPONENT_EXAMPLES})
-endif (MSVC)
-
-add_subdirectory(messaging)
-
diff --git a/qpid/cpp/examples/README.txt b/qpid/cpp/examples/README.txt
deleted file mode 100644
index 74de2788c3..0000000000
--- a/qpid/cpp/examples/README.txt
+++ /dev/null
@@ -1,224 +0,0 @@
-= Qpid C++ Examples =
-
-This directory contains example C++ programs for Apache Qpid. They are
-based on the 0-10 version of the AMQP specification (see www.amqp.org for
-details). A short description of each example follows.
-
-= Messaging API Examples = 
-
-Qpid now uses a new, simpler API called the Messaging API. The
-examples that use this API are in the cpp/examples/messaging
-directory. If you are new to Qpid, we encourage you to start with
-these examples.
-
-== hello_world.cpp ==
-
-hello_world.cpp is a simple example that creates a Sender and a
-Receiver for the same address, sends a message to the address, reads
-it, and prints it:
-
-$ ./hello_world
-Hello world!
-
-By default, this program connects to a broker running on
-localhost:5672. You can specify a host and port explicitly on the
-command line:
-
-$ ./hello_world localhost:5673
-
-== drain.cpp, spout.cpp ==
-
-drain and spout provide many features for sending or receiving
-messages. Use --help to see all available options.
-
-To learn how to specify various kinds of addresses using these
-programs, read the chapter on Addresses here:
-
-  http://qpid.apache.org/books/0.7/Programming-In-Apache-Qpid/html/
-
-If you do not have qpid-config installed, you can create queues
-explicitly as part of an address. For instance, to create a queue
-named 'hello-world' and send a message to it, you can use spout as
-follows:
-
-$ ./spout "hello-world ; { create: always }"
-
-Now you can read the message from this queue using drain:
-
-$ ./drain hello-world
-
-Message(properties={spout-id:c877e622-d57b-4df2-bf3e-6014c68da0ea:0}, content='')
-
-
-== map_sender.cpp, map_receiver.cpp ==
-
-These examples show how to send and receive typed data. Send the data
-with map_sender, then receive it with map_receiver:
-
-$ ./map_sender
-$ ./map_receiver
-{colours:[red, green, white], id:987654321, name:Widget, percent:0.98999999999999999, uuid:34935b4a-fd55-4212-9c41-e5baebc6e7a5}
-
-
-== hello-xml.cpp ==
-
-This example shows how to route XML messages with an XQuery using an
-XML Exchange.
-
-$ ./hello_xml
-<weather><station>Raleigh-Durham International Airport (KRDU)</station><wind_speed_mph>16</wind_speed_mph><temperature_f>70</temperature_f><dewpoint>35</dewpoint></weather>
-
-
-= Examples that use the Legacy API =
-
-The following examples use an older API that is now deprecated. If you
-are new to Qpid, we encourage you to use the Messaging API
-instead. These examples may not be part of future distributions.
-
-Please note that by default these examples attempt to connect to a Qpid
-broker running on the local host (127.0.0.1) at the standard AMQP port (5672).
-It is possible to instruct the examples to connect to an alternate broker
-host and port by specifying the host name/address and port number as arguments
-to the programs. For example, to have the declare_queues program connect to a
-broker running on host1, port 9999, run the following command:
-
-On Linux: 
-  # ./declare_queues host1 9999
-
-On Windows:
-  C:\Program Files\qpidc-0.7\examples\direct> declare_queues host1 9999
-
-The qpid C++ broker executable is named qpidd on Linux and qpidd.exe
-on Windows. The default install locations are:
-- Linux: /usr/sbin
-- Windows: C:\Program Files\qpidc-0.7\bin
-
-In a C++ source distribution the broker is located in the src subdirectory
-(generally, from this examples directory, ../src).
-
-
-== Direct ==
-
-This example shows how to create Point-to-Point applications using Qpid. This
-example contains three components.
-
- 1. declare_queues
-    This will bind a queue to the amq.direct exchange, so that the messages
-    sent to the amq.direct exchange with a given routing key (routing_key) are 
-    delivered to a specific queue (message_queue).
-
- 2. direct_producer
-    Publishes messages to the amq.direct exchange using the given routing key
-    (routing_key) discussed above.
-
- 3. listener
-    Uses a message listener to listen for messages from a specific queue
-    (message_queue) as discussed above.
-
-In order to run this example,
-
-On Linux:
-  # ./declare_queues
-  # ./direct_producer
-  # ./listener
-
-On Windows:
-  C:\Program Files\qpidc-0.7\examples\direct> declare_queues
-  C:\Program Files\qpidc-0.7\examples\direct> direct_producer
-  C:\Program Files\qpidc-0.7\examples\direct> listener
-
-Note that there is no requirement for the listener to be running before the
-messages are published. The messages are stored in the queue until consumed
-by the listener.
-
-== Fanout ==
-
-This example shows how to create Fanout exchange applications using Qpid.
-This example has two components. Unlike the Direct example, the Fanout exchange
-does not need a routing key to be specified.
-
- 1. fanout_producer
-    Publishes a message to the amq.fanout exchange, without using a routing key.
-
- 2. listener
-    Uses a message listener to listen for messages from the amq.fanout exchange.
-
-
-Note that unlike the Direct example, it is necessary to start the listener
-before the messages are published. The fanout exchange does not hold messages
-in a queue. Therefore, it is recommended that the two parts of the example be
-run in separate windows.
-
-In order to run this example:
-
-On Linux:
-  # ./listener
-
-  # ./fanout_producer
-
-On Windows:
-  C:\Program Files\qpidc-0.7\examples\fanout> listener
-
-  C:\Program Files\qpidc-0.7\examples\direct> fanout_producer
-
-== Publisher/Subscriber ==
-
-This example demonstrates the ability to create topic Publishers and
-Subscribers using Qpid. This example has two components.
-
- 1. topic_publisher
-    This application is used to publish messages to the amq.topic exchange
-    using multipart routing keys, usa.weather, europe.weather, usa.news and
-    europe.news.
-
- 2. topic_listener
-    This application is used to subscribe to several private queues, such as
-    usa, europe, weather and news. In this program, each private queue created
-    is bound to the amq.topic exchange using bindings that match the
-    corresponding parts of the multipart routing keys. For example, subscribing
-    to #.news will retrieve news irrespective of destination.
-
-This example also shows the use of the 'control' routing key which is used by
-control messages.
-
-Due to this example's design, the topic_listener must be running before
-starting the topic_publisher. Therefore, it is recommended that the two parts
-of the example be run in separate windows.
-
-In order to run this example,
-  
-On Linux:
-  # ./topic_listener
-
-  # ./topic_publisher
-
-On Windows:
-  C:\Program Files\qpidc-0.7\examples\pub-sub> topic_listener
-
-  C:\Program Files\qpidc-0.7\examples\pub-sub> topic_publisher
-
-== Request/Response ==
-
-This example shows a simple server that will accept strings from a client,
-convert them to upper case, and send them back to the client. This example
-has two components.
-
- 1. client
-    This sends lines of poetry to the server.
-
- 2. server
-    This is a simple service that will convert incoming strings to upper case
-    and send the result to amq.direct exchange on which the client listens.
-    It uses the request's reply_to property as the response's routing key.
-
-In order to run this example,
-
-On Linux:
-  # ./server
-  # ./client
-
-On Windows:
-  C:\Program Files\qpidc-0.7\examples\request-response> server
-  C:\Program Files\qpidc-0.7\examples\request-response> client
-
-
diff --git a/qpid/cpp/examples/examples.sln b/qpid/cpp/examples/examples.sln
deleted file mode 100644
index 8511fe3cce..0000000000
--- a/qpid/cpp/examples/examples.sln
+++ /dev/null
@@ -1,95 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00

-# Visual Studio 2008

-#

-# 

-# 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

-#

-#

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "messaging_client", "messaging\messaging_client.vcproj", "{80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "messaging_map_receiver", "messaging\messaging_map_receiver.vcproj", "{92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "messaging_map_sender", "messaging\messaging_map_sender.vcproj", "{3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "messaging_server", "messaging\messaging_server.vcproj", "{E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "messaging_drain", "messaging\messaging_drain.vcproj", "{D79791E5-C593-4F23-B545-0CE72D181F2A}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "messaging_spout", "messaging\messaging_spout.vcproj", "{D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.ActiveCfg = Debug|Win32

-		{80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.Build.0 = Debug|Win32

-		{80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.ActiveCfg = Debug|x64

-		{80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.Build.0 = Debug|x64

-		{80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.ActiveCfg = Release|Win32

-		{80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.Build.0 = Release|Win32

-		{80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.ActiveCfg = Release|x64

-		{80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.Build.0 = Release|x64

-		{92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.ActiveCfg = Debug|Win32

-		{92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.Build.0 = Debug|Win32

-		{92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.ActiveCfg = Debug|x64

-		{92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.Build.0 = Debug|x64

-		{92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.ActiveCfg = Release|Win32

-		{92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.Build.0 = Release|Win32

-		{92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.ActiveCfg = Release|x64

-		{92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.Build.0 = Release|x64

-		{3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.ActiveCfg = Debug|Win32

-		{3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.Build.0 = Debug|Win32

-		{3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.ActiveCfg = Debug|x64

-		{3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.Build.0 = Debug|x64

-		{3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.ActiveCfg = Release|Win32

-		{3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.Build.0 = Release|Win32

-		{3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.ActiveCfg = Release|x64

-		{3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.Build.0 = Release|x64

-		{E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.ActiveCfg = Debug|Win32

-		{E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.Build.0 = Debug|Win32

-		{E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.ActiveCfg = Debug|x64

-		{E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.Build.0 = Debug|x64

-		{E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.ActiveCfg = Release|Win32

-		{E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.Build.0 = Release|Win32

-		{E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.ActiveCfg = Release|x64

-		{E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.Build.0 = Release|x64

-		{D79791E5-C593-4F23-B545-0CE72D181F2A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{D79791E5-C593-4F23-B545-0CE72D181F2A}.Debug|Win32.Build.0 = Debug|Win32

-		{D79791E5-C593-4F23-B545-0CE72D181F2A}.Debug|x64.ActiveCfg = Debug|x64

-		{D79791E5-C593-4F23-B545-0CE72D181F2A}.Debug|x64.Build.0 = Debug|x64

-		{D79791E5-C593-4F23-B545-0CE72D181F2A}.Release|Win32.ActiveCfg = Release|Win32

-		{D79791E5-C593-4F23-B545-0CE72D181F2A}.Release|Win32.Build.0 = Release|Win32

-		{D79791E5-C593-4F23-B545-0CE72D181F2A}.Release|x64.ActiveCfg = Release|x64

-		{D79791E5-C593-4F23-B545-0CE72D181F2A}.Release|x64.Build.0 = Release|x64

-		{D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Debug|Win32.ActiveCfg = Debug|Win32

-		{D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Debug|Win32.Build.0 = Debug|Win32

-		{D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Debug|x64.ActiveCfg = Debug|x64

-		{D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Debug|x64.Build.0 = Debug|x64

-		{D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Release|Win32.ActiveCfg = Release|Win32

-		{D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Release|Win32.Build.0 = Release|Win32

-		{D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Release|x64.ActiveCfg = Release|x64

-		{D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/qpid/cpp/examples/messaging/CMakeLists.txt b/qpid/cpp/examples/messaging/CMakeLists.txt
deleted file mode 100644
index 40f9412189..0000000000
--- a/qpid/cpp/examples/messaging/CMakeLists.txt
+++ /dev/null
@@ -1,81 +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.
-#
-
-# drain and spout have explicit Boost.program_options usage in them, so be
-# sure that lib is linked in.
-
-macro(add_messaging_example example)
-  add_executable(${example} ${example}.cpp OptionParser.cpp)
-  set_target_properties(${example} PROPERTIES OUTPUT_NAME ${example})
-  target_link_libraries(${example} qpidmessaging qpidtypes ${_boost_libs_needed})
-  # For installs, don't install the built example; that would be pointless.
-  # Install the things a user needs to build the example on-site.
-  install (FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/${example}.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/OptionParser.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/OptionParser.cpp
-    DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/messaging
-    COMPONENT ${QPID_COMPONENT_EXAMPLES})
-
-  if (MSVC)
-    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/messaging_${example}.vcproj
-             DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/messaging
-             COMPONENT ${QPID_COMPONENT_EXAMPLES})
-  endif (MSVC)
-
-endmacro(add_messaging_example)
-
-add_messaging_example(drain)
-add_messaging_example(spout)
-
-add_messaging_example(map_receiver)
-add_messaging_example(map_sender)
-
-add_messaging_example(client)
-add_messaging_example(server)
-add_messaging_example(server_reconnect)
-
-# These don't need Boost or OptionParser
-add_executable(hello_world hello_world.cpp)
-set_target_properties(hello_world PROPERTIES OUTPUT_NAME hello_world)
-target_link_libraries(hello_world qpidmessaging qpidtypes)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/hello_world.cpp
-           DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/messaging
-           COMPONENT ${QPID_COMPONENT_EXAMPLES})
-
-add_executable(hello_xml hello_xml.cpp)
-set_target_properties(hello_xml PROPERTIES OUTPUT_NAME hello_xml)
-target_link_libraries(hello_xml qpidmessaging qpidtypes)
-
-install (FILES
-           ${CMAKE_CURRENT_SOURCE_DIR}/extra_dist/CMakeLists.txt
-           ${CMAKE_CURRENT_SOURCE_DIR}/OptionParser.cpp
-           ${CMAKE_CURRENT_SOURCE_DIR}/OptionParser.h
-           ${CMAKE_CURRENT_SOURCE_DIR}/hello_world.cpp
-           ${CMAKE_CURRENT_SOURCE_DIR}/hello_xml.cpp
-           ${CMAKE_CURRENT_SOURCE_DIR}/drain.cpp
-           ${CMAKE_CURRENT_SOURCE_DIR}/spout.cpp
-           ${CMAKE_CURRENT_SOURCE_DIR}/map_receiver.cpp
-           ${CMAKE_CURRENT_SOURCE_DIR}/map_sender.cpp
-           ${CMAKE_CURRENT_SOURCE_DIR}/client.cpp
-           ${CMAKE_CURRENT_SOURCE_DIR}/server.cpp
-           ${CMAKE_CURRENT_SOURCE_DIR}/server_reconnect.cpp
-           DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/messaging
-           COMPONENT ${QPID_COMPONENT_EXAMPLES})
-
diff --git a/qpid/cpp/examples/messaging/OptionParser.cpp b/qpid/cpp/examples/messaging/OptionParser.cpp
deleted file mode 100644
index 661d0a988a..0000000000
--- a/qpid/cpp/examples/messaging/OptionParser.cpp
+++ /dev/null
@@ -1,257 +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 "OptionParser.h"
-#include <qpid/types/Exception.h>
-#include <algorithm>
-#include <iostream>
-#include <iomanip>
-#include <sstream>
-#include <cstdlib>
-
-class Option
-{
-  public:
-    Option(const std::string& name, const std::string& description);
-    virtual ~Option() {}
-    virtual void setValue(const std::string&) = 0;
-    virtual bool isValueExpected() = 0;
-    bool match(const std::string&);
-    std::ostream& print(std::ostream& out);
-  private:
-    std::string longName;
-    std::string shortName;
-    std::string description;
-    std::ostream& printNames(std::ostream& out);
-  friend class OptionParser;
-};
-
-class StringOption : public Option
-{
-  public:
-    StringOption(const std::string& name, const std::string& description, std::string& v) : Option(name, description), value(v) {}
-    void setValue(const std::string& v) { value = v; }
-    bool isValueExpected() { return true; }
-  private:
-    std::string& value;
-};
-
-class IntegerOption : public Option
-{
-  public:
-    IntegerOption(const std::string& name, const std::string& description, int& v) : Option(name, description), value(v) {}
-    void setValue(const std::string& v) { value = atoi(v.c_str()); }
-    bool isValueExpected() { return true; }
-  private:
-    int& value;
-};
-
-class BooleanOption : public Option
-{
-  public:
-    BooleanOption(const std::string& name, const std::string& description, bool& v) : Option(name, description), value(v) {}
-    void setValue(const std::string&) { value = true; }
-    bool isValueExpected() { return false; }
-  private:
-    bool& value;
-};
-
-class MultiStringOption : public Option
-{
-  public:
-    MultiStringOption(const std::string& name, const std::string& description, std::vector<std::string>& v) : Option(name, description), value(v) {}
-    void setValue(const std::string& v) { value.push_back(v); }
-    bool isValueExpected() { return true; }
-  private:
-    std::vector<std::string>& value;
-};
-
-class OptionMatch
-{
-  public:
-    OptionMatch(const std::string& argument);
-    bool operator()(Option* option);
-    bool isOption();
-  private:
-    std::string name;
-};
-
-class OptionsError : public qpid::types::Exception
-{
-  public:
-    OptionsError(const std::string& message) : qpid::types::Exception(message) {}
-};
-
-Option::Option(const std::string& name, const std::string& desc) : description(desc)
-{
-    std::string::size_type i = name.find(",");
-    if (i != std::string::npos) {
-        longName = name.substr(0, i);
-        if (i + 1 < name.size())
-            shortName = name.substr(i+1);
-    } else {
-        longName = name;
-    }
-}
-
-bool Option::match(const std::string& name)
-{
-    return name == longName || name == shortName;
-}
-
-std::ostream& Option::printNames(std::ostream& out)
-{
-    if (shortName.size()) {
-        out << "-" << shortName;
-        if (isValueExpected()) out << " VALUE";
-        out << ", --" << longName;
-        if (isValueExpected()) out << " VALUE";
-    } else {
-        out << "--" << longName;
-        if (isValueExpected()) out << " VALUE";
-    }
-    return out;
-}
-
-std::ostream& Option::print(std::ostream& out)
-{
-    std::stringstream names;
-    printNames(names);
-    out << std::setw(30) << std::left << names.str() << description << std::endl;
-    return out;
-}
-
-std::vector<std::string>& OptionParser::getArguments() { return arguments; }
-
-void OptionParser::add(Option* option)
-{
-    options.push_back(option);
-}
-
-void OptionParser::add(const std::string& name, std::string& value, const std::string& description)
-{
-    add(new StringOption(name, description, value));
-}
-void OptionParser::add(const std::string& name, int& value, const std::string& description)
-{
-    add(new IntegerOption(name, description, value));
-}
-void OptionParser::add(const std::string& name, bool& value, const std::string& description)
-{
-    add(new BooleanOption(name, description, value));
-}
-void OptionParser::add(const std::string& name, std::vector<std::string>& value, const std::string& description)
-{
-    add(new MultiStringOption(name, description, value));
-}
-
-OptionMatch::OptionMatch(const std::string& argument)
-{
-    if (argument.find("--") == 0) {
-        name = argument.substr(2);
-    } else if (argument.find("-") == 0) {
-        name = argument.substr(1);
-    }
-}
-
-bool OptionMatch::operator()(Option* option)
-{
-    return option->match(name);
-}
-
-bool OptionMatch::isOption()
-{
-    return name.size() > 0;
-}
-
-OptionParser::OptionParser(const std::string& s, const std::string& d) : summary(s), description(d), help(false)
-{
-    add("help,h", help, "show this message");
-}
-
-Option* OptionParser::getOption(const std::string& argument)
-{
-    OptionMatch match(argument);
-    if (match.isOption()) {
-        Options::iterator i = std::find_if(options.begin(), options.end(), match);
-        if (i == options.end()) {
-            std::stringstream error;
-            error << "Unrecognised option: " << argument;
-            throw OptionsError(error.str());
-        } else {
-            return *i;
-        }        
-    } else {
-        return 0;
-    }
-}
-
-void OptionParser::error(const std::string& message)
-{
-    std::cout << summary << std::endl << std::endl;
-    std::cerr << "Error: " << message << "; try --help for more information" << std::endl;
-}
-
-bool OptionParser::parse(int argc, char** argv)
-{
-    try {
-        for (int i = 1; i < argc; ++i) {
-            std::string argument = argv[i];
-            Option* o = getOption(argument);
-            if (o) {
-                if (o->isValueExpected()) {
-                    if (i + 1 < argc) {
-                        o->setValue(argv[++i]);
-                    } else {
-                        std::stringstream error;
-                        error << "Value expected for option " << o->longName;
-                        throw OptionsError(error.str());
-                    }
-                } else {
-                    o->setValue("");
-                }
-            } else {
-                arguments.push_back(argument);
-            }
-        }
-        if (help) {
-            std::cout << summary << std::endl << std::endl;
-            std::cout << description << std::endl << std::endl;
-            std::cout << "Options: " << std::endl;
-            for (Options::iterator i = options.begin(); i != options.end(); ++i) {
-                (*i)->print(std::cout);
-            }
-            return false;
-        } else {
-            return true;
-        }
-    } catch (const std::exception& e) {
-        error(e.what());
-        return false;
-    }
-}
-
-
-OptionParser::~OptionParser()
-{
-    for (Options::iterator i = options.begin(); i != options.end(); ++i) {        
-        delete *i;
-    }
-}
diff --git a/qpid/cpp/examples/messaging/OptionParser.h b/qpid/cpp/examples/messaging/OptionParser.h
deleted file mode 100644
index 4cda53f92a..0000000000
--- a/qpid/cpp/examples/messaging/OptionParser.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef OPTIONPARSER_H
-#define OPTIONPARSER_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 <map>
-#include <string>
-#include <vector>
-
-class Option;
-
-class OptionParser
-{
-  public:
-    OptionParser(const std::string& usage, const std::string& description);
-    ~OptionParser();
-    void add(const std::string& name, std::string& value, const std::string& description = std::string());
-    void add(const std::string& name, int& value, const std::string& description = std::string());
-    void add(const std::string& name, bool& value, const std::string& description = std::string());
-    void add(const std::string& name, std::vector<std::string>& value, const std::string& description = std::string());
-    bool parse(int argc, char** argv);
-    void error(const std::string& message);
-    std::vector<std::string>& getArguments();
-  private:
-    typedef std::vector<Option*> Options;
-
-    const std::string summary;
-    const std::string description;
-    bool help;
-    Options options;
-    std::vector<std::string> arguments;
-
-    void add(Option*);
-    Option* getOption(const std::string& argument);
-};
-
-#endif  /*!OPTIONPARSER_H*/
diff --git a/qpid/cpp/examples/messaging/client.cpp b/qpid/cpp/examples/messaging/client.cpp
deleted file mode 100644
index 44720ef3ce..0000000000
--- a/qpid/cpp/examples/messaging/client.cpp
+++ /dev/null
@@ -1,80 +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/messaging/Address.h>
-#include <qpid/messaging/Connection.h>
-#include <qpid/messaging/Message.h>
-#include <qpid/messaging/Receiver.h>
-#include <qpid/messaging/Sender.h>
-#include <qpid/messaging/Session.h>
-
-#include <cstdlib>
-#include <iostream>
-
-#include <sstream>
-
-using namespace qpid::messaging;
-
-using std::stringstream;
-using std::string;
-
-int main(int argc, char** argv) {
-    const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
-    std::string connectionOptions = argc > 2 ? argv[2] : "";
-
-    Connection connection(url, connectionOptions);
-     try {
-        connection.open();
-        Session session = connection.createSession();
-
-        Sender sender = session.createSender("service_queue");
-
-        //create temp queue & receiver...
-        Receiver receiver = session.createReceiver("#");
-        Address responseQueue = receiver.getAddress();
-
-	// Now send some messages ...
-	string s[] = {
-            "Twas brillig, and the slithy toves",
-            "Did gire and gymble in the wabe.",
-            "All mimsy were the borogroves,",
-            "And the mome raths outgrabe."
-        };
-
-    	Message request;
-        request.setReplyTo(responseQueue);
-	for (int i=0; i<4; i++) {
-            request.setContentObject(s[i]);
-            sender.send(request);
-            Message response = receiver.fetch();
-            std::cout << request.getContentObject() << " -> " << response.getContentObject() << std::endl;
-            session.acknowledge(response);
-	}
-        connection.close();
-        return 0;
-    } catch(const std::exception& error) {
-        std::cout << error.what() << std::endl;
-        connection.close();
-    }
-    return 1;
-}
-
-
diff --git a/qpid/cpp/examples/messaging/drain.cpp b/qpid/cpp/examples/messaging/drain.cpp
deleted file mode 100644
index 0c58cc25e6..0000000000
--- a/qpid/cpp/examples/messaging/drain.cpp
+++ /dev/null
@@ -1,112 +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/messaging/Connection.h>
-#include <qpid/messaging/Message.h>
-#include <qpid/messaging/Message_io.h>
-#include <qpid/messaging/Receiver.h>
-#include <qpid/messaging/Session.h>
-
-#include <iostream>
-
-#include "OptionParser.h"
-
-using namespace qpid::messaging;
-using namespace qpid::types;
-
-struct Options : OptionParser
-{
-    std::string url;
-    std::string address;
-    std::string connectionOptions;
-    int timeout;
-    bool forever;
-    int count;
-
-    Options()
-        : OptionParser("Usage: drain [OPTIONS] ADDRESS", "Drains messages from the specified address"),
-          url("127.0.0.1"),
-          timeout(0),
-          forever(false),
-          count(0)
-    {
-        add("broker,b", url, "url of broker to connect to");
-        add("timeout,t", timeout, "timeout in seconds to wait before exiting");
-        add("forever,f", forever, "ignore timeout and wait forever");
-        add("connection-options", connectionOptions, "connection options string in the form {name1:value1, name2:value2}");
-        add("count,c", count, "number of messages to read before exiting");
-    }
-
-    Duration getTimeout()
-    {
-        if (forever) return Duration::FOREVER;
-        else return timeout*Duration::SECOND;
-    }
-
-    int getCount()
-    {
-        return count;
-    }
-    
-    bool checkAddress()
-    {
-        if (getArguments().empty()) {
-            error("Address is required");
-            return false;
-        } else {
-            address = getArguments()[0];
-            return true;
-        }
-    }
-};
-
-int main(int argc, char** argv)
-{
-    Options options;
-    if (options.parse(argc, argv) && options.checkAddress()) {
-        Connection connection;
-        try {
-            connection = Connection(options.url, options.connectionOptions);
-            connection.open();
-            Session session = connection.createSession();
-            Receiver receiver = session.createReceiver(options.address);
-            Duration timeout = options.getTimeout();
-            int count = options.getCount();
-            Message message;
-            int i = 0;
-
-            while (receiver.fetch(message, timeout)) {
-                std::cout << message << std::endl;
-                session.acknowledge();
-                if (count && (++i == count))
-                    break;
-            }
-            receiver.close();
-            session.close();
-            connection.close();
-            return 0;
-        } catch(const std::exception& error) {
-            std::cout << "Error: " << error.what() << std::endl;
-            connection.close();
-        }
-    }
-    return 1;
-}
diff --git a/qpid/cpp/examples/messaging/extra_dist/CMakeLists.txt b/qpid/cpp/examples/messaging/extra_dist/CMakeLists.txt
deleted file mode 100644
index 519338ea80..0000000000
--- a/qpid/cpp/examples/messaging/extra_dist/CMakeLists.txt
+++ /dev/null
@@ -1,62 +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.
-#
-
-cmake_minimum_required (VERSION 2.8.7)
-
-project (Examples)
-
-# drain and spout have explicit Boost.program_options usage in them, so be
-# sure that lib is linked in.
-
-macro(add_messaging_example example)
-  add_executable(${example} ${example}.cpp OptionParser.cpp)
-  set_target_properties(${example} PROPERTIES OUTPUT_NAME ${example})
-  target_link_libraries(${example} qpidtypes qpidmessaging ${_boost_libs_needed})
-  # For installs, don't install the built example; that would be pointless.
-  # Install the things a user needs to build the example on-site.
-  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${example}.cpp
-                  ${CMAKE_CURRENT_SOURCE_DIR}/OptionParser.h
-                  ${CMAKE_CURRENT_SOURCE_DIR}/OptionParser.cpp
-           DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/messaging
-           COMPONENT ${QPID_COMPONENT_EXAMPLES})
-  if (MSVC)
-    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/messaging_${example}.vcproj
-             DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/messaging
-             COMPONENT ${QPID_COMPONENT_EXAMPLES})
-  endif (MSVC)
-
-endmacro(add_messaging_example)
-
-add_messaging_example(drain)
-add_messaging_example(spout)
-
-add_messaging_example(map_receiver)
-add_messaging_example(map_sender)
-
-add_messaging_example(client)
-add_messaging_example(server)
-
-# These don't need Boost or OptionParser
-add_executable(hello_world hello_world.cpp)
-set_target_properties(hello_world PROPERTIES OUTPUT_NAME hello_world)
-target_link_libraries(hello_world qpidmessaging qpidtypes)
-
-add_executable(hello_xml hello_xml.cpp)
-set_target_properties(hello_xml PROPERTIES OUTPUT_NAME hello_xml)
-target_link_libraries(hello_xml qpidmessaging qpidtypes)
diff --git a/qpid/cpp/examples/messaging/hello_world.cpp b/qpid/cpp/examples/messaging/hello_world.cpp
deleted file mode 100644
index 61894f4667..0000000000
--- a/qpid/cpp/examples/messaging/hello_world.cpp
+++ /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.
- *
- */
-
-#include <qpid/messaging/Connection.h>
-#include <qpid/messaging/Message.h>
-#include <qpid/messaging/Receiver.h>
-#include <qpid/messaging/Sender.h>
-#include <qpid/messaging/Session.h>
-
-#include <iostream>
-
-using namespace qpid::messaging;
-
-int main(int argc, char** argv) {
-    std::string broker = argc > 1 ? argv[1] : "localhost:5672";
-    std::string address = argc > 2 ? argv[2] : "amq.topic";
-    std::string connectionOptions = argc > 3 ? argv[3] : "";
-
-    try {
-        Connection connection(broker, connectionOptions);
-        connection.open();
-        Session session = connection.createSession();
-
-        Receiver receiver = session.createReceiver(address);
-        Sender sender = session.createSender(address);
-
-        Message message;
-        message.setContentObject("Hello world!");
-        message.getContentObject().setEncoding("utf8");
-        sender.send(message);
-
-        message = receiver.fetch(Duration::SECOND * 1);
-        std::cout << message.getContent() << std::endl;
-        session.acknowledge();
-
-        connection.close();
-        return 0;
-    } catch(const std::exception& error) {
-        std::cerr << error.what() << std::endl;
-        return 1;
-    }
-}
diff --git a/qpid/cpp/examples/messaging/hello_xml.cpp b/qpid/cpp/examples/messaging/hello_xml.cpp
deleted file mode 100644
index 00e1b6c8e1..0000000000
--- a/qpid/cpp/examples/messaging/hello_xml.cpp
+++ /dev/null
@@ -1,87 +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/messaging/Connection.h>
-#include <qpid/messaging/Message.h>
-#include <qpid/messaging/Receiver.h>
-#include <qpid/messaging/Sender.h>
-#include <qpid/messaging/Session.h>
-
-#include <iostream>
-#include <sstream>
-using std::stringstream;
-
-using namespace qpid::messaging;
-
-int main(int argc, char** argv) {
-  std::string broker = argc > 1 ? argv[1] : "localhost:5672";
-  std::string connectionOptions = argc > 2 ? argv[2] : "";
-
-  std::string query = 
-    "let $w := ./weather "
-    "return $w/station = 'Raleigh-Durham International Airport (KRDU)' "
-    "   and $w/temperature_f > 50"
-    "   and $w/temperature_f - $w/dewpoint > 5"
-    "   and $w/wind_speed_mph > 7"
-    "   and $w/wind_speed_mph < 20";
-
-  stringstream address;
-
-  address << "xml-exchange; {"
-    " create: always, "        // This line and the next are not in docs
-    " node: { type: topic, x-declare: { type: xml } }, " // Added so it works "out of the box"
-    " link: { "
-    "  x-bindings: [{ exchange: xml-exchange, key: weather, arguments: { xquery:\"" 
-       << query 
-       << "\"} }] "
-    " } "
-    "}";
-
-  Connection connection(broker, connectionOptions);
-  try {
-    connection.open();
-    Session session = connection.createSession();
-
-    Receiver receiver = session.createReceiver(address.str());
-
-    Message message;
-    message.setContent(
-       "<weather>"
-       "<station>Raleigh-Durham International Airport (KRDU)</station>"
-       "<wind_speed_mph>16</wind_speed_mph>"
-       "<temperature_f>70</temperature_f>"
-       "<dewpoint>35</dewpoint>"
-       "</weather>");
-    Sender sender = session.createSender("xml-exchange/weather");
-    sender.send(message);
-
-    Message response = receiver.fetch();
-
-    std::cout << response.getContent() << std::endl;
-
-    connection.close();
-    return 0;
-  } catch(const std::exception& error) {
-    std::cerr << error.what() << std::endl;
-    connection.close();
-    return 1;   
-  }
-}
diff --git a/qpid/cpp/examples/messaging/map_receiver.cpp b/qpid/cpp/examples/messaging/map_receiver.cpp
deleted file mode 100644
index 96bc76b821..0000000000
--- a/qpid/cpp/examples/messaging/map_receiver.cpp
+++ /dev/null
@@ -1,58 +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/messaging/Connection.h>
-#include <qpid/messaging/Message.h>
-#include <qpid/messaging/Receiver.h>
-#include <qpid/messaging/Session.h>
-
-#include <cstdlib>
-#include <iostream>
-
-#include <sstream>
-
-using namespace qpid::messaging;
-using namespace qpid::types;
-
-using std::stringstream;
-using std::string;
-
-int main(int argc, char** argv) {
-    const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
-    const char* address = argc>2 ? argv[2] : "message_queue; {create: always}";
-    std::string connectionOptions = argc > 3 ? argv[3] : "";
-
-    Connection connection(url, connectionOptions);
-    try {
-        connection.open();
-        Session session = connection.createSession();
-        Receiver receiver = session.createReceiver(address);
-        std::cout << receiver.fetch().getContentObject() << std::endl;
-        session.acknowledge();
-        receiver.close();
-        connection.close();
-        return 0;
-    } catch(const std::exception& error) {
-        std::cout << error.what() << std::endl;
-        connection.close();
-    }
-    return 1;
-}
diff --git a/qpid/cpp/examples/messaging/map_sender.cpp b/qpid/cpp/examples/messaging/map_sender.cpp
deleted file mode 100644
index 81ac7320d8..0000000000
--- a/qpid/cpp/examples/messaging/map_sender.cpp
+++ /dev/null
@@ -1,73 +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/messaging/Connection.h>
-#include <qpid/messaging/Message.h>
-#include <qpid/messaging/Sender.h>
-#include <qpid/messaging/Session.h>
-
-#include <cstdlib>
-#include <iostream>
-
-#include <sstream>
-
-using namespace qpid::messaging;
-using namespace qpid::types;
-
-using std::stringstream;
-using std::string;
-
-int main(int argc, char** argv) {
-    const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
-    const char* address = argc>2 ? argv[2] : "message_queue; {create: always}";
-    std::string connectionOptions = argc > 3 ? argv[3] : "";
-
-    Connection connection(url, connectionOptions);
-    try {
-        connection.open();
-        Session session = connection.createSession();
-        Sender sender = session.createSender(address);
-
-        Message message;
-        Variant::Map content;
-        content["id"] = 987654321;
-        content["name"] = "Widget";
-        content["percent"] = 0.99;
-        Variant::List colours;
-        colours.push_back(Variant("red"));
-        colours.push_back(Variant("green"));
-        colours.push_back(Variant("white"));
-        content["colours"] = colours;
-        content["uuid"] = Uuid(true);
-        message.setContentObject(content);
-
-        sender.send(message, true);
-
-        connection.close();
-        return 0;
-    } catch(const std::exception& error) {
-        std::cout << error.what() << std::endl;
-        connection.close();
-    }
-    return 1;
-}
-
-
diff --git a/qpid/cpp/examples/messaging/messaging_client.vcproj b/qpid/cpp/examples/messaging/messaging_client.vcproj
deleted file mode 100644
index ff66891855..0000000000
--- a/qpid/cpp/examples/messaging/messaging_client.vcproj
+++ /dev/null
@@ -1,442 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<!--

- -

- - 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.

- -

- -->

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="messaging_client"

-	ProjectGUID="{80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}"

-	RootNamespace="messaging_client"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="0"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="."

-			IntermediateDirectory="Debug\messaging_client\I386"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessagingd.lib qpidcommond.lib qpidtypesd.lib"

-				OutputFile="$(OutDir)\client.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release\messaging_client\I386"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				RuntimeLibrary="2"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessaging.lib qpidcommon.lib qpidtypes.lib"

-				OutputFile="$(OutDir)\client.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TargetEnvironment="3"

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessagingd.lib qpidcommond.lib qpidtypesd.lib"

-				OutputFile="$(OutDir)\client.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TargetEnvironment="3"

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				RuntimeLibrary="2"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessaging.lib qpidcommon.lib qpidtypes.lib"

-				OutputFile="$(OutDir)\client.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;cxx;cc;c;C"

-			>

-			<File

-				RelativePath="client.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Documentation"

-			>

-			<File

-				RelativePath="CMakeLists.txt"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/qpid/cpp/examples/messaging/messaging_drain.vcproj b/qpid/cpp/examples/messaging/messaging_drain.vcproj
deleted file mode 100644
index 3fc0ebe3f8..0000000000
--- a/qpid/cpp/examples/messaging/messaging_drain.vcproj
+++ /dev/null
@@ -1,371 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<!--

- -

- - 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.

- -

- -->

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="messaging_drain"

-	ProjectGUID="{D79791E5-C593-4F23-B545-0CE72D181F2A}"

-	RootNamespace="messaging_drain"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="0"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="."

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessagingd.lib qpidcommond.lib qpidtypesd.lib"

-				OutputFile="$(OutDir)\drain.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				RuntimeLibrary="2"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessaging.lib qpidcommon.lib qpidtypes.lib"

-				OutputFile="$(OutDir)\drain.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessagingd.lib qpidcommond.lib qpidtypesd.lib"

-				OutputFile="$(OutDir)\drain.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				RuntimeLibrary="2"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessaging.lib qpidcommon.lib qpidtypes.lib"

-				OutputFile="$(OutDir)\drain.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="drain.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\OptionParser.cpp"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/qpid/cpp/examples/messaging/messaging_map_receiver.vcproj b/qpid/cpp/examples/messaging/messaging_map_receiver.vcproj
deleted file mode 100644
index 9242156ae9..0000000000
--- a/qpid/cpp/examples/messaging/messaging_map_receiver.vcproj
+++ /dev/null
@@ -1,442 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<!--

- -

- - 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.

- -

- -->

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="messaging_map_receiver"

-	ProjectGUID="{92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}"

-	RootNamespace="messaging_map_receiver"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="0"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="."

-			IntermediateDirectory="Debug\messaging_map_receiver\I386"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessagingd.lib qpidcommond.lib qpidtypesd.lib"

-				OutputFile="$(OutDir)\map_receiver.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release\messaging_map_receiver\I386"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				RuntimeLibrary="2"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessaging.lib qpidcommon.lib qpidtypes.lib"

-				OutputFile="$(OutDir)\map_receiver.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TargetEnvironment="3"

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessagingd.lib qpidcommond.lib qpidtypesd.lib"

-				OutputFile="$(OutDir)\map_receiver.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TargetEnvironment="3"

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				RuntimeLibrary="2"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessaging.lib qpidcommon.lib qpidtypes.lib"

-				OutputFile="$(OutDir)\map_receiver.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;cxx;cc;c;C"

-			>

-			<File

-				RelativePath="map_receiver.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Documentation"

-			>

-			<File

-				RelativePath="CMakeLists.txt"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/qpid/cpp/examples/messaging/messaging_map_sender.vcproj b/qpid/cpp/examples/messaging/messaging_map_sender.vcproj
deleted file mode 100644
index b68d88f97c..0000000000
--- a/qpid/cpp/examples/messaging/messaging_map_sender.vcproj
+++ /dev/null
@@ -1,442 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<!--

- -

- - 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.

- -

- -->

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="messaging_map_sender"

-	ProjectGUID="{3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}"

-	RootNamespace="messaging_map_sender"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="0"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="."

-			IntermediateDirectory="Debug\messaging_map_sender\I386"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessagingd.lib qpidcommond.lib qpidtypesd.lib"

-				OutputFile="$(OutDir)\map_sender.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release\messaging_map_sender\I386"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				RuntimeLibrary="2"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessaging.lib qpidcommon.lib qpidtypes.lib"

-				OutputFile="$(OutDir)\map_sender.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TargetEnvironment="3"

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessagingd.lib qpidcommond.lib qpidtypesd.lib"

-				OutputFile="$(OutDir)\map_sender.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TargetEnvironment="3"

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				RuntimeLibrary="2"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessaging.lib qpidcommon.lib qpidtypes.lib"

-				OutputFile="$(OutDir)\map_sender.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;cxx;cc;c;C"

-			>

-			<File

-				RelativePath="map_sender.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Documentation"

-			>

-			<File

-				RelativePath="CMakeLists.txt"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/qpid/cpp/examples/messaging/messaging_server.vcproj b/qpid/cpp/examples/messaging/messaging_server.vcproj
deleted file mode 100644
index 7050f8b9e1..0000000000
--- a/qpid/cpp/examples/messaging/messaging_server.vcproj
+++ /dev/null
@@ -1,442 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<!--

- -

- - 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.

- -

- -->

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="messaging_server"

-	ProjectGUID="{E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}"

-	RootNamespace="messaging_server"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="0"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="."

-			IntermediateDirectory="Debug\messaging_server\I386"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessagingd.lib qpidcommond.lib qpidtypesd.lib"

-				OutputFile="$(OutDir)\server.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release\messaging_server\I386"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				RuntimeLibrary="2"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessaging.lib qpidcommon.lib qpidtypes.lib"

-				OutputFile="$(OutDir)\server.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TargetEnvironment="3"

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessagingd.lib qpidcommond.lib qpidtypesd.lib"

-				OutputFile="$(OutDir)\server.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TargetEnvironment="3"

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				RuntimeLibrary="2"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessaging.lib qpidcommon.lib qpidtypes.lib"

-				OutputFile="$(OutDir)\server.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;cxx;cc;c;C"

-			>

-			<File

-				RelativePath="server.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Documentation"

-			>

-			<File

-				RelativePath="CMakeLists.txt"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/qpid/cpp/examples/messaging/messaging_server_reconnect.vcproj b/qpid/cpp/examples/messaging/messaging_server_reconnect.vcproj
deleted file mode 100644
index dfde201178..0000000000
--- a/qpid/cpp/examples/messaging/messaging_server_reconnect.vcproj
+++ /dev/null
@@ -1,442 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<!--

- -

- - 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.

- -

- -->

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="messaging_server_reconnect"

-	ProjectGUID="{AF862399-FECA-1BAD-1FEE-AE349A6B75AA}"

-	RootNamespace="messaging_server_reconnect"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="0"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="."

-			IntermediateDirectory="Debug\messaging_server_reconnect\I386"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessagingd.lib qpidcommond.lib qpidtypesd.lib"

-				OutputFile="$(OutDir)\server_reconnect.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release\messaging_server_reconnect\I386"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				RuntimeLibrary="2"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessaging.lib qpidcommon.lib qpidtypes.lib"

-				OutputFile="$(OutDir)\server_reconnect.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TargetEnvironment="3"

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessagingd.lib qpidcommond.lib qpidtypesd.lib"

-				OutputFile="$(OutDir)\server_reconnect.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TargetEnvironment="3"

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				RuntimeLibrary="2"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,$(QPID_ROOT)\include,..\..\include"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessaging.lib qpidcommon.lib qpidtypes.lib"

-				OutputFile="$(OutDir)\server_reconnect.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;cxx;cc;c;C"

-			>

-			<File

-				RelativePath="server_reconnect.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Documentation"

-			>

-			<File

-				RelativePath="CMakeLists.txt"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/qpid/cpp/examples/messaging/messaging_spout.vcproj b/qpid/cpp/examples/messaging/messaging_spout.vcproj
deleted file mode 100644
index 79043b8958..0000000000
--- a/qpid/cpp/examples/messaging/messaging_spout.vcproj
+++ /dev/null
@@ -1,371 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<!--

- -

- - 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.

- -

- -->

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="messaging_spout"

-	ProjectGUID="{D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}"

-	RootNamespace="messaging_spout"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="196613"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="."

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessagingd.lib qpidcommond.lib qpidtypesd.lib"

-				OutputFile="$(OutDir)\spout.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				RuntimeLibrary="2"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessaging.lib qpidcommon.lib qpidtypes.lib"

-				OutputFile="$(OutDir)\spout.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessagingd.lib qpidcommond.lib qpidtypesd.lib"

-				OutputFile="$(OutDir)\spout.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="&quot;$(QPID_ROOT)\include&quot;;..\..\include"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"

-				RuntimeLibrary="2"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="qpidmessaging.lib qpidcommon.lib qpidtypes.lib"

-				OutputFile="$(OutDir)\spout.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(QPID_ROOT)\bin;..\..\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath=".\OptionParser.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\spout.cpp"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/qpid/cpp/examples/messaging/readme.txt b/qpid/cpp/examples/messaging/readme.txt
deleted file mode 100644
index ff145e0160..0000000000
--- a/qpid/cpp/examples/messaging/readme.txt
+++ /dev/null
@@ -1,146 +0,0 @@
-The messaging API is intended as a high level abstraction for
-messaging that avoids some of the protocol specific interactions
-forced by the earlier API. This allows applications to concern
-themselves with handling incoming messages and producing their own
-messages and delegates knowledge of the protocol interactions required
-to do so to the Qpid client library.
-
-To send or receive messages you first need to establish a connection
-to a broker. You can then create one or more sessions on that
-connection. Once you have a session you can create 'senders' or
-'receivers'. These are objects through which you can send or receive
-messages respectively.
-
-Senders and receivers are both created for a specified 'address'. An
-address will often just be a simple name. As far as the API is
-concerned, addresses are fairly opaque. This allows different types of
-messaging pattern to be selected without affecting the code simply by
-changing the address used, or configuring the broker to correctly
-handle addresses of a certain name.
-
-At present there are two 'types' of address supported: queues and
-topics. Messages sent to a queue are stored on the queue until there
-is a subscriber who can receive them. Each message is in general
-allocated to one subscriber (i.e. a competing consumer pattern). A
-topic on the other hand will not store messages if there are no
-subscriptions active and each message will be delivered to all
-interested subscribers.
-
-In the current AMQP 0-10 implementation, queues are represented by
-AMQP queues and topic are represented by AMQP exchanges to which
-subscribers bind their own private subscription queue to receive
-messages.
-
-The drain and spout examples in this directory are useful for
-exploring the behaviour of the messaging API over AMQP 0-10 and
-different uses of addresses. There is also some documentation around
-the address syntax and currently supported options in the doxygen
-reference material for the Address class itself.
-
-For example, to demonstrate classic message queueing behaviour:
-
-* create a queue e.g. by running: qpid-config add queue my-queue
-
-* use spout to send a message to that queue: ./spout --address my-queue
-
-* now use drain to receive that message: ./drain --address my-queue
-
-You can use the --content option to spout to specify text to put n the
-message body. You can also alter the id used to unqieuly identify
-each message using the --id option.
-
-To demonstrate the publish-subscribe pattern used for topics:
-
-* create an exchange e.g. by running: qpid-config add exchange topic my-topic
-
-* start up a subscriber using drain: ./drain -f --address my-topic
-  (the -f here causes the drain program to wait indefinitely for messages)
-
-* now send a message to the topic using spout: ./spout --address my-topic
-
-If you run spout before drain, the message will not be stored. If you
-start multiple instances of drain, they will each receive the message.
-
-For a topic, you can select the messages you wish to receive by
-'subject', eg. using the same exchange as above:
-
-* start a subscriber using drain for a specific subject:
-  ./drain -f --address my-topic/my-subject
-
-* now if you send a message with that subject you can see the
-  subscriber receives it: ./spout --address my-topic/my-subject
-
-* however were you to specify another subject for sent messages, those
-  would not be received, e.g: ./spout --address my-topic/another-subject
-
-In AMQP 0-10, the routing key is used to route messages for a given
-subject. As my-topic is a topic exchange we can use the special
-widlcard selection patterns when creating a subscriber:
-
-E.g. A subscriber reciving from address 'my-topic/#.dog' will receive
-messages sent to 'my-topic/big.dog' and 'my-topic/blue.dog', but not
-those sent to 'my-topic.blue-cat'.
-
-Though preconfiguring the valid addresses on a broker is a very common
-pattern, it is still possible to have them created automatically
-'on-demand'. This is done by specifying a create 'policy' for the address.
-
-* run: ./spout --address 'my-new-queue; {create: always}'
-* then run: ./drain --address my-new-queue
-
-You can see that the queue was created by spout before it sent the
-message to it, no explicit creation of the queue was needed.
-
-We can do the same for a topic, but there we need to specify the type
-of address (as there is no existing entity from which to infer that
-type and as we do not want the default type to be created, namely a
-queue):
-
-* run: ./drain -f --address 'my-new-topic; {create: always, node:{type:topic}}'
-* then run: ./spout --address my-new-queue
-
-The value to the create policy is one of always, sender, receiver or
-never (which is the default). (Note: You can see the exchange created
-using qpid-config exchanges, likewise to see the list of all queues
-use qpid-config queues).
-
-In addition to a create policy there are assert and delete
-policies. These have the same valid values as the create policy -
-always, sender, receiver and never - indicating when they come in to
-effect. 
-
-An example using the headers exchange (uses default instance, though
-this need not of course be the case. You could create another using
-qpid-config or even auto-create one):
-
-* First start a subscriber, e.g.:
-  ./drain -f --address 'amq.match; {filter:{x-match:all, colour:blue}}'
-
-* Any message with a property name colour with value blue will be
-  received:
-
-  ./spout --address amq.match --property colour=blue --content 'matched!'
-
-* But if the value of the colour property is something else, the
-  message will not be received:
-  ./spout --address amq.match --property colour=red --content 'not matched'
-
-An example using xquery based filtering with the xml exchange:
-
-* First start a subscriber with an xquery filter specified:
-  ./drain -f --address 'xml; {link:{x-bindings:[{arguments:{xquery:"declare variable $colour external; $colour = '\''red'\''"}}]}}'
-
-* Then test receipt of messages that match the xquery filter:
-  ./spout --address 'xml' --property colour=red --content 'matched!'
-    and
-  ./spout --address 'xml' --property colour=blue --content 'not matched'
-
-TODO:
-
-* auto-creating exchanges of different types
-
-* 'durable' and 'reliable' subscriptions
-
-* map content
-
-* client/server example: temp queues and reply-to
diff --git a/qpid/cpp/examples/messaging/server.cpp b/qpid/cpp/examples/messaging/server.cpp
deleted file mode 100644
index ba9fa9e063..0000000000
--- a/qpid/cpp/examples/messaging/server.cpp
+++ /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.
- *
- */
-
-#include <qpid/messaging/Address.h>
-#include <qpid/messaging/Connection.h>
-#include <qpid/messaging/Message.h>
-#include <qpid/messaging/Receiver.h>
-#include <qpid/messaging/Sender.h>
-#include <qpid/messaging/Session.h>
-
-#include <algorithm>
-#include <cstdlib>
-#include <iostream>
-#include <memory>
-#include <sstream>
-
-using namespace qpid::messaging;
-
-using std::stringstream;
-using std::string;
-
-int main(int argc, char** argv) {
-    const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
-    std::string connectionOptions = argc > 2 ? argv[2] : "";
-
-    Connection connection(url, connectionOptions);
-    try {
-        connection.open();
-        Session session = connection.createSession();
-        Receiver receiver = session.createReceiver("service_queue; {create: always}");
-
-        while (true) {
-            Message request = receiver.fetch();
-            const Address& address = request.getReplyTo();
-            if (address) {
-                Sender sender = session.createSender(address);
-                Message response;
-
-                qpid::types::Variant requestObj = request.getContentObject();
-                if (requestObj.getType() == qpid::types::VAR_STRING) {
-                    // Received a string.
-                    // Server returns request string in upper case with same encoding.
-                    std::string s = requestObj;
-                    std::transform(s.begin(), s.end(), s.begin(), toupper);
-                    qpid::types::Variant responseObj(s);
-                    responseObj.setEncoding( requestObj.getEncoding() );
-                    response.setContentObject( responseObj );
-                } else {
-                    // Received something other than a string.
-                    // Server echos received object as a utf8 string.
-                    qpid::types::Variant responseObj( requestObj.asString() );
-                    responseObj.setEncoding( "utf8" );
-                    response.setContentObject( requestObj );
-                }
-                sender.send(response);
-                std::cout << "Processed request: "
-                          << request.getContentObject()
-                          << " -> "
-                          << response.getContentObject() << std::endl;
-                session.acknowledge();
-                sender.close();
-            } else {
-                std::cerr << "Error: no reply address specified for request: " << request.getContent() << std::endl;
-                session.reject(request);
-            }
-        }
-        connection.close();
-        return 0;
-    } catch(const std::exception& error) {
-        std::cout << error.what() << std::endl;
-        connection.close();
-    }
-    return 1;
-}
-
-
diff --git a/qpid/cpp/examples/messaging/server_reconnect.cpp b/qpid/cpp/examples/messaging/server_reconnect.cpp
deleted file mode 100644
index ab7147760f..0000000000
--- a/qpid/cpp/examples/messaging/server_reconnect.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/messaging/Address.h>
-#include <qpid/messaging/Connection.h>
-#include <qpid/messaging/exceptions.h>
-#include <qpid/messaging/Message.h>
-#include <qpid/messaging/Receiver.h>
-#include <qpid/messaging/Sender.h>
-#include <qpid/messaging/Session.h>
-
-#include <algorithm>
-#include <cstdlib>
-#include <iostream>
-#include <memory>
-#include <sstream>
-
-using namespace qpid::messaging;
-
-using std::stringstream;
-using std::string;
-
-int main(int argc, char** argv) {
-    std::string url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
-    std::string connectionOptions = argc > 2 ? argv[2] : "";
-
-    Connection connection(url, connectionOptions);
-    try {
-        connection.open();
-        Session session = connection.createSession();
-        Receiver receiver = session.createReceiver("service_queue; {create: always}");
-
-        while (true) {
-            try {
-                if (!connection.isOpen()) {
-                    // This demonstrates use of application controlled
-                    // reconnect; the reconnect connection option may
-                    // also be used to automatcially handle
-                    // reconnection
-                    if (url.empty()) {
-                        connection.reconnect();
-                    } else {
-                        connection.reconnect(url);
-                    }
-                    std::cout << "Reconnected to " << connection.getUrl() << std::endl;
-                }
-                Message request = receiver.fetch();
-                const Address& address = request.getReplyTo();
-                if (address) {
-                    Sender sender = session.createSender(address);
-                    std::string s = request.getContent();
-                    std::transform(s.begin(), s.end(), s.begin(), toupper);
-                    Message response(s);
-                    sender.send(response);
-                    std::cout << "Processed request: "
-                              << request.getContent()
-                              << " -> "
-                              << response.getContent() << std::endl;
-                    session.acknowledge();
-                    sender.close();
-                } else {
-                    std::cerr << "Error: no reply address specified for request: " << request.getContent() << std::endl;
-                    session.reject(request);
-                }
-            } catch (const TransportFailure&) {
-                std::cout << "Connection to broker was lost, please enter URL to reconnect to (or hit return to use original url):" << std::endl;
-                if (!std::getline(std::cin, url)) {
-                    return 1;
-                }
-            }
-        }
-        connection.close();
-        return 0;
-    } catch(const std::exception& error) {
-        std::cout << error.what() << std::endl;
-        connection.close();
-    }
-    return 1;
-}
diff --git a/qpid/cpp/examples/messaging/spout.cpp b/qpid/cpp/examples/messaging/spout.cpp
deleted file mode 100644
index ba5ffb23e2..0000000000
--- a/qpid/cpp/examples/messaging/spout.cpp
+++ /dev/null
@@ -1,190 +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/messaging/Address.h>
-#include <qpid/messaging/Connection.h>
-#include <qpid/messaging/Message.h>
-#include <qpid/messaging/Message_io.h>
-#include <qpid/messaging/Sender.h>
-#include <qpid/messaging/Session.h>
-#include <qpid/types/Variant.h>
-
-#include <iostream>
-#include <sstream>
-#include <vector>
-#include <ctime>
-
-#include "OptionParser.h"
-
-using namespace qpid::messaging;
-using namespace qpid::types;
-
-typedef std::vector<std::string> string_vector;
-
-struct Options : OptionParser
-{
-    std::string url;
-    std::string address;
-    int timeout;
-    bool durable;
-    int count;
-    std::string id;
-    std::string replyto;
-    string_vector properties;
-    string_vector entries;
-    std::string content;
-    std::string connectionOptions;
-    bool print;
-
-    Options()
-        : OptionParser("Usage: spout [OPTIONS] ADDRESS", "Send messages to the specified address"),
-          url("127.0.0.1"),
-          timeout(0),
-          count(1),
-          durable(false),
-          print(false)
-    {
-        add("broker,b", url, "url of broker to connect to");
-        add("timeout,t", timeout, "exit after the specified time");
-        add("durable,d", durable, "make the message durable (def. transient)");
-        add("count,c", count, "stop after count messages have been sent, zero disables");
-        add("id,i", id, "use the supplied id instead of generating one");
-        add("reply-to", replyto, "specify reply-to address");
-        add("property,P", properties, "specify message property");
-        add("map,M", entries, "specify entry for map content");
-        add("content", content, "specify textual content");
-        add("connection-options", connectionOptions, "connection options string in the form {name1:value1, name2:value2}");
-        add("print", print, "print each message sent");
-    }
-
-    static bool nameval(const std::string& in, std::string& name, std::string& value)
-    {
-        std::string::size_type i = in.find("=");
-        if (i == std::string::npos) {
-            name = in;
-            return false;
-        } else {
-            name = in.substr(0, i);
-            if (i+1 < in.size()) {
-                value = in.substr(i+1);
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
-
-    static void setProperty(Message& message, const std::string& property)
-    {
-        std::string name;
-        std::string value;
-        if (nameval(property, name, value)) {
-            message.getProperties()[name] = value;
-            message.getProperties()[name].setEncoding("utf8");
-        } else {
-            message.getProperties()[name] = Variant();
-        }
-    }
-
-    void setProperties(Message& message) const
-    {
-        for (string_vector::const_iterator i = properties.begin(); i != properties.end(); ++i) {
-            setProperty(message, *i);
-        }
-    }
-
-    void setEntries(Variant::Map& content) const
-    {
-        for (string_vector::const_iterator i = entries.begin(); i != entries.end(); ++i) {
-            std::string name;
-            std::string value;
-            if (nameval(*i, name, value)) {
-                content[name] = value;
-            } else {
-                content[name] = Variant();
-            }
-        }
-    }
-
-    bool checkAddress()
-    {
-        if (getArguments().empty()) {
-            error("Address is required");
-            return false;
-        } else {
-            address = getArguments()[0];
-            return true;
-        }
-    }
-
-    bool isDurable() const
-    {
-      return durable;
-    }
-};
-
-int main(int argc, char** argv)
-{
-    Options options;
-    if (options.parse(argc, argv) && options.checkAddress()) {
-        Connection connection(options.url, options.connectionOptions);
-        try {
-            connection.open();
-            Session session = connection.createSession();
-            Sender sender = session.createSender(options.address);
-
-            Message message;
-            message.setDurable(options.isDurable());
-            options.setProperties(message);
-            Variant& obj = message.getContentObject();
-            if (options.entries.size()) {
-                Variant::Map content;
-                options.setEntries(content);
-                obj = content;
-            } else if (options.content.size()) {
-                obj = options.content;
-                obj.setEncoding("utf8");
-            }
-            std::time_t start = std::time(0);
-            for (int count = 0; 
-                (count < options.count || options.count == 0) && 
-                (options.timeout == 0 || std::difftime(std::time(0), start) < options.timeout); 
-                count++) {
-                if (!options.replyto.empty()) message.setReplyTo(Address(options.replyto));
-                std::string id = options.id.empty() ? Uuid(true).str() : options.id;
-                std::stringstream spoutid;
-                spoutid << id << ":" << count;
-                message.getProperties()["spout-id"] = spoutid.str();
-                if (options.print) std::cout << message << std::endl;
-                sender.send(message);
-            }
-            session.sync();
-            connection.close();
-            return 0;
-        } catch(const std::exception& error) {
-            std::cout << error.what() << std::endl;
-            connection.close();
-        }
-    }
-    return 1;
-}
-
-
diff --git a/qpid/cpp/examples/winsdk-cmake/CMakeLists.txt b/qpid/cpp/examples/winsdk-cmake/CMakeLists.txt
deleted file mode 100644
index a59bdca954..0000000000
--- a/qpid/cpp/examples/winsdk-cmake/CMakeLists.txt
+++ /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.
-#
-
-#
-# Description
-#   For WinSDK:
-#   Top-level CMake source to build version-independent C++ 
-#   example solution and project files for Visual Studio.
-#
-# Usage:
-#   Target: Visual Studio 2008, 32-bit
-#     cd    <WinSDK>\examples\examples-cmake
-#     cmake -G "Visual Studio 9 2008" .
-#
-#   Target: Visual Studio 2008, 64-bit
-#     cd    <WinSDK>\examples\examples-cmake
-#     cmake -G "Visual Studio 9 2008 Win64" .
-#
-#   Target: Visual Studio 2010, 32-bit
-#     cd    <WinSDK>\examples\examples-cmake
-#     cmake -G "Visual Studio 10" .
-#
-#   Target: Visual Studio 2010, 64-bit
-#     cd    <WinSDK>\examples\examples-cmake
-#     cmake -G "Visual Studio 10 Win64" .
-#
-#   Then execute the examples.sln created by cmake to build
-#   the examples in Debug or Release configurations.
-#
-
-project(examples)
-
-set (CMAKE_VERBOSE_MAKEFILE ON)
-
-cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
-
-set (CMAKE_SUPPRESS_REGENERATION TRUE)
-
-add_definitions(
-  /D "_CRT_NONSTDC_NO_WARNINGS"
-  /D "NOMINMAX" 
-  /D "WIN32_LEAN_AND_MEAN" 
-)
-
-set (CMAKE_DEBUG_POSTFIX "d")
-
-include_directories      ( "../../include" )
-link_directories         ( "../../lib"     )
-
-macro(add_example_properties example)
-  set_target_properties(${example} PROPERTIES OUTPUT_NAME "${example}" )
-  set_target_properties(${example} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../bin/${CMAKE_BUILD_TYPE})
-  
-  target_link_libraries(${example} optimized qpidmessaging debug qpidmessagingd)
-  target_link_libraries(${example} optimized qpidcommon    debug qpidcommond   )
-  target_link_libraries(${example} optimized qpidtypes     debug qpidtypesd    )
-endmacro(add_example_properties)
-
-macro(add_example srcdirectory example)
-  add_executable(${example} ../${srcdirectory}/${example}.cpp)
-  add_example_properties(${example})
-endmacro(add_example)
-
-macro(add_example_with_parser srcdirectory example)
-  add_executable(${example} ../${srcdirectory}/${example}.cpp ../messaging/OptionParser.cpp)
-  add_example_properties(${example})
-endmacro(add_example_with_parser)
-
-add_example_with_parser(messaging drain)
-add_example_with_parser(messaging spout)
-
-add_example(messaging map_receiver)
-add_example(messaging map_sender)
-add_example(messaging client)
-add_example(messaging server)
-add_example(messaging server_reconnect)
-add_example(messaging hello_world)
-add_example(messaging hello_xml)